Skip to content

Commit ab38982

Browse files
committed
refactor: naming and comments (#655)
1 parent c1fe692 commit ab38982

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

lib/prepare/resolveOptions.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,16 @@ module.exports = async function resolveOptions (sourceDir) {
106106
const markdown = createMarkdown(siteConfig)
107107

108108
// resolve pageFiles
109-
const files = ['**/*.md', '!.vuepress', '!node_modules']
109+
const patterns = ['**/*.md', '!.vuepress', '!node_modules']
110110
if (siteConfig.dest) {
111-
// exclude dest folder from pageFiles
111+
// #654 exclude dest folder when dest dir was set in
112+
// sourceDir but not in '.vuepress'
112113
const outDirRelative = path.relative(sourceDir, outDir)
113-
files.push('!' + outDirRelative)
114+
if (!outDirRelative.includes('..')) {
115+
patterns.push('!' + outDirRelative)
116+
}
114117
}
115-
const pageFiles = sort(await globby(files, { cwd: sourceDir }))
118+
const pageFiles = sort(await globby(patterns, { cwd: sourceDir }))
116119

117120
// resolve lastUpdated
118121
const shouldResolveLastUpdated = (

0 commit comments

Comments
 (0)