Change plugin API to first-order function, use Babel Style for configure extra options

Author: dacsang97

lib/prepare.js

@@ -5,7 +5,7 @@ const yamlParser = require('js-yaml')
 const tomlParser = require('toml')
 const createMarkdown = require('./markdown')
 const tempPath = path.resolve(__dirname, 'app/.temp')
-const { inferTitle, extractHeaders, parseFrontmatter, loadPlugin } = require('./util')
+const { inferTitle, extractHeaders, parseFrontmatter, loadPlugin, cloneOptions } = require('./util')
 
 fs.ensureDirSync(tempPath)
 
@@ -77,20 +77,20 @@ if (!Object.assign) Object.assign = require('object-assign')`
   // 7. handle user plugins
   if (options.siteConfig.plugins && Array.isArray(options.siteConfig.plugins)) {
     const { plugins } = options.siteConfig
+
     for (const plugin of plugins) {
       let pluginRequired
+      let pluginOptions
+      const vuepressOptions = cloneOptions(options)
       if (typeof plugin === 'string') {
-        pluginRequired = loadPlugin(plugin, options)
-      }
-      if (typeof plugin === 'object') {
-        pluginRequired = loadPlugin(plugin.resolve, options)
-        if (plugin.options) {
-          pluginRequired = pluginRequired(plugin.options)
-        }
+        pluginRequired = loadPlugin(plugin, sourceDir)
+      } else if (Array.isArray(plugin)) {
+        pluginRequired = loadPlugin(plugin[0], sourceDir)
+        pluginOptions = plugin[1]
       }
       if (pluginRequired) {
         try {
-          await pluginRequired(options)
+          await pluginRequired({ vuepressOptions, pluginOptions })
         } catch (e) {
           throw e
         }

lib/util/index.js

@@ -85,10 +85,10 @@ exports.extractHeaders = (content, include = [], md) => {
   return res
 }
 
-exports.loadPlugin = (pluginPath, options) => {
+exports.loadPlugin = (pluginPath, sourceDir) => {
   const fs = require('fs-extra')
   const path = require('path')
-  const vuepressDir = path.resolve(options.sourceDir, '.vuepress')
+  const vuepressDir = path.resolve(sourceDir, '.vuepress')
   let plugin
   try {
     if (fs.existsSync(path.resolve(vuepressDir, pluginPath))) {
@@ -101,3 +101,26 @@ exports.loadPlugin = (pluginPath, options) => {
   }
   return plugin
 }
+
+exports.cloneOptions = (options) => {
+  const optionClone = {}
+  const readonlyProperties = ['sourceDir', 'outDir', 'publicPath', 'markdown', 'themePath', 'useDefaultTheme', 'notFoundPath']
+  const writableProperties = ['siteConfig', 'pageFiles', 'siteData']
+
+  readonlyProperties.forEach(prop => {
+    Object.defineProperty(optionClone, prop, {
+      value: options[prop],
+      enumerable: true
+    })
+  })
+
+  writableProperties.forEach(prop => {
+    Object.defineProperty(optionClone, prop, {
+      value: options[prop],
+      writable: true,
+      enumerable: true
+    })
+  })
+
+  return optionClone
+}