fix($plugin-blog): inconsistent paths of tag and category pages with …

…index page (#1420)
vuejs · Mar 12, 2019 · 5c0e62f · 5c0e62f
1 parent 9734a58
commit 5c0e62f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
@@ -20,15 +20,15 @@ module.exports = (options, ctx) => {
       frontmatter: { layout: getLayout('Categories', 'Page') }
     },
     {
-      when: ({ regularPath }) => regularPath.startsWith('/category/'),
+      when: ({ regularPath }) => regularPath.startsWith(categoryIndexPageUrl),
       frontmatter: { layout: getLayout('Category', 'Page') }
     },
     {
       when: ({ regularPath }) => regularPath === tagIndexPageUrl,
       frontmatter: { layout: getLayout('Tags', 'Page') }
     },
     {
-      when: ({ regularPath }) => regularPath.startsWith('/tag/'),
+      when: ({ regularPath }) => regularPath.startsWith(tagIndexPageUrl),
       frontmatter: { layout: getLayout('Tag', 'Page') }
     },
     {
@@ -86,15 +86,14 @@ module.exports = (options, ctx) => {
         if (key) {
           if (!map[key]) {
             map[key] = {}
-            map[key].path = `/${scope}/${key}.html`
+            map[key].path = `${scope}${key}.html`
             map[key].pageKeys = []
           }
           map[key].pageKeys.push(pageKey)
         }
       }
-
-      const handleTag = curryHandler('tag', tagMap)
-      const handleCategory = curryHandler('category', categoryMap)
+      const handleTag = curryHandler(tagIndexPageUrl, tagMap)
+      const handleCategory = curryHandler(categoryIndexPageUrl, categoryMap)
 
       pages.forEach(({
         key,