From bd589beb794999aefc1f93f993a7dd2cb3cab2e5 Mon Sep 17 00:00:00 2001 From: Pedro Di Martino Date: Tue, 17 Jul 2018 11:40:17 +0200 Subject: [PATCH 1/2] exclude dest folder from pageFiles --- lib/prepare/resolveOptions.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js index 76fa2fcc78..15c567327a 100644 --- a/lib/prepare/resolveOptions.js +++ b/lib/prepare/resolveOptions.js @@ -106,6 +106,12 @@ module.exports = async function resolveOptions (sourceDir) { const markdown = createMarkdown(siteConfig) // resolve pageFiles + const files = ['**/*.md', '!.vuepress', '!node_modules'] + if (siteConfig.dest) { + // exclude dest folder from pageFiles + const outDirRelative = path.relative(sourceDir, outDir) + files.push('!' + siteConfig.dest) + } const pageFiles = sort(await globby(['**/*.md', '!.vuepress', '!node_modules'], { cwd: sourceDir })) // resolve lastUpdated From c8cd2e11d8ca9c3ef21aecef722171dd3f91774f Mon Sep 17 00:00:00 2001 From: Pedro Di Martino Date: Tue, 17 Jul 2018 17:56:56 +0200 Subject: [PATCH 2/2] fix use files variable --- lib/prepare/resolveOptions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js index 15c567327a..540876c039 100644 --- a/lib/prepare/resolveOptions.js +++ b/lib/prepare/resolveOptions.js @@ -110,9 +110,9 @@ module.exports = async function resolveOptions (sourceDir) { if (siteConfig.dest) { // exclude dest folder from pageFiles const outDirRelative = path.relative(sourceDir, outDir) - files.push('!' + siteConfig.dest) + files.push('!' + outDirRelative) } - const pageFiles = sort(await globby(['**/*.md', '!.vuepress', '!node_modules'], { cwd: sourceDir })) + const pageFiles = sort(await globby(files, { cwd: sourceDir })) // resolve lastUpdated const shouldResolveLastUpdated = (