Skip to content

fix($core): normalize theme path with Layout.vue correctly (close #2178) #2188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix($core): normalize theme path with Layout.vue correctly (close #2178) #2188

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa496bc
fix($core): normalize theme path with Layout.vue correctly (close #2178)
meteorlxy Feb 17, 2020
658f007
tweaks
meteorlxy Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/@vuepress/core/lib/node/loadTheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down