Skip to content

Commit 1145447

Browse files
committed
test: Add a test for themes from dependencies using Layout.vue as entry point
1 parent 41b5cfb commit 1145447

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

packages/@vuepress/core/lib/node/loadTheme.js

+3-11
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,7 @@ module.exports = function loadTheme (ctx) {
5656
function normalizeThemePath (resolved) {
5757
const { entry, name, fromDep } = resolved
5858
if (fromDep) {
59-
const packageRoot = require.resolve(`${name}/package.json`)
60-
const { main } = require(packageRoot)
61-
if (main.endsWith('.vue')) {
62-
// For those cases that "main" field is set to an non-index file
63-
// e.g. `layouts/Layout.vue`
64-
return packageRoot
65-
} else {
66-
// For those cases that "index.js" is not at package root
67-
// e.g. `lib/index.js` (#1362)
68-
return parse(require.resolve(name)).dir
69-
}
59+
return parse(require.resolve(name)).dir
7060
} else if (entry.endsWith('.js') || entry.endsWith('.vue')) {
7161
return parse(entry).dir
7262
} else {
@@ -97,6 +87,8 @@ function resolveTheme (ctx, resolver, ignoreLocal, theme) {
9787
// 2. From dep
9888
} else if (isString(theme)) {
9989
const resolved = resolver.resolve(theme, sourceDir)
90+
console.log('resolveTheme, theme=', theme, 'sourceDir=', sourceDir, 'resolver=', resolver)
91+
console.log('resolved:', resolved)
10092
if (resolved.entry === null) {
10193
throw new Error(`Cannot resolve theme: ${theme}.`)
10294
}

0 commit comments

Comments
 (0)