From f1855338ba3c64a5d1b6aae7cec224bcf3da8ef4 Mon Sep 17 00:00:00 2001 From: eduardcotmrf Date: Tue, 16 Jul 2019 14:35:03 +0200 Subject: [PATCH 1/4] feat($core): config pattern --- packages/@vuepress/core/lib/node/App.js | 4 +++- .../prepare/fixtures/docs-patterns/.vuepress/config.js | 10 ++++++++++ .../__tests__/prepare/fixtures/docs-patterns/README.md | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/.vuepress/config.js create mode 100644 packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/README.md diff --git a/packages/@vuepress/core/lib/node/App.js b/packages/@vuepress/core/lib/node/App.js index 99df7fc280..3e81e00156 100755 --- a/packages/@vuepress/core/lib/node/App.js +++ b/packages/@vuepress/core/lib/node/App.js @@ -316,7 +316,9 @@ module.exports = class App { async resolvePages () { // resolve pageFiles - const patterns = ['**/*.md', '**/*.vue', '!.vuepress', '!node_modules'] + const patterns = this.siteConfig.patterns ? this.siteConfig.patterns : ['**/*.md', '**/*.vue'] + patterns.push('!.vuepress', '!node_modules') + if (this.siteConfig.dest) { // #654 exclude dest folder when dest dir was set in // sourceDir but not in '.vuepress' diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/.vuepress/config.js b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/.vuepress/config.js new file mode 100644 index 0000000000..365f688050 --- /dev/null +++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/.vuepress/config.js @@ -0,0 +1,10 @@ +module.exports = { + title: 'Hello VuePress', + description: '# Hello, VuePress!', + dest: 'vuepress', + base: 'vuepress', + patterns: ['**/*.md', '**/*.vue', '!**/deploy.*'], + head: [ + ['link', { rel: 'icon', href: '/logo.png' }] + ] +} diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/README.md b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/README.md new file mode 100644 index 0000000000..aef89369f1 --- /dev/null +++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-patterns/README.md @@ -0,0 +1 @@ +# Hello, VuePress! From 70a7d3b26db50526a3ef1e3b5c22587dead43820 Mon Sep 17 00:00:00 2001 From: eduardcotmrf Date: Wed, 17 Jul 2019 09:07:36 +0200 Subject: [PATCH 2/4] add doc --- packages/docs/docs/config/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/docs/docs/config/README.md b/packages/docs/docs/config/README.md index 96ea75e639..b612e71b85 100644 --- a/packages/docs/docs/config/README.md +++ b/packages/docs/docs/config/README.md @@ -131,6 +131,13 @@ module.exports = { } ``` +### pattern + +- Type: `Array` +- Default: `['**/*.md', '**/*.vue']` + +Specify which pattern of files you want to be resolved. + ## Styling ### palette.styl From 942ef58867cf89eb267e4ebb494da4d3a759a2f9 Mon Sep 17 00:00:00 2001 From: eduardcotmrf Date: Wed, 17 Jul 2019 09:09:40 +0200 Subject: [PATCH 3/4] typo --- packages/docs/docs/config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docs/docs/config/README.md b/packages/docs/docs/config/README.md index b612e71b85..75f809ecbe 100644 --- a/packages/docs/docs/config/README.md +++ b/packages/docs/docs/config/README.md @@ -131,7 +131,7 @@ module.exports = { } ``` -### pattern +### patterns - Type: `Array` - Default: `['**/*.md', '**/*.vue']` From 040177f3d79760c65c174c06b18df99ce7eef28b Mon Sep 17 00:00:00 2001 From: eduardcotmrf Date: Mon, 7 Oct 2019 10:13:07 +0200 Subject: [PATCH 4/4] adding do to zh --- packages/docs/docs/zh/config/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/docs/docs/zh/config/README.md b/packages/docs/docs/zh/config/README.md index 22782537f3..b501547814 100644 --- a/packages/docs/docs/zh/config/README.md +++ b/packages/docs/docs/zh/config/README.md @@ -127,6 +127,13 @@ module.exports = { } ``` +### patterns + +- Type: `Array` +- Default: `['**/*.md', '**/*.vue']` + +Specify which pattern of files you want to be resolved. + ## Styling ### palette.styl