fix($core): validate the existence of directory specified by director…

…y classifier. (close: #1)
vuepress · Jun 23, 2019 · d64964d · d64964d
1 parent 93c6a4e
commit d64964d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ lib
 .temp
 types
 src/**/*.js
+dist
 
 ### Code ###
 # Visual Studio Code - https://code.visualstudio.com/

diff --git a/examples/blog/.vuepress/config.js b/examples/blog/.vuepress/config.js
@@ -14,6 +14,17 @@ module.exports = {
             lengthPerPage: 2,
           },
         },
+        {
+          id: 'archive',
+          dirname: '_archive',
+          path: '/archive/',
+          // layout: 'IndexArchive', defaults to `Layout.vue`
+          itemLayout: 'Post',
+          itemPermalink: '/archive/:year/:month/:day/:slug',
+          pagination: {
+            lengthPerPage: 5,
+          },
+        },
       ],
       frontmatters: [
         {

diff --git a/examples/launch.js b/examples/launch.js
@@ -33,11 +33,11 @@ async function launch() {
   fork(
     require.resolve('vuepress/cli.js'),
     [
-      'dev',
+      process.argv[2],
       `${process.cwd()}/examples/${target}`,
       '--temp',
       `examples/${target}/.temp`,
-      ...process.argv.slice(2),
+      ...process.argv.slice(3),
     ],
     { stdio: 'inherit' },
   )

diff --git a/package.json b/package.json
@@ -13,7 +13,8 @@
     "build:components": "mkdir -p lib/client/components && cp -r src/client/components lib/client",
     "dev:docs": "vuepress dev docs --temp docs/.temp",
     "build:docs": "vuepress build docs --temp docs/.temp",
-    "example": "node examples/launch.js",
+    "dev:example": "node examples/launch.js dev",
+    "build:example": "node examples/launch.js build",
     "prepublishOnly": "npm run build && conventional-changelog -p angular -r 2 -i CHANGELOG.md -s"
   },
   "main": "lib/node/index.js",

diff --git a/src/node/handleOptions.ts b/src/node/handleOptions.ts
@@ -1,3 +1,4 @@
+import { fs, path, logger, chalk } from '@vuepress/shared-utils'
 import { BlogPluginOptions } from './interface/Options'
 import { ExtraPage } from './interface/ExtraPages'
 import { PageEnhancer } from './interface/PageEnhancer'
@@ -23,7 +24,25 @@ export function handleOptions(
   options: BlogPluginOptions,
   ctx: VuePressContext,
 ) {
-  const { directories = [], frontmatters = [] } = options
+  let { directories = [], frontmatters = [] } = options
+
+  /**
+   * Validate the existence of directory specified by directory classifier.
+   * Fixed https://github.com/ulivz/vuepress-plugin-blog/issues/1
+   */
+  directories = directories.filter(directory => {
+    const targetDir = path.join(ctx.sourceDir, directory.dirname)
+    if (fs.existsSync(targetDir)) {
+      return true
+    }
+
+    logger.warn(
+      `[@vuepress/plugin-blog] Invalid directory classifier: ${chalk.cyan(directory.id)}, ` +
+      `${chalk.gray(targetDir)} doesn't exist!`,
+    )
+
+    return false
+  })
 
   const pageEnhancers: PageEnhancer[] = []
   const frontmatterClassificationPages: FrontmatterClassificationPage[] = []
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ lib @@
     .temp
     types
     src/**/*.js
+    dist
     ### Code ###
     # Visual Studio Code - https://code.visualstudio.com/
@@ Expand Down @@