fix($core): cannot resolve agreement file from parent theme

vuejs · Jun 22, 2019 · 1aaa6e3 · 1aaa6e3
1 parent 17ba325
commit 1aaa6e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/@vuepress/core/lib/node/App.js b/packages/@vuepress/core/lib/node/App.js
@@ -385,7 +385,7 @@ module.exports = class App {
       return current
     }
     if (this.themeAPI.existsParentTheme) {
-      const parent = path.resolve(this.themeAPI.theme.path, filepath)
+      const parent = path.resolve(this.themeAPI.parentTheme.path, filepath)
       if (fs.existsSync(parent)) {
         return parent
       }

diff --git a/packages/@vuepress/core/lib/node/theme-api/index.js b/packages/@vuepress/core/lib/node/theme-api/index.js
@@ -80,7 +80,7 @@ module.exports = class ThemeAPI {
         isInternal: true
       }
       logger.warn(
-        `[vuepress] Cannot resolve Layout.vue file in \n ${Layout.path},`
+        `[vuepress] Cannot resolve Layout.vue file in \n ${Layout.path}, `
         + `fallback to default layout: ${fallbackLayoutPath}`
       )
     }