fix($core): normalize theme path with Layout.vue correctly (close vue…

…js#2178)
meteorlxy · Feb 17, 2020 · aa496bc · aa496bc
1 parent 0ca620f
commit aa496bc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/@vuepress/core/lib/node/loadTheme.js b/packages/@vuepress/core/lib/node/loadTheme.js
@@ -60,8 +60,15 @@ module.exports = function loadTheme (ctx) {
 }
 
 function normalizeThemePath (resolved) {
-  const { entry, fromDep } = resolved
+  const { entry, name, fromDep } = resolved
   if (fromDep) {
+    const packageRoot = require.resolve(`${name}/package.json`)
+    const { main } = require(packageRoot)
+    if (main.endsWith('.vue')) {
+      // For those cases that "main" field is set to .vue file
+      // e.g. `layouts/Layout.vue`
+      return parse(packageRoot).dir
+    }
     return parse(require.resolve(entry)).dir
   } else if (entry.endsWith('.js') || entry.endsWith('.vue')) {
     return parse(entry).dir