fix(@plugin-blog): fix blog layout rendering error (close: #1073)

vuejs · Dec 12, 2018 · bc170f9 · bc170f9
1 parent a56c3b4
commit bc170f9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
     "dev": "yarn tsc && yarn workspace docs dev",
     "build": "yarn tsc && yarn workspace docs build",
     "show-help": "yarn workspace docs show-help",
-    "dev:blog": "yarn workspace blog dev",
-    "build:blog": "yarn workspace blog build",
+    "dev:blog": "yarn tsc && yarn workspace blog dev",
+    "build:blog": "yarn tsc && yarn workspace blog build",
     "register-vuepress": "lerna exec --scope vuepress -- yarn link",
     "lint": "eslint --fix packages/**/*.js packages/**/*.vue packages/**/bin/*",
     "release": "yarn --pure-lockfile && yarn tsc && node scripts/release.js",

diff --git a/packages/@vuepress/core/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
@@ -2,7 +2,7 @@
 
 const PLUGIN_OPTION_META_MAP = {
   // hooks
-  READY: { name: 'ready', types: [Function] },
+  READY: { name: 'ready', types: [Function], async: true },
   COMPILED: { name: 'compiled', types: [Function] },
   UPDATED: { name: 'updated', types: [Function] },
   GENERATED: { name: 'generated', types: [Function], async: true },

diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -111,7 +111,7 @@ module.exports = class AppContext {
       })
     )
 
-    await this.pluginAPI.options.ready.apply()
+    await this.pluginAPI.options.ready.asyncApply()
     await Promise.all([
       this.pluginAPI.options.clientDynamicModules.apply(this),
       this.pluginAPI.options.enhanceAppFiles.apply(this),

diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
@@ -128,6 +128,10 @@ module.exports = class Page {
           layout: this.key
         }, data)
       }
+
+      if (typeof this.frontmatter.layout === 'string') {
+        this._hasInitLayout = true
+      }
     }
 
     // resolve i18n

diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
@@ -65,7 +65,9 @@ module.exports = (options, ctx) => {
       }) => {
         if (when(pageCtx)) {
           Object.keys(frontmatter).forEach(key => {
-            rawFrontmatter[key] = rawFrontmatter[key] || frontmatter[key]
+            if (!pageCtx._hasInitLayout) {
+              rawFrontmatter[key] = frontmatter[key]
+            }
           })
           Object.assign(pageCtx, data)
         }
@@ -75,7 +77,7 @@ module.exports = (options, ctx) => {
     /**
      * Create tag page and category page.
      */
-    ready () {
+    async ready () {
       const { pages } = ctx
       const tagMap = {}
       const categoryMap = {}
@@ -140,7 +142,7 @@ module.exports = (options, ctx) => {
           frontmatter: { title: `${categoryName} | Category` }
         }))
       ]
-      extraPages.forEach(page => ctx.addPage(page))
+      await Promise.all(extraPages.map(page => ctx.addPage(page)))
     },
 
     /**

diff --git a/packages/@vuepress/theme-blog/layouts/Tags.vue b/packages/@vuepress/theme-blog/layouts/Tags.vue
@@ -0,0 +1,5 @@
+<template>
+  <div class="container">
+    <h2>Now is Tags Page</h2>
+  </div>
+</template>