refactor: naming and comments (#655)

vuejs · Jul 27, 2018 · ab38982 · ab38982
1 parent c1fe692
commit ab38982
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
@@ -106,13 +106,16 @@ module.exports = async function resolveOptions (sourceDir) {
   const markdown = createMarkdown(siteConfig)
 
   // resolve pageFiles
-  const files = ['**/*.md', '!.vuepress', '!node_modules']
+  const patterns = ['**/*.md', '!.vuepress', '!node_modules']
   if (siteConfig.dest) {
-    // exclude dest folder from pageFiles
+    // #654 exclude dest folder when dest dir was set in
+    // sourceDir but not in '.vuepress'
     const outDirRelative = path.relative(sourceDir, outDir)
-    files.push('!' + outDirRelative)
+    if (!outDirRelative.includes('..')) {
+      patterns.push('!' + outDirRelative)
+    }
   }
-  const pageFiles = sort(await globby(files, { cwd: sourceDir }))
+  const pageFiles = sort(await globby(patterns, { cwd: sourceDir }))
 
   // resolve lastUpdated
   const shouldResolveLastUpdated = (