From 46e1992f8f89f54f9c372179d6bf0fa9c464475a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 2 Jun 2018 02:04:54 +0800
Subject: [PATCH 001/242] feat: init plugin

---
 docs/.vuepress/config.js                      |  5 ++
 lib/plugin-api/hook.js                        | 28 ++++++
 lib/plugin-api/index.js                       | 89 +++++++++++++++++++
 lib/plugin-api/util.js                        | 34 +++++++
 .../vuepress-plugin-last-updated/index.js     | 15 ++++
 lib/prepare/resolveOptions.js                 | 23 ++++-
 6 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 lib/plugin-api/hook.js
 create mode 100644 lib/plugin-api/index.js
 create mode 100644 lib/plugin-api/util.js
 create mode 100644 lib/plugins/vuepress-plugin-last-updated/index.js

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index ad70d04dba..a8522e1147 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -25,6 +25,11 @@ module.exports = {
   ],
   serviceWorker: true,
   theme: 'vue',
+  plugins: [
+    [
+      require('../../lib/plugins/vuepress-plugin-last-updated/index'),
+    ]
+  ],
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
diff --git a/lib/plugin-api/hook.js b/lib/plugin-api/hook.js
new file mode 100644
index 0000000000..0c7108ffcd
--- /dev/null
+++ b/lib/plugin-api/hook.js
@@ -0,0 +1,28 @@
+module.exports = class Hook {
+  constructor (name) {
+    this.name = name
+    this.handlers = []
+  }
+
+  tap (symbol, handler) {
+    if (typeof handler !== 'function') {
+      return
+    }
+    this.handlers.push({ symbol, handler })
+    return this
+  }
+
+  remove (symbol) {
+    const index = this.handlers.findIndex(item => item.symbol === symbol)
+    if (index !== -1) {
+      this.handlers.splice(index, 1)
+    }
+    return this
+  }
+
+  async run () {
+    for (const item of this.handlers) {
+      await item.handler.apply(null, arguments)
+    }
+  }
+}
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
new file mode 100644
index 0000000000..f33f30f7b2
--- /dev/null
+++ b/lib/plugin-api/index.js
@@ -0,0 +1,89 @@
+const { resolvePlugin, inferPluginName } = require('./util')
+const Hook = require('./hook')
+
+module.exports = class Plugin {
+  constructor (pluginConfigs) {
+    this.hooks = {}
+    this.apis = {}
+    this.extendHooks([
+      'ready',
+      'compiled',
+      'updated',
+      'generated'
+    ])
+    this.extendAPIs([
+      'client',
+      'chainWebpack',
+      'enhanceDevServer',
+      'extendMarkdown',
+      'enhanceAppFiles',
+      'outFiles',
+      'extendPageData'
+    ])
+    this.resolvePluginConfig(pluginConfigs)
+  }
+
+  extendHooks (hooks) {
+    hooks.forEach(hook => {
+      this.hooks[hook] = new Hook(hook)
+    })
+  }
+
+  extendAPIs (apis) {
+    apis.forEach(api => {
+      this.apis[api] = []
+    })
+  }
+
+  resolvePluginConfigs (pluginConfigs) {
+    pluginConfigs.forEach(([name, pluginOptions]) => {
+      let plugin = resolvePlugin(name)
+      if (typeof plugin === 'function') {
+        plugin = plugin(pluginOptions)
+      }
+      plugin = Object.assign(plugin, { name: inferPluginName(name, plugin) })
+      this.resolvePluginConfig(plugin)
+    })
+  }
+
+  registerHook (name, hook, symbol) {
+    this.hooks[name].tap(symbol, hook)
+    return this
+  }
+
+  registerAPI (name, api) {
+    this.apis[name].push(api)
+    return this
+  }
+
+  resolvePluginConfig ({
+    name,
+    client,
+    chainWebpack,
+    enhanceDevServer,
+    extendMarkdown,
+    enhanceAppFiles,
+    outFiles,
+    extendPageData,
+    ready,
+    compiled,
+    updated,
+    generated
+  }) {
+    console.log(this.hooks)
+    this
+      .registerHook('ready', ready, name)
+      .registerHook('compiled', compiled, name)
+      .registerHook('updated', updated, name)
+      .registerHook('generated', generated, name)
+
+    this
+      .registerAPI('client', client)
+      .registerAPI('chainWebpack', chainWebpack)
+      .registerAPI('enhanceDevServer', enhanceDevServer)
+      .registerAPI('extendMarkdown', extendMarkdown)
+      .registerAPI('enhanceAppFiles', enhanceAppFiles)
+      .registerAPI('outFiles', outFiles)
+      .registerAPI('extendPageData', extendPageData)
+  }
+}
diff --git a/lib/plugin-api/util.js b/lib/plugin-api/util.js
new file mode 100644
index 0000000000..9fe67c9c34
--- /dev/null
+++ b/lib/plugin-api/util.js
@@ -0,0 +1,34 @@
+const logger = require('../util/logger')
+const chalk = require('chalk')
+
+exports.resolvePlugin = function (pluginName) {
+  if (typeof pluginName === 'function' || typeof pluginName === 'object') {
+    return pluginName
+  }
+  if (typeof pluginName === 'string') {
+    try {
+      return require(pluginName.startsWith('vuepress-plugin-')
+        ? pluginName
+        : `vuepress-plugin-${pluginName}`
+      )
+    } catch (err) {
+      console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginName}\n`, false)))
+      throw new Error(err)
+    }
+  }
+  logger.warn(`\n[vuepress] Invalid plugin usage: ${chalk.yellow(pluginName)}\n`)
+}
+
+exports.inferPluginName = function (pluginName, pluginConfig) {
+  if (pluginConfig.name) {
+    return pluginConfig.name
+  }
+  if (typeof pluginName === 'string') {
+    if (pluginName.startsWith('vuepress-plugin-')) {
+      return pluginName.slice(16)
+    }
+    return pluginName
+  }
+  // ensure each plugin have a unique name.
+  return Date.now().toString(16)
+}
diff --git a/lib/plugins/vuepress-plugin-last-updated/index.js b/lib/plugins/vuepress-plugin-last-updated/index.js
new file mode 100644
index 0000000000..6a27a26d17
--- /dev/null
+++ b/lib/plugins/vuepress-plugin-last-updated/index.js
@@ -0,0 +1,15 @@
+const path = require('path')
+const spawn = require('cross-spawn')
+
+module.exports = options => ({
+  client: path.resolve(__dirname, 'client.js'),
+  extendPageData (filepath) {
+    return {
+      lastModified: getGitLastUpdatedTimeStamp(filepath)
+    }
+  }
+})
+
+function getGitLastUpdatedTimeStamp (filepath) {
+  return parseInt(spawn.sync('git', ['log', '-1', '--format=%ct', filepath]).stdout.toString('utf-8')) * 1000
+}
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
index 76fa2fcc78..5a1323ce17 100644
--- a/lib/prepare/resolveOptions.js
+++ b/lib/prepare/resolveOptions.js
@@ -2,6 +2,7 @@ const fs = require('fs-extra')
 const path = require('path')
 const globby = require('globby')
 const createMarkdown = require('../markdown')
+const Plugin = require('../plugin-api')
 const loadConfig = require('./loadConfig')
 const { encodePath, fileToPath, sort, getGitLastUpdatedTimeStamp } = require('./util')
 const {
@@ -32,6 +33,14 @@ module.exports = async function resolveOptions (sourceDir) {
     })
   }
 
+  // resolve plugins
+  const plugins = (Array.isArray(siteConfig.plugins)
+    ? siteConfig.plugins
+    : []
+  )
+  const plugin = new Plugin(plugins)
+  console.log(plugin)
+
   // resolve outDir
   const outDir = siteConfig.dest
     ? path.resolve(siteConfig.dest)
@@ -99,7 +108,7 @@ module.exports = async function resolveOptions (sourceDir) {
   const isAlgoliaSearch = (
     themeConfig.algolia ||
     Object.keys(siteConfig.locales && themeConfig.locales || {})
-          .some(base => themeConfig.locales[base].algolia)
+      .some(base => themeConfig.locales[base].algolia)
   )
 
   // resolve markdown
@@ -112,7 +121,7 @@ module.exports = async function resolveOptions (sourceDir) {
   const shouldResolveLastUpdated = (
     themeConfig.lastUpdated ||
     Object.keys(siteConfig.locales && themeConfig.locales || {})
-          .some(base => themeConfig.locales[base].lastUpdated)
+      .some(base => themeConfig.locales[base].lastUpdated)
   )
 
   // resolve pagesData
@@ -124,6 +133,13 @@ module.exports = async function resolveOptions (sourceDir) {
       path: encodePath(fileToPath(file))
     }
 
+    for (const fn of plugin.apis.extendPageData) {
+      const res = await fn(file)
+      if (typeof res === 'object') {
+        Object.assign(data, res)
+      }
+    }
+
     if (shouldResolveLastUpdated) {
       data.lastUpdated = getGitLastUpdatedTimeStamp(filepath)
     }
@@ -178,7 +194,8 @@ module.exports = async function resolveOptions (sourceDir) {
     themeEnhanceAppPath,
     useDefaultTheme,
     isAlgoliaSearch,
-    markdown
+    markdown,
+    plugin
   }
 
   return options

From 50e346730b8d3a4181a34dfe6258e5251a1ae65c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 2 Jun 2018 02:31:22 +0800
Subject: [PATCH 002/242] feat: make lastUpdated as a plugin.

---
 docs/.vuepress/config.js                      |  2 +-
 lib/plugin-api/index.js                       | 27 +++++++++++--------
 .../vuepress-plugin-last-updated/index.js     |  4 +--
 lib/prepare/resolveOptions.js                 | 21 ++++-----------
 lib/prepare/util.js                           |  5 ----
 5 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index a8522e1147..46e4469e88 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -27,7 +27,7 @@ module.exports = {
   theme: 'vue',
   plugins: [
     [
-      require('../../lib/plugins/vuepress-plugin-last-updated/index'),
+      require('../../lib/plugins/vuepress-plugin-last-updated/index')
     ]
   ],
   themeConfig: {
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index f33f30f7b2..e7072d02c0 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -20,7 +20,7 @@ module.exports = class Plugin {
       'outFiles',
       'extendPageData'
     ])
-    this.resolvePluginConfig(pluginConfigs)
+    this.resolvePluginConfigs(pluginConfigs)
   }
 
   extendHooks (hooks) {
@@ -35,27 +35,32 @@ module.exports = class Plugin {
     })
   }
 
+  registerHook (name, hook, symbol) {
+    if (hook) {
+      this.hooks[name].tap(symbol, hook)
+    }
+    return this
+  }
+
+  registerAPI (name, api) {
+    if (api) {
+      this.apis[name].push(api)
+    }
+    return this
+  }
+
   resolvePluginConfigs (pluginConfigs) {
     pluginConfigs.forEach(([name, pluginOptions]) => {
       let plugin = resolvePlugin(name)
       if (typeof plugin === 'function') {
         plugin = plugin(pluginOptions)
       }
+      console.log(plugin)
       plugin = Object.assign(plugin, { name: inferPluginName(name, plugin) })
       this.resolvePluginConfig(plugin)
     })
   }
 
-  registerHook (name, hook, symbol) {
-    this.hooks[name].tap(symbol, hook)
-    return this
-  }
-
-  registerAPI (name, api) {
-    this.apis[name].push(api)
-    return this
-  }
-
   resolvePluginConfig ({
     name,
     client,
diff --git a/lib/plugins/vuepress-plugin-last-updated/index.js b/lib/plugins/vuepress-plugin-last-updated/index.js
index 6a27a26d17..0945cd0d41 100644
--- a/lib/plugins/vuepress-plugin-last-updated/index.js
+++ b/lib/plugins/vuepress-plugin-last-updated/index.js
@@ -3,9 +3,9 @@ const spawn = require('cross-spawn')
 
 module.exports = options => ({
   client: path.resolve(__dirname, 'client.js'),
-  extendPageData (filepath) {
+  extendPageData ({ filepath }) {
     return {
-      lastModified: getGitLastUpdatedTimeStamp(filepath)
+      lastUpdated: getGitLastUpdatedTimeStamp(filepath)
     }
   }
 })
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
index 5a1323ce17..5b9f9e576b 100644
--- a/lib/prepare/resolveOptions.js
+++ b/lib/prepare/resolveOptions.js
@@ -4,7 +4,7 @@ const globby = require('globby')
 const createMarkdown = require('../markdown')
 const Plugin = require('../plugin-api')
 const loadConfig = require('./loadConfig')
-const { encodePath, fileToPath, sort, getGitLastUpdatedTimeStamp } = require('./util')
+const { encodePath, fileToPath, sort } = require('./util')
 const {
   inferTitle,
   extractHeaders,
@@ -117,33 +117,22 @@ module.exports = async function resolveOptions (sourceDir) {
   // resolve pageFiles
   const pageFiles = sort(await globby(['**/*.md', '!.vuepress', '!node_modules'], { cwd: sourceDir }))
 
-  // resolve lastUpdated
-  const shouldResolveLastUpdated = (
-    themeConfig.lastUpdated ||
-    Object.keys(siteConfig.locales && themeConfig.locales || {})
-      .some(base => themeConfig.locales[base].lastUpdated)
-  )
-
   // resolve pagesData
-  const pagesData = await Promise.all(pageFiles.map(async (file) => {
-    const filepath = path.resolve(sourceDir, file)
+  const pagesData = await Promise.all(pageFiles.map(async (relative) => {
+    const filepath = path.resolve(sourceDir, relative)
     const key = 'v-' + Math.random().toString(16).slice(2)
     const data = {
       key,
-      path: encodePath(fileToPath(file))
+      path: encodePath(fileToPath(relative))
     }
 
     for (const fn of plugin.apis.extendPageData) {
-      const res = await fn(file)
+      const res = await fn({ filepath, relative, key, sourceDir })
       if (typeof res === 'object') {
         Object.assign(data, res)
       }
     }
 
-    if (shouldResolveLastUpdated) {
-      data.lastUpdated = getGitLastUpdatedTimeStamp(filepath)
-    }
-
     // extract yaml frontmatter
     const content = await fs.readFile(filepath, 'utf-8')
     const frontmatter = parseFrontmatter(content)
diff --git a/lib/prepare/util.js b/lib/prepare/util.js
index efa96cc9b7..66e7be2aa1 100644
--- a/lib/prepare/util.js
+++ b/lib/prepare/util.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const spawn = require('cross-spawn')
 const fs = require('fs-extra')
 const globby = require('globby')
 
@@ -74,7 +73,3 @@ exports.sort = function (arr) {
 exports.encodePath = function (userpath) {
   return userpath.split('/').map(item => encodeURIComponent(item)).join('/')
 }
-
-exports.getGitLastUpdatedTimeStamp = function (filepath) {
-  return parseInt(spawn.sync('git', ['log', '-1', '--format=%ct', filepath]).stdout.toString('utf-8')) * 1000
-}

From 1a9689c1e789bbd2c2d67f6a3b774572561fa755 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 2 Jun 2018 02:49:02 +0800
Subject: [PATCH 003/242] feat: support Array<Function|string> |
 Array<Array<Function|string, Options>>

---
 docs/.vuepress/config.js                               |  4 +---
 lib/plugin-api/index.js                                | 10 ++++++----
 lib/prepare/resolveOptions.js                          |  1 -
 .../vuepress-plugin-last-updated/index.js              |  0
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename {lib/plugins => packages}/vuepress-plugin-last-updated/index.js (100%)

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 46e4469e88..46bbeaa6dd 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -26,9 +26,7 @@ module.exports = {
   serviceWorker: true,
   theme: 'vue',
   plugins: [
-    [
-      require('../../lib/plugins/vuepress-plugin-last-updated/index')
-    ]
+    require('../../packages/vuepress-plugin-last-updated/index')
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index e7072d02c0..b181753751 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -1,7 +1,7 @@
 const { resolvePlugin, inferPluginName } = require('./util')
 const Hook = require('./hook')
 
-module.exports = class Plugin {
+module.exports = class VuePressPlugin {
   constructor (pluginConfigs) {
     this.hooks = {}
     this.apis = {}
@@ -50,12 +50,15 @@ module.exports = class Plugin {
   }
 
   resolvePluginConfigs (pluginConfigs) {
-    pluginConfigs.forEach(([name, pluginOptions]) => {
+    pluginConfigs.forEach(pluginConfigs => {
+      pluginConfigs = Array.isArray(pluginConfigs)
+        ? pluginConfigs
+        : [pluginConfigs]
+      const [name, pluginOptions] = pluginConfigs
       let plugin = resolvePlugin(name)
       if (typeof plugin === 'function') {
         plugin = plugin(pluginOptions)
       }
-      console.log(plugin)
       plugin = Object.assign(plugin, { name: inferPluginName(name, plugin) })
       this.resolvePluginConfig(plugin)
     })
@@ -75,7 +78,6 @@ module.exports = class Plugin {
     updated,
     generated
   }) {
-    console.log(this.hooks)
     this
       .registerHook('ready', ready, name)
       .registerHook('compiled', compiled, name)
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
index 5b9f9e576b..3001ba8ef3 100644
--- a/lib/prepare/resolveOptions.js
+++ b/lib/prepare/resolveOptions.js
@@ -39,7 +39,6 @@ module.exports = async function resolveOptions (sourceDir) {
     : []
   )
   const plugin = new Plugin(plugins)
-  console.log(plugin)
 
   // resolve outDir
   const outDir = siteConfig.dest
diff --git a/lib/plugins/vuepress-plugin-last-updated/index.js b/packages/vuepress-plugin-last-updated/index.js
similarity index 100%
rename from lib/plugins/vuepress-plugin-last-updated/index.js
rename to packages/vuepress-plugin-last-updated/index.js

From ea5f04b1b69e53e5731a87e56ccc43564aeab3c2 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 2 Jun 2018 17:53:34 +0800
Subject: [PATCH 004/242] feat: add types check and friendly warn log for
 plugin options

---
 lib/plugin-api/index.js                       | 54 ++++++++-----
 lib/plugin-api/util.js                        | 75 +++++++++++++++----
 .../vuepress-plugin-last-updated/index.js     |  1 +
 3 files changed, 96 insertions(+), 34 deletions(-)

diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index b181753751..d8cdf13df7 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -1,5 +1,7 @@
-const { resolvePlugin, inferPluginName } = require('./util')
+const chalk = require('chalk')
+const { resolvePlugin, inferPluginName, assertTypes } = require('./util')
 const Hook = require('./hook')
+const logger = require('../util/logger')
 
 module.exports = class VuePressPlugin {
   constructor (pluginConfigs) {
@@ -35,16 +37,28 @@ module.exports = class VuePressPlugin {
     })
   }
 
-  registerHook (name, hook, symbol) {
-    if (hook) {
-      this.hooks[name].tap(symbol, hook)
+  registerHook (name, hook, pluginName, types) {
+    const { valid, warnMsg } = assertTypes(hook, types)
+    if (valid) {
+      this.hooks[name].tap(pluginName, hook)
+    } else if (hook !== undefined) {
+      logger.warn(
+        `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
+        `Invalid value for "option" ${chalk.cyan(name)}: ${warnMsg}`
+      )
     }
     return this
   }
 
-  registerAPI (name, api) {
-    if (api) {
+  registerAPI (name, api, pluginName, types) {
+    const { valid, warnMsg } = assertTypes(api, types)
+    if (valid) {
       this.apis[name].push(api)
+    } else if (api !== undefined) {
+      logger.warn(
+        `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
+        `Invalid value for "option" ${chalk.cyan(name)}: ${warnMsg}`
+      )
     }
     return this
   }
@@ -54,12 +68,12 @@ module.exports = class VuePressPlugin {
       pluginConfigs = Array.isArray(pluginConfigs)
         ? pluginConfigs
         : [pluginConfigs]
-      const [name, pluginOptions] = pluginConfigs
-      let plugin = resolvePlugin(name)
+      const [pluginRaw, pluginOptions] = pluginConfigs
+      let plugin = resolvePlugin(pluginRaw)
       if (typeof plugin === 'function') {
         plugin = plugin(pluginOptions)
       }
-      plugin = Object.assign(plugin, { name: inferPluginName(name, plugin) })
+      plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
       this.resolvePluginConfig(plugin)
     })
   }
@@ -79,18 +93,18 @@ module.exports = class VuePressPlugin {
     generated
   }) {
     this
-      .registerHook('ready', ready, name)
-      .registerHook('compiled', compiled, name)
-      .registerHook('updated', updated, name)
-      .registerHook('generated', generated, name)
+      .registerHook('ready', ready, name, [Function])
+      .registerHook('compiled', compiled, name, [Function])
+      .registerHook('updated', updated, name, [Function])
+      .registerHook('generated', generated, name, [Function])
 
     this
-      .registerAPI('client', client)
-      .registerAPI('chainWebpack', chainWebpack)
-      .registerAPI('enhanceDevServer', enhanceDevServer)
-      .registerAPI('extendMarkdown', extendMarkdown)
-      .registerAPI('enhanceAppFiles', enhanceAppFiles)
-      .registerAPI('outFiles', outFiles)
-      .registerAPI('extendPageData', extendPageData)
+      .registerAPI('client', client, name, [String])
+      .registerAPI('chainWebpack', chainWebpack, name, [Function])
+      .registerAPI('enhanceDevServer', enhanceDevServer, name, [Function])
+      .registerAPI('extendMarkdown', extendMarkdown, name, [Function])
+      .registerAPI('enhanceAppFiles', enhanceAppFiles, name, [Object])
+      .registerAPI('outFiles', outFiles, name, [Object])
+      .registerAPI('extendPageData', extendPageData, name, [Function])
   }
 }
diff --git a/lib/plugin-api/util.js b/lib/plugin-api/util.js
index 9fe67c9c34..b053e67fd4 100644
--- a/lib/plugin-api/util.js
+++ b/lib/plugin-api/util.js
@@ -1,34 +1,81 @@
 const logger = require('../util/logger')
 const chalk = require('chalk')
 
-exports.resolvePlugin = function (pluginName) {
-  if (typeof pluginName === 'function' || typeof pluginName === 'object') {
-    return pluginName
+exports.resolvePlugin = function (pluginRaw) {
+  if (typeof pluginRaw === 'function' || typeof pluginRaw === 'object') {
+    return pluginRaw
   }
-  if (typeof pluginName === 'string') {
+  if (typeof pluginRaw === 'string') {
     try {
-      return require(pluginName.startsWith('vuepress-plugin-')
-        ? pluginName
-        : `vuepress-plugin-${pluginName}`
+      return require(pluginRaw.startsWith('vuepress-plugin-')
+        ? pluginRaw
+        : `vuepress-plugin-${pluginRaw}`
       )
     } catch (err) {
-      console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginName}\n`, false)))
+      console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
       throw new Error(err)
     }
   }
-  logger.warn(`\n[vuepress] Invalid plugin usage: ${chalk.yellow(pluginName)}\n`)
+  logger.warn(`\n[vuepress] Invalid plugin usage: ${chalk.yellow(pluginRaw)}\n`)
 }
 
-exports.inferPluginName = function (pluginName, pluginConfig) {
+exports.inferPluginName = function (pluginRaw, pluginConfig) {
   if (pluginConfig.name) {
     return pluginConfig.name
   }
-  if (typeof pluginName === 'string') {
-    if (pluginName.startsWith('vuepress-plugin-')) {
-      return pluginName.slice(16)
+  if (typeof pluginRaw === 'string') {
+    if (pluginRaw.startsWith('vuepress-plugin-')) {
+      return pluginRaw.slice(16)
     }
-    return pluginName
+    return pluginRaw
   }
   // ensure each plugin have a unique name.
   return Date.now().toString(16)
 }
+
+/**
+ * Get the raw type string of a value e.g. [object Object]
+ */
+const _toString = Object.prototype.toString
+
+exports.toRawType = function (value) {
+  return _toString.call(value).slice(8, -1)
+}
+
+exports.getType = function (fn) {
+  const match = fn && fn.toString().match(/^\s*function (\w+)/)
+  return match ? match[1] : ''
+}
+
+function toNaturalMultiTypesLanguage (types) {
+  const len = types.length
+  if (len === 1) {
+    return types.join('')
+  }
+  const rest = types.slice(0, len - 1)
+  const last = types[len - 1]
+  return rest.join(', ') + ' or ' + last
+}
+
+exports.assertTypes = function (value, types) {
+  let valid
+  let warnMsg
+  const actualType = exports.toRawType(value)
+  const expectedTypes = []
+
+  for (const type of types) {
+    const expectedType = exports.getType(type)
+    expectedTypes.push(expectedType)
+    valid = actualType === expectedType
+    if (valid) break
+  }
+
+  if (!valid) {
+    warnMsg = `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))}, but got ${chalk.yellow(actualType)}.`
+  }
+
+  return {
+    valid,
+    warnMsg
+  }
+}
diff --git a/packages/vuepress-plugin-last-updated/index.js b/packages/vuepress-plugin-last-updated/index.js
index 0945cd0d41..e1bc8f43e7 100644
--- a/packages/vuepress-plugin-last-updated/index.js
+++ b/packages/vuepress-plugin-last-updated/index.js
@@ -2,6 +2,7 @@ const path = require('path')
 const spawn = require('cross-spawn')
 
 module.exports = options => ({
+  name: 'last-updated',
   client: path.resolve(__dirname, 'client.js'),
   extendPageData ({ filepath }) {
     return {

From 5b00b0281dbbc5c7278ea06eaecaa1e5f0d384be Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 4 Jun 2018 00:31:14 +0800
Subject: [PATCH 005/242] feat: support enhanceAppFiles API.

---
 docs/.vuepress/components/demo-1.vue          |  2 +-
 docs/.vuepress/config.js                      | 11 +++-
 lib/app/app.js                                |  8 +--
 lib/plugin-api/api/AbstractAPI.js             | 18 ++++++
 lib/plugin-api/api/EnhanceAppFiles.js         | 57 +++++++++++++++++++
 lib/plugin-api/api/ExtendPageData.js          | 14 +++++
 lib/plugin-api/api/instantiateAPI.js          | 14 +++++
 lib/plugin-api/index.js                       | 13 +++--
 lib/plugin-api/util.js                        |  4 +-
 lib/prepare/index.js                          |  5 ++
 lib/prepare/resolveOptions.js                 | 10 +---
 lib/prepare/util.js                           |  4 +-
 .../vuepress-plugin-last-updated/index.js     |  2 +
 packages/vuepress-plugin-test/enhanceApp.js   |  1 +
 packages/vuepress-plugin-test/index.js        | 20 +++++++
 15 files changed, 163 insertions(+), 20 deletions(-)
 create mode 100644 lib/plugin-api/api/AbstractAPI.js
 create mode 100644 lib/plugin-api/api/EnhanceAppFiles.js
 create mode 100644 lib/plugin-api/api/ExtendPageData.js
 create mode 100644 lib/plugin-api/api/instantiateAPI.js
 create mode 100644 packages/vuepress-plugin-test/enhanceApp.js
 create mode 100644 packages/vuepress-plugin-test/index.js

diff --git a/docs/.vuepress/components/demo-1.vue b/docs/.vuepress/components/demo-1.vue
index f1dfb581c5..0c6dc47718 100644
--- a/docs/.vuepress/components/demo-1.vue
+++ b/docs/.vuepress/components/demo-1.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-export default {
+module.exports = {
   data () {
     return {
       msg: 'Hello this is <demo-1>'
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 46bbeaa6dd..a0ea3a8b7f 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,3 +1,6 @@
+const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
+const testPlugin = require('../../packages/vuepress-plugin-test')
+
 module.exports = {
   dest: 'vuepress',
   locales: {
@@ -26,7 +29,13 @@ module.exports = {
   serviceWorker: true,
   theme: 'vue',
   plugins: [
-    require('../../packages/vuepress-plugin-last-updated/index')
+    lastUpdatedPlugin,
+    [
+      testPlugin,
+      {
+
+      }
+    ]
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
diff --git a/lib/app/app.js b/lib/app/app.js
index 1f64553e8a..83b32e1a35 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -8,8 +8,7 @@ import dataMixin from './dataMixin'
 import store from './store'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
-import enhanceApp from '@temp/enhanceApp'
-import themeEnhanceApp from '@temp/themeEnhanceApp'
+import appEnhancers from '@temp/appEnhancers.js'
 
 // suggest dev server restart on base change
 if (module.hot) {
@@ -80,8 +79,9 @@ export function createApp () {
 
   const options = {}
 
-  themeEnhanceApp({ Vue, options, router, siteData })
-  enhanceApp({ Vue, options, router, siteData })
+  appEnhancers.forEach(enhancer => {
+    enhancer({ Vue, options, router, siteData })
+  })
 
   const app = new Vue(
     Object.assign(options, {
diff --git a/lib/plugin-api/api/AbstractAPI.js b/lib/plugin-api/api/AbstractAPI.js
new file mode 100644
index 0000000000..be847c137b
--- /dev/null
+++ b/lib/plugin-api/api/AbstractAPI.js
@@ -0,0 +1,18 @@
+module.exports = class AbstractAPI {
+  constructor (name) {
+    this.name = name
+    this.items = []  // Array<T>
+  }
+
+  add (value) {
+    this.items.push(value)
+  }
+
+  remove (index) {
+    this.items.splice(index, 1)
+  }
+
+  async run () {
+
+  }
+}
diff --git a/lib/plugin-api/api/EnhanceAppFiles.js b/lib/plugin-api/api/EnhanceAppFiles.js
new file mode 100644
index 0000000000..3db54fce14
--- /dev/null
+++ b/lib/plugin-api/api/EnhanceAppFiles.js
@@ -0,0 +1,57 @@
+const fs = require('fs-extra')
+const path = require('path')
+const AbstractAPI = require('./AbstractAPI')
+const { writeTemp } = require('../../prepare/util')
+
+module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
+  add (value /* Array<String> | () => Array<String> */, pluginName) {
+    if (typeof value === 'function') {
+      value = value()
+    }
+    this.items.push(...value.map(filepath => ({
+      pluginName,
+      filepath
+    })))
+  }
+
+  async run (...args) {
+    const manifest = []
+
+    for (const { filepath, pluginName } of this.items) {
+      let filename = path.parse(filepath).base
+      filename = `enhanceAppFiles-${pluginName}-${filename}`
+      const destPath = await writeTemp(
+        filename,
+        fs.existsSync(filepath)
+          ? `export { default } from ${JSON.stringify(filepath)}`
+          : `export default function () {}`
+      )
+      manifest.push(destPath)
+    }
+
+    await writeTemp(
+      'appEnhancers.js',
+      this.getEnhanceAppCode(manifest)
+    )
+  }
+
+  getEnhanceAppCode (files) {
+    let index = 0
+    let code = ''
+
+    code += files
+      .map(filepath => `import m${index++} from ${JSON.stringify(filepath)}`)
+      .join('\n')
+
+    code += '\n\nexport default [\n'
+
+    for (let i = 0; i < index; i++) {
+      code += `  m${i}`
+      code += i === index - 1 ? '\n' : ',\n'
+    }
+
+    code += ']\n'
+
+    return code
+  }
+}
diff --git a/lib/plugin-api/api/ExtendPageData.js b/lib/plugin-api/api/ExtendPageData.js
new file mode 100644
index 0000000000..b5fbecad72
--- /dev/null
+++ b/lib/plugin-api/api/ExtendPageData.js
@@ -0,0 +1,14 @@
+const AbstractAPI = require('./AbstractAPI')
+
+module.exports = class enhanceAppFiles extends AbstractAPI {
+  async run (args) {
+    const { data } = args
+    for (const fn of this.items) {
+      // TODO handle error
+      const res = await fn(args)
+      if (typeof res === 'object') {
+        Object.assign(data, res)
+      }
+    }
+  }
+}
diff --git a/lib/plugin-api/api/instantiateAPI.js b/lib/plugin-api/api/instantiateAPI.js
new file mode 100644
index 0000000000..ff5b68a8d5
--- /dev/null
+++ b/lib/plugin-api/api/instantiateAPI.js
@@ -0,0 +1,14 @@
+const EnhanceAppFiles = require('./EnhanceAppFiles')
+const ExtendPageData = require('./ExtendPageData')
+const AbstractAPI = require('./AbstractAPI')
+
+module.exports = function instantiateAPI (name) {
+  switch (name) {
+  case 'enhanceAppFiles':
+    return new EnhanceAppFiles(name)
+  case 'extendPageData':
+    return new ExtendPageData(name)
+
+  default: return new AbstractAPI(name)
+  }
+}
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index d8cdf13df7..c98b226181 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -1,6 +1,7 @@
 const chalk = require('chalk')
 const { resolvePlugin, inferPluginName, assertTypes } = require('./util')
 const Hook = require('./hook')
+const instantiateAPI = require('./api/instantiateAPI')
 const logger = require('../util/logger')
 
 module.exports = class VuePressPlugin {
@@ -33,7 +34,7 @@ module.exports = class VuePressPlugin {
 
   extendAPIs (apis) {
     apis.forEach(api => {
-      this.apis[api] = []
+      this.apis[api] = instantiateAPI(api)
     })
   }
 
@@ -53,7 +54,7 @@ module.exports = class VuePressPlugin {
   registerAPI (name, api, pluginName, types) {
     const { valid, warnMsg } = assertTypes(api, types)
     if (valid) {
-      this.apis[name].push(api)
+      this.apis[name].add(api, pluginName)
     } else if (api !== undefined) {
       logger.warn(
         `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
@@ -74,11 +75,11 @@ module.exports = class VuePressPlugin {
         plugin = plugin(pluginOptions)
       }
       plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
-      this.resolvePluginConfig(plugin)
+      this.applyPlugin(plugin)
     })
   }
 
-  resolvePluginConfig ({
+  applyPlugin ({
     name,
     client,
     chainWebpack,
@@ -92,6 +93,8 @@ module.exports = class VuePressPlugin {
     updated,
     generated
   }) {
+    logger.tip(`Apply plugin ${chalk.cyan(name)}...`)
+
     this
       .registerHook('ready', ready, name, [Function])
       .registerHook('compiled', compiled, name, [Function])
@@ -103,7 +106,7 @@ module.exports = class VuePressPlugin {
       .registerAPI('chainWebpack', chainWebpack, name, [Function])
       .registerAPI('enhanceDevServer', enhanceDevServer, name, [Function])
       .registerAPI('extendMarkdown', extendMarkdown, name, [Function])
-      .registerAPI('enhanceAppFiles', enhanceAppFiles, name, [Object])
+      .registerAPI('enhanceAppFiles', enhanceAppFiles, name, [Array, Function])
       .registerAPI('outFiles', outFiles, name, [Object])
       .registerAPI('extendPageData', extendPageData, name, [Function])
   }
diff --git a/lib/plugin-api/util.js b/lib/plugin-api/util.js
index b053e67fd4..16353c77cf 100644
--- a/lib/plugin-api/util.js
+++ b/lib/plugin-api/util.js
@@ -71,7 +71,9 @@ exports.assertTypes = function (value, types) {
   }
 
   if (!valid) {
-    warnMsg = `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))}, but got ${chalk.yellow(actualType)}.`
+    warnMsg =
+      `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))}` +
+      `but got ${chalk.yellow(actualType)}.`
   }
 
   return {
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index b2a0a0b45f..564150d4dc 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -8,6 +8,9 @@ module.exports = async function prepare (sourceDir) {
   // 1. load options
   const options = await resolveOptions(sourceDir)
 
+  const { plugin } = options
+  await plugin.hooks.ready.run(options)
+
   // 2. generate routes & user components registration code
   const routesCode = await genRoutesFile(options)
   const componentCode = await genComponentRegistrationFile(options)
@@ -26,6 +29,8 @@ module.exports = async function prepare (sourceDir) {
   const hasUserOverride = fs.existsSync(overridePath)
   await writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
 
+  await plugin.apis.enhanceAppFiles.run()
+
   // 5. handle enhanceApp.js
   const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
   await writeEnhanceTemp('enhanceApp.js', enhanceAppPath)
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
index 3001ba8ef3..2420c32207 100644
--- a/lib/prepare/resolveOptions.js
+++ b/lib/prepare/resolveOptions.js
@@ -125,15 +125,11 @@ module.exports = async function resolveOptions (sourceDir) {
       path: encodePath(fileToPath(relative))
     }
 
-    for (const fn of plugin.apis.extendPageData) {
-      const res = await fn({ filepath, relative, key, sourceDir })
-      if (typeof res === 'object') {
-        Object.assign(data, res)
-      }
-    }
-
     // extract yaml frontmatter
     const content = await fs.readFile(filepath, 'utf-8')
+
+    await plugin.apis.extendPageData.run({ data, filepath, relative, key, sourceDir, content })
+
     const frontmatter = parseFrontmatter(content)
     // infer title
     const title = inferTitle(frontmatter)
diff --git a/lib/prepare/util.js b/lib/prepare/util.js
index 66e7be2aa1..0ecec30340 100644
--- a/lib/prepare/util.js
+++ b/lib/prepare/util.js
@@ -7,12 +7,14 @@ fs.ensureDirSync(tempPath)
 
 const tempCache = new Map()
 exports.writeTemp = async function (file, content) {
+  const destPath = path.join(tempPath, file)
   // cache write to avoid hitting the dist if it didn't change
   const cached = tempCache.get(file)
   if (cached !== content) {
-    await fs.writeFile(path.join(tempPath, file), content)
+    await fs.writeFile(destPath, content)
     tempCache.set(file, content)
   }
+  return destPath
 }
 
 exports.writeEnhanceTemp = async function (destName, srcPath) {
diff --git a/packages/vuepress-plugin-last-updated/index.js b/packages/vuepress-plugin-last-updated/index.js
index e1bc8f43e7..7607534b01 100644
--- a/packages/vuepress-plugin-last-updated/index.js
+++ b/packages/vuepress-plugin-last-updated/index.js
@@ -3,7 +3,9 @@ const spawn = require('cross-spawn')
 
 module.exports = options => ({
   name: 'last-updated',
+
   client: path.resolve(__dirname, 'client.js'),
+
   extendPageData ({ filepath }) {
     return {
       lastUpdated: getGitLastUpdatedTimeStamp(filepath)
diff --git a/packages/vuepress-plugin-test/enhanceApp.js b/packages/vuepress-plugin-test/enhanceApp.js
new file mode 100644
index 0000000000..ea9b101e1c
--- /dev/null
+++ b/packages/vuepress-plugin-test/enhanceApp.js
@@ -0,0 +1 @@
+export default function () {}
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
new file mode 100644
index 0000000000..28fe2c0bad
--- /dev/null
+++ b/packages/vuepress-plugin-test/index.js
@@ -0,0 +1,20 @@
+const path = require('path')
+
+module.exports = options => ({
+  name: 'test',
+
+  ready () {
+    console.log('Ready')
+  },
+
+  extendPageData ({ content }) {
+    return {
+      size: (content.length / 1024).toFixed(2) + 'kb'
+    }
+  },
+
+  enhanceAppFiles: [
+    path.resolve(__dirname, 'enhanceApp.js')
+  ]
+
+})

From ab75ba9192a8d5e6472930b28226e51a0e3cdf27 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 4 Jun 2018 01:51:21 +0800
Subject: [PATCH 006/242] feat: move enhanceApp and themeEnhanceApp to plugin.

---
 docs/.vuepress/components/demo-1.vue         |  2 +-
 docs/.vuepress/config.js                     |  4 +-
 lib/plugin-api/api/AbstractAPI.js            | 11 +++--
 lib/plugin-api/api/EnhanceAppFiles.js        | 50 ++++++++++++--------
 lib/plugin-api/api/ExtendPageData.js         |  2 +-
 lib/plugin-api/context.js                    | 22 +++++++++
 lib/plugin-api/index.js                      |  9 ++--
 lib/prepare/index.js                         |  9 +---
 lib/prepare/resolveOptions.js                | 26 +++++-----
 packages/vuepree-plugin-enhance-app/index.js | 17 +++++++
 10 files changed, 99 insertions(+), 53 deletions(-)
 create mode 100644 lib/plugin-api/context.js
 create mode 100644 packages/vuepree-plugin-enhance-app/index.js

diff --git a/docs/.vuepress/components/demo-1.vue b/docs/.vuepress/components/demo-1.vue
index 0c6dc47718..f1dfb581c5 100644
--- a/docs/.vuepress/components/demo-1.vue
+++ b/docs/.vuepress/components/demo-1.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-module.exports = {
+export default {
   data () {
     return {
       msg: 'Hello this is <demo-1>'
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index a0ea3a8b7f..d0c56b577e 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,5 +1,6 @@
 const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
 const testPlugin = require('../../packages/vuepress-plugin-test')
+const enhanceApp = require('../../packages/vuepree-plugin-enhance-app')
 
 module.exports = {
   dest: 'vuepress',
@@ -35,7 +36,8 @@ module.exports = {
       {
 
       }
-    ]
+    ],
+    enhanceApp
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
diff --git a/lib/plugin-api/api/AbstractAPI.js b/lib/plugin-api/api/AbstractAPI.js
index be847c137b..6626d466a8 100644
--- a/lib/plugin-api/api/AbstractAPI.js
+++ b/lib/plugin-api/api/AbstractAPI.js
@@ -4,12 +4,15 @@ module.exports = class AbstractAPI {
     this.items = []  // Array<T>
   }
 
-  add (value) {
-    this.items.push(value)
+  add (value, pluginName) {
+    this.items.push({
+      value,
+      pluginName
+    })
   }
 
-  remove (index) {
-    this.items.splice(index, 1)
+  get values () {
+    return this.items.map(item => item.value)
   }
 
   async run () {
diff --git a/lib/plugin-api/api/EnhanceAppFiles.js b/lib/plugin-api/api/EnhanceAppFiles.js
index 3db54fce14..ad9728564b 100644
--- a/lib/plugin-api/api/EnhanceAppFiles.js
+++ b/lib/plugin-api/api/EnhanceAppFiles.js
@@ -4,29 +4,20 @@ const AbstractAPI = require('./AbstractAPI')
 const { writeTemp } = require('../../prepare/util')
 
 module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
-  add (value /* Array<String> | () => Array<String> */, pluginName) {
-    if (typeof value === 'function') {
-      value = value()
-    }
-    this.items.push(...value.map(filepath => ({
-      pluginName,
-      filepath
-    })))
-  }
-
   async run (...args) {
     const manifest = []
+    const items = this.resolveItems()
 
-    for (const { filepath, pluginName } of this.items) {
-      let filename = path.parse(filepath).base
-      filename = `enhanceAppFiles-${pluginName}-${filename}`
-      const destPath = await writeTemp(
-        filename,
-        fs.existsSync(filepath)
-          ? `export { default } from ${JSON.stringify(filepath)}`
-          : `export default function () {}`
-      )
-      manifest.push(destPath)
+    for (const [index, { filepath }] of items.entries()) {
+      if (fs.existsSync(filepath)) {
+        let filename = path.parse(filepath).base
+        filename = `enhanceAppFiles-${index}.js`
+        const destPath = await writeTemp(
+          filename,
+          `export { default } from ${JSON.stringify(filepath)}`
+        )
+        manifest.push(destPath)
+      }
     }
 
     await writeTemp(
@@ -35,6 +26,25 @@ module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
     )
   }
 
+  /**
+   * Don't resolve items via overriding 'add' is due to
+   * we want to delay the execution of the function.
+   * @returns {Array}
+   */
+  resolveItems () {
+    const items = []
+    this.items.forEach(({ value, pluginName }) => {
+      if (typeof value === 'function') {
+        value = value()
+      }
+      items.push(...value.map(filepath => ({
+        pluginName,
+        filepath
+      })))
+    })
+    return items
+  }
+
   getEnhanceAppCode (files) {
     let index = 0
     let code = ''
diff --git a/lib/plugin-api/api/ExtendPageData.js b/lib/plugin-api/api/ExtendPageData.js
index b5fbecad72..b3007878bc 100644
--- a/lib/plugin-api/api/ExtendPageData.js
+++ b/lib/plugin-api/api/ExtendPageData.js
@@ -3,7 +3,7 @@ const AbstractAPI = require('./AbstractAPI')
 module.exports = class enhanceAppFiles extends AbstractAPI {
   async run (args) {
     const { data } = args
-    for (const fn of this.items) {
+    for (const fn of this.values) {
       // TODO handle error
       const res = await fn(args)
       if (typeof res === 'object') {
diff --git a/lib/plugin-api/context.js b/lib/plugin-api/context.js
new file mode 100644
index 0000000000..be00427729
--- /dev/null
+++ b/lib/plugin-api/context.js
@@ -0,0 +1,22 @@
+module.exports = class PluginContext {
+  constructor (options) {
+    Object.defineProperty(this, '_options', {
+      enumerable: false,
+      configurable: false,
+      writable: false,
+      value: options
+    })
+  }
+
+  get sourceDir () {
+    return this._options.sourceDir
+  }
+
+  get outDir () {
+    return this._options.outDir
+  }
+
+  get themePath () {
+    return this._options.themePath
+  }
+}
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index c98b226181..989cfbf511 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -5,7 +5,7 @@ const instantiateAPI = require('./api/instantiateAPI')
 const logger = require('../util/logger')
 
 module.exports = class VuePressPlugin {
-  constructor (pluginConfigs) {
+  constructor (pluginConfigs, context) {
     this.hooks = {}
     this.apis = {}
     this.extendHooks([
@@ -23,7 +23,7 @@ module.exports = class VuePressPlugin {
       'outFiles',
       'extendPageData'
     ])
-    this.resolvePluginConfigs(pluginConfigs)
+    this.resolvePluginConfigs(pluginConfigs, context)
   }
 
   extendHooks (hooks) {
@@ -54,6 +54,7 @@ module.exports = class VuePressPlugin {
   registerAPI (name, api, pluginName, types) {
     const { valid, warnMsg } = assertTypes(api, types)
     if (valid) {
+      console.log(api)
       this.apis[name].add(api, pluginName)
     } else if (api !== undefined) {
       logger.warn(
@@ -64,7 +65,7 @@ module.exports = class VuePressPlugin {
     return this
   }
 
-  resolvePluginConfigs (pluginConfigs) {
+  resolvePluginConfigs (pluginConfigs, context) {
     pluginConfigs.forEach(pluginConfigs => {
       pluginConfigs = Array.isArray(pluginConfigs)
         ? pluginConfigs
@@ -72,7 +73,7 @@ module.exports = class VuePressPlugin {
       const [pluginRaw, pluginOptions] = pluginConfigs
       let plugin = resolvePlugin(pluginRaw)
       if (typeof plugin === 'function') {
-        plugin = plugin(pluginOptions)
+        plugin = plugin(pluginOptions, context)
       }
       plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
       this.applyPlugin(plugin)
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index 564150d4dc..86c6280bcc 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -2,7 +2,7 @@ const path = require('path')
 const fs = require('fs-extra')
 const resolveOptions = require('./resolveOptions')
 const { genRoutesFile, genComponentRegistrationFile } = require('./codegen')
-const { writeTemp, writeEnhanceTemp } = require('./util')
+const { writeTemp } = require('./util')
 
 module.exports = async function prepare (sourceDir) {
   // 1. load options
@@ -31,12 +31,5 @@ module.exports = async function prepare (sourceDir) {
 
   await plugin.apis.enhanceAppFiles.run()
 
-  // 5. handle enhanceApp.js
-  const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
-  await writeEnhanceTemp('enhanceApp.js', enhanceAppPath)
-
-  // 6. handle the theme enhanceApp.js
-  await writeEnhanceTemp('themeEnhanceApp.js', options.themeEnhanceAppPath)
-
   return options
 }
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
index 2420c32207..b8f3da6110 100644
--- a/lib/prepare/resolveOptions.js
+++ b/lib/prepare/resolveOptions.js
@@ -3,6 +3,7 @@ const path = require('path')
 const globby = require('globby')
 const createMarkdown = require('../markdown')
 const Plugin = require('../plugin-api')
+const PluginContext = require('../plugin-api/context')
 const loadConfig = require('./loadConfig')
 const { encodePath, fileToPath, sort } = require('./util')
 const {
@@ -33,17 +34,19 @@ module.exports = async function resolveOptions (sourceDir) {
     })
   }
 
+  // resolve outDir
+  const outDir = siteConfig.dest
+    ? path.resolve(siteConfig.dest)
+    : path.resolve(sourceDir, '.vuepress/dist')
+
   // resolve plugins
   const plugins = (Array.isArray(siteConfig.plugins)
     ? siteConfig.plugins
     : []
   )
-  const plugin = new Plugin(plugins)
-
-  // resolve outDir
-  const outDir = siteConfig.dest
-    ? path.resolve(siteConfig.dest)
-    : path.resolve(sourceDir, '.vuepress/dist')
+  const pluginContextOptions = { sourceDir, outDir }
+  const pluginContext = new PluginContext(pluginContextOptions)
+  const plugin = new Plugin(plugins, pluginContext)
 
   // resolve theme
   const useDefaultTheme = (
@@ -54,7 +57,6 @@ module.exports = async function resolveOptions (sourceDir) {
   let themePath = null
   let themeLayoutPath = null
   let themeNotFoundPath = null
-  let themeEnhanceAppPath = null
 
   if (useDefaultTheme) {
     // use default theme
@@ -92,12 +94,6 @@ module.exports = async function resolveOptions (sourceDir) {
     if (!fs.existsSync(themeNotFoundPath)) {
       themeNotFoundPath = path.resolve(defaultThemePath, 'NotFound.vue')
     }
-
-    // resolve theme enhanceApp
-    themeEnhanceAppPath = path.resolve(themePath, 'enhanceApp.js')
-    if (!fs.existsSync(themeEnhanceAppPath)) {
-      themeEnhanceAppPath = null
-    }
   }
 
   // resolve theme config
@@ -175,12 +171,14 @@ module.exports = async function resolveOptions (sourceDir) {
     themePath,
     themeLayoutPath,
     themeNotFoundPath,
-    themeEnhanceAppPath,
     useDefaultTheme,
     isAlgoliaSearch,
     markdown,
     plugin
   }
 
+  Object.assign(pluginContextOptions, options)
+  Object.freeze(options)
+
   return options
 }
diff --git a/packages/vuepree-plugin-enhance-app/index.js b/packages/vuepree-plugin-enhance-app/index.js
new file mode 100644
index 0000000000..72e27db1e2
--- /dev/null
+++ b/packages/vuepree-plugin-enhance-app/index.js
@@ -0,0 +1,17 @@
+const path = require('path')
+
+module.exports = (options, context) => {
+  return {
+    name: 'enhance-app',
+
+    enhanceAppFiles: () => {
+      const { sourceDir, themePath } = context
+      const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
+      const themeEnhanceAppPath = path.resolve(themePath, 'enhanceApp.js')
+      return [
+        enhanceAppPath,
+        themeEnhanceAppPath
+      ]
+    }
+  }
+}

From fa4eb647116d3ae1eedd84846c3353b703fe66ae Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 4 Jun 2018 02:30:59 +0800
Subject: [PATCH 007/242] refactor: extract the resolveSiteData as a single
 step

---
 bin/vuepress.js                       |  1 +
 lib/plugin-api/api/EnhanceAppFiles.js | 41 +++++++--------
 lib/plugin-api/index.js               |  4 +-
 lib/prepare/index.js                  | 22 ++++++--
 lib/prepare/resolveOptions.js         | 75 ++-------------------------
 lib/prepare/resolveSiteData.js        | 67 ++++++++++++++++++++++++
 lib/util/logger.js                    |  9 ++++
 7 files changed, 121 insertions(+), 98 deletions(-)
 create mode 100644 lib/prepare/resolveSiteData.js

diff --git a/bin/vuepress.js b/bin/vuepress.js
index 00ea5bdfe2..502015311c 100755
--- a/bin/vuepress.js
+++ b/bin/vuepress.js
@@ -27,6 +27,7 @@ program
   .description('start development server')
   .option('-p, --port <port>', 'use specified port (default: 8080)')
   .option('-h, --host <host>', 'use specified host (default: 0.0.0.0)')
+  .option('--debug', 'development mode for debugging')
   .action((dir = '.', { host, port }) => {
     wrapCommand(dev)(path.resolve(dir), { host, port })
   })
diff --git a/lib/plugin-api/api/EnhanceAppFiles.js b/lib/plugin-api/api/EnhanceAppFiles.js
index ad9728564b..933a599e07 100644
--- a/lib/plugin-api/api/EnhanceAppFiles.js
+++ b/lib/plugin-api/api/EnhanceAppFiles.js
@@ -1,22 +1,40 @@
 const fs = require('fs-extra')
 const path = require('path')
+const chalk = require('chalk')
 const AbstractAPI = require('./AbstractAPI')
 const { writeTemp } = require('../../prepare/util')
+const logger = require('../../util/logger')
 
 module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
+  add (value, pluginName) {
+    if (typeof value === 'function') {
+      value = value()
+    }
+    this.items.push(...value.map(filepath => ({
+      pluginName,
+      filepath
+    })))
+  }
+
   async run (...args) {
     const manifest = []
-    const items = this.resolveItems()
 
-    for (const [index, { filepath }] of items.entries()) {
+    for (const [index, { filepath, pluginName }] of this.items.entries()) {
       if (fs.existsSync(filepath)) {
         let filename = path.parse(filepath).base
         filename = `enhanceAppFiles-${index}.js`
+
         const destPath = await writeTemp(
           filename,
           `export { default } from ${JSON.stringify(filepath)}`
         )
+
         manifest.push(destPath)
+      } else {
+        logger.debug(
+          chalk.gray(`[vuepress-plugin-${pluginName}]`) +
+          `${chalk.cyan(filepath)} Not Found.`
+        )
       }
     }
 
@@ -26,25 +44,6 @@ module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
     )
   }
 
-  /**
-   * Don't resolve items via overriding 'add' is due to
-   * we want to delay the execution of the function.
-   * @returns {Array}
-   */
-  resolveItems () {
-    const items = []
-    this.items.forEach(({ value, pluginName }) => {
-      if (typeof value === 'function') {
-        value = value()
-      }
-      items.push(...value.map(filepath => ({
-        pluginName,
-        filepath
-      })))
-    })
-    return items
-  }
-
   getEnhanceAppCode (files) {
     let index = 0
     let code = ''
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 989cfbf511..d9f5b120d1 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -6,6 +6,9 @@ const logger = require('../util/logger')
 
 module.exports = class VuePressPlugin {
   constructor (pluginConfigs, context) {
+    if (!Array.isArray(pluginConfigs)) {
+      pluginConfigs = []
+    }
     this.hooks = {}
     this.apis = {}
     this.extendHooks([
@@ -54,7 +57,6 @@ module.exports = class VuePressPlugin {
   registerAPI (name, api, pluginName, types) {
     const { valid, warnMsg } = assertTypes(api, types)
     if (valid) {
-      console.log(api)
       this.apis[name].add(api, pluginName)
     } else if (api !== undefined) {
       logger.warn(
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index 86c6280bcc..ce00766c25 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -1,17 +1,31 @@
 const path = require('path')
 const fs = require('fs-extra')
+const Plugin = require('../plugin-api')
+const PluginContext = require('../plugin-api/context')
 const resolveOptions = require('./resolveOptions')
+const resolveSiteData = require('./resolveSiteData')
 const { genRoutesFile, genComponentRegistrationFile } = require('./codegen')
 const { writeTemp } = require('./util')
 
 module.exports = async function prepare (sourceDir) {
   // 1. load options
   const options = await resolveOptions(sourceDir)
+  const { siteConfig } = options
+
+  // 2. initialize plugin
+  const pluginContext = new PluginContext(options)
+  const plugin = new Plugin(siteConfig.plugins, pluginContext)
+  options.plugin = plugin
+
+  // 3. resolve siteData
+  // SiteData must be resolved after the plugin initialization
+  // because plugins can expand the sitedata.
+  options.siteData = await resolveSiteData(options)
+  Object.freeze(options)
 
-  const { plugin } = options
   await plugin.hooks.ready.run(options)
 
-  // 2. generate routes & user components registration code
+  // 4. generate routes & user components registration code
   const routesCode = await genRoutesFile(options)
   const componentCode = await genComponentRegistrationFile(options)
 
@@ -20,11 +34,11 @@ module.exports = async function prepare (sourceDir) {
     routesCode
   ].join('\n'))
 
-  // 3. generate siteData
+  // 5. generate siteData
   const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
   await writeTemp('siteData.js', dataCode)
 
-  // 4. handle user override
+  // 5. handle user override
   const overridePath = path.resolve(sourceDir, '.vuepress/override.styl')
   const hasUserOverride = fs.existsSync(overridePath)
   await writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
diff --git a/lib/prepare/resolveOptions.js b/lib/prepare/resolveOptions.js
index b8f3da6110..f1467643a5 100644
--- a/lib/prepare/resolveOptions.js
+++ b/lib/prepare/resolveOptions.js
@@ -2,15 +2,8 @@ const fs = require('fs-extra')
 const path = require('path')
 const globby = require('globby')
 const createMarkdown = require('../markdown')
-const Plugin = require('../plugin-api')
-const PluginContext = require('../plugin-api/context')
 const loadConfig = require('./loadConfig')
-const { encodePath, fileToPath, sort } = require('./util')
-const {
-  inferTitle,
-  extractHeaders,
-  parseFrontmatter
-} = require('../util/index')
+const { sort } = require('./util')
 
 module.exports = async function resolveOptions (sourceDir) {
   const vuepressDir = path.resolve(sourceDir, '.vuepress')
@@ -39,15 +32,6 @@ module.exports = async function resolveOptions (sourceDir) {
     ? path.resolve(siteConfig.dest)
     : path.resolve(sourceDir, '.vuepress/dist')
 
-  // resolve plugins
-  const plugins = (Array.isArray(siteConfig.plugins)
-    ? siteConfig.plugins
-    : []
-  )
-  const pluginContextOptions = { sourceDir, outDir }
-  const pluginContext = new PluginContext(pluginContextOptions)
-  const plugin = new Plugin(plugins, pluginContext)
-
   // resolve theme
   const useDefaultTheme = (
     !siteConfig.theme &&
@@ -112,73 +96,20 @@ module.exports = async function resolveOptions (sourceDir) {
   // resolve pageFiles
   const pageFiles = sort(await globby(['**/*.md', '!.vuepress', '!node_modules'], { cwd: sourceDir }))
 
-  // resolve pagesData
-  const pagesData = await Promise.all(pageFiles.map(async (relative) => {
-    const filepath = path.resolve(sourceDir, relative)
-    const key = 'v-' + Math.random().toString(16).slice(2)
-    const data = {
-      key,
-      path: encodePath(fileToPath(relative))
-    }
-
-    // extract yaml frontmatter
-    const content = await fs.readFile(filepath, 'utf-8')
-
-    await plugin.apis.extendPageData.run({ data, filepath, relative, key, sourceDir, content })
-
-    const frontmatter = parseFrontmatter(content)
-    // infer title
-    const title = inferTitle(frontmatter)
-    if (title) {
-      data.title = title
-    }
-    const headers = extractHeaders(
-      frontmatter.content,
-      ['h2', 'h3'],
-      markdown
-    )
-    if (headers.length) {
-      data.headers = headers
-    }
-    if (Object.keys(frontmatter.data).length) {
-      data.frontmatter = frontmatter.data
-    }
-    if (frontmatter.excerpt) {
-      const { html } = markdown.render(frontmatter.excerpt)
-      data.excerpt = html
-    }
-    return data
-  }))
-
-  // resolve site data
-  const siteData = {
-    title: siteConfig.title || '',
-    description: siteConfig.description || '',
-    base,
-    pages: pagesData,
-    themeConfig,
-    locales: siteConfig.locales
-  }
-
   const options = {
     siteConfig,
-    siteData,
+    themeConfig,
     sourceDir,
     outDir,
     publicPath: base,
     pageFiles,
-    pagesData,
     themePath,
     themeLayoutPath,
     themeNotFoundPath,
     useDefaultTheme,
     isAlgoliaSearch,
-    markdown,
-    plugin
+    markdown
   }
 
-  Object.assign(pluginContextOptions, options)
-  Object.freeze(options)
-
   return options
 }
diff --git a/lib/prepare/resolveSiteData.js b/lib/prepare/resolveSiteData.js
new file mode 100644
index 0000000000..fd16806946
--- /dev/null
+++ b/lib/prepare/resolveSiteData.js
@@ -0,0 +1,67 @@
+const fs = require('fs-extra')
+const path = require('path')
+const { encodePath, fileToPath } = require('./util')
+const {
+  inferTitle,
+  extractHeaders,
+  parseFrontmatter
+} = require('../util/index')
+
+module.exports = async function ({
+  sourceDir,
+  pageFiles,
+  plugin,
+  markdown,
+  siteConfig,
+  themeConfig,
+  publicPath
+}) {
+  // resolve pagesData
+  const pagesData = await Promise.all(pageFiles.map(async (relative) => {
+    const filepath = path.resolve(sourceDir, relative)
+    const key = 'v-' + Math.random().toString(16).slice(2)
+    const data = {
+      key,
+      path: encodePath(fileToPath(relative))
+    }
+
+    // extract yaml frontmatter
+    const content = await fs.readFile(filepath, 'utf-8')
+
+    await plugin.apis.extendPageData.run({ data, filepath, relative, key, sourceDir, content })
+
+    const frontmatter = parseFrontmatter(content)
+    // infer title
+    const title = inferTitle(frontmatter)
+    if (title) {
+      data.title = title
+    }
+    const headers = extractHeaders(
+      frontmatter.content,
+      ['h2', 'h3'],
+      markdown
+    )
+    if (headers.length) {
+      data.headers = headers
+    }
+    if (Object.keys(frontmatter.data).length) {
+      data.frontmatter = frontmatter.data
+    }
+    if (frontmatter.excerpt) {
+      const { html } = markdown.render(frontmatter.excerpt)
+      data.excerpt = html
+    }
+    return data
+  }))
+
+  const siteData = {
+    title: siteConfig.title || '',
+    description: siteConfig.description || '',
+    base: publicPath,
+    pages: pagesData,
+    themeConfig,
+    locales: siteConfig.locales
+  }
+
+  return siteData
+}
diff --git a/lib/util/logger.js b/lib/util/logger.js
index 9fd1a9a296..7824e2e003 100644
--- a/lib/util/logger.js
+++ b/lib/util/logger.js
@@ -44,5 +44,14 @@ for (const type in logTypes) {
   logger[type] = getLoggerFn(color, label)
 }
 
+const debugFn = getLoggerFn('magenta', 'DEBUG')
+const isDebug = process.argv.indexOf('--debug') !== -1 || process.argv.indexOf('--verbose') !== -1
+
+logger.debug = function (msg) {
+  if (isDebug) {
+    debugFn(msg)
+  }
+}
+
 module.exports = logger
 module.exports.getLoggerFn = getLoggerFn

From bc4689675b4ef1ba645947baeff82e4429e0389c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 4 Jun 2018 02:57:01 +0800
Subject: [PATCH 008/242] feat: support context.writeTemp

---
 lib/plugin-api/context.js                    |  3 +++
 lib/plugin-api/index.js                      |  2 +-
 lib/plugin-api/util.js                       |  7 ++++--
 packages/vuepree-plugin-enhance-app/index.js | 24 +++++++++-----------
 packages/vuepress-plugin-test/index.js       |  6 ++---
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/plugin-api/context.js b/lib/plugin-api/context.js
index be00427729..c56940ef0d 100644
--- a/lib/plugin-api/context.js
+++ b/lib/plugin-api/context.js
@@ -1,3 +1,5 @@
+const { writeTemp } = require('../prepare/util')
+
 module.exports = class PluginContext {
   constructor (options) {
     Object.defineProperty(this, '_options', {
@@ -6,6 +8,7 @@ module.exports = class PluginContext {
       writable: false,
       value: options
     })
+    this.writeTemp = writeTemp
   }
 
   get sourceDir () {
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index d9f5b120d1..b520f63149 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -96,7 +96,7 @@ module.exports = class VuePressPlugin {
     updated,
     generated
   }) {
-    logger.tip(`Apply plugin ${chalk.cyan(name)}...`)
+    logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
     this
       .registerHook('ready', ready, name, [Function])
diff --git a/lib/plugin-api/util.js b/lib/plugin-api/util.js
index 16353c77cf..a1cb54e111 100644
--- a/lib/plugin-api/util.js
+++ b/lib/plugin-api/util.js
@@ -60,8 +60,11 @@ function toNaturalMultiTypesLanguage (types) {
 exports.assertTypes = function (value, types) {
   let valid
   let warnMsg
-  const actualType = exports.toRawType(value)
+  let actualType = exports.toRawType(value)
   const expectedTypes = []
+  if (actualType === 'AsyncFunction') {
+    actualType = 'Function'
+  }
 
   for (const type of types) {
     const expectedType = exports.getType(type)
@@ -72,7 +75,7 @@ exports.assertTypes = function (value, types) {
 
   if (!valid) {
     warnMsg =
-      `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))}` +
+      `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))} ` +
       `but got ${chalk.yellow(actualType)}.`
   }
 
diff --git a/packages/vuepree-plugin-enhance-app/index.js b/packages/vuepree-plugin-enhance-app/index.js
index 72e27db1e2..22c3fe5b75 100644
--- a/packages/vuepree-plugin-enhance-app/index.js
+++ b/packages/vuepree-plugin-enhance-app/index.js
@@ -1,17 +1,15 @@
 const path = require('path')
 
-module.exports = (options, context) => {
-  return {
-    name: 'enhance-app',
+module.exports = (options, context) => ({
+  name: 'enhance-app',
 
-    enhanceAppFiles: () => {
-      const { sourceDir, themePath } = context
-      const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
-      const themeEnhanceAppPath = path.resolve(themePath, 'enhanceApp.js')
-      return [
-        enhanceAppPath,
-        themeEnhanceAppPath
-      ]
-    }
+  enhanceAppFiles: () => {
+    const { sourceDir, themePath } = context
+    const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
+    const themeEnhanceAppPath = path.resolve(themePath, 'enhanceApp.js')
+    return [
+      enhanceAppPath,
+      themeEnhanceAppPath
+    ]
   }
-}
+})
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index 28fe2c0bad..6ea460dee1 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -1,10 +1,10 @@
 const path = require('path')
 
-module.exports = options => ({
+module.exports = (options, context) => ({
   name: 'test',
 
-  ready () {
-    console.log('Ready')
+  async ready () {
+    context.writeTemp('my-temp.js', 'A temp file generated by vuepress-plugin-test.')
   },
 
   extendPageData ({ content }) {

From 0f3fa74bdf7ec1ee6a6a68236f15cfa06b07817b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 4 Jun 2018 03:05:00 +0800
Subject: [PATCH 009/242] feat: support chainWebpack option

---
 lib/plugin-api/api/AbstractAPI.js      | 6 ++++--
 lib/webpack/createClientConfig.js      | 3 +++
 packages/vuepress-plugin-test/index.js | 8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/plugin-api/api/AbstractAPI.js b/lib/plugin-api/api/AbstractAPI.js
index 6626d466a8..ba5993d37a 100644
--- a/lib/plugin-api/api/AbstractAPI.js
+++ b/lib/plugin-api/api/AbstractAPI.js
@@ -15,7 +15,9 @@ module.exports = class AbstractAPI {
     return this.items.map(item => item.value)
   }
 
-  async run () {
-
+  async run (...args) {
+    for (const fn of this.values) {
+      await fn(...args)
+    }
   }
 }
diff --git a/lib/webpack/createClientConfig.js b/lib/webpack/createClientConfig.js
index 8c27663301..6a13db9b0c 100644
--- a/lib/webpack/createClientConfig.js
+++ b/lib/webpack/createClientConfig.js
@@ -65,5 +65,8 @@ module.exports = function createClientConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, false /* isServer */)
   }
 
+  console.log(options.plugin.apis.chainWebpack)
+  options.plugin.apis.chainWebpack.run(config, false /* isServer */)
+
   return config
 }
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index 6ea460dee1..604fb7529f 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -4,7 +4,7 @@ module.exports = (options, context) => ({
   name: 'test',
 
   async ready () {
-    context.writeTemp('my-temp.js', 'A temp file generated by vuepress-plugin-test.')
+    context.writeTemp('my-temp', 'A temp file generated by vuepress-plugin-test.')
   },
 
   extendPageData ({ content }) {
@@ -15,6 +15,10 @@ module.exports = (options, context) => ({
 
   enhanceAppFiles: [
     path.resolve(__dirname, 'enhanceApp.js')
-  ]
+  ],
+
+  chainWebpack (config) {
+    console.log(config)
+  }
 
 })

From d733f1afa6c1a0a1e8d160d199f910df98413eaa Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 00:50:42 +0800
Subject: [PATCH 010/242] refactor: (wip) reorganize

---
 lib/app/app.js                                |  8 ++-
 lib/plugin-api/api/AbstractAPI.js             | 23 ------
 lib/plugin-api/api/instantiateAPI.js          | 14 ----
 lib/plugin-api/constans.js                    | 32 +++++++++
 lib/plugin-api/core/Hook.js                   |  3 +
 lib/plugin-api/core/Tapable.js                | 46 ++++++++++++
 lib/plugin-api/hook.js                        | 28 --------
 lib/plugin-api/index.js                       | 71 +++++++++----------
 .../EnhanceAppFilesOption.js}                 | 21 +++---
 .../ExtendPageDataOption.js}                  |  5 +-
 lib/plugin-api/option/instantiateOption.js    | 14 ++++
 lib/plugin-api/util.js                        | 52 --------------
 lib/prepare/index.js                          |  4 +-
 lib/prepare/resolveSiteData.js                |  2 +-
 lib/util/shared.js                            | 60 ++++++++++++++++
 lib/webpack/createClientConfig.js             |  3 +-
 lib/webpack/createServerConfig.js             |  2 +
 packages/vuepress-plugin-test/index.js        |  2 +-
 18 files changed, 211 insertions(+), 179 deletions(-)
 delete mode 100644 lib/plugin-api/api/AbstractAPI.js
 delete mode 100644 lib/plugin-api/api/instantiateAPI.js
 create mode 100644 lib/plugin-api/constans.js
 create mode 100644 lib/plugin-api/core/Hook.js
 create mode 100644 lib/plugin-api/core/Tapable.js
 delete mode 100644 lib/plugin-api/hook.js
 rename lib/plugin-api/{api/EnhanceAppFiles.js => option/EnhanceAppFilesOption.js} (72%)
 rename lib/plugin-api/{api/ExtendPageData.js => option/ExtendPageDataOption.js} (60%)
 create mode 100644 lib/plugin-api/option/instantiateOption.js

diff --git a/lib/app/app.js b/lib/app/app.js
index 83b32e1a35..61b4c24855 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -79,9 +79,11 @@ export function createApp () {
 
   const options = {}
 
-  appEnhancers.forEach(enhancer => {
-    enhancer({ Vue, options, router, siteData })
-  })
+  try {
+    appEnhancers.forEach(enhancer => enhancer({ Vue, options, router, siteData }))
+  } catch (e) {
+    console.error(e)
+  }
 
   const app = new Vue(
     Object.assign(options, {
diff --git a/lib/plugin-api/api/AbstractAPI.js b/lib/plugin-api/api/AbstractAPI.js
deleted file mode 100644
index ba5993d37a..0000000000
--- a/lib/plugin-api/api/AbstractAPI.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports = class AbstractAPI {
-  constructor (name) {
-    this.name = name
-    this.items = []  // Array<T>
-  }
-
-  add (value, pluginName) {
-    this.items.push({
-      value,
-      pluginName
-    })
-  }
-
-  get values () {
-    return this.items.map(item => item.value)
-  }
-
-  async run (...args) {
-    for (const fn of this.values) {
-      await fn(...args)
-    }
-  }
-}
diff --git a/lib/plugin-api/api/instantiateAPI.js b/lib/plugin-api/api/instantiateAPI.js
deleted file mode 100644
index ff5b68a8d5..0000000000
--- a/lib/plugin-api/api/instantiateAPI.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const EnhanceAppFiles = require('./EnhanceAppFiles')
-const ExtendPageData = require('./ExtendPageData')
-const AbstractAPI = require('./AbstractAPI')
-
-module.exports = function instantiateAPI (name) {
-  switch (name) {
-  case 'enhanceAppFiles':
-    return new EnhanceAppFiles(name)
-  case 'extendPageData':
-    return new ExtendPageData(name)
-
-  default: return new AbstractAPI(name)
-  }
-}
diff --git a/lib/plugin-api/constans.js b/lib/plugin-api/constans.js
new file mode 100644
index 0000000000..bb243ea86d
--- /dev/null
+++ b/lib/plugin-api/constans.js
@@ -0,0 +1,32 @@
+const READY = 'ready'
+const COMPILED = 'compiled'
+const UPDATED = 'updated'
+const GENERATED = 'generated'
+
+const CLIENT = 'client'
+const CHAIN_WEBPACK = 'chainWebpack'
+const ENHANCE_DEV_SERVER = 'enhanceDevServer'
+const ENHANCE_APP_FILES = 'enhanceAppFiles'
+const OUT_FILES = 'outFiles'
+const EXTEND_PAGE_DATA = 'extendPageData'
+const EXTEND_MARKDOWN = 'extendMarkdown'
+
+const HOOK = {
+  READY,
+  COMPILED,
+  UPDATED,
+  GENERATED
+}
+
+const OPTION = {
+  CLIENT,
+  CHAIN_WEBPACK,
+  ENHANCE_DEV_SERVER,
+  ENHANCE_APP_FILES,
+  OUT_FILES,
+  EXTEND_PAGE_DATA,
+  EXTEND_MARKDOWN
+}
+
+exports.HOOK = HOOK
+exports.OPTION = OPTION
diff --git a/lib/plugin-api/core/Hook.js b/lib/plugin-api/core/Hook.js
new file mode 100644
index 0000000000..3614637401
--- /dev/null
+++ b/lib/plugin-api/core/Hook.js
@@ -0,0 +1,3 @@
+const Tapable = require('./Tapable')
+
+module.exports = class Hook extends Tapable {}
diff --git a/lib/plugin-api/core/Tapable.js b/lib/plugin-api/core/Tapable.js
new file mode 100644
index 0000000000..0d811cf87f
--- /dev/null
+++ b/lib/plugin-api/core/Tapable.js
@@ -0,0 +1,46 @@
+module.exports = class Tapable {
+  constructor (key) {
+    this.key = key
+    this.items = [] // Array<{ value: T, name: string }>
+  }
+
+  /**
+   * set value with name.
+   * @param {string} name
+   * @param {any} value
+   */
+  tap (name, value) {
+    if (Array.isArray(value)) {
+      this.items.push(value.map(i => ({ value: i, name })))
+    }
+    this.items.push({ value, name })
+  }
+
+  /**
+   * get values.
+   * @returns {Array<T>}
+   */
+  get values () {
+    return this.items.map(item => item.value)
+  }
+
+  /**
+   * execute in serial
+   * @param args
+   * @returns {Promise.<void>}
+   */
+  async run (...args) {
+    for (const fn of this.values) {
+      await fn(...args)
+    }
+  }
+
+  /**
+   * execute in parallel
+   * @param args
+   * @returns {Promise.<void>}
+   */
+  async parallelRun (...args) {
+    return await Promise.all(this.values.map(fn => fn(...args)))
+  }
+}
diff --git a/lib/plugin-api/hook.js b/lib/plugin-api/hook.js
deleted file mode 100644
index 0c7108ffcd..0000000000
--- a/lib/plugin-api/hook.js
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = class Hook {
-  constructor (name) {
-    this.name = name
-    this.handlers = []
-  }
-
-  tap (symbol, handler) {
-    if (typeof handler !== 'function') {
-      return
-    }
-    this.handlers.push({ symbol, handler })
-    return this
-  }
-
-  remove (symbol) {
-    const index = this.handlers.findIndex(item => item.symbol === symbol)
-    if (index !== -1) {
-      this.handlers.splice(index, 1)
-    }
-    return this
-  }
-
-  async run () {
-    for (const item of this.handlers) {
-      await item.handler.apply(null, arguments)
-    }
-  }
-}
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index b520f63149..5c73793f4b 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -1,31 +1,20 @@
 const chalk = require('chalk')
-const { resolvePlugin, inferPluginName, assertTypes } = require('./util')
-const Hook = require('./hook')
-const instantiateAPI = require('./api/instantiateAPI')
+const Hook = require('./core/Hook')
+const instantiateAPI = require('./option/instantiateOption')
 const logger = require('../util/logger')
+const { resolvePlugin, inferPluginName } = require('./util')
+const { assertTypes } = require('../util/shared')
+const { HOOK, OPTION } = require('./constans')
 
-module.exports = class VuePressPlugin {
+module.exports = class Plugin {
   constructor (pluginConfigs, context) {
     if (!Array.isArray(pluginConfigs)) {
       pluginConfigs = []
     }
     this.hooks = {}
-    this.apis = {}
-    this.extendHooks([
-      'ready',
-      'compiled',
-      'updated',
-      'generated'
-    ])
-    this.extendAPIs([
-      'client',
-      'chainWebpack',
-      'enhanceDevServer',
-      'extendMarkdown',
-      'enhanceAppFiles',
-      'outFiles',
-      'extendPageData'
-    ])
+    this.options = {}
+    this.extendHooks(Object.values(HOOK))
+    this.extendOptions(Object.values(OPTION))
     this.resolvePluginConfigs(pluginConfigs, context)
   }
 
@@ -35,9 +24,9 @@ module.exports = class VuePressPlugin {
     })
   }
 
-  extendAPIs (apis) {
-    apis.forEach(api => {
-      this.apis[api] = instantiateAPI(api)
+  extendOptions (options) {
+    options.forEach(api => {
+      this.options[api] = instantiateAPI(api)
     })
   }
 
@@ -48,16 +37,16 @@ module.exports = class VuePressPlugin {
     } else if (hook !== undefined) {
       logger.warn(
         `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
-        `Invalid value for "option" ${chalk.cyan(name)}: ${warnMsg}`
+        `Invalid value for "hook" ${chalk.cyan(name)}: ${warnMsg}`
       )
     }
     return this
   }
 
-  registerAPI (name, api, pluginName, types) {
+  registerOption (name, api, pluginName, types) {
     const { valid, warnMsg } = assertTypes(api, types)
     if (valid) {
-      this.apis[name].add(api, pluginName)
+      this.options[name].tap(pluginName, api)
     } else if (api !== undefined) {
       logger.warn(
         `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
@@ -82,6 +71,14 @@ module.exports = class VuePressPlugin {
     })
   }
 
+  // async callOption (name, args) {
+  //   await this.options[name].run(args)
+  // }
+  //
+  // async callHook (name, args) {
+  //   await this.hooks[name].run(args)
+  // }
+
   applyPlugin ({
     name,
     client,
@@ -99,18 +96,18 @@ module.exports = class VuePressPlugin {
     logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
     this
-      .registerHook('ready', ready, name, [Function])
-      .registerHook('compiled', compiled, name, [Function])
-      .registerHook('updated', updated, name, [Function])
-      .registerHook('generated', generated, name, [Function])
+      .registerHook(HOOK.READY, ready, name, [Function])
+      .registerHook(HOOK.COMPILED, compiled, name, [Function])
+      .registerHook(HOOK.UPDATED, updated, name, [Function])
+      .registerHook(HOOK.GENERATED, generated, name, [Function])
 
     this
-      .registerAPI('client', client, name, [String])
-      .registerAPI('chainWebpack', chainWebpack, name, [Function])
-      .registerAPI('enhanceDevServer', enhanceDevServer, name, [Function])
-      .registerAPI('extendMarkdown', extendMarkdown, name, [Function])
-      .registerAPI('enhanceAppFiles', enhanceAppFiles, name, [Array, Function])
-      .registerAPI('outFiles', outFiles, name, [Object])
-      .registerAPI('extendPageData', extendPageData, name, [Function])
+      .registerOption(OPTION.CLIENT, client, name, [String])
+      .registerOption(OPTION.CHAIN_WEBPACK, chainWebpack, name, [Function])
+      .registerOption(OPTION.ENHANCE_DEV_SERVER, enhanceDevServer, name, [Function])
+      .registerOption(OPTION.EXTEND_MARKDOWN, extendMarkdown, name, [Function])
+      .registerOption(OPTION.EXTEND_PAGE_DATA, extendPageData, name, [Function])
+      .registerOption(OPTION.ENHANCE_APP_FILES, enhanceAppFiles, name, [Array, Function])
+      .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
   }
 }
diff --git a/lib/plugin-api/api/EnhanceAppFiles.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
similarity index 72%
rename from lib/plugin-api/api/EnhanceAppFiles.js
rename to lib/plugin-api/option/EnhanceAppFilesOption.js
index 933a599e07..b4415ce24b 100644
--- a/lib/plugin-api/api/EnhanceAppFiles.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -1,34 +1,28 @@
 const fs = require('fs-extra')
-const path = require('path')
 const chalk = require('chalk')
-const AbstractAPI = require('./AbstractAPI')
+const Tapable = require('../core/Tapable')
 const { writeTemp } = require('../../prepare/util')
 const logger = require('../../util/logger')
 
-module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
+module.exports = class EnhanceAppFilesOption extends Tapable {
   add (value, pluginName) {
     if (typeof value === 'function') {
       value = value()
     }
-    this.items.push(...value.map(filepath => ({
-      pluginName,
-      filepath
-    })))
+    super.add(value, pluginName)
   }
 
   async run (...args) {
     const manifest = []
 
-    for (const [index, { filepath, pluginName }] of this.items.entries()) {
+    // 1. write enhance app files.
+    for (const [index, value] of this.items.entries()) {
+      const { filepath, pluginName } = value
       if (fs.existsSync(filepath)) {
-        let filename = path.parse(filepath).base
-        filename = `enhanceAppFiles-${index}.js`
-
         const destPath = await writeTemp(
-          filename,
+          `enhanceAppFiles-${index}.js`,
           `export { default } from ${JSON.stringify(filepath)}`
         )
-
         manifest.push(destPath)
       } else {
         logger.debug(
@@ -38,6 +32,7 @@ module.exports = class EnhanceAppFilesAPI extends AbstractAPI {
       }
     }
 
+    // 2. write entry file.
     await writeTemp(
       'appEnhancers.js',
       this.getEnhanceAppCode(manifest)
diff --git a/lib/plugin-api/api/ExtendPageData.js b/lib/plugin-api/option/ExtendPageDataOption.js
similarity index 60%
rename from lib/plugin-api/api/ExtendPageData.js
rename to lib/plugin-api/option/ExtendPageDataOption.js
index b3007878bc..c80081200a 100644
--- a/lib/plugin-api/api/ExtendPageData.js
+++ b/lib/plugin-api/option/ExtendPageDataOption.js
@@ -1,10 +1,9 @@
-const AbstractAPI = require('./AbstractAPI')
+const Tapable = require('../core/Tapable')
 
-module.exports = class enhanceAppFiles extends AbstractAPI {
+module.exports = class ExtendPageDataOption extends Tapable {
   async run (args) {
     const { data } = args
     for (const fn of this.values) {
-      // TODO handle error
       const res = await fn(args)
       if (typeof res === 'object') {
         Object.assign(data, res)
diff --git a/lib/plugin-api/option/instantiateOption.js b/lib/plugin-api/option/instantiateOption.js
new file mode 100644
index 0000000000..85d1e49831
--- /dev/null
+++ b/lib/plugin-api/option/instantiateOption.js
@@ -0,0 +1,14 @@
+const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
+const ExtendPageDataOption = require('./ExtendPageDataOption')
+const Tapable = require('../core/Tapable')
+
+module.exports = function instantiateOption (name) {
+  switch (name) {
+  case 'enhanceAppFiles':
+    return new EnhanceAppFilesOption(name)
+  case 'extendPageData':
+    return new ExtendPageDataOption(name)
+
+  default: return new Tapable(name)
+  }
+}
diff --git a/lib/plugin-api/util.js b/lib/plugin-api/util.js
index a1cb54e111..8fe5ca9d16 100644
--- a/lib/plugin-api/util.js
+++ b/lib/plugin-api/util.js
@@ -32,55 +32,3 @@ exports.inferPluginName = function (pluginRaw, pluginConfig) {
   // ensure each plugin have a unique name.
   return Date.now().toString(16)
 }
-
-/**
- * Get the raw type string of a value e.g. [object Object]
- */
-const _toString = Object.prototype.toString
-
-exports.toRawType = function (value) {
-  return _toString.call(value).slice(8, -1)
-}
-
-exports.getType = function (fn) {
-  const match = fn && fn.toString().match(/^\s*function (\w+)/)
-  return match ? match[1] : ''
-}
-
-function toNaturalMultiTypesLanguage (types) {
-  const len = types.length
-  if (len === 1) {
-    return types.join('')
-  }
-  const rest = types.slice(0, len - 1)
-  const last = types[len - 1]
-  return rest.join(', ') + ' or ' + last
-}
-
-exports.assertTypes = function (value, types) {
-  let valid
-  let warnMsg
-  let actualType = exports.toRawType(value)
-  const expectedTypes = []
-  if (actualType === 'AsyncFunction') {
-    actualType = 'Function'
-  }
-
-  for (const type of types) {
-    const expectedType = exports.getType(type)
-    expectedTypes.push(expectedType)
-    valid = actualType === expectedType
-    if (valid) break
-  }
-
-  if (!valid) {
-    warnMsg =
-      `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))} ` +
-      `but got ${chalk.yellow(actualType)}.`
-  }
-
-  return {
-    valid,
-    warnMsg
-  }
-}
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index ce00766c25..e34fe50c3f 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -19,7 +19,7 @@ module.exports = async function prepare (sourceDir) {
 
   // 3. resolve siteData
   // SiteData must be resolved after the plugin initialization
-  // because plugins can expand the sitedata.
+  // because plugins can be able to extend the sitedata.
   options.siteData = await resolveSiteData(options)
   Object.freeze(options)
 
@@ -43,7 +43,7 @@ module.exports = async function prepare (sourceDir) {
   const hasUserOverride = fs.existsSync(overridePath)
   await writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
 
-  await plugin.apis.enhanceAppFiles.run()
+  await plugin.options.enhanceAppFiles.run()
 
   return options
 }
diff --git a/lib/prepare/resolveSiteData.js b/lib/prepare/resolveSiteData.js
index fd16806946..6480350946 100644
--- a/lib/prepare/resolveSiteData.js
+++ b/lib/prepare/resolveSiteData.js
@@ -28,7 +28,7 @@ module.exports = async function ({
     // extract yaml frontmatter
     const content = await fs.readFile(filepath, 'utf-8')
 
-    await plugin.apis.extendPageData.run({ data, filepath, relative, key, sourceDir, content })
+    await plugin.options.extendPageData.run({ data, filepath, relative, key, sourceDir, content })
 
     const frontmatter = parseFrontmatter(content)
     // infer title
diff --git a/lib/util/shared.js b/lib/util/shared.js
index 023f63bd1b..b3b1919048 100644
--- a/lib/util/shared.js
+++ b/lib/util/shared.js
@@ -1,3 +1,8 @@
+const chalk = require('chalk')
+
+/**
+ * Build functional pipeline.
+ */
 exports.compose = (...processors) => {
   if (processors.length === 0) return input => input
   if (processors.length === 1) return processors[0]
@@ -5,3 +10,58 @@ exports.compose = (...processors) => {
     return (...args) => next(prev(...args))
   })
 }
+
+exports.isObject = obj => obj !== null && typeof obj === 'object'
+
+/**
+ * Get the raw type string of a value e.g. [object Object]
+ */
+const _toString = Object.prototype.toString
+
+exports.toRawType = value => _toString.call(value).slice(8, -1)
+
+exports.getType = function (fn) {
+  const match = fn && fn.toString().match(/^\s*function (\w+)/)
+  return match ? match[1] : ''
+}
+
+/**
+ * Transform multi-types to natural language. e.g.
+ *   ['Function']                     => 'Function'
+ *   ['Function', 'Object']           => 'Function or Object'
+ *   ['Function', 'Object', 'Number'] => 'Function, Object or Number'
+ */
+function toNaturalMultiTypesLanguage (types) {
+  const len = types.length
+  if (len === 1) {
+    return types.join('')
+  }
+  const rest = types.slice(0, len - 1)
+  const last = types[len - 1]
+  return rest.join(', ') + ' or ' + last
+}
+
+exports.assertTypes = function (value, types) {
+  let valid
+  let warnMsg
+  let actualType = exports.toRawType(value)
+  const expectedTypes = []
+  if (actualType === 'AsyncFunction') {
+    actualType = 'Function'
+  }
+
+  for (const type of types) {
+    const expectedType = exports.getType(type)
+    expectedTypes.push(expectedType)
+    valid = actualType === expectedType
+    if (valid) break
+  }
+
+  if (!valid) {
+    warnMsg =
+      `expected a ${chalk.green(toNaturalMultiTypesLanguage(expectedTypes))} ` +
+      `but got ${chalk.yellow(actualType)}.`
+  }
+
+  return { valid, warnMsg }
+}
diff --git a/lib/webpack/createClientConfig.js b/lib/webpack/createClientConfig.js
index 6a13db9b0c..6abe1d36d3 100644
--- a/lib/webpack/createClientConfig.js
+++ b/lib/webpack/createClientConfig.js
@@ -65,8 +65,7 @@ module.exports = function createClientConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, false /* isServer */)
   }
 
-  console.log(options.plugin.apis.chainWebpack)
-  options.plugin.apis.chainWebpack.run(config, false /* isServer */)
+  options.plugin.options.chainWebpack.run(config, false /* isServer */)
 
   return config
 }
diff --git a/lib/webpack/createServerConfig.js b/lib/webpack/createServerConfig.js
index e9f098354b..44d25420a5 100644
--- a/lib/webpack/createServerConfig.js
+++ b/lib/webpack/createServerConfig.js
@@ -54,5 +54,7 @@ module.exports = function createServerConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, true /* isServer */)
   }
 
+  options.plugin.options.chainWebpack.run(config, true /* isServer */)
+
   return config
 }
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index 604fb7529f..a52e0fd68d 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -18,7 +18,7 @@ module.exports = (options, context) => ({
   ],
 
   chainWebpack (config) {
-    console.log(config)
+    console.log('chainWebpack')
   }
 
 })

From f19da0aa54565f30016a7890a5450fac6a399d7f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 01:47:46 +0800
Subject: [PATCH 011/242] feat: support 'generated' hook and 'extendMarkdown'
 and 'enhanceDevServer' option

---
 docs/.vuepress/images/logo.png         | Bin 0 -> 3451 bytes
 lib/build.js                           |   2 ++
 lib/dev.js                             |   4 +++
 lib/plugin-api/context.js              |   4 +++
 lib/prepare/index.js                   |  13 +++++---
 packages/vuepress-plugin-test/index.js |  42 +++++++++++++++++++++++--
 6 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 docs/.vuepress/images/logo.png

diff --git a/docs/.vuepress/images/logo.png b/docs/.vuepress/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..60e17006ad07cd313788585e2f5e528fbb7cf821
GIT binary patch
literal 3451
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

literal 0
HcmV?d00001

diff --git a/lib/build.js b/lib/build.js
index 33003a01c4..f49ffb91c9 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -89,6 +89,8 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     })
   }
 
+  await options.plugin.hooks.generated.run()
+
   // DONE.
   const relativeDir = path.relative(process.cwd(), outDir)
   logger.success(`\n${chalk.green('Success!')} Generated static files in ${chalk.cyan(relativeDir)}.\n`)
diff --git a/lib/dev.js b/lib/dev.js
index cfb7dc4bf7..d9c550756a 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -107,6 +107,10 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
     logLevel: 'error',
     port,
     add: app => {
+      // apply plugin options to extend dev server.
+      const { plugin } = options
+      plugin.options.enhanceDevServer.run(app)
+
       const userPublic = path.resolve(sourceDir, '.vuepress/public')
       // respect base when serving static files...
       if (fs.existsSync(userPublic)) {
diff --git a/lib/plugin-api/context.js b/lib/plugin-api/context.js
index c56940ef0d..e79918e765 100644
--- a/lib/plugin-api/context.js
+++ b/lib/plugin-api/context.js
@@ -22,4 +22,8 @@ module.exports = class PluginContext {
   get themePath () {
     return this._options.themePath
   }
+
+  get publicPath () {
+    return this._options.publicPath
+  }
 }
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index e34fe50c3f..f9e7fffec8 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -10,14 +10,17 @@ const { writeTemp } = require('./util')
 module.exports = async function prepare (sourceDir) {
   // 1. load options
   const options = await resolveOptions(sourceDir)
-  const { siteConfig } = options
+  const { siteConfig, markdown } = options
 
   // 2. initialize plugin
   const pluginContext = new PluginContext(options)
   const plugin = new Plugin(siteConfig.plugins, pluginContext)
   options.plugin = plugin
 
-  // 3. resolve siteData
+  // 3. Apply plugin options to extend makrdown.
+  plugin.options.extendMarkdown.run(markdown)
+
+  // 4. resolve siteData
   // SiteData must be resolved after the plugin initialization
   // because plugins can be able to extend the sitedata.
   options.siteData = await resolveSiteData(options)
@@ -25,7 +28,7 @@ module.exports = async function prepare (sourceDir) {
 
   await plugin.hooks.ready.run(options)
 
-  // 4. generate routes & user components registration code
+  // 5. generate routes & user components registration code
   const routesCode = await genRoutesFile(options)
   const componentCode = await genComponentRegistrationFile(options)
 
@@ -34,11 +37,11 @@ module.exports = async function prepare (sourceDir) {
     routesCode
   ].join('\n'))
 
-  // 5. generate siteData
+  // 6. generate siteData
   const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
   await writeTemp('siteData.js', dataCode)
 
-  // 5. handle user override
+  // 7. handle user override
   const overridePath = path.resolve(sourceDir, '.vuepress/override.styl')
   const hasUserOverride = fs.existsSync(overridePath)
   await writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index a52e0fd68d..7ca73e2126 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -1,5 +1,13 @@
 const path = require('path')
 
+class SimpleLogPlugin {
+  apply (compiler) {
+    compiler.hooks.done.tap('simple-log', function () {
+      console.log('\n\nDone!')
+    })
+  }
+}
+
 module.exports = (options, context) => ({
   name: 'test',
 
@@ -17,8 +25,36 @@ module.exports = (options, context) => ({
     path.resolve(__dirname, 'enhanceApp.js')
   ],
 
-  chainWebpack (config) {
-    console.log('chainWebpack')
-  }
+  chainWebpack (config, isServer) {
+    if (isServer) {
+      config
+        .plugin('copy')
+        .tap(args => {
+          args[0].push({
+            from: path.resolve(context.sourceDir, '.vuepress/images'),
+            to: path.resolve(context.outDir, 'images')
+          })
+          return args
+        })
+    }
+    config
+      .plugin('simple-log')
+      .use(SimpleLogPlugin)
+  },
 
+  extendMarkdown (md) {
+    // md.use()
+  },
+
+  enhanceDevServer (app) {
+    const path = require('path')
+    const mount = require('koa-mount')
+    const serveStatic = require('koa-static')
+    const imagePublicPath = path.resolve(context.sourceDir, '.vuepress/images')
+    app.use(mount(path.join(context.publicPath, 'images'), serveStatic(imagePublicPath)))
+  },
+
+  async generated () {
+    console.log('generated')
+  }
 })

From af14e4b1294b591fd5180ed527937aaa2efc3c8b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 16:48:42 +0800
Subject: [PATCH 012/242] feat: internal and external plugins

---
 docs/.vuepress/config.js                      |  6 +--
 lib/plugin-api/index.js                       | 53 +++++++++----------
 lib/prepare/index.js                          |  8 ++-
 lib/prepare/resolvePlugin.js                  | 18 +++++++
 .../index.js                                  |  7 +++
 .../mixin.js                                  | 47 ++++++++++++++++
 packages/vuepress-plugin-test/enhanceApp.js   |  4 +-
 packages/vuepress-plugin-test/root-mixins.js  |  8 +++
 8 files changed, 112 insertions(+), 39 deletions(-)
 create mode 100644 lib/prepare/resolvePlugin.js
 create mode 100644 packages/vuepress-plugin-active-header-links/index.js
 create mode 100644 packages/vuepress-plugin-active-header-links/mixin.js
 create mode 100644 packages/vuepress-plugin-test/root-mixins.js

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index d0c56b577e..33aa66ecfb 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,6 +1,4 @@
-const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
 const testPlugin = require('../../packages/vuepress-plugin-test')
-const enhanceApp = require('../../packages/vuepree-plugin-enhance-app')
 
 module.exports = {
   dest: 'vuepress',
@@ -30,14 +28,12 @@ module.exports = {
   serviceWorker: true,
   theme: 'vue',
   plugins: [
-    lastUpdatedPlugin,
     [
       testPlugin,
       {
 
       }
-    ],
-    enhanceApp
+    ]
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 5c73793f4b..2fcee6c83c 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -7,15 +7,35 @@ const { assertTypes } = require('../util/shared')
 const { HOOK, OPTION } = require('./constans')
 
 module.exports = class Plugin {
-  constructor (pluginConfigs, context) {
-    if (!Array.isArray(pluginConfigs)) {
-      pluginConfigs = []
-    }
+  constructor (context) {
     this.hooks = {}
     this.options = {}
+    this._pluginContext = context
     this.extendHooks(Object.values(HOOK))
     this.extendOptions(Object.values(OPTION))
-    this.resolvePluginConfigs(pluginConfigs, context)
+  }
+
+  use (pluginRaw, pluginOptions) {
+    let plugin = resolvePlugin(pluginRaw)
+    if (typeof plugin === 'function') {
+      plugin = plugin(pluginOptions, this._pluginContext)
+    }
+    plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
+    this.applyPlugin(plugin)
+    return this
+  }
+
+  useByConfigs (pluginConfigs) {
+    if (!Array.isArray(pluginConfigs)) {
+      pluginConfigs = []
+    }
+    pluginConfigs.forEach(pluginConfigs => {
+      pluginConfigs = Array.isArray(pluginConfigs)
+        ? pluginConfigs
+        : [pluginConfigs]
+      const [pluginRaw, pluginOptions] = pluginConfigs
+      this.use(pluginRaw, pluginOptions)
+    })
   }
 
   extendHooks (hooks) {
@@ -56,29 +76,6 @@ module.exports = class Plugin {
     return this
   }
 
-  resolvePluginConfigs (pluginConfigs, context) {
-    pluginConfigs.forEach(pluginConfigs => {
-      pluginConfigs = Array.isArray(pluginConfigs)
-        ? pluginConfigs
-        : [pluginConfigs]
-      const [pluginRaw, pluginOptions] = pluginConfigs
-      let plugin = resolvePlugin(pluginRaw)
-      if (typeof plugin === 'function') {
-        plugin = plugin(pluginOptions, context)
-      }
-      plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
-      this.applyPlugin(plugin)
-    })
-  }
-
-  // async callOption (name, args) {
-  //   await this.options[name].run(args)
-  // }
-  //
-  // async callHook (name, args) {
-  //   await this.hooks[name].run(args)
-  // }
-
   applyPlugin ({
     name,
     client,
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index f9e7fffec8..f4f1abe38b 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -1,9 +1,8 @@
 const path = require('path')
 const fs = require('fs-extra')
-const Plugin = require('../plugin-api')
-const PluginContext = require('../plugin-api/context')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
+const resolvePlugin = require('./resolvePlugin')
 const { genRoutesFile, genComponentRegistrationFile } = require('./codegen')
 const { writeTemp } = require('./util')
 
@@ -12,9 +11,8 @@ module.exports = async function prepare (sourceDir) {
   const options = await resolveOptions(sourceDir)
   const { siteConfig, markdown } = options
 
-  // 2. initialize plugin
-  const pluginContext = new PluginContext(options)
-  const plugin = new Plugin(siteConfig.plugins, pluginContext)
+  // 2. resolve plugin
+  const plugin = resolvePlugin(siteConfig.plugins, options)
   options.plugin = plugin
 
   // 3. Apply plugin options to extend makrdown.
diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js
new file mode 100644
index 0000000000..b4d14a4d80
--- /dev/null
+++ b/lib/prepare/resolvePlugin.js
@@ -0,0 +1,18 @@
+const Plugin = require('../plugin-api')
+const PluginContext = require('../plugin-api/context')
+
+// built-in plugins
+const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
+const enhanceApp = require('../../packages/vuepree-plugin-enhance-app')
+
+module.exports = function (pluginConfigs, context) {
+  const pluginContext = new PluginContext(context)
+  const plugin = new Plugin(pluginContext)
+
+  plugin
+    .use(lastUpdatedPlugin)
+    .use(enhanceApp)
+    .useByConfigs(pluginConfigs)
+
+  return plugin
+}
diff --git a/packages/vuepress-plugin-active-header-links/index.js b/packages/vuepress-plugin-active-header-links/index.js
new file mode 100644
index 0000000000..e15966e596
--- /dev/null
+++ b/packages/vuepress-plugin-active-header-links/index.js
@@ -0,0 +1,7 @@
+const path = require('path')
+
+module.exports = (options, context) => ({
+  name: 'active-header-links',
+  // This file will be mixed into the root component of each page.
+  mixin: path.resolve(__dirname, 'root-mixin.js')
+})
diff --git a/packages/vuepress-plugin-active-header-links/mixin.js b/packages/vuepress-plugin-active-header-links/mixin.js
new file mode 100644
index 0000000000..ae94fd9b8f
--- /dev/null
+++ b/packages/vuepress-plugin-active-header-links/mixin.js
@@ -0,0 +1,47 @@
+import store from '@app/store'
+import throttle from 'lodash.throttle'
+
+export default {
+  mounted () {
+    window.addEventListener('scroll', this.onScroll)
+  },
+  methods: {
+    onScroll: throttle(function () {
+      this.setActiveHash()
+    }, 300),
+    setActiveHash () {
+      const sidebarLinks = [].slice.call(document.querySelectorAll('.sidebar-link'))
+      const anchors = [].slice.call(document.querySelectorAll('.header-anchor'))
+        .filter(anchor => sidebarLinks.some(sidebarLink => sidebarLink.hash === anchor.hash))
+
+      const scrollTop = Math.max(
+        window.pageYOffset,
+        document.documentElement.scrollTop,
+        document.body.scrollTop
+      )
+
+      for (let i = 0; i < anchors.length; i++) {
+        const anchor = anchors[i]
+        const nextAnchor = anchors[i + 1]
+
+        const isActive = i === 0 && scrollTop === 0 ||
+          (scrollTop >= anchor.parentElement.offsetTop + 10 &&
+          (!nextAnchor || scrollTop < nextAnchor.parentElement.offsetTop - 10))
+
+        if (isActive && decodeURIComponent(this.$route.hash) !== decodeURIComponent(anchor.hash)) {
+          store.disableScrollBehavior = true
+          this.$router.replace(decodeURIComponent(anchor.hash), () => {
+            // execute after scrollBehavior handler.
+            this.$nextTick(() => {
+              store.disableScrollBehavior = false
+            })
+          })
+          return
+        }
+      }
+    }
+  },
+  beforeDestroy () {
+    window.removeEventListener('scroll', this.onScroll)
+  }
+}
diff --git a/packages/vuepress-plugin-test/enhanceApp.js b/packages/vuepress-plugin-test/enhanceApp.js
index ea9b101e1c..f45a4c345d 100644
--- a/packages/vuepress-plugin-test/enhanceApp.js
+++ b/packages/vuepress-plugin-test/enhanceApp.js
@@ -1 +1,3 @@
-export default function () {}
+export default function (Vue) {
+  Vue.use(/**/)
+}
diff --git a/packages/vuepress-plugin-test/root-mixins.js b/packages/vuepress-plugin-test/root-mixins.js
new file mode 100644
index 0000000000..5a36f0efd5
--- /dev/null
+++ b/packages/vuepress-plugin-test/root-mixins.js
@@ -0,0 +1,8 @@
+export default {
+  created () {
+    console.log('created')
+  },
+  mounted () {
+    console.log('mounted')
+  }
+}

From 4f26102b4d18f2f2cd0e681daab22a8b1894f6b7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 18:24:36 +0800
Subject: [PATCH 013/242] feat: support 'dynamicClientCode' option

1. Move global components registration to a single plugin 'vuepress-plugin-register-global-components'
2. Support register global theme components (`${themePath}/components`) (#345)
---
 lib/app/app.js                                |  1 +
 lib/plugin-api/constans.js                    |  4 +-
 lib/plugin-api/index.js                       |  4 +-
 .../option/DynamicClientCodeOption.js         | 19 +++++++++
 lib/plugin-api/option/instantiateOption.js    |  3 ++
 lib/prepare/codegen.js                        | 16 +-------
 lib/prepare/index.js                          | 20 ++++-----
 lib/prepare/resolvePlugin.js                  | 15 +++++--
 lib/prepare/util.js                           | 20 ---------
 .../index.js                                  | 41 +++++++++++++++++++
 10 files changed, 91 insertions(+), 52 deletions(-)
 create mode 100644 lib/plugin-api/option/DynamicClientCodeOption.js
 create mode 100644 packages/vuepress-plugin-register-global-components/index.js

diff --git a/lib/app/app.js b/lib/app/app.js
index 61b4c24855..57b57b9690 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -9,6 +9,7 @@ import store from './store'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
 import appEnhancers from '@temp/appEnhancers.js'
+import '@temp/dynamicClientCode.js'
 
 // suggest dev server restart on base change
 if (module.hot) {
diff --git a/lib/plugin-api/constans.js b/lib/plugin-api/constans.js
index bb243ea86d..93b9afd255 100644
--- a/lib/plugin-api/constans.js
+++ b/lib/plugin-api/constans.js
@@ -10,6 +10,7 @@ const ENHANCE_APP_FILES = 'enhanceAppFiles'
 const OUT_FILES = 'outFiles'
 const EXTEND_PAGE_DATA = 'extendPageData'
 const EXTEND_MARKDOWN = 'extendMarkdown'
+const DYNAMIC_CLIENT_CODE = 'dynamicClientCode'
 
 const HOOK = {
   READY,
@@ -25,7 +26,8 @@ const OPTION = {
   ENHANCE_APP_FILES,
   OUT_FILES,
   EXTEND_PAGE_DATA,
-  EXTEND_MARKDOWN
+  EXTEND_MARKDOWN,
+  DYNAMIC_CLIENT_CODE
 }
 
 exports.HOOK = HOOK
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 2fcee6c83c..618809504c 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -88,7 +88,8 @@ module.exports = class Plugin {
     ready,
     compiled,
     updated,
-    generated
+    generated,
+    dynamicClientCode
   }) {
     logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
@@ -106,5 +107,6 @@ module.exports = class Plugin {
       .registerOption(OPTION.EXTEND_PAGE_DATA, extendPageData, name, [Function])
       .registerOption(OPTION.ENHANCE_APP_FILES, enhanceAppFiles, name, [Array, Function])
       .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
+      .registerOption(OPTION.DYNAMIC_CLIENT_CODE, dynamicClientCode, name, [Function])
   }
 }
diff --git a/lib/plugin-api/option/DynamicClientCodeOption.js b/lib/plugin-api/option/DynamicClientCodeOption.js
new file mode 100644
index 0000000000..02301c1a56
--- /dev/null
+++ b/lib/plugin-api/option/DynamicClientCodeOption.js
@@ -0,0 +1,19 @@
+const Tapable = require('../core/Tapable')
+const { writeTemp } = require('../../prepare/util')
+
+module.exports = class DynamicClientCodeOption extends Tapable {
+  async run () {
+    let code = ''
+    for (const item of this.items) {
+      const { value: fn, name: pluginName } = item
+      const res = await fn()
+      code += `
+/**
+ * Generated by [vuepress-plugin-${pluginName}]"
+ */
+${res}\n\n
+        `.trim()
+    }
+    await writeTemp('dynamicClientCode.js', code)
+  }
+}
diff --git a/lib/plugin-api/option/instantiateOption.js b/lib/plugin-api/option/instantiateOption.js
index 85d1e49831..110ac43d6f 100644
--- a/lib/plugin-api/option/instantiateOption.js
+++ b/lib/plugin-api/option/instantiateOption.js
@@ -1,5 +1,6 @@
 const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ExtendPageDataOption = require('./ExtendPageDataOption')
+const DynamicClientCodeOption = require('./DynamicClientCodeOption')
 const Tapable = require('../core/Tapable')
 
 module.exports = function instantiateOption (name) {
@@ -8,6 +9,8 @@ module.exports = function instantiateOption (name) {
     return new EnhanceAppFilesOption(name)
   case 'extendPageData':
     return new ExtendPageDataOption(name)
+  case 'dynamicClientCode':
+    return new DynamicClientCodeOption(name)
 
   default: return new Tapable(name)
   }
diff --git a/lib/prepare/codegen.js b/lib/prepare/codegen.js
index 52e85355a2..8de4ba7e4b 100644
--- a/lib/prepare/codegen.js
+++ b/lib/prepare/codegen.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const { fileToComponentName, resolveComponents } = require('./util')
 
 exports.genRoutesFile = async function ({
   siteData: { pages },
@@ -49,6 +48,7 @@ exports.genRoutesFile = async function ({
   }`
 
   return (
+    `import Vue from 'vue'\n` +
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
     `import { injectMixins } from '@app/util'\n` +
@@ -58,17 +58,3 @@ exports.genRoutesFile = async function ({
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
   )
 }
-
-exports.genComponentRegistrationFile = async function ({ sourceDir }) {
-  function genImport (file) {
-    const name = fileToComponentName(file)
-    const baseDir = path.resolve(sourceDir, '.vuepress/components')
-    const absolutePath = path.resolve(baseDir, file)
-    const code = `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
-    return code
-  }
-
-  const components = (await resolveComponents(sourceDir)) || []
-  return `import Vue from 'vue'\n` + components.map(genImport).join('\n')
-}
-
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index f4f1abe38b..3c6a801fec 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -3,20 +3,21 @@ const fs = require('fs-extra')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
 const resolvePlugin = require('./resolvePlugin')
-const { genRoutesFile, genComponentRegistrationFile } = require('./codegen')
+const { genRoutesFile } = require('./codegen')
 const { writeTemp } = require('./util')
 
 module.exports = async function prepare (sourceDir) {
   // 1. load options
   const options = await resolveOptions(sourceDir)
-  const { siteConfig, markdown } = options
+  const { markdown } = options
 
   // 2. resolve plugin
-  const plugin = resolvePlugin(siteConfig.plugins, options)
+  const plugin = resolvePlugin(options)
   options.plugin = plugin
 
-  // 3. Apply plugin options to extend makrdown.
+  // 3. Apply plugin options to extend markdown.
   plugin.options.extendMarkdown.run(markdown)
+  plugin.options.dynamicClientCode.run()
 
   // 4. resolve siteData
   // SiteData must be resolved after the plugin initialization
@@ -24,16 +25,11 @@ module.exports = async function prepare (sourceDir) {
   options.siteData = await resolveSiteData(options)
   Object.freeze(options)
 
-  await plugin.hooks.ready.run(options)
+  await plugin.hooks.ready.run()
 
-  // 5. generate routes & user components registration code
+  // 5. generate routes code
   const routesCode = await genRoutesFile(options)
-  const componentCode = await genComponentRegistrationFile(options)
-
-  await writeTemp('routes.js', [
-    componentCode,
-    routesCode
-  ].join('\n'))
+  await writeTemp('routes.js', routesCode)
 
   // 6. generate siteData
   const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js
index b4d14a4d80..006c62d2b0 100644
--- a/lib/prepare/resolvePlugin.js
+++ b/lib/prepare/resolvePlugin.js
@@ -1,18 +1,27 @@
+const path = require('path')
 const Plugin = require('../plugin-api')
 const PluginContext = require('../plugin-api/context')
 
 // built-in plugins
 const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
 const enhanceApp = require('../../packages/vuepree-plugin-enhance-app')
+const registerGlobalComponents = require('../../packages/vuepress-plugin-register-global-components')
 
-module.exports = function (pluginConfigs, context) {
-  const pluginContext = new PluginContext(context)
+module.exports = function (options) {
+  const { siteConfig, sourceDir, themePath } = options
+  const pluginContext = new PluginContext(options)
   const plugin = new Plugin(pluginContext)
 
   plugin
     .use(lastUpdatedPlugin)
     .use(enhanceApp)
-    .useByConfigs(pluginConfigs)
+    .use(registerGlobalComponents, {
+      baseDirs: [
+        path.resolve(sourceDir, '.vuepress/components'),
+        path.resolve(themePath, 'components')
+      ]
+    })
+    .useByConfigs(siteConfig.plugins)
 
   return plugin
 }
diff --git a/lib/prepare/util.js b/lib/prepare/util.js
index 0ecec30340..fc9b75a24c 100644
--- a/lib/prepare/util.js
+++ b/lib/prepare/util.js
@@ -1,6 +1,5 @@
 const path = require('path')
 const fs = require('fs-extra')
-const globby = require('globby')
 
 const tempPath = path.resolve(__dirname, '../app/.temp')
 fs.ensureDirSync(tempPath)
@@ -41,29 +40,10 @@ exports.fileToPath = function (file) {
   }
 }
 
-exports.fileToComponentName = function (file) {
-  let normalizedName = file
-    .replace(/\/|\\/g, '-')
-    .replace(extRE, '')
-  if (exports.isIndexFile(file)) {
-    normalizedName = normalizedName.replace(/readme$/i, 'index')
-  }
-  const pagePrefix = /\.md$/.test(file) ? `page-` : ``
-  return `${pagePrefix}${normalizedName}`
-}
-
 exports.isIndexFile = function (file) {
   return indexRE.test(file)
 }
 
-exports.resolveComponents = async function (sourceDir) {
-  const componentDir = path.resolve(sourceDir, '.vuepress/components')
-  if (!fs.existsSync(componentDir)) {
-    return
-  }
-  return exports.sort(await globby(['**/*.vue'], { cwd: componentDir }))
-}
-
 exports.sort = function (arr) {
   return arr.sort((a, b) => {
     if (a < b) return -1
diff --git a/packages/vuepress-plugin-register-global-components/index.js b/packages/vuepress-plugin-register-global-components/index.js
new file mode 100644
index 0000000000..1c7e726322
--- /dev/null
+++ b/packages/vuepress-plugin-register-global-components/index.js
@@ -0,0 +1,41 @@
+const fs = require('fs-extra')
+const path = require('path')
+const globby = require('globby')
+
+function fileToComponentName (file) {
+  return file
+    .replace(/\/|\\/g, '-')
+    .replace(/\.vue$/, '')
+}
+
+async function resolveComponents (componentDir) {
+  if (!fs.existsSync(componentDir)) {
+    return
+  }
+  return (await globby(['**/*.vue'], { cwd: componentDir }))
+}
+
+module.exports = (options, context) => ({
+  name: 'register-global-components',
+
+  async dynamicClientCode () {
+    const { baseDirs } = options
+    // const { sourceDir } = context
+
+    function genImport (baseDir, file) {
+      const name = fileToComponentName(file)
+      const absolutePath = path.resolve(baseDir, file)
+      // const baseDir = path.resolve(sourceDir, '.vuepress/components')
+      const code = `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
+      return code
+    }
+
+    let code = ''
+    for (const baseDir of baseDirs) {
+      const files = await resolveComponents(baseDir) || []
+      code += files.map(file => genImport(baseDir, file)).join('\n') + '\n\n'
+    }
+
+    return `import Vue from 'vue'\n` + code
+  }
+})

From 079bd23fd418149f0d16c4dd24ce554c097ee2ca Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 18:32:13 +0800
Subject: [PATCH 014/242] chore: fix typo

---
 lib/plugin-api/{constans.js => constants.js} | 0
 lib/plugin-api/index.js                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugin-api/{constans.js => constants.js} (100%)

diff --git a/lib/plugin-api/constans.js b/lib/plugin-api/constants.js
similarity index 100%
rename from lib/plugin-api/constans.js
rename to lib/plugin-api/constants.js
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 618809504c..c0ed272919 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -4,7 +4,7 @@ const instantiateAPI = require('./option/instantiateOption')
 const logger = require('../util/logger')
 const { resolvePlugin, inferPluginName } = require('./util')
 const { assertTypes } = require('../util/shared')
-const { HOOK, OPTION } = require('./constans')
+const { HOOK, OPTION } = require('./constants')
 
 module.exports = class Plugin {
   constructor (context) {

From 8bb328757947ec4ae3554283e6eb647754963696 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 19:34:50 +0800
Subject: [PATCH 015/242] feat: rename 'dynamicClientCode' to
 'dynamicClientModules'

---
 lib/app/app.js                                |  2 +-
 lib/plugin-api/constants.js                   |  4 ++--
 lib/plugin-api/index.js                       |  4 ++--
 .../option/DynamicClientCodeOption.js         | 19 ---------------
 .../option/DynamicClientModulesOption.js      | 24 +++++++++++++++++++
 lib/plugin-api/option/instantiateOption.js    |  6 ++---
 lib/prepare/index.js                          |  2 +-
 lib/prepare/util.js                           |  1 +
 lib/webpack/createBaseConfig.js               |  1 +
 .../index.js                                  | 11 +++++----
 10 files changed, 41 insertions(+), 33 deletions(-)
 delete mode 100644 lib/plugin-api/option/DynamicClientCodeOption.js
 create mode 100644 lib/plugin-api/option/DynamicClientModulesOption.js

diff --git a/lib/app/app.js b/lib/app/app.js
index 57b57b9690..dd6a09cb73 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -9,7 +9,7 @@ import store from './store'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
 import appEnhancers from '@temp/appEnhancers.js'
-import '@temp/dynamicClientCode.js'
+import '@dynamic/global-components'
 
 // suggest dev server restart on base change
 if (module.hot) {
diff --git a/lib/plugin-api/constants.js b/lib/plugin-api/constants.js
index 93b9afd255..2e08289766 100644
--- a/lib/plugin-api/constants.js
+++ b/lib/plugin-api/constants.js
@@ -10,7 +10,7 @@ const ENHANCE_APP_FILES = 'enhanceAppFiles'
 const OUT_FILES = 'outFiles'
 const EXTEND_PAGE_DATA = 'extendPageData'
 const EXTEND_MARKDOWN = 'extendMarkdown'
-const DYNAMIC_CLIENT_CODE = 'dynamicClientCode'
+const DYNAMIC_CLIENT_MODULES = 'dynamicClientModules'
 
 const HOOK = {
   READY,
@@ -27,7 +27,7 @@ const OPTION = {
   OUT_FILES,
   EXTEND_PAGE_DATA,
   EXTEND_MARKDOWN,
-  DYNAMIC_CLIENT_CODE
+  DYNAMIC_CLIENT_MODULES
 }
 
 exports.HOOK = HOOK
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index c0ed272919..531ae80e46 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -89,7 +89,7 @@ module.exports = class Plugin {
     compiled,
     updated,
     generated,
-    dynamicClientCode
+    dynamicClientModules
   }) {
     logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
@@ -107,6 +107,6 @@ module.exports = class Plugin {
       .registerOption(OPTION.EXTEND_PAGE_DATA, extendPageData, name, [Function])
       .registerOption(OPTION.ENHANCE_APP_FILES, enhanceAppFiles, name, [Array, Function])
       .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
-      .registerOption(OPTION.DYNAMIC_CLIENT_CODE, dynamicClientCode, name, [Function])
+      .registerOption(OPTION.DYNAMIC_CLIENT_MODULES, dynamicClientModules, name, [Function])
   }
 }
diff --git a/lib/plugin-api/option/DynamicClientCodeOption.js b/lib/plugin-api/option/DynamicClientCodeOption.js
deleted file mode 100644
index 02301c1a56..0000000000
--- a/lib/plugin-api/option/DynamicClientCodeOption.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const Tapable = require('../core/Tapable')
-const { writeTemp } = require('../../prepare/util')
-
-module.exports = class DynamicClientCodeOption extends Tapable {
-  async run () {
-    let code = ''
-    for (const item of this.items) {
-      const { value: fn, name: pluginName } = item
-      const res = await fn()
-      code += `
-/**
- * Generated by [vuepress-plugin-${pluginName}]"
- */
-${res}\n\n
-        `.trim()
-    }
-    await writeTemp('dynamicClientCode.js', code)
-  }
-}
diff --git a/lib/plugin-api/option/DynamicClientModulesOption.js b/lib/plugin-api/option/DynamicClientModulesOption.js
new file mode 100644
index 0000000000..de66789fcd
--- /dev/null
+++ b/lib/plugin-api/option/DynamicClientModulesOption.js
@@ -0,0 +1,24 @@
+const Tapable = require('../core/Tapable')
+const { writeTemp } = require('../../prepare/util')
+
+module.exports = class DynamicClientModulesOption extends Tapable {
+  async run () {
+    for (const item of this.items) {
+      const { value: fn, name: pluginName } = item
+      let modules = await fn()
+      if (!Array.isArray(modules)) {
+        modules = [modules]
+      }
+      for (const { name, content } of modules) {
+        await writeTemp(
+          `dynamic-modules/${name}`,
+          `
+/**
+ * Generated by [vuepress-plugin-${pluginName}]"
+ */
+${content}\n\n
+        `.trim())
+      }
+    }
+  }
+}
diff --git a/lib/plugin-api/option/instantiateOption.js b/lib/plugin-api/option/instantiateOption.js
index 110ac43d6f..2c7479458d 100644
--- a/lib/plugin-api/option/instantiateOption.js
+++ b/lib/plugin-api/option/instantiateOption.js
@@ -1,6 +1,6 @@
 const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ExtendPageDataOption = require('./ExtendPageDataOption')
-const DynamicClientCodeOption = require('./DynamicClientCodeOption')
+const DynamicClientModulesOption = require('./DynamicClientModulesOption')
 const Tapable = require('../core/Tapable')
 
 module.exports = function instantiateOption (name) {
@@ -9,8 +9,8 @@ module.exports = function instantiateOption (name) {
     return new EnhanceAppFilesOption(name)
   case 'extendPageData':
     return new ExtendPageDataOption(name)
-  case 'dynamicClientCode':
-    return new DynamicClientCodeOption(name)
+  case 'dynamicClientModules':
+    return new DynamicClientModulesOption(name)
 
   default: return new Tapable(name)
   }
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index 3c6a801fec..199d1374a8 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -17,7 +17,7 @@ module.exports = async function prepare (sourceDir) {
 
   // 3. Apply plugin options to extend markdown.
   plugin.options.extendMarkdown.run(markdown)
-  plugin.options.dynamicClientCode.run()
+  plugin.options.dynamicClientModules.run()
 
   // 4. resolve siteData
   // SiteData must be resolved after the plugin initialization
diff --git a/lib/prepare/util.js b/lib/prepare/util.js
index fc9b75a24c..38b01f75cc 100644
--- a/lib/prepare/util.js
+++ b/lib/prepare/util.js
@@ -7,6 +7,7 @@ fs.ensureDirSync(tempPath)
 const tempCache = new Map()
 exports.writeTemp = async function (file, content) {
   const destPath = path.join(tempPath, file)
+  await fs.ensureDir(path.parse(destPath).dir)
   // cache write to avoid hitting the dist if it didn't change
   const cached = tempCache.get(file)
   if (cached !== content) {
diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js
index d8fa94d6a0..cf6b26614f 100644
--- a/lib/webpack/createBaseConfig.js
+++ b/lib/webpack/createBaseConfig.js
@@ -43,6 +43,7 @@ module.exports = function createBaseConfig ({
       .set('@source', sourceDir)
       .set('@app', path.resolve(__dirname, '../app'))
       .set('@temp', path.resolve(__dirname, '../app/.temp'))
+      .set('@dynamic', path.resolve(__dirname, '../app/.temp/dynamic-modules'))
       .set('@default-theme', path.resolve(__dirname, '../default-theme'))
       .set('@AlgoliaSearchBox', isAlgoliaSearch
         ? path.resolve(__dirname, '../default-theme/AlgoliaSearchBox.vue')
diff --git a/packages/vuepress-plugin-register-global-components/index.js b/packages/vuepress-plugin-register-global-components/index.js
index 1c7e726322..3c82584752 100644
--- a/packages/vuepress-plugin-register-global-components/index.js
+++ b/packages/vuepress-plugin-register-global-components/index.js
@@ -18,14 +18,12 @@ async function resolveComponents (componentDir) {
 module.exports = (options, context) => ({
   name: 'register-global-components',
 
-  async dynamicClientCode () {
+  async dynamicClientModules () {
     const { baseDirs } = options
-    // const { sourceDir } = context
 
     function genImport (baseDir, file) {
       const name = fileToComponentName(file)
       const absolutePath = path.resolve(baseDir, file)
-      // const baseDir = path.resolve(sourceDir, '.vuepress/components')
       const code = `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
       return code
     }
@@ -33,9 +31,12 @@ module.exports = (options, context) => ({
     let code = ''
     for (const baseDir of baseDirs) {
       const files = await resolveComponents(baseDir) || []
-      code += files.map(file => genImport(baseDir, file)).join('\n') + '\n\n'
+      code += files.map(file => genImport(baseDir, file)).join('\n') + '\n'
     }
 
-    return `import Vue from 'vue'\n` + code
+    return {
+      name: 'global-components.js',
+      content: `import Vue from 'vue'\n` + code
+    }
   }
 })

From 7863b56ad353c4f8a6893dee4d240f62ced4388b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 20:51:14 +0800
Subject: [PATCH 016/242] feat: rename 'dynamicClientModules' to
 'clientDynamicModules'

---
 lib/plugin-api/constants.js                                 | 4 ++--
 lib/plugin-api/index.js                                     | 4 ++--
 ...ClientModulesOption.js => ClientDynamicModulesOption.js} | 2 +-
 lib/plugin-api/option/instantiateOption.js                  | 6 +++---
 lib/prepare/index.js                                        | 2 +-
 packages/vuepress-plugin-active-header-links/client.js      | 0
 packages/vuepress-plugin-active-header-links/index.js       | 5 ++++-
 .../vuepress-plugin-register-global-components/index.js     | 2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)
 rename lib/plugin-api/option/{DynamicClientModulesOption.js => ClientDynamicModulesOption.js} (89%)
 create mode 100644 packages/vuepress-plugin-active-header-links/client.js

diff --git a/lib/plugin-api/constants.js b/lib/plugin-api/constants.js
index 2e08289766..4d4e2de2ef 100644
--- a/lib/plugin-api/constants.js
+++ b/lib/plugin-api/constants.js
@@ -10,7 +10,7 @@ const ENHANCE_APP_FILES = 'enhanceAppFiles'
 const OUT_FILES = 'outFiles'
 const EXTEND_PAGE_DATA = 'extendPageData'
 const EXTEND_MARKDOWN = 'extendMarkdown'
-const DYNAMIC_CLIENT_MODULES = 'dynamicClientModules'
+const CLIENT_DYNAMIC_MODULES = 'clientDynamicModules'
 
 const HOOK = {
   READY,
@@ -27,7 +27,7 @@ const OPTION = {
   OUT_FILES,
   EXTEND_PAGE_DATA,
   EXTEND_MARKDOWN,
-  DYNAMIC_CLIENT_MODULES
+  CLIENT_DYNAMIC_MODULES
 }
 
 exports.HOOK = HOOK
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 531ae80e46..4671143b43 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -89,7 +89,7 @@ module.exports = class Plugin {
     compiled,
     updated,
     generated,
-    dynamicClientModules
+    clientDynamicModules
   }) {
     logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
@@ -107,6 +107,6 @@ module.exports = class Plugin {
       .registerOption(OPTION.EXTEND_PAGE_DATA, extendPageData, name, [Function])
       .registerOption(OPTION.ENHANCE_APP_FILES, enhanceAppFiles, name, [Array, Function])
       .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
-      .registerOption(OPTION.DYNAMIC_CLIENT_MODULES, dynamicClientModules, name, [Function])
+      .registerOption(OPTION.CLIENT_DYNAMIC_MODULES, clientDynamicModules, name, [Function])
   }
 }
diff --git a/lib/plugin-api/option/DynamicClientModulesOption.js b/lib/plugin-api/option/ClientDynamicModulesOption.js
similarity index 89%
rename from lib/plugin-api/option/DynamicClientModulesOption.js
rename to lib/plugin-api/option/ClientDynamicModulesOption.js
index de66789fcd..385bbc99c6 100644
--- a/lib/plugin-api/option/DynamicClientModulesOption.js
+++ b/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -1,7 +1,7 @@
 const Tapable = require('../core/Tapable')
 const { writeTemp } = require('../../prepare/util')
 
-module.exports = class DynamicClientModulesOption extends Tapable {
+module.exports = class ClientDynamicModulesOption extends Tapable {
   async run () {
     for (const item of this.items) {
       const { value: fn, name: pluginName } = item
diff --git a/lib/plugin-api/option/instantiateOption.js b/lib/plugin-api/option/instantiateOption.js
index 2c7479458d..3a413d7f02 100644
--- a/lib/plugin-api/option/instantiateOption.js
+++ b/lib/plugin-api/option/instantiateOption.js
@@ -1,6 +1,6 @@
 const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ExtendPageDataOption = require('./ExtendPageDataOption')
-const DynamicClientModulesOption = require('./DynamicClientModulesOption')
+const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
 const Tapable = require('../core/Tapable')
 
 module.exports = function instantiateOption (name) {
@@ -9,8 +9,8 @@ module.exports = function instantiateOption (name) {
     return new EnhanceAppFilesOption(name)
   case 'extendPageData':
     return new ExtendPageDataOption(name)
-  case 'dynamicClientModules':
-    return new DynamicClientModulesOption(name)
+  case 'clientDynamicModules':
+    return new ClientDynamicModulesOption(name)
 
   default: return new Tapable(name)
   }
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index 199d1374a8..2a7f5c3b05 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -17,7 +17,7 @@ module.exports = async function prepare (sourceDir) {
 
   // 3. Apply plugin options to extend markdown.
   plugin.options.extendMarkdown.run(markdown)
-  plugin.options.dynamicClientModules.run()
+  plugin.options.clientDynamicModules.run()
 
   // 4. resolve siteData
   // SiteData must be resolved after the plugin initialization
diff --git a/packages/vuepress-plugin-active-header-links/client.js b/packages/vuepress-plugin-active-header-links/client.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/vuepress-plugin-active-header-links/index.js b/packages/vuepress-plugin-active-header-links/index.js
index e15966e596..fd6455cefb 100644
--- a/packages/vuepress-plugin-active-header-links/index.js
+++ b/packages/vuepress-plugin-active-header-links/index.js
@@ -2,6 +2,9 @@ const path = require('path')
 
 module.exports = (options, context) => ({
   name: 'active-header-links',
+
+  client: path.resolve(__dirname, 'client.js'),
+
   // This file will be mixed into the root component of each page.
-  mixin: path.resolve(__dirname, 'root-mixin.js')
+  clientRootMixin: path.resolve(__dirname, 'root-mixin.js')
 })
diff --git a/packages/vuepress-plugin-register-global-components/index.js b/packages/vuepress-plugin-register-global-components/index.js
index 3c82584752..8fc3c89b81 100644
--- a/packages/vuepress-plugin-register-global-components/index.js
+++ b/packages/vuepress-plugin-register-global-components/index.js
@@ -18,7 +18,7 @@ async function resolveComponents (componentDir) {
 module.exports = (options, context) => ({
   name: 'register-global-components',
 
-  async dynamicClientModules () {
+  async clientDynamicModules () {
     const { baseDirs } = options
 
     function genImport (baseDir, file) {

From dd87d37008d976a047748eb1d0a4d8319e1e6a47 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 21:19:13 +0800
Subject: [PATCH 017/242] feat: support 'clientRootMixin' option and change
 'active-header-links' as a plugin.

---
 lib/app/root-mixins/activeHeaderLinks.js      | 47 -------------------
 lib/app/root-mixins/index.js                  |  7 ---
 lib/plugin-api/constants.js                   |  4 +-
 lib/plugin-api/index.js                       |  4 +-
 .../option/EnhanceAppFilesOption.js           | 26 +---------
 lib/prepare/codegen.js                        | 36 +++++++++++++-
 lib/prepare/resolvePlugin.js                  |  2 +
 .../client.js                                 |  0
 .../index.js                                  |  7 +--
 9 files changed, 46 insertions(+), 87 deletions(-)
 delete mode 100644 lib/app/root-mixins/activeHeaderLinks.js
 delete mode 100644 lib/app/root-mixins/index.js
 delete mode 100644 packages/vuepress-plugin-active-header-links/client.js

diff --git a/lib/app/root-mixins/activeHeaderLinks.js b/lib/app/root-mixins/activeHeaderLinks.js
deleted file mode 100644
index 6cad69d5cc..0000000000
--- a/lib/app/root-mixins/activeHeaderLinks.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import store from '@app/store'
-import throttle from 'lodash.throttle'
-
-export default {
-  mounted () {
-    window.addEventListener('scroll', this.onScroll)
-  },
-  methods: {
-    onScroll: throttle(function () {
-      this.setActiveHash()
-    }, 300),
-    setActiveHash () {
-      const sidebarLinks = [].slice.call(document.querySelectorAll('.sidebar-link'))
-      const anchors = [].slice.call(document.querySelectorAll('.header-anchor'))
-      .filter(anchor => sidebarLinks.some(sidebarLink => sidebarLink.hash === anchor.hash))
-
-      const scrollTop = Math.max(
-        window.pageYOffset,
-        document.documentElement.scrollTop,
-        document.body.scrollTop
-      )
-
-      for (let i = 0; i < anchors.length; i++) {
-        const anchor = anchors[i]
-        const nextAnchor = anchors[i + 1]
-
-        const isActive = i === 0 && scrollTop === 0 ||
-        (scrollTop >= anchor.parentElement.offsetTop + 10 &&
-        (!nextAnchor || scrollTop < nextAnchor.parentElement.offsetTop - 10))
-
-        if (isActive && decodeURIComponent(this.$route.hash) !== decodeURIComponent(anchor.hash)) {
-          store.disableScrollBehavior = true
-          this.$router.replace(decodeURIComponent(anchor.hash), () => {
-            // execute after scrollBehavior handler.
-            this.$nextTick(() => {
-              store.disableScrollBehavior = false
-            })
-          })
-          return
-        }
-      }
-    }
-  },
-  beforeDestroy () {
-    window.removeEventListener('scroll', this.onScroll)
-  }
-}
diff --git a/lib/app/root-mixins/index.js b/lib/app/root-mixins/index.js
deleted file mode 100644
index fd966f396e..0000000000
--- a/lib/app/root-mixins/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import updateMeta from './updateMeta'
-import activeHeaderLinks from '@activeHeaderLinks'
-
-export default [
-  updateMeta, // required
-  activeHeaderLinks // optional
-]
diff --git a/lib/plugin-api/constants.js b/lib/plugin-api/constants.js
index 4d4e2de2ef..4b29f5afaf 100644
--- a/lib/plugin-api/constants.js
+++ b/lib/plugin-api/constants.js
@@ -11,6 +11,7 @@ const OUT_FILES = 'outFiles'
 const EXTEND_PAGE_DATA = 'extendPageData'
 const EXTEND_MARKDOWN = 'extendMarkdown'
 const CLIENT_DYNAMIC_MODULES = 'clientDynamicModules'
+const CLIENT_ROOT_MIXIN = 'clientRootMixin'
 
 const HOOK = {
   READY,
@@ -27,7 +28,8 @@ const OPTION = {
   OUT_FILES,
   EXTEND_PAGE_DATA,
   EXTEND_MARKDOWN,
-  CLIENT_DYNAMIC_MODULES
+  CLIENT_DYNAMIC_MODULES,
+  CLIENT_ROOT_MIXIN
 }
 
 exports.HOOK = HOOK
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 4671143b43..1a2e75a40d 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -89,7 +89,8 @@ module.exports = class Plugin {
     compiled,
     updated,
     generated,
-    clientDynamicModules
+    clientDynamicModules,
+    clientRootMixin
   }) {
     logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
@@ -108,5 +109,6 @@ module.exports = class Plugin {
       .registerOption(OPTION.ENHANCE_APP_FILES, enhanceAppFiles, name, [Array, Function])
       .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
       .registerOption(OPTION.CLIENT_DYNAMIC_MODULES, clientDynamicModules, name, [Function])
+      .registerOption(OPTION.CLIENT_ROOT_MIXIN, clientRootMixin, name, [String])
   }
 }
diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
index b4415ce24b..9574fb03f2 100644
--- a/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -2,6 +2,7 @@ const fs = require('fs-extra')
 const chalk = require('chalk')
 const Tapable = require('../core/Tapable')
 const { writeTemp } = require('../../prepare/util')
+const { pathsToModuleCode } = require('../../prepare/codegen')
 const logger = require('../../util/logger')
 
 module.exports = class EnhanceAppFilesOption extends Tapable {
@@ -33,29 +34,6 @@ module.exports = class EnhanceAppFilesOption extends Tapable {
     }
 
     // 2. write entry file.
-    await writeTemp(
-      'appEnhancers.js',
-      this.getEnhanceAppCode(manifest)
-    )
-  }
-
-  getEnhanceAppCode (files) {
-    let index = 0
-    let code = ''
-
-    code += files
-      .map(filepath => `import m${index++} from ${JSON.stringify(filepath)}`)
-      .join('\n')
-
-    code += '\n\nexport default [\n'
-
-    for (let i = 0; i < index; i++) {
-      code += `  m${i}`
-      code += i === index - 1 ? '\n' : ',\n'
-    }
-
-    code += ']\n'
-
-    return code
+    await writeTemp('appEnhancers.js', pathsToModuleCode(manifest))
   }
 }
diff --git a/lib/prepare/codegen.js b/lib/prepare/codegen.js
index 8de4ba7e4b..1589bf3a4c 100644
--- a/lib/prepare/codegen.js
+++ b/lib/prepare/codegen.js
@@ -1,9 +1,31 @@
 const path = require('path')
+const { writeTemp } = require('./util')
+
+exports.pathsToModuleCode = function (files) {
+  let index = 0
+  let code = ''
+
+  code += files
+    .map(filepath => `import m${index++} from ${JSON.stringify(filepath)}`)
+    .join('\n')
+
+  code += '\n\nexport default [\n'
+
+  for (let i = 0; i < index; i++) {
+    code += `  m${i}`
+    code += i === index - 1 ? '\n' : ',\n'
+  }
+
+  code += ']\n'
+
+  return code
+}
 
 exports.genRoutesFile = async function ({
   siteData: { pages },
   sourceDir,
-  pageFiles
+  pageFiles,
+  plugin
 }) {
   function genRoute ({ path: pagePath, key: componentName }, index) {
     const file = pageFiles[index]
@@ -47,12 +69,22 @@ exports.genRoutesFile = async function ({
     component: ThemeNotFound
   }`
 
+  // TODO move it to a single file?
+  const builtInRootMixins = [
+    path.resolve(__dirname, '../app/root-mixins/updateMeta.js')
+  ]
+  const rootMixins = [
+    ...builtInRootMixins,
+    ...plugin.options.clientRootMixin.values
+  ]
+  await writeTemp('root-mixins.js', exports.pathsToModuleCode(rootMixins))
+
   return (
     `import Vue from 'vue'\n` +
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
     `import { injectMixins } from '@app/util'\n` +
-    `import rootMixins from '@app/root-mixins'\n\n` +
+    `import rootMixins from '@temp/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js
index 006c62d2b0..ad21825da2 100644
--- a/lib/prepare/resolvePlugin.js
+++ b/lib/prepare/resolvePlugin.js
@@ -6,6 +6,7 @@ const PluginContext = require('../plugin-api/context')
 const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
 const enhanceApp = require('../../packages/vuepree-plugin-enhance-app')
 const registerGlobalComponents = require('../../packages/vuepress-plugin-register-global-components')
+const activeHeaderLinks = require('../../packages/vuepress-plugin-active-header-links')
 
 module.exports = function (options) {
   const { siteConfig, sourceDir, themePath } = options
@@ -21,6 +22,7 @@ module.exports = function (options) {
         path.resolve(themePath, 'components')
       ]
     })
+    .use(activeHeaderLinks)
     .useByConfigs(siteConfig.plugins)
 
   return plugin
diff --git a/packages/vuepress-plugin-active-header-links/client.js b/packages/vuepress-plugin-active-header-links/client.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/vuepress-plugin-active-header-links/index.js b/packages/vuepress-plugin-active-header-links/index.js
index fd6455cefb..65b8273a5b 100644
--- a/packages/vuepress-plugin-active-header-links/index.js
+++ b/packages/vuepress-plugin-active-header-links/index.js
@@ -2,9 +2,6 @@ const path = require('path')
 
 module.exports = (options, context) => ({
   name: 'active-header-links',
-
-  client: path.resolve(__dirname, 'client.js'),
-
-  // This file will be mixed into the root component of each page.
-  clientRootMixin: path.resolve(__dirname, 'root-mixin.js')
+  // This mixin will be applied to the root component of each page.
+  clientRootMixin: path.resolve(__dirname, 'mixin.js')
 })

From 3ba2254f7fc03f8c9f51bd3318f7ad70cd536621 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 21:42:14 +0800
Subject: [PATCH 018/242] fix: make 'activeHeaderLinks' backward compatible

---
 lib/app/app.js                                 |  6 +++++-
 lib/app/clientEntry.js                         |  2 ++
 lib/plugin-api/constants.js                    |  2 --
 lib/plugin-api/index.js                        |  2 --
 lib/plugin-api/option/EnhanceAppFilesOption.js |  2 +-
 lib/prepare/resolvePlugin.js                   | 18 +++++++++++-------
 lib/webpack/createBaseConfig.js                | 12 ------------
 .../index.js                                   |  0
 packages/vuepress-plugin-last-updated/index.js |  3 ---
 9 files changed, 19 insertions(+), 28 deletions(-)
 rename packages/{vuepree-plugin-enhance-app => vuepress-plugin-enhance-app}/index.js (100%)

diff --git a/lib/app/app.js b/lib/app/app.js
index dd6a09cb73..f1ac7cfe61 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -81,7 +81,11 @@ export function createApp () {
   const options = {}
 
   try {
-    appEnhancers.forEach(enhancer => enhancer({ Vue, options, router, siteData }))
+    appEnhancers.forEach(enhancer => {
+      if (typeof enhancer === 'function') {
+        enhancer({ Vue, options, router, siteData })
+      }
+    })
   } catch (e) {
     console.error(e)
   }
diff --git a/lib/app/clientEntry.js b/lib/app/clientEntry.js
index 4b11dbb48b..3b07316623 100644
--- a/lib/app/clientEntry.js
+++ b/lib/app/clientEntry.js
@@ -5,6 +5,7 @@ import { register } from 'register-service-worker'
 
 const { app, router } = createApp()
 
+// TODO Separate it into a plugin ('vuepress-plugin-ga')
 // Google analytics integration
 if (process.env.NODE_ENV === 'production' && GA_ID) {
   (function (i, s, o, g, r, a, m) {
@@ -32,6 +33,7 @@ if (process.env.NODE_ENV === 'production' && GA_ID) {
 router.onReady(() => {
   app.$mount('#app')
 
+  // TODO Separate it into a plugin ('vuepress-plugin-pwa')
   // Register service worker
   if (process.env.NODE_ENV === 'production' &&
     SW_ENABLED &&
diff --git a/lib/plugin-api/constants.js b/lib/plugin-api/constants.js
index 4b29f5afaf..4a1c94f2dd 100644
--- a/lib/plugin-api/constants.js
+++ b/lib/plugin-api/constants.js
@@ -3,7 +3,6 @@ const COMPILED = 'compiled'
 const UPDATED = 'updated'
 const GENERATED = 'generated'
 
-const CLIENT = 'client'
 const CHAIN_WEBPACK = 'chainWebpack'
 const ENHANCE_DEV_SERVER = 'enhanceDevServer'
 const ENHANCE_APP_FILES = 'enhanceAppFiles'
@@ -21,7 +20,6 @@ const HOOK = {
 }
 
 const OPTION = {
-  CLIENT,
   CHAIN_WEBPACK,
   ENHANCE_DEV_SERVER,
   ENHANCE_APP_FILES,
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 1a2e75a40d..fb9363c24d 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -78,7 +78,6 @@ module.exports = class Plugin {
 
   applyPlugin ({
     name,
-    client,
     chainWebpack,
     enhanceDevServer,
     extendMarkdown,
@@ -101,7 +100,6 @@ module.exports = class Plugin {
       .registerHook(HOOK.GENERATED, generated, name, [Function])
 
     this
-      .registerOption(OPTION.CLIENT, client, name, [String])
       .registerOption(OPTION.CHAIN_WEBPACK, chainWebpack, name, [Function])
       .registerOption(OPTION.ENHANCE_DEV_SERVER, enhanceDevServer, name, [Function])
       .registerOption(OPTION.EXTEND_MARKDOWN, extendMarkdown, name, [Function])
diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
index 9574fb03f2..b3f7a1de2a 100644
--- a/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -21,7 +21,7 @@ module.exports = class EnhanceAppFilesOption extends Tapable {
       const { filepath, pluginName } = value
       if (fs.existsSync(filepath)) {
         const destPath = await writeTemp(
-          `enhanceAppFiles-${index}.js`,
+          `enhance-app-files/${index}.js`,
           `export { default } from ${JSON.stringify(filepath)}`
         )
         manifest.push(destPath)
diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js
index ad21825da2..3266b21e7a 100644
--- a/lib/prepare/resolvePlugin.js
+++ b/lib/prepare/resolvePlugin.js
@@ -4,26 +4,30 @@ const PluginContext = require('../plugin-api/context')
 
 // built-in plugins
 const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
-const enhanceApp = require('../../packages/vuepree-plugin-enhance-app')
-const registerGlobalComponents = require('../../packages/vuepress-plugin-register-global-components')
-const activeHeaderLinks = require('../../packages/vuepress-plugin-active-header-links')
+const enhanceAppPlugin = require('../../packages/vuepress-plugin-enhance-app')
+const registerGlobalComponentsPlugin = require('../../packages/vuepress-plugin-register-global-components')
+const activeHeaderLinksPlugin = require('../../packages/vuepress-plugin-active-header-links')
 
 module.exports = function (options) {
-  const { siteConfig, sourceDir, themePath } = options
+  const { siteConfig, themeConfig, sourceDir, themePath } = options
   const pluginContext = new PluginContext(options)
   const plugin = new Plugin(pluginContext)
 
   plugin
     .use(lastUpdatedPlugin)
-    .use(enhanceApp)
-    .use(registerGlobalComponents, {
+    .use(enhanceAppPlugin)
+    .use(registerGlobalComponentsPlugin, {
       baseDirs: [
         path.resolve(sourceDir, '.vuepress/components'),
         path.resolve(themePath, 'components')
       ]
     })
-    .use(activeHeaderLinks)
     .useByConfigs(siteConfig.plugins)
 
+  const { activeHeaderLinks = true } = themeConfig
+  if (activeHeaderLinks) {
+    plugin.use(activeHeaderLinksPlugin)
+  }
+
   return plugin
 }
diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js
index cf6b26614f..a7ff3464ae 100644
--- a/lib/webpack/createBaseConfig.js
+++ b/lib/webpack/createBaseConfig.js
@@ -58,18 +58,6 @@ module.exports = function createBaseConfig ({
       .add(path.resolve(__dirname, '../../../'))
       .add('node_modules')
 
-  // Load extra root mixins on demand.
-  const { activeHeaderLinks = true } = siteData.themeConfig
-  const rootMixinsLoadingConfig = { activeHeaderLinks }
-  for (const mixinName in rootMixinsLoadingConfig) {
-    const enabled = rootMixinsLoadingConfig[mixinName]
-    config.resolve
-     .alias.set(`@${mixinName}`, enabled
-       ? path.resolve(__dirname, `../app/root-mixins/${mixinName}.js`)
-       : path.resolve(__dirname, './noopModule.js')
-     )
-  }
-
   config.resolveLoader
     .set('symlinks', true)
     .modules
diff --git a/packages/vuepree-plugin-enhance-app/index.js b/packages/vuepress-plugin-enhance-app/index.js
similarity index 100%
rename from packages/vuepree-plugin-enhance-app/index.js
rename to packages/vuepress-plugin-enhance-app/index.js
diff --git a/packages/vuepress-plugin-last-updated/index.js b/packages/vuepress-plugin-last-updated/index.js
index 7607534b01..aef6897524 100644
--- a/packages/vuepress-plugin-last-updated/index.js
+++ b/packages/vuepress-plugin-last-updated/index.js
@@ -1,11 +1,8 @@
-const path = require('path')
 const spawn = require('cross-spawn')
 
 module.exports = options => ({
   name: 'last-updated',
 
-  client: path.resolve(__dirname, 'client.js'),
-
   extendPageData ({ filepath }) {
     return {
       lastUpdated: getGitLastUpdatedTimeStamp(filepath)

From eec3048c83d791cdfa643cff55e4efe902f97432 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 21:54:32 +0800
Subject: [PATCH 019/242] fix: make 'lastUpdated' backward compatible

---
 lib/prepare/resolvePlugin.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js
index 3266b21e7a..142ef459b6 100644
--- a/lib/prepare/resolvePlugin.js
+++ b/lib/prepare/resolvePlugin.js
@@ -14,7 +14,9 @@ module.exports = function (options) {
   const plugin = new Plugin(pluginContext)
 
   plugin
-    .use(lastUpdatedPlugin)
+    // 1. user plugin
+    .useByConfigs(siteConfig.plugins)
+    // 2. built-in plugins
     .use(enhanceAppPlugin)
     .use(registerGlobalComponentsPlugin, {
       baseDirs: [
@@ -22,12 +24,22 @@ module.exports = function (options) {
         path.resolve(themePath, 'components')
       ]
     })
-    .useByConfigs(siteConfig.plugins)
 
+  // 1. whether to use active header links
   const { activeHeaderLinks = true } = themeConfig
   if (activeHeaderLinks) {
     plugin.use(activeHeaderLinksPlugin)
   }
 
+  // 2. whether to use last updated
+  const shouldUseLastUpdated = (
+    themeConfig.lastUpdated ||
+    Object.keys(siteConfig.locales && themeConfig.locales || {})
+      .some(base => themeConfig.locales[base].lastUpdated)
+  )
+  if (shouldUseLastUpdated) {
+    plugin.use(lastUpdatedPlugin)
+  }
+
   return plugin
 }

From 68d9e4b26c7394489edc98655cd65f00502b869f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 21:56:01 +0800
Subject: [PATCH 020/242] chore: tweaks comments

---
 lib/prepare/resolvePlugin.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/prepare/resolvePlugin.js b/lib/prepare/resolvePlugin.js
index 142ef459b6..24e95f5f4a 100644
--- a/lib/prepare/resolvePlugin.js
+++ b/lib/prepare/resolvePlugin.js
@@ -2,7 +2,6 @@ const path = require('path')
 const Plugin = require('../plugin-api')
 const PluginContext = require('../plugin-api/context')
 
-// built-in plugins
 const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
 const enhanceAppPlugin = require('../../packages/vuepress-plugin-enhance-app')
 const registerGlobalComponentsPlugin = require('../../packages/vuepress-plugin-register-global-components')
@@ -14,9 +13,9 @@ module.exports = function (options) {
   const plugin = new Plugin(pluginContext)
 
   plugin
-    // 1. user plugin
+    // user plugin
     .useByConfigs(siteConfig.plugins)
-    // 2. built-in plugins
+    // built-in plugins
     .use(enhanceAppPlugin)
     .use(registerGlobalComponentsPlugin, {
       baseDirs: [
@@ -25,13 +24,13 @@ module.exports = function (options) {
       ]
     })
 
-  // 1. whether to use active header links
+  // whether to use active header links
   const { activeHeaderLinks = true } = themeConfig
   if (activeHeaderLinks) {
     plugin.use(activeHeaderLinksPlugin)
   }
 
-  // 2. whether to use last updated
+  // whether to use last updated
   const shouldUseLastUpdated = (
     themeConfig.lastUpdated ||
     Object.keys(siteConfig.locales && themeConfig.locales || {})

From b20c23bdeda1cc4df44befbb63f8a66672042808 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 22:32:30 +0800
Subject: [PATCH 021/242] feat: make 'register-global-components' fully
 independent.

---
 lib/app/app.js                                      |  1 -
 lib/plugin-api/index.js                             |  5 ++++-
 lib/prepare/index.js                                | 10 +++++-----
 .../index.js                                        | 13 ++++++++++---
 packages/vuepress-plugin-test/index.js              |  2 ++
 .../{root-mixins.js => mixin.js}                    |  0
 6 files changed, 21 insertions(+), 10 deletions(-)
 rename packages/vuepress-plugin-test/{root-mixins.js => mixin.js} (100%)

diff --git a/lib/app/app.js b/lib/app/app.js
index f1ac7cfe61..03ed86e476 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -9,7 +9,6 @@ import store from './store'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
 import appEnhancers from '@temp/appEnhancers.js'
-import '@dynamic/global-components'
 
 // suggest dev server restart on base change
 if (module.hot) {
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index fb9363c24d..5932b8f800 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -18,7 +18,9 @@ module.exports = class Plugin {
   use (pluginRaw, pluginOptions) {
     let plugin = resolvePlugin(pluginRaw)
     if (typeof plugin === 'function') {
-      plugin = plugin(pluginOptions, this._pluginContext)
+      // 'Object.create' here is to give each plugin a separate context,
+      // but also own the inheritance context.
+      plugin = plugin(pluginOptions, Object.create(this._pluginContext))
     }
     plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
     this.applyPlugin(plugin)
@@ -36,6 +38,7 @@ module.exports = class Plugin {
       const [pluginRaw, pluginOptions] = pluginConfigs
       this.use(pluginRaw, pluginOptions)
     })
+    return this
   }
 
   extendHooks (hooks) {
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index 2a7f5c3b05..68c473d329 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -15,11 +15,7 @@ module.exports = async function prepare (sourceDir) {
   const plugin = resolvePlugin(options)
   options.plugin = plugin
 
-  // 3. Apply plugin options to extend markdown.
-  plugin.options.extendMarkdown.run(markdown)
-  plugin.options.clientDynamicModules.run()
-
-  // 4. resolve siteData
+  // 3. resolve siteData
   // SiteData must be resolved after the plugin initialization
   // because plugins can be able to extend the sitedata.
   options.siteData = await resolveSiteData(options)
@@ -27,6 +23,10 @@ module.exports = async function prepare (sourceDir) {
 
   await plugin.hooks.ready.run()
 
+  // 4. Apply plugin options to extend markdown.
+  plugin.options.extendMarkdown.run(markdown)
+  plugin.options.clientDynamicModules.run()
+
   // 5. generate routes code
   const routesCode = await genRoutesFile(options)
   await writeTemp('routes.js', routesCode)
diff --git a/packages/vuepress-plugin-register-global-components/index.js b/packages/vuepress-plugin-register-global-components/index.js
index 8fc3c89b81..986e893add 100644
--- a/packages/vuepress-plugin-register-global-components/index.js
+++ b/packages/vuepress-plugin-register-global-components/index.js
@@ -15,10 +15,12 @@ async function resolveComponents (componentDir) {
   return (await globby(['**/*.vue'], { cwd: componentDir }))
 }
 
+const FILE_NAME = 'global-components.js'
+
 module.exports = (options, context) => ({
   name: 'register-global-components',
 
-  async clientDynamicModules () {
+  async ready () {
     const { baseDirs } = options
 
     function genImport (baseDir, file) {
@@ -33,10 +35,15 @@ module.exports = (options, context) => ({
       const files = await resolveComponents(baseDir) || []
       code += files.map(file => genImport(baseDir, file)).join('\n') + '\n'
     }
+    code = `import Vue from 'vue'\n` + code
+    context.registrationModulePath = await context.writeTemp(FILE_NAME, code)
+  },
 
+  async clientDynamicModules () {
+    const code = `import '${context.registrationModulePath}'`
     return {
-      name: 'global-components.js',
-      content: `import Vue from 'vue'\n` + code
+      name: FILE_NAME,
+      content: code
     }
   }
 })
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index 7ca73e2126..a02711dd88 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -11,6 +11,8 @@ class SimpleLogPlugin {
 module.exports = (options, context) => ({
   name: 'test',
 
+  clientRootMixin: path.resolve(__dirname, 'mixin.js'),
+
   async ready () {
     context.writeTemp('my-temp', 'A temp file generated by vuepress-plugin-test.')
   },
diff --git a/packages/vuepress-plugin-test/root-mixins.js b/packages/vuepress-plugin-test/mixin.js
similarity index 100%
rename from packages/vuepress-plugin-test/root-mixins.js
rename to packages/vuepress-plugin-test/mixin.js

From a63f3aed820ec94913e8e557fc7c427f0467bed0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 6 Jun 2018 23:08:59 +0800
Subject: [PATCH 022/242] fix: enhance app doesn't work due to interface change

---
 lib/app/app.js                                 |  2 +-
 lib/plugin-api/core/Tapable.js                 |  2 +-
 lib/plugin-api/option/EnhanceAppFilesOption.js | 14 ++++++++------
 packages/vuepress-plugin-test/enhanceApp.js    |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/app/app.js b/lib/app/app.js
index 03ed86e476..ad4be2cb54 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -8,7 +8,7 @@ import dataMixin from './dataMixin'
 import store from './store'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
-import appEnhancers from '@temp/appEnhancers.js'
+import appEnhancers from '@temp/app-enhancers.js'
 
 // suggest dev server restart on base change
 if (module.hot) {
diff --git a/lib/plugin-api/core/Tapable.js b/lib/plugin-api/core/Tapable.js
index 0d811cf87f..91f6da7884 100644
--- a/lib/plugin-api/core/Tapable.js
+++ b/lib/plugin-api/core/Tapable.js
@@ -11,7 +11,7 @@ module.exports = class Tapable {
    */
   tap (name, value) {
     if (Array.isArray(value)) {
-      this.items.push(value.map(i => ({ value: i, name })))
+      return this.items.push(...value.map(i => ({ value: i, name })))
     }
     this.items.push({ value, name })
   }
diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
index b3f7a1de2a..e8dde60612 100644
--- a/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -6,34 +6,36 @@ const { pathsToModuleCode } = require('../../prepare/codegen')
 const logger = require('../../util/logger')
 
 module.exports = class EnhanceAppFilesOption extends Tapable {
-  add (value, pluginName) {
+  tap (pluginName, value) {
     if (typeof value === 'function') {
       value = value()
     }
-    super.add(value, pluginName)
+    super.tap(pluginName, value)
   }
 
   async run (...args) {
     const manifest = []
 
+    console.log(this.items)
+
     // 1. write enhance app files.
     for (const [index, value] of this.items.entries()) {
-      const { filepath, pluginName } = value
+      const { value: filepath, name: pluginName } = value
       if (fs.existsSync(filepath)) {
         const destPath = await writeTemp(
-          `enhance-app-files/${index}.js`,
+          `app-enhancers/enhancer-${index}.js`,
           `export { default } from ${JSON.stringify(filepath)}`
         )
         manifest.push(destPath)
       } else {
         logger.debug(
-          chalk.gray(`[vuepress-plugin-${pluginName}]`) +
+          chalk.gray(`[vuepress-plugin-${pluginName}] `) +
           `${chalk.cyan(filepath)} Not Found.`
         )
       }
     }
 
     // 2. write entry file.
-    await writeTemp('appEnhancers.js', pathsToModuleCode(manifest))
+    await writeTemp('app-enhancers.js', pathsToModuleCode(manifest))
   }
 }
diff --git a/packages/vuepress-plugin-test/enhanceApp.js b/packages/vuepress-plugin-test/enhanceApp.js
index f45a4c345d..b231205031 100644
--- a/packages/vuepress-plugin-test/enhanceApp.js
+++ b/packages/vuepress-plugin-test/enhanceApp.js
@@ -1,3 +1,3 @@
-export default function (Vue) {
-  Vue.use(/**/)
+export default function ({ Vue }) {
+  console.warn('[vuepress-plugin-test] enhancing !!!')
 }

From 9cd74b13efa238a15cf54428ecfd67e8a7b3167f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 7 Jun 2018 00:33:02 +0800
Subject: [PATCH 023/242] feat: support 'additionalPages' option

---
 lib/plugin-api/constants.js                   |  4 ++-
 lib/plugin-api/index.js                       |  4 ++-
 .../option/AdditionalPagesOption.js           | 10 ++++++
 .../option/EnhanceAppFilesOption.js           |  2 --
 lib/plugin-api/option/instantiateOption.js    | 13 ++++++--
 lib/prepare/codegen.js                        |  8 ++---
 lib/prepare/resolveSiteData.js                | 33 ++++++++++++-------
 packages/vuepress-plugin-test/index.js        |  9 +++++
 8 files changed, 59 insertions(+), 24 deletions(-)
 create mode 100644 lib/plugin-api/option/AdditionalPagesOption.js

diff --git a/lib/plugin-api/constants.js b/lib/plugin-api/constants.js
index 4a1c94f2dd..b992f1b445 100644
--- a/lib/plugin-api/constants.js
+++ b/lib/plugin-api/constants.js
@@ -11,6 +11,7 @@ const EXTEND_PAGE_DATA = 'extendPageData'
 const EXTEND_MARKDOWN = 'extendMarkdown'
 const CLIENT_DYNAMIC_MODULES = 'clientDynamicModules'
 const CLIENT_ROOT_MIXIN = 'clientRootMixin'
+const ADDITIONAL_PAGES = 'additionalPages'
 
 const HOOK = {
   READY,
@@ -27,7 +28,8 @@ const OPTION = {
   EXTEND_PAGE_DATA,
   EXTEND_MARKDOWN,
   CLIENT_DYNAMIC_MODULES,
-  CLIENT_ROOT_MIXIN
+  CLIENT_ROOT_MIXIN,
+  ADDITIONAL_PAGES
 }
 
 exports.HOOK = HOOK
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index 5932b8f800..af8fdf1b5e 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -92,7 +92,8 @@ module.exports = class Plugin {
     updated,
     generated,
     clientDynamicModules,
-    clientRootMixin
+    clientRootMixin,
+    additionalPages
   }) {
     logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
 
@@ -111,5 +112,6 @@ module.exports = class Plugin {
       .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
       .registerOption(OPTION.CLIENT_DYNAMIC_MODULES, clientDynamicModules, name, [Function])
       .registerOption(OPTION.CLIENT_ROOT_MIXIN, clientRootMixin, name, [String])
+      .registerOption(OPTION.ADDITIONAL_PAGES, additionalPages, name, [Function, Array])
   }
 }
diff --git a/lib/plugin-api/option/AdditionalPagesOption.js b/lib/plugin-api/option/AdditionalPagesOption.js
new file mode 100644
index 0000000000..482b34e76c
--- /dev/null
+++ b/lib/plugin-api/option/AdditionalPagesOption.js
@@ -0,0 +1,10 @@
+const Tapable = require('../core/Tapable')
+
+module.exports = class AdditionalPagesOption extends Tapable {
+  tap (pluginName, value) {
+    if (typeof value === 'function') {
+      value = value()
+    }
+    super.tap(pluginName, value)
+  }
+}
diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
index e8dde60612..454c4d2253 100644
--- a/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -16,8 +16,6 @@ module.exports = class EnhanceAppFilesOption extends Tapable {
   async run (...args) {
     const manifest = []
 
-    console.log(this.items)
-
     // 1. write enhance app files.
     for (const [index, value] of this.items.entries()) {
       const { value: filepath, name: pluginName } = value
diff --git a/lib/plugin-api/option/instantiateOption.js b/lib/plugin-api/option/instantiateOption.js
index 3a413d7f02..68091211e5 100644
--- a/lib/plugin-api/option/instantiateOption.js
+++ b/lib/plugin-api/option/instantiateOption.js
@@ -1,17 +1,24 @@
 const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ExtendPageDataOption = require('./ExtendPageDataOption')
 const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
+const AdditionalPagesOption = require('./AdditionalPagesOption')
 const Tapable = require('../core/Tapable')
+const { OPTION } = require('../constants')
 
 module.exports = function instantiateOption (name) {
   switch (name) {
-  case 'enhanceAppFiles':
+  case OPTION.ENHANCE_APP_FILES:
     return new EnhanceAppFilesOption(name)
-  case 'extendPageData':
+
+  case OPTION.EXTEND_PAGE_DATA:
     return new ExtendPageDataOption(name)
-  case 'clientDynamicModules':
+
+  case OPTION.CLIENT_DYNAMIC_MODULES:
     return new ClientDynamicModulesOption(name)
 
+  case OPTION.ADDITIONAL_PAGES:
+    return new AdditionalPagesOption(name)
+
   default: return new Tapable(name)
   }
 }
diff --git a/lib/prepare/codegen.js b/lib/prepare/codegen.js
index 1589bf3a4c..5522311ade 100644
--- a/lib/prepare/codegen.js
+++ b/lib/prepare/codegen.js
@@ -23,20 +23,16 @@ exports.pathsToModuleCode = function (files) {
 
 exports.genRoutesFile = async function ({
   siteData: { pages },
-  sourceDir,
-  pageFiles,
   plugin
 }) {
-  function genRoute ({ path: pagePath, key: componentName }, index) {
-    const file = pageFiles[index]
-    const filePath = path.resolve(sourceDir, file)
+  function genRoute ({ filepath, path: pagePath, key: componentName }, index) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
-      import(${JSON.stringify(filePath)}).then(comp => {
+      import(${JSON.stringify(filepath)}).then(comp => {
         Vue.component(${JSON.stringify(componentName)}, comp.default)
         next()
       })
diff --git a/lib/prepare/resolveSiteData.js b/lib/prepare/resolveSiteData.js
index 6480350946..8d34ce5fe8 100644
--- a/lib/prepare/resolveSiteData.js
+++ b/lib/prepare/resolveSiteData.js
@@ -16,20 +16,14 @@ module.exports = async function ({
   themeConfig,
   publicPath
 }) {
-  // resolve pagesData
-  const pagesData = await Promise.all(pageFiles.map(async (relative) => {
-    const filepath = path.resolve(sourceDir, relative)
+  async function getPageData ({ filepath, routePath, base }) {
     const key = 'v-' + Math.random().toString(16).slice(2)
-    const data = {
-      key,
-      path: encodePath(fileToPath(relative))
-    }
+    const data = { key, path: routePath, filepath }
 
-    // extract yaml frontmatter
     const content = await fs.readFile(filepath, 'utf-8')
+    await plugin.options.extendPageData.run({ data, filepath, routePath, base, key, content })
 
-    await plugin.options.extendPageData.run({ data, filepath, relative, key, sourceDir, content })
-
+    // extract yaml frontmatter
     const frontmatter = parseFrontmatter(content)
     // infer title
     const title = inferTitle(frontmatter)
@@ -52,13 +46,30 @@ module.exports = async function ({
       data.excerpt = html
     }
     return data
+  }
+
+  // resolve pagesData
+  const pagesData = await Promise.all(pageFiles.map(async (base) => {
+    const filepath = path.resolve(sourceDir, base)
+    const routePath = encodePath(fileToPath(base))
+    return getPageData({ filepath, routePath, base })
   }))
 
+  // resolve additional pagesData
+  const additionalPagesData = await Promise.all(
+    plugin.options.additionalPages.values.map(async ({ route: routePath, path: filepath }) => {
+      return getPageData({ filepath, routePath })
+    })
+  )
+
   const siteData = {
     title: siteConfig.title || '',
     description: siteConfig.description || '',
     base: publicPath,
-    pages: pagesData,
+    pages: [
+      ...pagesData,
+      ...additionalPagesData
+    ],
     themeConfig,
     locales: siteConfig.locales
   }
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index a02711dd88..acaca0746d 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -58,5 +58,14 @@ module.exports = (options, context) => ({
 
   async generated () {
     console.log('generated')
+  },
+
+  additionalPages () {
+    return [
+      {
+        route: '/readme/',
+        path: path.resolve(__dirname, '../../README.md')
+      }
+    ]
   }
 })

From 0bcc895a1d642305f514d8ffd002cdf6bf3e332d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 7 Jun 2018 00:43:56 +0800
Subject: [PATCH 024/242] feat: support 'updated' hook

---
 lib/dev.js                             | 1 +
 packages/vuepress-plugin-test/index.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib/dev.js b/lib/dev.js
index d9c550756a..fc94e0a9f4 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -23,6 +23,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
+    options.plugin.hooks.updated.run()
     prepare(sourceDir).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index acaca0746d..4edcc86c29 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -60,6 +60,10 @@ module.exports = (options, context) => ({
     console.log('generated')
   },
 
+  updated () {
+    console.log('updated')
+  },
+
   additionalPages () {
     return [
       {

From e8c08ced45a481f777ebcfd1dd951a43348f6bdf Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 10 Jun 2018 17:03:21 +0800
Subject: [PATCH 025/242] feat: Content component - support take pageKey to
 render dynamic page

---
 lib/app/Content.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/app/Content.js b/lib/app/Content.js
index 46628195e6..e05678e5c6 100644
--- a/lib/app/Content.js
+++ b/lib/app/Content.js
@@ -5,11 +5,12 @@ export default {
     custom: {
       type: Boolean,
       default: true
-    }
+    },
+    pageKey: String
   },
 
   render (h, { parent, props, data }) {
-    return h(parent.$page.key, {
+    return h(props.pageKey || parent.$page.key, {
       class: [props.custom ? 'custom' : '', data.class, data.staticClass],
       style: data.style
     })

From cb6362907647392e9bf8a14edbd9b93c64841c61 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 10 Jun 2018 20:45:26 +0800
Subject: [PATCH 026/242] wip commit

---
 docs/.vuepress/config.js                      |  13 +-
 docs/.vuepress/public/plugin.png              | Bin 0 -> 150892 bytes
 docs/plugin/README.md                         | 280 ++++++++++++++++++
 lib/app/app.js                                |   3 +-
 lib/app/dataMixin.js                          |   6 +-
 lib/app/util.js                               |   7 +
 lib/plugin-api/context.js                     |  11 +-
 lib/prepare/codegen.js                        |   3 +-
 packages/vuepress-plugin-test/index.js        |   7 +
 .../TranslationHelper.vue                     |  53 ++++
 .../vuepress-translation-comparison/client.js |   5 +
 .../vuepress-translation-comparison/index.js  |  14 +
 .../translation.md                            |   3 +
 13 files changed, 393 insertions(+), 12 deletions(-)
 create mode 100644 docs/.vuepress/public/plugin.png
 create mode 100644 docs/plugin/README.md
 create mode 100644 packages/vuepress-translation-comparison/TranslationHelper.vue
 create mode 100644 packages/vuepress-translation-comparison/client.js
 create mode 100644 packages/vuepress-translation-comparison/index.js
 create mode 100644 packages/vuepress-translation-comparison/translation.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 33aa66ecfb..0868c019a5 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,4 +1,5 @@
 const testPlugin = require('../../packages/vuepress-plugin-test')
+const translationComparisonPlugin = require('../../packages/vuepress-translation-comparison')
 
 module.exports = {
   dest: 'vuepress',
@@ -28,12 +29,8 @@ module.exports = {
   serviceWorker: true,
   theme: 'vue',
   plugins: [
-    [
-      testPlugin,
-      {
-
-      }
-    ]
+    testPlugin,
+    translationComparisonPlugin
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
@@ -54,6 +51,10 @@ module.exports = {
             text: 'Config Reference',
             link: '/config/'
           },
+          {
+            text: 'Plugin',
+            link: '/plugin/'
+          },
           {
             text: 'Default Theme Config',
             link: '/default-theme-config/'
diff --git a/docs/.vuepress/public/plugin.png b/docs/.vuepress/public/plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..e22cec992241e4f66d5a434fdd5bda5a63853302
GIT binary patch
literal 150892
zcmeFabyQXR*Eb4VkW!>UIz>dfdkY8%3MeAoN{5tmsdOq5(x3=RNhu9V3rHy44br*k
z{eBmCg!6me=Y7T<_m6wuF+5|a`)t;lYsP2hcP<T7R+PPnO^%I%f^zYeob){u6ihS}
z6tpAE^WYm52Lm+}lnX>=Qc}vdq@-w-?QD$AEFYnu$OT5JVW_J#lO$=~!(@Dg0=p-<
zBKLxwZ<C$M@;M{?Dk|aAAS#{vkJ&N<yff#50-jo+KFm@7_z|;jq4sG|0ehLD)bt(f
zxxE3zcSKvFgvocIjbwY1EB2_$MUSSZAH9)BnOfaI@ARn(seAkI{5(D!1v}Fl)~aD?
zkfe0~KAAUn4^n4j*t<tLS2Nh?aAC)b_z|vJ(|MG@r-D%o4`<=-WGLFt5}BJYygRVA
z{Os2^>YOnRRZ$r+QSeD89awtsChxO+df8Ve!$Y@y-aEU-5UUF{CD4TjyKkNo_fBhP
zbo=-kU9MkWWa5_zxceo;tb_#Z0ODr6_;gQF=0h7Ul}4ii_4!HlxM1lfPf-J1ev1*L
zMi`P!s6Q=V=z_jV6CT>lV0%Bu!N@3zYYo_VG?N)J(vsP*HFRoOLyiU~Zs{Ag-1|2^
zMPON+|B33}PZ_OuwQc|}E4X07{b64cQ^by>8}HK?8cNpM_fLmRHQbB5ld15p1Q&8Y
zqY(A8D3L_Qa>euN!a3_6r>FYk@E8)l740lUuh_v1FvD}gDKwOPRCNiPCl=p`A9lAW
zwh+J0<_8*T=RJzs46=gJq{g+zw`PD%Homt9Tzt7_7^rPv*hhwe+uN@94R!MIt}VAU
znYK<<C->+?#p2c1Vh?KDa6_VdE{o7!54gOs)aH+KTN7jP?iE%>dH&w=ii1pb76D3h
z18=MYlyd?43h1S@gsWxewa$-o%*&zZqoT@TXzR262ytPQli69ld=C2y4W6yf<Dqsn
z?r-Sm%E(9BtR9-rc$-aq>KJfDeFZUkzlzy9iCz$|G$?G;dECn-;WyEjE$x*?!xcaV
z=cSqb;+I`$K!`F@-Rb)^38#?Iems17m5q9wCDng5;BjJyY{|umFNC*<UUy&DeKCeH
za{&)`PrnF7<H`F`6aRR4Pgn`ZGU~3>a*1#*diGi~Cn3!c&ddyE@hA^bsQvzf7MfYY
z!Xt5-*Ga}V>|f=}QF-yS+Gf$b;jGTW$JkDl&@^Ptmr}=gLS7y~RjY||P9(6{FtN{;
zi&_s$iILU7@{=jn=j&wt0>(yz`Xc)KyZ)sb1-tcI1T*%tGr<Dqcm!;cyknAHw6FSP
zaK+%anhdIQEm|#Uqu?bkb-gi~3z}+`;f<=Ek0v?CnQraiusJ87vvUIlHxK4*w-o=q
z=)85WH43|>NiZ7vy~G{C^JqI>shCc_S31!BYA(zeT}tp4Sv`M5izfY4Jp#@6YmkXI
zWs?i8I!g3YLuKq9pF1f8mghviP=BPML}MEx6TJBSSxX9qHipx9*&GJP7d&SS89X#P
zy8F+=OzB+%xC{gP7}x`tC&Hi8b;=REeEOEbUHbWTcr;zQ+~s?Li|}7B^j^GaGMl3B
zdNw3OO@FS5Vu~;*6+83Vhi7pqk;<e$F)rRT>bz_!EKI>B9rMPb1G|W1*q{GRMrX^M
zW6>p#KwKk~$i|;s9<Ai|Ut-l6qeIdSV3zm~o<<oJt26YRAKg&RzC=+cJ|UeD#`D;s
zg#X#9U_xkn1L=6yn!Nj^k&xv2yopO|bO)?H@*P*y35GDgJeQUfHo#4dRaWe~BPc0|
zfw&_vPW3|WK64yF;&|0<dSilFLN&tA1n~hG0b+HHbp`~1Z*LVax<t_5x_(dmeQc3$
zQMkj)p9;U2J!o4Zx0<%6Q0%y0E3wnZL?T`)MYuJ$H!;}B+cnr(+r6-(EOoK7n10e+
z+^q9rA%-ILs>*E^>R0OWS01sXKkbqek}Z|pRnXNPfsd$qeh^ji40QKBK;6Yzzcejz
zE%U1SRZik}tN}zlSAVi3+$+ghC5@8jOLbL=e82mX@2Bgp%fHV3!XQsHmcn^wYZ`2(
zT4b!ru@se-kd~hoK5@HVvfi#<DoBk8BWmi^?N_n#*VAvxtIEqpSzo)z`Xg%T6+@K$
zD>c>?)vC+`ZQr+sX%l&0?`q^0s7!}^GZK~&c*`?yxyQZ7z9-~beeG`deLi(QmE!x3
z)#fq3BI1Gu9u_+nmzt}ZH+Jv+<Z>k3(%-V&D*lDhZIkI0m%{VK1m^Vh16C-ZD|1C}
zZ02~*m+q^brd=huYqug(=ks2tm+BVY+^8bSeU!?lY7zDzv_~lCOW+5>Vdetn=-Z-#
zYhnB!tWv3R#Pr-Uo@8u)49itaQB3+ylE@?ctn63WNZIQ$3P+_m+_}yz(Jg0JiY>)o
zmHL@n?qvNT*bN#D5mlc&BdX-Q{5@li0({=zNVxIhM&uU{si4$ggSc^-+9$Pi3}SB{
zzd@I|DB~0|9ikJ$6Cyz2L{=@p#dnKS!=TG>edvBIZ(mVI(U;An%iXOlmY+0o`uXhB
zN`qaZcOPt6<NW;ENne}xZ6b)teEwl`;gEU1(an!`#S>cHn!`m8K5pl;f3*JSY5K;R
z&{*Z+55o=fmz{5?ZY?l7-rh4`Fpak=Z`saG4AKeEd7%?OOyP#(_Q@makPqX7ly|M6
z{{#QtNH%7B=HA;?({fH1oV3ULmUrr#`)`f?oZ}s{oJyF`UUL6&vzzJLqv95HwWnEm
z3x>T$xirHGL+iu1Wry?DOG(pJy@$I*KUjuX%HN4@bFS*UEUwONJam5NY>iml=t3B}
zbi0bJ^KZ^LuWWnH7%fN67q-tv<>lnnAOcq0-ci`oZM>qHA)Qm3=$+1+pqbU1N7B~N
z(u$?f>0j;Odh9v&o>o%Xv|}$N{)_OJ#j(AyRJ_>;Upf;hVo4)ORw)`^jptZj2flW$
zMyy^ON6?2b?BKJ#pyd{{lbSlb`XjUdZuK1|#n3oSzAdvNoz16nVPvkY*|C*eD~29M
zy$vIwJi&zZ#f_{DO5u6oUddxI%F!J$f-JTM6Vr@2jJo$MxLJh6U7Xfed68!E@3xej
z5_Clm8!r5~Y;U5S@ScyyZDvg)s8GESHy!UD!M*Kw?#4F@%r$D?e|g{iUdr-{8_zyd
zV|?KYo|>((Xxrp;m$y;rVoC_P(FpN~@u<5=Tunyn*Ie>=o^gMERMj5T`k{rqO|i-P
z8{O>NDaz@r)xsSUdq)tmx2H5_h-bIjp2Sz0ZAZ}F|ELv!X@aS>p*qf&q4My`-mT4#
zHH9f3#%dFGg#2f&wNJM%C75v8bXS=8qWV_1HqI8#e&*=V`{?kc)>j<I>AECII=i`^
zWr_3d#1WH^!uIv_>us8QZZE9vYIF`h!fF|aUbwDTaImK2Bf&@XBM7}-K&>RN?-PMu
zvsQocH-qkIRXqhkrWkoEg%$;gJmb8o&BEb!Vu|qFTUtMgd(5obgeQcL$|x2pdsbLf
z*jcZ;RnWOhZOAk<ybQGwXd7_IcemU9)b^?^t<8hjfH+4h<Wu(GdMWptb=N2xRh8l=
zTOWQQw1l+WEGjI>KhImT4sV-@*zD&}`G~|>+%a!)B5)#EbT4D|RBPm5ul~8xGoVwp
zuRv9uYooN8RJiqhYs;+|k!uB~kiK|s|J};M$jayH;?6Q#*+^HFdDO>nhq3xRmg*5f
zGS`oX5iO|=wGIAR;T_?xcp2I@;`}waHTN_lHQmDeD6MSlZA8}N+iV;gH^Wt_)I_Sb
z(WdLx3Ewc|DB&i56XA0fKHQw#)>v|CXG|)6^5j>4u6^n(d%`6_uXnW>lT+y7IF0OO
zI-;)4)Aw2)Wwf*<h9$~+IvpI!#i*!l5YMva4CfA8iK)0MZn|zIRsC|>Iw&5qh{==H
zUMa<Qn(S$t7udJ9wHB*R^w{4@d@91=6f?vy#9Er?P<`OD{cON17Ww9V`}>t0scQek
za6{^0k5<ov^}yBU*`sNt_ew3v^I}<E*2sfCcnus8Y{s#tH&aP@`TCL6Zul=X<2+pC
z{GrLL@`N(d;>$v(Ko+v=AZvMP>hn_V-P%hd(-jmhdh0hfYLmj*X+*@C++F#(XL;uB
z>q$2_tn{R+M=07ZQ?(gkslUuZIZqK6eZD4M7$x%-O2@d4k7T5$+by&go*eRcJ4)(%
z9#`<0QOFILtL%7`P#>f46WWkbY`^#zzI8tHS*>$qAZObbUGm@_6qH+D4x4w_QS3f?
z;8Idi1(H)8!m1BHTA(C2vmee7;@|^I4hG%L8=+f$b3pi`+p0*CH$e}y30RNiH0)7O
zNSL5ssJHGhuA-ozCY#+?cTm4`TiD3PirwI$jo~A9XRF8HY7`VvXJPQs>XCy1t+SP-
zwY{*j82#}T!r(LXH3vQI@g)uxV)W{Flxd}G>>knbvGcNX(u-r$($b3BJv0`+CoS{)
zcJO~<^rj9DkA*onoSdB4op{)7>`XYggoK1RIJr5vx!J%KZ1yhJ4hGI_*7gi1ME;>8
z{m9<P&g`*+nT<6qMAyL3#?e8Ho*sJ8pZ`wyeB^9)`Xp=n-(mp)IiR0#aItf8{GknQ
z6@|VPRyK2fWT`G~X7$M09y~*wo0E@Q^!SGV@}tv7p1D=y^j0oz0l~Akp83)5TSYk_
z5zdHoqOap`fx^VGMLGT`UmW|DwqO&m2c?;`(tYqJ3^ES*!wdX&_2f_J^Lm1=i_>is
z6gbK)=^OW*Q5T0@ytP%MI9CZV@i4V8@h(ckc_UKL@NVAczZrYu#$60zPQ&MS-xLIK
zKD}NLQbUUgyB0uB?2nmtRq$$<H$DA@ct6!>cR9{)1e|m}4ozx_Z_BejWR-m=w{ThM
z373%T&O$7UA)H1e5I^VD7@|pzaFF=4aBmb;7#b$tfA`@QR!9e4#C>r#zyI@fXqeXt
zJMhM2{yRE<9)X2ziYdqWK3e*JcrY3-S_#H~&({e(_){1;jNtYMrvFipi>S;0M>!#S
z5h>n&-e{5LxBf8u-+X{edAt2j>|-)sO`)Ux@>Y}Je|j!Z8}(nc{iA`uYWq*T{6*W@
zF!0w&|4UH%8{5ugvA-$dzvS}2ne=S!^0xr_&(h^@0dlqi{#$_jEkOP$M*mAF{o5s+
z4W<87B7X~zzXixYSU4L>|8bwc1;|;i`CEYeEkMq8v}a<+F--mzAb$&xzXb@;!2d0+
z{CS3t4)a|l7Cq0_2DMf~+?J6FqDOT@&Ynk4)rY$IVhs`$yy5539$XgU?$Nb(xZP)}
zZCN>OVVFVnDb(sy92tX5NE6&a@{G+>BGG@+2n+4^B*l5}Nts_RriP*2BL#zaSHGNa
z5F}L5blG`f2a7QR^-jh|qSRh?)=`C&SKzcOFhX4+cHDuL;d}(ONTWRYx%DK)HNron
zn-T%N<$G83VNwKhxf1S+&)gczM@u93Y9r8ez)0R_2Fn!FG%4o=78r+X`1E^ua926^
z^iGcWQ@2@$z!=~u`LIa6a*YJLO=hFWP`&;>pHP`I;oRpM?AIk#eab5lAHjpZHW%~4
z(Ck>jApG-tLP6lxepep1AcqMX6Sj+;4LZ|OFOFS<F8J7xdDphVHaU=L^rNG7FYV(q
zRm3`7%27nPXy8jY586+fxK#7o;D;A<;8HamOWL;p%R^WWHVxr|^9ggB1&mJlII$=`
z4VWR?F4KauZy9*edHsG|JyV?A$5Zyo^q#=;!6j7on)~=%iyamAngpnJeiJhcs5X>v
z&hz%DEUs8*Br3VAIU}r;cy9S8a>Rvsf7g4+Sb6M}Rsk#EY<MUj1fB)VrO9S34mi6H
zXesyC-vu8TnO4`k(rr7&nd>VriN*aayY7eLlZxYjd^hU!U5w=cIhWzwvyzu*YlE9W
zeK*N;31~mwh97<j1*ySj8wXg#3s)NY{0`?}vy5W$Ri0<o{6;MJ!X3+f?PGYO+x8HX
z-i_esQ&K*y*qIU!`T1ZB9S?j6aU}$|`;BHlHR#&`z8ng`Ifvr+s$xRg4t$sbjuM9R
z=$GX1#^i)S{DopU7}_t=*wt^gYm*A!L-3OblqKSL037~FQ<+y&j+9^2-+-ZE17@wy
z0fI$pa4ERkVVmMHi$iM}`;(*LLY2Q+#MXA7vCUsv_|#;wns((MGPH179&rEbTfT72
zhxg!zbdhHGM5r(-`V_hpDFUn4fX&<*m(jhISlj91L>&ETVDzh;TZeA-sWiwA@7bM*
zQ(;kI#Q+-SSi1>u6P!#5hbKolNkDPnq{%d|x*zb~;o$QuT%2z?ZcG2iEEg&&Y?r9d
zI4jV$S)*~5$NBE5f6zu;M&0sneJe?e#?1n(+gyYhgyMsX-+|Xb7x)PvPgqUA{ZN8J
zsogEt9yL1w#RnC=A-7yn+o^x|T+*ZzP{tok{UiWLW16yuC9<U)b@cCkc7>r00AEO{
zJThhm(d`HNlOYq$>&w5)_e8G%btJ>GLMShP*7h(He@4o8CI`O8SN3YUeGN^LHWJd<
z?cfwlyg5A7i>OpDO<Ne@DfZ}}MlH-|*+;%%;bkg}ZCjZ9bWDmoWdx5_`40RrH7;Zl
z4RaGSQ({wYCk7}lhZsnuX;TQ!&Qhjf{8Mbq0(8Kc`XXl8AHh!T6d?p@BwZSg#?1^g
zQu+!r;6F4{<5yvCZ!?Ydi})j5p4vB;Gdj2roGkOoByfE(z`7X05fc#H0-YDFsAtd;
zTxVM9ebJ?*`Hmc|6X2j!;kEZE(jF=TRM@lN<N35=0W7mK!RX;BQs7+BK`xCg62<2`
zc-+d+kd}~-E4pRVLX;i#8J%?lKzwKxRP=_2gFqDi+zUd1CeT^V7C!~JPLo|<YQ)Zt
zkN`x)i!R3z@ekXt0n<&|@@Ueu_K?060=@rJ-<C}x0*D8SDY~c>>#peuvZoOc&Ihz*
z&K(9^ivd`jVO$ULj|ad%EGpYTr1Xi#>5KTBF!UVFj#*zSsr(gI>>nJ%X8_aOF$Adi
zO$mVMnS1oK0C3XaUVp{`ZY;bxZSc77ZIw}knQB1ix-7G2jy?aH_<wKW^><2w#)D3c
zrT!IcJ=7Yp9~SycW)3zcUhb3dd*~9rWd&BSw$2GTwL%uKf+mv=fBRdf#z(T%4E&3^
z_#ulyqh5#v!SOPoN6gbxR)jrielK%|vLqg|(xlM=7ldG`n49woxCVfw631F3LW13x
zvgGE<SL%v`x;|ui_;wZIX^lRBDhBI}`<X!T4J40mH#Ik^Dr7#+rDjc7`RjDYHDmC#
z><I2eh#7X3Wz{{cZ*N?ZC>752%-#&Ah|7;&=jv8IA64X+oPE^s_})1J;KJ+x+>TsA
zfk2R5z(Tvt@`sz^yXP9~Ld>+bJVh7wnHyv|e&BWBOw^}9Ox&4)on-<D{SB_U`KdyN
z6It~-f8nl#P3Pj4(#8vw_VC(IS{W-(UAzJiD_#bz%OV7A>I%ED=2vfySvkKy>NxM9
z0x>|FLRVu2WvMzq{)fWHHcM9_D@2fG(_kX%#%YLcss`A0vs2e)Xfl_o`JyK-Aztcu
zSE@$E*U$SsIc&hbx5(zfmj8Bt{A=LjAe;UUox<=MKha9Y7@KX!&lxe35AvG)D!M0T
z82%)bh@@k}nkR%e3ps+!B4rSCY;nXYqfRnIgHCmXu%PSrJl-Egm>cH=qxfWl%-ZDY
zR|nkJ#{j!8;u0a}vlu|15A7l6Eg_s{KT#7bLQo$34h%jQKuRrQW|`)Dn$3@Pdt^UC
zaK%WZA&#LuF}m(tuLqB~>lZ5~)8D#bnqu>MbJPKa7+SdgYi~ak0T>`fKnkJb3xDDK
zbkQ(t0iBK0`BtSr;e!?l0?tyiflDZD)<x8<IbI{SX(MyYOlHD15!u63mrpVvF4w@p
z(!=?#waXAWJV1^%@R7pD*KFt3p7enrT6=}}50+7U!bp|9OxxL%bs0ce66bG6a}hON
zJjXNRsKeZL1B4I#QoxzhKb*B2JZ-chp>b)9H_W=z*l^8vm6XF%{K&3-$+p=M!J*Zv
zEKnHv*~4hD?C`<bhl@Sx{MOe!>5lg1q}B#UM<_qH=S&pM?DQG!hZ^1=pS;;FMqFL7
z(RqzIntJ46S2Wk7Ax+<B9Q6tN)Yn6*KW?I}a5Dk#d+&gGx?BQh2i`Cc`DvZ}#x1Fu
z61K@Puh#^51CK33*onwUs#hI`Y!_^dX4ve_(aK#dt0(Koss}#g&(&v4eA1#0HNmJb
ztn71X#LBl0-C(v6VbU%9{sEukh{w~d<?yh9@-bWYjLp4^=>ra7mz3a#2F{+jkV2I~
zLb{;(-4PhNDG;OsMS|k%t!)zuCQ9LzS3<KWH`7YjA~zHRa2~`{R|{LpuLu>F4LTjw
z(AjPtiPW=}S9j;Fk4jMQNhR11`L4C>rZeA`*q?~yH!B`_7OrjoWYOu%aODbXRo`~a
zPOX_+T|qMX^#o327)@Pnqn_H@eT+gnpodV=fTw>f2TwZIL#3x)+UUko-&SAaM2iUx
zdASm~7FTAjOQBJNMn<Er(*x@f4jTI&M0jYp?t{ue{q>{9`jB&<=MuBJcH`a0VoU4>
z9#qb@mTwK_?>AS^dyF2YxsSY@@q5WrKFXWn*JVSFL4FP7DP_fHP#Iti#Sj&t7f=i#
z0x?8k<XxSU2{o}+jt1*U?oOkMg5k5R{i?S#nRNPl?`P|ZmadVa?6va>REZzXl}zPV
zDQyewwb*{Op4`W6Ef*W9M!Im7ugF!a?I$`bx_kOp3C)hGm|_Y(kb+BOUZ4U`Q09Iv
zc?$mw2>!RUcVp(bysQt5rb_zsy(O^Kspo^&B2{ohRcz)*iIl}>;Ew*w`M-p!4-(|{
zwtMZrulL2PNNI?FLJFvWI_Gs+128Jw5y;YQ<qoL(FrryDZA3J5Pb!R7&~6Wu%-a0g
zH`L|zx>1+e$@Kv#Tgj|C80+<Rwf?~1rd}&Yd5Xmi(e)0awa>HV6U6a0m-E=oud8qG
zrpZn;ArgrMwnD1rt88n1_hs~wzdqghayL21etAJC^<cDZ;w4Qo<scC;wYBI5q3zF$
zhd39e)m%r#LE=6RX#WHgIMgRCH9rKBwxrEnJE;B~)<GOR!x4DbV*AkGhTdEI2?aMQ
z3N-|k`t}F+R&z)Hq?TiWQw7i<yA_fk`PG1|rByOeDai-P`j8U(NDo3lztU8!Sh*K$
ztc}TseQ$8db|!{BEQ@C0h~8tX&jcA>{{o|`bS`+e>IbWJE3*fur_*+M+ML_2^LkI#
z1P`;G>U!_tpqIXDg2+-E)2x_X+q`cwdWly(+CqIl&-YNBo|X8O=FtQiw`51HQJ)Dl
z5o#i@or%HyU%0{40ZLUXMJ1IxlzBW*fpc6g{*ihaWSN1;f_098a_lw~h8Vtc6=Y62
z_Mn~oViVnq+H+mh5IMzwBcW2Fcq=7pduQ6{LAD4{=)Lyc>Ddd#bSW%+uhNR0`?W!h
zHM2*a2w>U`67T&;+XV125VJ4BMB;_4`__cuSn<uoy^ZCt_xs6Ih-iOt>(8++YmF1#
zl{!Z)N|{Am$)4LcxvaY8M(}5bd3c^kY|mD%1nXHAAnw{uXS~~_iqnhrs;=5~5}$gz
z^Q|f`ch6-M1AkhHX-9Tk02NuhD1aK=ju57Rblvpq>S?Jxr2&j0*3XJe^Kc<jYP=LC
zLjS$AQ1o5*WJ`=LUU_v|=11iR=jN)?+*{=x{U=^5Kp;-#N8^3tcdvpZFCKK19ol+t
zK(<VY^Y-&TE+pZ!_y9g3%yw<V6Qn#6BosuxLSqcuICoIhh~r>ah?a);ty*!6boI#W
zhex=Q!}3;~q_w%L5%B)tHQSL#dSRb8b(MECydfhxTh^ORZinc(?|Y|_>4nfxIm#t;
zu9%$T4_+bhWY^CcX(S->3|}pgn)vC79#Ak}X;lv5;h+jF%0F2U6;=wR6eaAIYSVCM
zc29>PlgSWsw>7IvArc9nWJe<p)3VPitIO=h9{$38q>wXvux{`76R#tLT)tnk!YUW!
zXnT)Ps8citY3#T}NAZyc4$70%bZfuiqRGl2LIp)9yza$*0+GN)yzQyO@ZifB)}3xL
zyAAHGVg7X-RV6AbGgVzz$`KR99NQvm2|EY4Mrsvq?CghqCX-)FJxr*OZ3>f>6bMH;
z(cN;Jx{-|0At%Xk)!hoNm2GF_(QMR#^o?fpk%uy%q~Ljvhxrdc!7$-C$2%TYnO4tY
z<S*p+Uc|fY!s8|FqLb?0y58P`kp~HMt^1mJ(vRol^1GT9Hvhdyg^5kg`!p&$c3xQ{
zw4}pMsufF_S+1jMu6L_$u#d*ZgkScxMh<$a?bsjjJ$TQneO*_3?r79NzLOB0-nx9Q
zZ|7(G%x03FxJhfW>W+pFkGyBk7(+%9jlb1r#TCAA<oaSCVyN70)a`{1K*-{Z%)>uD
z4B9$9fKt-!sFhw;k4|0ceth5L%c3cBCg=CNiN%#ORc|k3slM{k71wpS5cQoyBI8~{
z@pqOyC*Cx_dsQSW{|6viG8gn1f4;Xl-TTU>s6`@=S0=}(kX?dHd~aAbSkcW$+i}Un
zNOI*xZpn6unXTjs1Lo(D7S99U*uH&xRNssXw>d-~jpdKvR5X1A(DI9903)J*97qUs
zx~58L-z-p~s!Tb;7sn)}kj%m4dn<cK`L?T%x{+5?DwdW1#q;|u7Z>f}m6p8sL|W+!
zlonwSz_df<0l+i?z@VW3hz&xZ>}r1kYY})C#a}ngdbRqUJCD|p%kEb3s8hWXw%&H~
z!2ToTI_o>qqo?|soqBi&lRY+#)kz2Ok7&aBw<31BXPtgg?AcU@Iw_V5CM}6fsQQ5_
zmnVTT^|S{AwF9VZ2~>5@WoG2AreEeU%-h<Zs9fs$sshUcbu9CQY9R=KaZDE4K;#S8
z!RsLUG|8Ymq(wl1L~&f1e|ft1rzNKPCfxmSusU4bs(XMeE0=)d`)lIS^3<Jqlok$(
z!r9H8ZUdWTiZ`6g%%e`4L%M?Zj(X7#lQ}z_UaR#J0zq{ZrBByuX>E>Ejk-%{N|K+q
zr`yg7X%d06h8|T40CbtuuKaNflDF*<&ghw)wsoxLsD9U@c`bBYeG)KBZeqp=F)IU?
zs?je3gG>}3N>D1Bh?pIEB9~Jwpl(H6zayT=vt{KQs%J}{d!fimm`&qyBL`C92o)oD
z*I?WPHJAP1dQDRjVfn<K%Dejf&#!2bDNL4~99k1b?UTF;K`)-Pbs-R%Y@R>?zI|N%
zyjdrQr*jOnFo?`#kv3LWJ}DlloxXE8ZPc?zP?@yR(*B;vB*#APuGIX^)ifp`CYu32
z7ND^QhM04*6A-yB0?6><<ut{};ID7C_p6M&7{i8U-<Ftpe?;tTve@pG^UsUDaW|^E
zHO{e{cl}7=DB}okCD|49IhBTU9O8BpLbiRlMs66fP74Bth%DyDrHrjZ?V2><IC58v
zReC~Ty4P~gX#asQ8s?NHlmq6owwPRznImLsI{W>x9s6H`ZI@X58^9Zki(*|it!|!p
z<<xFEE3?xaPuPF5RB^)-)AkQMjYb4`o{0ULWs>R^&bZ9?>Lp5rSs6gpkH9-nXB7kx
zeXT%H4t#Vt4w)@{PQiMu2kMp`6vpFu%k2jalx|X^G8Kq7UxV*#i!!oHWM}%MJkGA5
zqitBaEC9m3dLiQLiEDmMti<p;G8}w1aVev+GSA0g<ecpi!$PC(;1(a&(38&bwfD(l
zJexw={dOR_L`TM-PTb&j$Ay|1C|~e#CI)!ILkK_oB;HGw5UA30{x*sTN?KPtirKll
zBlXOQ<fvn;A6tR4aN)*UVSBZh46#Q~p5on|Z1<5=Q94>+J(i%smKiX&;~nk00PLU1
z2xeq2gN(pOIXMuZ7n-%jsvPFg^LtrclkxGmkjt@Uqy4rv8gr2damK3M_lffS{lgiX
zqo#S(jb0m1omU!e8htMp5idpd+q(6~PTMdm4O~yESm_LkKbW2k3lBE-6dLL4wNe(A
z?p@sZDy|oz7frpzJ_#&&St(-mj3wcaC2w6j&gM81dwEF&jk*FE*E0ngTC*f5^4PDD
zUU!}Q@KuRaSJidot;eL3$%@u}uel(K>b-fvUu9hqx^qWwd})Y|OjAoPr?{mYIR>5Q
zLzCt)znZRq$Snm*Y}?`!1~B~q5PLEwLnFWki1noZJc=yY+4IqQg*LGDGrMFgVWqyE
z#+AQE*UQj-ZtPNHwUt2CR6>$K6#u|*c;~+Acm}5YQM`nR=VlH~oj_iB^%M@WIr3dy
zuG=yJaxdCyBFZ8x#Oq+0Vl6LYRNKyMEnW;4X_rtXJFPxLOwCZTj}nf5ow{*h5vrn?
zN$KfM`)V~%Zf!rzwUeq@SEsI?j1!!FnKk*Yk^a-DeX`&(;YtwJqtOvPuNmfRqUnzd
zOCHWN=ih0jIY$(Cp$fTGGFMPOxofM{Q0=wuz4MuB&-437=dGw;MANpo^H`|9w;%w7
z4KK`q#LL^;I|l*a3IM?Iv=UEF8UWx@;Pr#<!$-c=WqMAg`40w6ox&aJ`bq0iBW2Xc
zidbjb^^^t0xn**M%2w8ptlzVDdQt1&SeDrgJsz*RDRHY~!(e<CSCQpl=tk!X?za2H
zs3n-enTSZFotYhA9LxBAC3rhm66L1Xo}R2=Fm>6xRR`}D)}+#n45h%limY|gBVvxL
z!s_o8J4t8P3H=A~@H!L7<?rt3^4|qW2`ur0x=9qMJ+E2A2WGto+Vl2XB#lcXYB~q`
zvC0-Jy3UNqbkZSwH=0j2mLCnxfcaV^G{wSp*5_?&dW<l9SI1N{8jnavC2IJx8vA*w
z@XNFHo_tHwSZhWk-rX?4`j)%Se-1*b+*7<WNY#drigo=k?Qp(id);l4jb@0&{IKmt
z@8}WUk9RtKE3?@95At>0=i^Q4bSd(BoHDzzBoikV^hy~<kh?w$MCrCN*UM~-L4}eW
z6QbTO)WU8me=(hr$R>^v6cUW;wa|#i57eaOaB--;8Ug9g{?!-0jJg;lan2{nyt$Gc
zI%`c-z4f;m^{4^3wGIqt8eJ)1*5#X^kRhI~#_1EN+jgTNlU?5LiQNg3SHe-Z)$I*l
zn|gz2MCxieC+LqeqnjTJxFFvcHu$K>E4od^6&h9JEVB#E+!2RbxEIWK0T;j9#ijx%
z+ZGfykN7u4B@cMkPqo+gBK9q{x%WbCM*>wQ+2V75NMz=sb1i(92&`={%bl7<+fVNE
zcvvYoQO7Xx%s2V`91?+3?-(RDx%V1llb`PX2NlZ#6T0uUt`i~72LiK=RVKp^xUIxy
zH+4JSlFP5`=<?nKdS=N!4~?<!fToKtFae6o?f_7;oL&}T;T|JpH!Vd!?c*HOueE0&
zNd$D9oLbp+zr`)oPi@K8KlN>ISS-Z}mUw?u#<~1`(1wJtmxeGaS5t5){c9i6{fe=~
z>f><)TJn2Oonj?yF3WoX2Af}R=Ih@uNZ9RGbP!ztrq^hX*f}-*Lp{KfhY&fBb*1z4
zFMOP&Ys2y3mp^MP7PY<0H%P7eXr6k0wU?PXWOQWRlqwWu+Cqcl$%x~<+mw2l%$q-1
ztU>w-T0q(Q$wKa^XzSeeA(g0o+_4tQ{W4}?0F8M;9_0R%l7!np&;#grfWw6TN{2bf
z2@itf&*W@Z5YFbOe+FUlLJ6=ltpT_f+ygknFMB%@;0$)qsCDosRsy^Q7*k8eivD-D
z2YI>~ct2yjCJsXfCvZf+yW|1j%Vz`~c$`<+nL#&1>jmWAZFwDlRip_<-~V;)=PFc8
z4+|v$<zrFi8c>dMGJxt{Lc&eJ^bjamX89dq%pKfNBD)(85&vCi6ac21-}QXO<OK(A
zsRpmk(*qAq0ZrwFpq6HEO;a)`QjhGe7{YQ$KGN9~m+YQu{w*^&57AZ334p%=<qA2Q
zxhSCelNkgrab^=x7SetOOqbqCtidX}4VZrP^9msT`_U2E0KEn8i#cHz!D)jjS-KCP
z%Xt+*>e+-HH(+la>Yl3;0%O79BGA^!;o|SJrFn23@-{|=mA=CiXiFxT9J0a|ltS8@
zH6W&Q0Mphg%#UGgpd7ThTpW1HG$V9qX=%<D0{?5`|IbbQaZ>z;p{<(Q5sZ`z6~>0I
z{%ESHWcrta7I)08Q<LGzfl&|L@Q~(Z9~p3b$1B-M28>Jw4G2<8OM`&zOY!^ck?jpX
zHj-NIRKS?vDaA0OULEG#^2LK5MRWdBKSO&7&?d*8P9mL>3Xp$snwJb<?K~4`MU=G_
zp}2m8hAY1J6Iy22#nG+<XIIkt@i|u-m`tcfUzXkm)3iUXQwI6_OwTt=UP<6O_(2UI
zG}m-MuG7}03ZXFc&-ra>pjrxa45t5U9}y%aag_T1oU7%XABSrzjR{HBH8*d2!xhlj
z#Wza&wjH&K9<oRNIdcVD3%NCkUY@kLy9Z|T>>b~Lo}#_?YCrC1L*dH+_y`$Eaxgdy
zjPUSDSBPoY$31cvJ(?O?#9);Kr-Iiw$D<}E8e<YJgQX19`HCy2B?6pQ3^?1So%u~P
zawd=xuilyjkJUE?0nTq`2COk)PRWmD^bV6{xNm8d25Edm!{pT)3-<RA9Vwh;Z%b~1
zYTJLZm&0@5{<3fT>9H<ojy<ov6y~wr=hD$zdaPb@1`tBH!el@R27iaH%Pz_^mQt$}
z<VNGl`@<GH48^Ah>$c~T@miw2Qc#pARf^-B@tMF<0w_;leG-L9flUW8SeycQYKJ}u
zEEmu7Q3B%?T;tr&Q)&Pk4qUqGMOU-vg1}J-305|j`F;15ipb-wj<m~nq|R761E9`9
z{#{Na+zO~*K;}CT1I`L8T_o9030XRzh7IYYL}}Y4)LH!SmJB_?d2qZ;LRPx|&G!2(
z*}5>BzOrtWGr0mfKnB|v5z<;$d{9BA`CTq)f|fX?e(W7kI=mdcOkf)9iSQ|5n>x|A
zDy3Y64JYoJP$Dk3p;&zsVEPA!C_ah+(sM;2S{y#&fID%VJRoocIuKZ+=_wf`yrIu>
zBf?`XJFgL}VGK;Xz9S3Bqm_9TuDp69F>eAJh(g&ott;l>fC}#IGA5@ApvlHj7zz*&
zdNcIGm78)vSX1Ac766=fPZt$;lbQC(HRjn*hVu5{Ip=+_@+e6$mJrK*ZsCbW>G%u-
zcs?wr2ikaZ4*_Xt@xtjPAkF+}P!kKUDISoncyzl0BK@(ZOVX%Drw~fkt|mkFNWF<Q
z=9z|#4br-a+}!i+4+UXpacm#IHND8+j(cPDRc6v~flZH4Wa*=oWnp(6St@=?|7HUi
z1OMZtDIf_-U8JQUY<dAcguP_C4{%BZELU>z7>sZXtb<vBYQ2I1<PPGT!id`$v!Bo)
z1LLjQ$LKmIhg9THcC(F^Il<d&XsY5Kga-Q2Kjr`*>^MM**(cIG{*n=NbF`@sHL;Jc
z$OH#Ix(ZFRXIugDiJHeCf%>t|fei`BV1mGSp@qCBZ_YMVfMhnK!U#VT#UKm20bLGd
zbig1vXz9QmSWG|eoe0GS(!8dm_!&JMGw26WAE)+>-s7`Kp9T;MOcT;yoZK=4O>>gz
zQBQFIxvI|)XiKNWeMycriUsbFyZSo%BnX;=QmB_;UFfXjfEFh-oF2z6OFEXGR}n4+
zpS&J=GLGTq06Be^2<x<wKE7y57ld~NOVRO+RZb4vA=z9+bS$p20w^4!Bihe^=$Nl@
zP%m9j>)1NhV~Q<^LB9tzKrt>r`qm6N?|<tU%$R;%Dpg8Fhx84X1a}a~ze_(3NMKOL
zKUMtP9SmjvCCmkob_`0M=AP&=6ujTvA*jG`Jn!;pg<2@_n=r;xtU-4}v*9KWY_?-c
z1fYJ4Q08XyJtq4TOk(n&b(nwirC$R0swH+1JASlj0`P_g4RYud8x8ZJF6jO?SO{qU
z#TH&uCBX8siYY2YDIx;g@%*J3%ZVzY0a)1Rl8;S%=B`>|5DRlt7LN4@p9BuT`@IYD
zW`LayApL8l7bySMF?<<7(k@vN=UCs*!5xgRZY!L0#l@h0wKy3po)zZ*m8+Oyy?Fi4
z-vt0f|LZn?-RA#Fx0ykw_B;rTt=2c_7R;-hzr>WhRJ;+dFhW|bVZTY9zx#Zx-oFAA
znvihh;IBwX@rm_2$tD`mg6qG=z$ZaKZ!8IeI?TelBAw2s$|8o!Xn~F2rb+$$?+Mi&
z*y5P8nK(Jak%Km^j@zoUj!E0W?GvM?OFkOA`y&={aA43@x;$Xfz`X6IlwH&nU=TWK
zcoLOT%0Mvr#V>wBx*3Z1P_6v$xHv%H5s-oAEDYDWXL1j^Z;lgWAFAlbEnq6}ua%YK
z)N(8YNNQJo#>JUxexQ;^VL^o>xY7q&J6N1lIevD;EAZ&IU1nVWVjP~51FLnB_s%$1
z#OHVg3dBCRAgXrUX#NCcay)3~M(jkHrw`+m*UwbK0;4OLM>T@S<WfEX;wN<*V5b=q
z$aN)(<V-OSG09EG`RZ7%EBBZ&kL5buF@!WQ406U0#=qI~hBKg_-+zUogkk!&D*u=T
zP$OPMEe=h%ajdnMV0AL$_BFQWzt!-Y*M~CtoX0G-zP&>Wk?f!Y)P)&4qrpZm;H3<x
zrsUG8NGA%D!TEXetfC62$A^3W`&o7joQQdo$@CZ!wNS*q#QvjZ6O83b+2;KTfvnsz
z`49?`cRLZi{~-W0RNoSX40EkZ=%kQ|y9QwSzT*5z-pe5_*;;m+^s=dZLl;?f*fv;?
ztEFUpioZWhc9CRmL7I>gK|VO%2<!(7mdE?S$Fg70)CZlO_D*fqgs(3L?%u!zPLH}r
zaqQ8!hf&lEhTuzXcm9ntFbKWI*`Wdh75=sO6J5YnfL?f`ddE(zx&;e$KE{T)jq!gZ
zVi(fPZHSpBH{<%_(#-|hah_cagbvNYmNFjM@-b!D2dV#12wVpil|(Q$kK)*Qyi5k#
zn47?<RManmGc|DU04rxg23m!O|B|6UOXOfVO5uMd+ft&dUJzST+@Vh)PxtwE_7sCj
zc|bqj#N30{P|rS|>;rraVoN_WC>JyV;HRO`>Mfb<n-c)EVqKVKK~2JqDCNaI9pW4l
znNm!dWkDVG@iMGN)XB4kHVu=bftC-@zXw53{z}fX<Lh2wUD$?5D4(BW`}f0XIUo8g
zXP`MCKW~x5UvjxX`nwja1#yYfU5ep13)mNCj#=pE#Xemc{D*~ozyi`m7`}XuSs#*2
z?lw@JAyzTvv6#x&l~<0nuHI(xFS$*N;0U!^gxEfEV%tlU?2<U5H+JJIPrm+I+MH(D
z+fJ3s;V3>=a6%~a?Lu@P-4D?-s*El9-jIKIp3tZ(R?U~j&y>4j9278|(!lwop4&sa
zVW4dZhKn70S;a$@gtK~XimB;JSD5sg9io!(+??4N{A#jJTww~<hqcCtv+_t+1{ZVI
zw%1e)>o9Xr9czylg4pnYC14L#PSo%O`={$M^ms&Oen;~Yk1T`PlZaBy9_=!(t!~(N
z>Aa1?r&Xr^xH~X8x!PMP&=5|oWj90tac2sR=>BZQ6y4TOIgUOpUHWGRgJ2Cjq$W{G
zj1uYCPMmMrtUy(0jKc)h)@m}N)I!^>4t@Hb9JakU4hH8zk@k=l>-UQkZ6qfiVEU<I
z?QCh+;Q||OLqWRqPUk<IfB9Xjf|w9&+v`u`vo?BJZrr$ox{Lw1dk6=HJO7dv?buEo
z*go>dihR%%e*&XpEug{@89EMmP-RD51DVe`D1OU%1y}W1W=2mauKnUEp7J3Aa@!7a
zV3QnMew<^Qn3ltLk1?>sf`5#f-;~f^5~!Csm{D#tDol>g&N3FW2h+jz=V0-9V&dPO
ze-x2%8P;`R*dF)27Zkum_GF|1Xs$CU9~`^7+Ojk_pZx=Bu-|yF7g#>=)y*q<i?bdy
zy}{`3ltx5G@;mw2lDZurK!7D>x)j;3)yLpSIfv$&M9@+BbDm~I0KBbIaPEOs;91zv
zc3AqP`(lZ2l;cd;;3S)E-v_-WtqCko-J^16U{IVY2|uE+4l4%5=OI)tN6O=zB+@M`
z2MMN>{c5Urw{uru&}j55o8+*<q(my_A@Mg28sKOlMFm~4|L6^uOKX;}<8BWKiawv9
zO@7wuW?;q+PoHJnqy3~qFWY?y>JW_NeT!C?@z?4fo$orZ>2w{9Np}$WL`Ac&G<v#7
zJ8d7vysT*gmYq|Tso&x22@YJaq#U&2<hnx4KPbGa@~xowAN2!oc~=vHkr$r)y^1OR
zOCVVL|AbRv5=mwBt8RFZ+8;~-XgdO-B*nGR1I?12o^>JP@C|!eJUR80{e1U-IS*FG
zK-aNj9NVQxb!=y_iV)G}R*}OM3*H`B#J;WRB$=?+@T`C$r3qXJ-kSmKOr(Vw(0k?;
zPLnS`Y?qV02rfxTWDKx?t@4Q2ni-4m@LD~@2$_Vdr6FtKNoYCIXaOzfQbS&yJqKHp
z<W)mjIPEjoLbk9l`|xzr1(_?*LH=6~(2gHcYS96h$fGU0{~F)PbIT35si1pJX!#;4
zY#t{>)1`Z7sD~!Ns&`cMuwE0o@*fG<h<C=eGWK`BL<hx(z^lLvWoC7KxH=*)<tDTl
zAPrglrCbY?nZ?d}nX94`E-DNQJ6pTY8`;QD^OGn--<s{D$vbvk5%dvcmdb!oWht15
z_|!zL92nxJ5z&K3cY(I^c*qVENQ_?Qb!BW$i(~DfcaShH!QAyT&Q{oEUHpepv_CmK
z;yF+#W0xsDn9nH#pT>>6@(>7g;eq}<csHk&h9lHJIhm(VAyLU2o_5yTq|;c7uAhpI
zrpW?aC2C-XK0*oj^KNT=CSbK15I>mhzy=CZRvGJ68X_hg*)NQn74iXvAVI9S%ZhWO
z%%DS0TF%*bbKZdh%oIE81{Nb2ywbjR(7XUPRG?=0%|omxAg2_*x@O57Pjxx%(Wlkd
zsoKlrVAGexx&GHeeecNj{Avh5h$V!O-;SgSotWS3ct;mu1XvSNOzHrv6$93^Gn7^#
zAhB^S^!M9-UE(oMp1T0vDY!TGYDt1Tva#X=L$7t`DIv^1^9ov3K<T}4PZ{tFs3^`h
zk#h&vk^S+JN3m~80D$kKj}$hCaXC&bzh`d;7yof>(-+__k{j`U@GwxbObNP3f>6;5
z{Kqa){0pcUQa;tJefD5pjz>5z5hmX7hRgnO1!21-k~6i?X}f+8DyaT<yW6+R*I3tv
z6ma~6f?BZf<W%(&Rb?B~%PC*~TF(wX6A?+EnGb%E8RnEafI?U#vjdn`u>l+O&J&6P
zu$kkyukQVLV=@17fLZt%*q$aL6Ed7GaYt}CObxKbouTw+dh`|)i?rRXnxv?(vkgow
zSf8c2lG1|Z;0-1c7>xY{r#XlhS`uuo@neqg27?UPts;<Q>;SrGW6TJ70T;i(SS@e#
z+iNsoRWSWg;jtM$wGbG<9UV_$<W#}X=<jp?>iPd4xH6clA#A8%*`_RiP&Z*R+0gG)
zCp9dUQ*hVaIZ~jG#3F~(B2-(btV}ncF)5B%!u24@`NOySgbkKzWG1)kT5u+N8a-*e
zTwS{RtiI;v@B0xN{*+gkNXD6|%cHKMv-Vs|_hbmswfeCW6Z$EvH?PpWD&XrbPI4f|
zk*CtZ>Pq;QNcAlIjp52=n?pYSP#ykQvdA8C3X7aiG9lV5*cM*mNzT?!4vqpP8kRV=
z6Z(;(PqM4Mh{7&_<p$1(uyzo*Iz&OlYb)e~4qv&Uef&UP%%|Y|1<ZvLslS}oEKR;(
zAg=s__ln}c63^P+i{ajCqS4Cnkeyj$jCvFP*UFD-T-JU_crqA^svV_!t_k9Ml_7$h
zjVC>fVv5z+FPn6#^wy&~9p%sU&BY2&zgbJV*hoUf>ej!7C|Ueu(-^gZ5oa%$FPmNc
zU29^lcZn!Z!>GHUSz+{Ox|4Mxwt7g-^>KeWU|*69_ab-~lan_55>y!R0`~8`;o}7C
z7yR=&0X!P8Uzk9Ze};X3i2V)TD`BJ4Jo!sOD_@e`3=Fah8-DSfk5@CL6qLx-)ppmM
z7pzYvs!kHw4~jj~ZzuirX0n3{ccGV8+1+z=!K;B-AelnKJ#|G+dOkra{IJ+|L_~s!
zg7}hH&4LJWvsiG;rae0GF1bR#f29pY`O%0$WhS(muXr^BaFX%`qyh2^=HM^`^WhyZ
z;<dPpf5~SN%+pOcnCZ_PWeI>$da7~u9%;XQa+%1{?Aq5$nAt}I&WJh|u1~8w2T91X
znPD=Tilui+pMAYB$Y+mYH`WKZY!BDCR@PW2I*2c#+9V2!g$=!3X-3frrVf4Wb#&*T
z-Cl{vvq1kxtgy>UpU0u&{!A>=i)$;|!sy1z3!fQE>BX!{CeM!>B8EQ;Z1sW~lMYl4
zeg&2r_26*SWvcds4-0sijGJ8An+PEV3+4iPIz+Mv-*fd{*;@!n=erpoq$esXg6<Xm
z3~JWNem(}#yD1K2fgWypYS@3Xpefa+p3YH#)Bt<h!8j5)9f)qX>;gyak_9(I?G@gQ
zi3z=A8svsuyN~?j^}x|lkGlzni1q4sD^>3n^VaoZiTy_pCY>uxN{Eq1EmQNhO)_G7
z4b?=w$hCx$OvEhqwKkzweX@;TRK$tmD|eLLXOH63I$)hE)t7AcOLuDaSd$V~*AsTW
z<y8|4#3ZP)L>uQ-Gosl1f?k$B*9^_pO`n2%ekFw*dR<uqTB^LqUnfZ$4`%26t-+b6
ziGS)AI5f!YzlNkQU-jK%n{5c$J#2J4%#xsHwi2&GJnNF3jR_}Q>#H3Nenah&jX0Pf
zCFI|GoFKBx$BIi_HCH_yQj+;KA;0Tw$to4ioRxG5awM<bR%w%$>{Ywa&%R)WtOM7t
ztk`Q+Rm>y4w)J<A#1iiLJ45U0n)yc)yOp`J0B6)pv!D`5S%Yw9V=fKhOdjA&WghQ>
z&uwUZm7DG98Jw{~ID4118N7(@Rej~%h==U-7wqt!<h#yAM{~r<N7F|(bzI>{kNWa1
z+cNBMMDl}mXJi-MsKm5=KGKi%XrgL?!*<8Uvu_1#=;mFeLX<M+1)6y+2j*=SrZ(!5
zYt=h3S?H0)5R=1lDM6{mw~$Bn{@FQjs(QhDk^ykXdl!@=gtix<X6HJzfJcX8NE=}V
z4stAKWse)Rllp$07Wn(m>rvnxwx5n%Ti+!fP+LYVO?2su5-()$ICSz<hn+iGL9mWQ
zh4LsH-53w@ct=T1GyFKG%0*X~K*wXnRnM{h8<%<d$mjeN#;O7#1@VP)<NhpEqZJXS
zP4f5#@w`|{E%1+kWDA&wejQ@vKt4|IHeAdkzIfqoIh}sZ%=51Sp&DL#L%Q9d4pB~y
zEQA85DTq9wBz(~8x7=4i;LLxH=?^~-1<qI^x-*gIH57RW`2#q*jcNs#sFDNN)ZA}K
zIBk11Zeq}Aa;@n%1n&IA)e9Kz)m?kEPb;Z+f2RxSJ>uv4rBz6I(HG^x0B@K}t=r_C
z1rk1%`=ME3e%?NDgxHh(#)qosHg6CED_-Nog=))YVEDKTmd-%6MOvVS8otaa;j;)G
zSxLy!pH9jm9FGHx>0`YQ$wh<A6I%>1?ZtENzY@Zhv)7+{lj{X2dDL>PC2c)ey6C#h
z6W$<UR9{mmtDqMWLOO}Kq<vZKyO&u#Mre@78$qkjX8Di$H+6JyjJ_yvuzT5k(ND(f
zc)1m`=d7j$Ao=M952ULLP?AyRy8`Ko5$G!QA*L@}2GUg=nZX%df#cd*<w!oDs}|~V
zWDEvJsFATmzTw1;5S5a&sTaE(Z9(q^js!_AxMDqvwfF9G8nknDH~!i;(ofo2F7my6
z)@x#$)Q$WSHcig`ozmw{n+MuoR{=w@TL{0!n~C7e%~4V)6!`K*=nYGK<y!D;S_|OK
zQteI8xom>O8cC>CKkxLH*ltthFVeYZSrXBVOkK>c*IcOAWKavs%_W`4&oHhJr><sB
z`oP`&oNJJ{;WFXc`qz@J{L#i_U0uE>@gFS~tHz&ywHap%^kR=Ctajb;D=Bq;Q*M~u
znPo+eEa>c6+jER=C%r4^HO{kEGrAH;b99)0jYo#}+IA9F566MuC_BaNkXsg^p~Vlh
z7-UGOmHN83+(p-h7IzK_y{=n!xqV+m+KBXwN?^;L2SJHOuF>SQR>u4ZUcpulzn5+=
zUwvPXccnpa>{I-;M6v~&9h<dK7Oid1C&<dtfXSqt{UAj8<n_!o()In@yV~v!wcSVw
zHzyd4nkvHUAl}0wlHV$lcOKWwtRFl4NQ1aT{MV%4#8Vgvn>tZMK@1EVQ~ewLeRLYU
zedTWxPp^Z&<Gdh>%7?^ML7<Gu>IZ*Y74wFKK=V**Vk@IPGf#8tl)WBDlg@V`#1I0@
z#rFH*uzlIa@(-J&a)oxMzMK9flOT{gA{+2yeih{pJDT-p;^?`n4<1^KVO|Z8hQk??
zMyp>^BA9D-q`V}xWl>Pkz$Pmk?x4*=jEaUAa2Zv2YMj5`RL8ArclgI@vFR?3!hMmg
zePOTlI$HDx^ML{@J%`=moePO99xX3M^fm&nF}v$9@8tZL)qd9gE%r^RfAafC99Q}&
zx8af;$xD@6Ug9cSE-E`C_Oy;M4Kq|(Ex5a{a9fvO%XGMrj)FqKQyNDgcT23haz!iV
zi|Y|e_t^bpm_yV4)Hpp1lhzyM_ixW>0mqnfsF8wtAGB`qTWhBJ#(&;PSL{V^)c!yy
z^VT8Rrt?Q0TW6)?$iwe;dpMY}>YF;lwsSrstpkS3F1PaB24bEq3a*$j+37i%T;3v9
zGF$%O<T{*JG^JH$7A-(#IEIS)!sSS}drDdY79z2EuI>>U9-LMlhK44M6>SLqxho%a
z{1ho_YXw1(x7`;*zqM@3e8*rd{Dy{mpy_3`Rk?h<5fQX<w44(@H?%cE`b(&6EEB!*
z>3R1bh{fJtFVvPhYA=eJFwTnA=DEH1+!`Id8)(z%u~@x-WaChqd+5oM;J8+9N+Ywq
zyJXmpb=Mo$B|w=`3K$3ve)5}73g8PZeSTJQ%+p?@pGUK3=8hXVl7rGA%u_HwB_rEU
zHE#c#-qOO65$Yj2nw*Nmph<NGi}CrI+?<;>xh`;pZxsr7&h7C^B(00Sqp_|b#*8-I
zOBT9Yuj#nB9i3Y7Qap?;r`a3(zS%}rX9Z^<&^YAIUBV1#-9V7#lg6P;UP={ufepc=
z2n8sMBwZBJPy^arg#RF|k4W(YvvNdkm&B)dbhHBbt?7Axi;!U#{vUJk?++CnZ!h(#
z2`$_od66}56s%f&h_BN@h4*-9)827yD(N-qK%96_vbeJ@GLt`Xy@(}FWPvq~=gIx{
zXWfUg_Imqn9XGs_p0h6`*=AE8Y??&%Yrum)ExPL=uW6-Uq9A|un*V`4?v732;teIS
zZVS$@-vo);SN7``{psQUqC`wxr$D0hhU-E0P5;qbJa%YY+-<I)8dYEytQxzVcsV62
zTVV7sJ$f+*!P2Lph(ty0N{wvqD*h4d@hu`QZriN3ifUlE>)lYR`yFbXw6Cqp8s|jB
zdx+b`I*Q*Kny}A`QK6S+mLmlN?q?xB=czrC{UG1ac7fBvfDs0xUpok6o}ooUZJ?2a
z(_;Z(<DsL%U}@g+F96Wt*ReY2E`8>MIhtFv6`)k}w7_;8N`Bz}&|yx>mfYu8-5a*A
z?vYq@M8Kkc<f^G1KKQJ<<8{Y|cmkp7S?gc68YSzNlZf!unEmC?G!nDM=DOWBxTWP*
z`V@}1kg+TzyuZ3)YQAxP`13MTGA{TxB=&MOW>?}z9FK&*ZMDpL=Bc@|$5+A~1GhIs
zuGQSY1U@Kr!sQ<y+++bhm@Mj{ec`9gGDB(UePfUNAHR#VqzL3_6s({XZW<uU_myF=
z?1WLyNt}%SNt}^_rw6>KsHAb;-b>rla^02E0!h3|80iD(7^C?OS}!TKniM|&8aEz&
zD7AJ_g)osIf|PTY{vxCt7oZ$^8~H#;Ik%6MBXl5AJmb4(;WX#zW>uABcPY`B{@10s
zz)UB_#1*};J?$79!$6H%n`kF;(T%jxY>b^j6vX}Y+rwM^HUmDG3q1!iYEl1-y*Ces
z`u+aLGss$$N-2yAQKE$GB*~WSSx3p9J?mi5zS**`$-b{+XK119`)<g-k8Ny&`Q1;d
z_v`)HuIu;xUf=&d{|K4q-1oW9@;K)_&OL6Vv^%&nHbcnRYrV0KO_kNmD;Z7R-;NED
z9@i4~%u+lZF-51P*G$0xj9uyF>OXuCoIV}00fns;$Ms(sE)wxp^|cml^TwLfMBj=m
zg`8}ZT5*W=GVix@Q4<vY*Ba>jrX%G)xlgG_Zq$g9wBsc-b(e&9AJ-n^UT!8EiAzjS
zH3^x+ZyafvVRe#VmEZIvqxTwWI`UER>Ca;+)4d*XXO5N6wRJA#X;lzZm_5D;i-5wj
zj#cQ%lCOE0)vaPE7xJxR`Cv(G>Vfo-S*8NBJT{TY2btyizFBfKA9eHmt{z#=eOInu
zDGP;((3MOfXr1jD%6c(yxy(O$qA+4+cS<;U!=)Q{_7x(%gF3(LUXgX@ix$aw1~*((
zw@!9J0<Pke*N`WU@$vBT{H{u$(9IUs#O&y!+`zUj9bx?ApCC^KzYQJW^VyKb96Ai3
z+j(v@HES@)DYf}Tl-A$1>B7D=a4&Bruu0|InrATX$ZVtfScU#B!8m*GUcY(MIn~5G
z3k%Cdb4_cj59v|qh4Fntl-0$BKe{Um9;?4n>2)&i#P(;oWBLeJW@4Pwk(KNH{QTS9
za+BLe5|~x&IXo}WP~x3L$YX-5HKe3&XmBw=l40AAYj>9JS?3(@@axQHz$8{I(kO?t
z%&ZYB`aQ?B?;(81IqJ0OF!#+)y`L|Yl`HRe_nWU2OuEG1ClTz(ErmgD({ikhPh;l_
z7RA#X^HZiXWD9Ow$dTHL=$ph2Sut{$nJbyP9D24*M>)-Zvu5z>^_F3E+x1(J9z`;w
z{hO3Zz@gPxZ&!_erW<yVma!9vos%HbA5?oUxddwAFiKj0u1I9Ynhl_^BMm*_Dmv<(
zwU5otys$_rfqZu{3)NaWC-ii<S6R5--@i=F(V-ksRG#Yo(QO9hzQIVg5|!U_=E?}d
z9N{En@iE2x7s^waXdA2&;EOu8Zcj-<;z`aK?r?r}$N5F?{}^n1%k7_eQJ)=eSk~W=
zP9AlR0nT&j-T$=6Z1I_M%>9)`hz>)3nd)+BQ_AV77n_4b-PDh(9SaJ$?491s_fr`2
zPoAZYoSIGU_yo)}uM?JQ?Y!p3@gdiCG3Id>LQ&D3uHqXmP5L9wFTJJRyi(}oc4=DK
zaKo=p{L>;^i-9CP31pbrWIEQ0;P}$xEl#XVdB420Ygu0sY!9{gAA-rSOG#DV|LKST
z`e_sZnFY<lXZ1Oug}qvQL!q6O&c+9WU}J}y$&I#K_Z<-)8Z}z8G<%P)F80X{sfbML
z$4J`0_l(+3*WB)!MNL~H7bG0H`mTg6>EIlwNaNVx*IR70BVy>u!GkGfuY))F8?!07
zfjZug^t$@K8_gM=BU6q!GK~zyc)ev>+ZSiu=*v6a%M@Nmz-xTKFeu!}e6aK~@O^yd
z!2Nzra<0;_O?OvK!Qj=Zzto=cP;_DS3h=ZZiY#~1)REoDD~R3`Sx1QPsKw|6bj7&D
zd94l_xL19>D)NmPz>F+{kY9;L%7=w)#fCcuo1<U*7ZId#Qql*ZXfI^EL=srVE|onq
zWVwG9z0F{>6E7KW)YH+l;>H*;L0WzuwjLrLzh$LGp?J=CYOHke+8tq~^sk#=`7F#?
zfOS2(=k4tsZgrgdIndnOS^&6|#5RY`YH^(v%4+@6q_;z@^#2B>0hCBGdi^&*+>h{U
zmw~`Bw=YT=_0sU|@y(;i!6)SSupI}IeLYgj14;G)B-s$>D*BC3HLdmcr?T8SVrz*s
z6fp^`_pU4%hB9ecEM7*Ta}@VcWI*zCQHz&~dQhco(R7mlow<C33l$9K#>Hv;w(1)G
zbkkjI`an-bdgVH}>!31asC(#|jQ6_57LChHP8PO3af}0{&8UK-G7LD(LQfwtg-g4D
zjE7=b(;JO{>M^~(_wuU|L4D~%K39PU-BgCo11N{Lcf9>nHu%fxPtdEvM3xls&F%e`
z=%jQ7ozm~zN*m3ztxj=&Kuc*FPzh34q6}wTl2r;LA(%}-V4>rsr)Xh$l5%OpR-{<j
z?H3V4G_=khnU`acQfKGSH6!~|vX~j2ByF}!%UoAZ$IYYNQ3Q8Q=fw2KgG$WdL!Ky6
z*#njNpIyZ-7>x2Mka~3v_y*2*0{~~*527xzU?Yc>A*JZ_tk9rSd)&7!_q3)A?WHX@
z*U!-06F-D&mZ74|rQWQ~bac{vgKKcbJo2Pdma2Zi0XHi5ysGBJ+xCI8sY5!=xu(WN
zq%mpyj`&J@mU~H`P~Uwq3~slNP8K}=l0u^NA039wsfz40YFhD?6(!t=3M>jo^4}~9
zXlj>eT&sY|SfTlP9`_nb8mpD0-6NScP+vq=qT_e<rm4@p(`^DDrSQ!uH*n8fV2N{{
z>4hVX+dto5&=`%Os+N?OOQ`4WnZuop?U0=HZBh8QD88e*=c29twN7_=QPOGY*wl3I
zlR1Yh9j%e0b@?#UhtJqt_Y5^BK+f@hqs`#+M!otZ?Z2I14v)xqKd!Z4-J4WAx4wb=
zm}eo(@j-sLzui`sNG5ENAmDgAur@g<tu#Rsoh6WNlivQ)bQpeUSU)feY4$VuXk6}G
zYicDL-1=0oq0=rpm%Q%2fHtM3%ssNWN|AafW&6Y@87wCqBM3}?y$1X*r2Pu1@xwiu
z>ah#n)d5uW^n8!k22X=OJbexdz#<f=G!~mT&%$^?ymM6;Op^l#=TDCOH%o{G9{pEo
zAdSzji{Qo^J4@?WkeNP`2d41A^2n?&<YS~EbxK{{Q4^1yW3fR7+QNbKC_c*>{=<*a
z=K=*7*#N6N@Mvt=7eLTz15Oq$k{$dOJm%Z`L(D67QRib3>2;1nU#)ppj@<S>x+S&t
z;~n_lzZpX)SkDd%z@R87ZQ%Uo1l|NL0;Pp@A!<;34&P4;)qnf=j`EcroaY_KVNd?S
zFNcK@Vm+P#X(a|JhnO9_j{VEcf=~pdbF>-(JCqlzz+1c-t`%bgi%JHOKd<j<=YF0Q
z4y}-@13#8<wLN+;`?a^HiHiANWY@1#f<LxKOBbIheP0j(foF9;Apc!5=}DuVho5}M
z<>1TYr%`uz1ShGENx=olDJfq!Imc^(y-9roaZv7kkT2jJfRmvbC=@&Wk3B!*u$wKw
z+>c7}Y+bDT0QOr&ruI>7txj0GRy!#T@}mJ@x{vJQU73~B(9=NU0OtGCj)jD*0{q&Q
zee=yfCHRZF5xE?eZj(kQB)SD2Rztqh?pQeg{2jv%m)m|0`5%@B)_IzpoGl<1dXFa^
zD@Ol14NBU`>Mq-%6tw05#e&x$B?;N6qS0jPo3dXYhy8OD)b*g#ktU<0yc_Ux{2Js4
z0GEo4?Bg#n7^N!^z>>le1PK3X@0XJ$sNDkhM{`!cOgUL$lov~?e}43D8=P@G{(rW(
z$lZapj^Z%7{@s#e;5fso@o_iR3+|}A{XbgVQuzC+oC@`FrpsS>d_92JKfz>mwziv=
zr?|MJ!L^&WfPOzRfNaB-ZT1xqI_-V%0|_jM+2<h~z#cyH$1KPGwO=1;de`iE@gel&
zPw5hdVjvyY<2PNpwb%NB`j$0JW+AfxA019YLe&*5MhlL)RS!H4%MlG+YYO=FJvzUC
zi4F)_jKse#;f3whj^xOdC2BY$cy)9&N$Gdp72+fp*PAVp<JtCZaDczTwTZCN<h0aF
z;F<Jbyn*Dmg@Yyjw(vjC^_iv)?!k4K*bZhSuZK=!U$+C*og}}m-tN?(YL;=+OsTOa
zg!(+N<u_LVz&~GnwdEyPH5f&MZ3=)5?SZqOR(U=550!zB+!-0Fj4Ir$luRG$SmZcs
z0Uqf?rWT|ITz;C!qj?glH4QOpXlZdkS-zQ-t6D*7^w>u|Zudq1wD+rd*;`~UqomSj
zJ`wGkL%uHLx&51~d7bZl@`T;otXw!3yuSH_ztk1#2mGY^?!7`(hhKlMjlT!t;T52K
zr$d{XWq@b2J089<%Bwk~CK=5VVFn^3Bg}0^Sl9W>_p1&8C;oL@;5$m?YF&vDKRT8k
zAmY~R0l+Pc8jg4mJ~D9q(er=<zNi;O0d{>GKpc3W?ng5y2Er)yce_1x_0ZzgC-1QV
zNwqhsGB|zZ#L$t0Jwnj^;0ygp==e}!IqeCon9l|uLR3pBUYrMWcr+(WCgy_E>Sp-A
zzq-uDWifsEHUv>g$esWxKcRL8-}`(!@yBr9Y}tvO1e*6?Wc+8H`Qn-|>D5=TKgYSh
z84!%cCP({$Wvs{IbrF>^6GuYQZLJ?ge64CNc`5at`auKTWTHv>O;JS0D#tX#ShCgR
zwETHm_?@%wE!n)Qa~T1E>m^bjf=>NvZtc?|)b{$yZIn_h9SPZ&6D4~LW|pBdg$2-F
z|80X@KHoRQMlM;l?eL$gJNJ9*)gw?~a_t_Z0*gC+oa8c$xD(=Xoo6^;+EJbCkzRFV
zGft>3PL2%qM2G?X&k7unJ%n{jtgdsvhu$fm8gfu}V=Lz1UA?tOO7l0K_C#`4zS_AB
zge5}W9D_gUS@c+t>7R>&)_7Y3Jm$57+Hao=?qGx)NqIcJ170;MQ$4n9{wu1XFfCb3
zf?J6P=;|ztV*HfVPhwO`;zg~^cOrs9fBo0KoL@!&i~5>b<E9UJHlOfQKpB#wUe!bL
z2xPdFGn~?ZEzwq9;0e4O90U~m>Oaj%zdKF=3XT6*<F_L4yu2Za&ZE%r8M#98s_2hO
zkp)wbSC<yC%DOvP)~-bh*2&{y60on@aCR=)ccyXa7iwAfJdU|K{KLOO>q(`ir>EC6
zq=u@^^itJ;r9_flau<@|H_X2bXD=#<Q>q&6Ex=!$^vd(2(V-rP$N#=fdOJ|6_CCwg
z4p~1iRs*1opXU^3z{;hRfDTa%F4v6pYpAn)#3!gh1tcF*hj&iD*bv4M-ak6j{;i%2
z&MOYA!wY`y;9-2v!BNt(Nfbk8@KOz&!SwJ%#@cjUj=8q+#C@$7$P3<5C&=ICuQ=6r
zj;%$Eehmo@KJi^t^~OI12WglAc+gVRfk36^DZ$o7t)-PAIj|jD3NOzd!YJF~baL=r
zq8ixyY1`c#Xt(}Xi4udr?!PeJRaQ{Fr<?q?U{yfe)>q=1O_`}*?8PsKz6h~%{`(tw
zBf;(mqXJ0}EDZ2(>FIfN>LIudPWUhY1$9OV_u2pbC`ibTD*=Q?W_6#1V*l^5Axtng
znXqzj`X!*$u-N>r^B=l!U^F9!AWz*e9X~h_xGvb^ZN*TB0~GjL8bF9^y_Yl~gZk%@
z`H+ERlC6d*xNaYszqSHP9xdBS1+f@<>>|J*<*Vlf{(WQMXiFH4c4{im2p>G`HK4zd
zv;`&YD>n#t_W}B&6{OaLV&6aC4qgKg-`(896ZZSR9o2<Q)kcCFlmNind5eNYE>_(A
zu>aFPzbpcbWM_Nl=)uE2gKB|P;bShw{fGOU26&g{*@s&p|9mItjqmb-JneX<wA(r8
zbv`AK&1FaV*B_YD$UX0)rJ}rQ|G}`pGLYb9|9foz(31Z>w*R%Z|FyRNb&>}W^T1dC
z|8tV?dYE+xp{v9+CQ<^M-W^lknU5?MnPuv18@#BZXcdgRw+wP@DK+=VApYwiV(0Z{
zUc68^i%4ut`xqiH2Tz*xzvpo%mfq(ONXW^gew{doM=}>dazbC@2xXKICb$J^1NT!M
zRsO^rqa||P%j@auAw3#|**QzD0pZP)BYq%d;tDXlZg|08T=#;%=p74kV^wLRUP@4n
zd=eQ+u^*malR|OuQ()?EL=t!$#27C5`oHz7N9vy}zH(?v><M*Y%KJ518KOcGwJ2#7
zeJ)O%vkzavtecpGvVe@jb@~@OsF5sL+Qy!O!WFy-3g-*!@y-V>1;EUsZnuTGX#WJt
z*JpgXhfekv?67rV%*bK6Y@qE(Gu|knG}bJpZ1I9TPhWZVWwkemqo?UvBYsEse{_|A
z93JU`XFe&W`xh|Qr*Rca_Za2Ulvqy`%gQ1t;7m%qv|4QuGZ$f|6q#B$dOm4#f=ifR
zMt)|7WYz9C3E3^irNYA0gft!Nt}aWS;iO6Hf&J4Hv<XeA6gQHVx3H)uZfgglR>Be!
z6TK~NzL63Gl|}lNEV-fmMIBcLvHiA{YV1CWIpiY&ki>@1*S}~7-b~h?VO2QSjO<*h
ziS!m|5nDPm5$jrUhh<lu-OP+a>8m_QN@JzuWS&_fP>KS)6@zEa(NEv&d)27c=C&FV
z6n1v{`V{?ZJrJx%i)K=9LMkBz12{Io`$PSOgFJ&?2}pwPO!MCuzs%mMR;6z8&Q^V(
zs^0Kqi->tyt;ecW3_onG><86;u3=T{?ddO;UF$T59FlZWs!}**@Of=?xiZ@x=Hm*g
zHf)A^e(w7Zy!aWQo;SVeVhjiBC=Iqq;q&V++@zO-DMuBj?j$49E3=zb=Yj|IKM=4k
zH&#j#n5TpRBI!Mr>N(-GptDSY?&-YA9diBA^S3!A4<b5}Z#Fx6OI1(<f#&eYRUQab
z6%yzZ&DaA7=K~ego>kj1{Z$+W5-U@0=ANsICusvbmm0Gz>f|QA|NMAgne1hb6jIZv
z$AOhK+X?<anuH<S;F}W3(UV6<H38IgwHBV;hg<=#p<L-v#){H`ZjwP&GqRT*2R{Mn
zo&z5R(qlf*C5b~TNnxWuYAikD2d972l{)?PAy^EI#h-f*N1`c7s385OD`C`rL{eSB
zFndglg7RAwsGlu&KkD4aZ16xR)2{CpAdU@JSifTG@k$J3HnHq0RkTKKq$T9ZGb<~v
z6rzuqER+brsMrF6Bh$wlmDtTpxSi%tC;9WLZ9hM5(i9#4UY_AJpW<t+Nwz`CRyLOe
zS=~RD4}VG4c=}c!uZ{ZGS61gj>Ls@tm>g%h{2W1sDYZj6PZ&!8_F(HrZN_?Ck^SA(
zhmBw2zerbrGBmv{&mGSLf$IQ)*Vq_z_!PqqSsJ=);&Bx{R&Oyi*+(~IjBe6AP+y)n
zC#+W*CsD*N<(*^ka@F?hlAE*0_}7#yH?`j@xqHQ@zK)peiE{5;z8}L++DM2U3wFr3
z_~$Nwa}*#8LcvZpXstzZ88sHGsP6StokP*dd^k3J%4o+2L4NR{M{-~>(v~zTR#BFQ
z9y)|L58W)}`q6fSQqYKh&K)3VlX(X<feJ=`NeK=PWwI1(XQOuk8ZwssGnMZ^Jt^Uz
zAkX5yr7~e*jTXqKi%ko<%sWBzNbfl_+315$j)w#EnrPux3$N}fD0YlT<!I|Z^zrlq
z|0fS=i6zf|?Fk+*4W(hXXnHDk($~dz%+Q*ebYF%_K;44&Hrz=gw$@`quYR{PkCf|W
z1?9I)P#z7pX5xklK>K+L*~v?ot)pF-;{K}Gps0+WLIx=(I#3T~K)Hh6Txjg2UQWrK
z1p$F|(h1=6zK0>qSqq*?i9rXWk|hf@TS0;ZRnsmN*)=p9q?b%d2zV7rOdA9_=7)&S
z!A+VkX}T}FCNZAmcDsFVDsrm3f9eUS?eLMP=tYS{Ms})d=Y$%RcL6V;JlCC3b7iPa
zb(p?zDf3K+CLfWYz=}9=1N6&Z%Yjs6x!1Du%y090Ss>N%Qn}x&>BCXq&#RMG<Mwi*
z&GsN5F7w_e)X()hO^N$aM7R!V)?X2?w)Z0?8<mEHX3jnfECam1KB#%UR#Vg?k|LG~
z6O*!!9dkq<sC#|5Ir}kYE>ur_C(p)>_xwFLy(bAjbDY3QM3Z7p`r?P;bLzJ4wz1I>
z@xBGkk3Tihd}(=3|4Am6zUha|LE7hC&3F6~#w2Za*uX^6zFWFO;Fp<pZ{0l5^G8(k
zn_J43H(0N`7Drz=s=aJNQvvE8a2pUjUPmQ={=9!8U!{OF?+WF+{Vdt2k+dKV$IWOu
zfIxi5bFqMF_j?O}7J`@g9-Qwfth>;o8&#l5^tcxr8Y>`NDUiPx#f;o8rot}!F7anW
z`K;5bs@rePKWz#=f(D76`0`>hO?>^MO3Ai^NkqiqJ`e-1ku&vVcKDsOS$8YBs9b9N
zrk%QWJKC7hrx#?EZ0iHBnf5b&T2>H*&-Zr6t{+{fB5b4^Z0Y8xIr>Fs*_*{C7uxT%
zAbHOLiCusJOR#KNd8I*YMpjzhSlKkzaBbF6P>^4A`oKW>?ITdZzuF5<?5n}2l{`)~
zuEoEPHiF__$G13yHBd58x8lm(H4{p=7~>%Ps`Z$gg96;Vu`~T^3Mj_JhooMBbhz3M
zYEY>0SeqX1#Sb8n<fIP@VDCj&pH9TA&D<S&;{Y~T59?~dJcg07%nRs&^2z<Rv4RLt
zcicO{Y5?@A4WIP%ucHcr>G75;@R*1$oTq7)P<M+Hu8}YWG4r_kr|n_h^ik}@`q!ke
z_dVl!HiiCu(r^~&@Lp+s1~3NNi!3-iO7t3*Vz1XK!n;$|joZ*Q@H&Ue+g5{1he2CU
z@srz}U<hxifwieH$#9nAmN)-By!dwsm_0k7hGa*+t3N2N05v*go-vr?--7ve>aK!(
zTVZ(^x3K7dMBPzPF;0fUuwYz)RP4Glfh1*bQV<}rB4|0?ATxiBKlRz`U^!3^h_cXm
z;c|{uPt3+m1%=C3?*9x4%fIa{^8(m}VzutAPxFk$=}s;$5=LdGntFbW`8h|Afg(2)
zYj}BN#rG{7RJ2NH9yA<VESqx?l<9u2rd(ng=-CJ@rKs9(?o`Hd!jW~EQ!xY?9e&1q
zHhNwF3%@BUs_r8{pI=Z}{g7U%$<$SA%&dsh4S@l69ez@!l0|M`k|)Q&fg(sQUoxr_
z5E3z^zT4c``t59v>h|X6O;0{ci6=mf=?0RgYJM*S;FR^u&1dPcdnpE1R=ajq%=Ur+
zC$PW>dpqIWtjKn+URC0%FcjGLb;Swj%A?8`si08-=?YXf^v<drD~nPpTy!rFPF%a8
ze52;j6$Yb^xzD5q!6qr52uYK~hH4RX@=cY55L5aOA&*x90-AqV=;zpdxdI0=NM3JS
zC4<Lh6`iT&y{Ub{Z~HkU5F0XVse9fXo5ijEil^9~L}7%JI++E9&L`kI(2g?(>jsXd
ztjVJdy!*=YUz`?6p>tD1j^&0e&MEl*(pTJNT%yWf&$hdxn7%pW=|{n}v)l(cbtr(+
z&w;pN{AY`hcWY(Ood}Y(94Z}{3@;p?st>=pufswxTfi!7BO@zeJG)ZYG~i-B@FlJf
zfA=gRm8+QNzf&JRy@8JYWFDHUj!G9|9mk)XM7T?bvj-i4x+tG^x)Eu6F&p!ix(&~i
zbll$swW}>S&i~g-+KMK(%*jFvC-36alE(cY0aQbz9h<^O7p#%WS%O4!AA^YCzzYHk
zi%IKw12KNJcM52KVlMj2Z4KY-vvzL3Fro`;YCVr1AJjtNmLT#ym)F~!Urm2d^rhLF
z=Oo`&=-Chud!aB%4`O|{I1-J|&p4+@aRNm8mC5Mf2Xyrv7Yl(4dTwLLvR|x)BG_G{
zv52W39sLDQ`g|I2f;B%ZsMel~)f)l$$`{@rSQ>^O#^7D5%XNsmdMJuP8|J2_bgxO_
z1=NZKx~IpglX22~aIj<Wl#Dx>K7idLk?&~_6y>%uus}O=<%<iUG>rA`!qY={P+K%i
z$o}H}lD7}p$zDQhTp`hxm>btj4U2TBJI=-R6SDHWE5IRy>b)xaTcQ_-oxK;;<7l+5
zz^XfWbMg?05ZHf7+uN8z(k)RV@)H`88@}AEC<Q27%Y4`#G`q1#FoQx5Jr6K~&+Lk&
z2Wu(;y@Be=h~GZH$WixLnR*yD^8~-=&9jh218|C#FtjTjQ;ea~Mr3E|P_VB*TYXA(
z0W9cYWDv#gq|1kl@$`>()nqAWcIvDwKh`_n?RKyyH%@HKtaj=xK%}QFR&}!}b6<12
z4of-mw5UirJ$1V5QPbf-lNG;n4;Rfsj@_a!D@}3^R?Oltt-J7nHz40pqyafK`<<!O
zO=hYJpVRJ!_&Dj&C9&9dZR=L4w#wo4&zI<%he=eB<(9E1oe+QVw4&Wfmv-BRD96v#
zlTCQh1~ynA6th;6gZJaSw^RwFBW%S4R9M<%QiyYNU>$45XU7&u+X2Km)$7z#2?AOA
zZUDfIhA$)?yef?mk12dkLku$GBe$IX6fpt5|5ZUrt9Bwq=EOAq<Zh`W8Y3c)WYu51
z^l&zwA*5_tgrMJ~&TGE$Y-6CVN_6W*!VS}9{A7|>&pWqaE9~wr-Ht4hxEH*^H`3DH
z(G-b8TqlzCW@>MmY=|Y+GR7XUL(3;Mgjo$4Tn=8j)AArx2tIO>pWy}7*`+?+rY9%5
z3)YTGr9MFGbSc^_$y>o_7AsVl#Ig2%&wfyqY>T$G#YcuAG$#^JPK}nch^UH|=uf@{
zEo+iZ*I>sWk&Gsu_$`uNNNtk%8_1tXnECY2&CW-&Ya6D|%b4~Zz!aJr9=Uf+FeP1H
zKZ1{4xB;y3%2}g#xeN`EpDA@p1xj*&by_cs%*q<62(BN7j}T9K=6+U~ig{F(P0Vks
zAaPIVp}|*|DxlnbZa5Z=ea1@@MLAHhV^5ZzwI`U~r8y;X{DG6}K=8v!9y_!fxMEpi
z<-M5yURz-C(=;mQ(?V_b%_0xn+BCTbD?6q<3aD5fJoNkM*_?M)-X~!1Xn0<Ie-E~^
z3L};ciWh`R&&4-!YQJ_^*P{Huu(<|+dOp-atovBe=Le|skF@8z%{g1^J^c`KS(sCg
zVsO>UkgWgwJe-e~Ovwz{u@je?fK{66tyI?ah`G+O!NRv}IK>IegSgOIy1wqevE3n<
zC(ZM<^SQY5C9`VPsF&VGeTrdG_MZyRRSKefYP-7*D|XLS5PQ~q3~M*)$6dZ4ZE-VL
z-kD16?Y)^Jl;*Y}f^jp^%UAD@NWY7CY1A>Z8a%81WaiB)#aeG3cbMlMGoLYo6S(>Y
z%6LHv#-@FKqoXcD=V%MH@NTZWxtO>$$G7CKJ8R)~F^L!1%^oy3J++SQ)<SFd{4h3s
z6tGpNdrJ`H$Q$`0OiW#BHZaphfy>Gc&Y{;i@b4KwQk!n^^^Pb?!6rN3G!h=Sn3d&#
zfq?2%aXriOn+ug;U1jB88nw1`UA+9;-%^9@WqBPRn(v?~z8W1P>3J*f4r+OI9Y2{h
zAY$gf)GcYea`D4f5tYp>Hd4^0JN6{qz!pE9m=w9>&96wE4|CmCAdI1LaRQEIZ<{6S
zs<2CYuedP_+8mf={+2k;>6$Xs+D$?ky1?8^#m$fAPq$I36QrYd^7?pxGxXHnt9ktk
z5^jmLh^JNih=Z2SCkC^Fp2d3gc=g&ls&u6CHs(RlM+>UtbcMzn{?<-!Z}m?tj6ThY
z=Vb4~U8SU6-BG@**)^#=d9Q0SV-u6=te50$V4pS|Goa}{z?=Bxco&f%5W-7{8FTk~
z7+O2%Wi}<e+OIm-7`A)H?}TaD-hfTeTZP0j4r^V9auGpWyTnVCdyi(kWkg!gg06)V
z^H^SIMU|bzr`;ZDr3S3}CcZt)2)xV5sUwuRepo@o-js0r+TM!fhy#hs@Rbke1~lPB
zzqeAk7*aegySqwKGJTR~Kz~?hYDp%9_~BznbV%A-&?8Zdz*)<VT7OXlWt32v0*ml1
zoesr?IcrT#%LjPr4Vqs^ll)kcqAws#E6s-rw4F?oVK|zpPJ81JLYncy4v(ly+BTwP
zfH%71-Mhw{^{9cKsA62}Ufo_d{yMhe{=K-H(#BO=0tEMtNgmU!qx?~_8#Eh@7U}|v
zjUDdUIm4+#F1!V}IN^lOE6dw51oyE>CvG8QVeC#{fob~Y3eCdYkqk+VKIP)Rx^9|<
zAlb0qI?^f|!|*Vk#e|)jDjU;sv}q;Yrklo7Zuh+1?p~fOc2pE~oPK0v1O#5F4<vmO
zgd=vB@0AUjyEw)LedCs!UB|2~5JnK{)-@ukw>)*aT^<)Cuz9?!lwtN4AgZKJjz9eE
znBhL;zLk_pBXTS&ax^FC0}$cHhNDqAh9MUta>lzJTrinB9L`)#Mk;0mI~3HhFx5-w
z)?L8to+9-2FMIv6#ag7}+c?ovm0gzev^V&A76o`|3giZ6vIab-8E=db&J&*{H3To$
zDu`C1)!nxllXyKl>}~K}??NV6AMmwQn8&PkH9ys~axrhgOFE8oRW78oZ>Fu6VjH+_
zgjc_o?Ct4$<L6BrCYd8&tdbNrH5}Bd;UXQ#rxWCTp0nb{HeW3EXdV$~F^h`$(7N<X
zH)N=Hby#n`M&D)3m|SVTq=szksjW`I(e~#Vyc;as(Q}un-C_4KeJLq(g+T;^BxuyS
zZ!T41+w7M5gus}Fw-=itJj3_VDEW?PS5*wM*d)+viEOs%lk!%RORrF2vRl-W`joEU
zx-0<SY#^(9lzJ@{Vsn5L2EfNx-o$s+?XN=dfsu-V^pq#)M<kmtPONjXyWFdvCF-V<
zlTuJM6|ad!EfLv6J<4U*B+O(MSBr}>@E<k`C$h88kXOiVPT~v@a}9eGN@@%hBL(D<
z^3}!BQUxbBub!p1EA@6u3HSEpB@Dh8GN;@mGQS=dKfnCN<rD9Fir`_}bG1x4=vwQ_
zDB{f{J%r_Jim>_3(unv(WCN%Va_r1g;~q{0k=W$qT#7WBDs~3W!p?4g<$&`E5Zg!)
zvcb2(MA>IzD0$H9V>|VJnhpBoC<<(``eGU1b=pX&x$L2ShvoAGFAG!d3NA(D`LqQZ
zw#BD61k-0{P!WObDpQ@FY^E2^z@UDwo${T-e=<a)yJR~E@JWF5yQWLHxG3ArCYtq$
z$=aWOQN?J*vsFSWX%c2MDa!3X`sB8w^PJTSm)kHmo5^Qa^+*oO6Rf(n<22K~=6DuR
zL{B-EVbbB9oF>GlJSX(}#Hhtqed#YPLT|Zo2$7W`JYY)vq1Se(am=FlfK*F?cGi%M
zDSb&Tr%Q_xh2O_>xAm)uIH`-a0RmqumMW9|8LRA3m7QXUmJ;OzB8_c9qW9Rg+}SeI
z(|7M_1#NLQ=<|Y9R2f@1W4xg6u016XF&9Chq}k?XYT>t-1+r4jojtGBsW0Oy3R<<n
z@_y_`bnENU8+53=RWqea&hLp2#+16B1jlSCpRtf7XTopACUFg{FRJ6;T`phYWdF(Z
zipg!T4Li`F+a8bA?awFdadihBEucf^6!&yHRdp7}HYt336#D#!m|djj5L1|CpDNaq
zc(EYyc4(SRyys9ye|phw*W@0@$d58P_eixn?{jnX#&oopY<IKb0F7`d7b0tc9PU01
zIO2SA!4`~Eccd=Xx?db4NL(E|%dlAaMTP7Z!xF3A5-#|a7IoTTz3OdIqh0YO8!b-r
ze(~-bL5oFxlct)ItI_L{TZR2|b4}ZBjyG&<T9{lH6)p(C{v%&r>I&s1hVmjDzMVBX
zEE$%`yQm$0R+JPLX*p218y(B&V`Dif`LQ}yE><lB(JF<QaI2$jd`qgkAfzbW{aR4D
zq^=@hZQvFarFs8w=EBr&Z(zY%QASffNyoTk!9x&bbnes$JNjI>Kyi#=i70ARS)J`M
zFE5a}2cJh?G&8$gS#tNxN6xg7%u;7z9?|;7_SdLck9e!f#-{N5pRc7vM!?I2=3Y2W
zFsL|HE};$Y`t!C=^Lk>DI^8sL>1J`o2v<GcOh=WQRa4u0++CH+p}SvhI<1*c?DRY#
zl;OXW)m+gt!sIqH_id?Rqdq0Xt9C28faozke<dkwO-UYSVWB!#RlmqM`BS0!t~RJ0
z3zds4fCA#R@aCQ5Jq2Y|HHEjHF)=@&PJ^4e0z}~f)fRo=Q1t7qqeT(1f>zhj*$dSK
zoT^&7ty0Mbwd65C&q7t#43yIG2&KJL_;Wzrz(eAsQ=?7_80-$xq<ide0kqQF2Z~<&
zOdGrW`>8yXwcUNE#`4Ec(KC|}8GRsDX<xAhanEhJFmLi50n1-Q9_c$=99^}Mp&TIH
zlSzW(-9uj=7DB8Y9ux@{JFmhl!GGw%&kEziK7fMRB^2y^C}Un*$=e5aE<8ytM1khi
z45_2USB2KfkgGfKPdBe&WxVdF!h69At?>1AaT=8onxCzXy=%Q3xStO9ulmSL3(LO&
zbP2#ya0@)>0Qi_go=8oom-xE;%FA)eUf3S#QEYQ%jCV}<Ny;glPfDeMKnrH@Oxth~
z3YBAakiy_^Pj4txQ;{9MB=yR}+xzhW{|AWmusl3^uNJP!^U!u|Sh9t;@do0{aMzsM
zKvQOKR7>>K&Ec)Coe#wk^5l(-KdSW71<Jj*nEG_hs<$I74O{#h)rXpy7AnSX4F{WI
z43ZdQIGHU%S?<nkZ;mfWByS^r1MRC9dcz1lz7((z;`1KsN4j{*2d?HgzI^V;+xD{D
zYs|5^b2)xE%2>j0S^7=C4GKjOS!^vdMuSoxin4XNDt%f()?vT8v5VTc^;4dSY!K9m
zNB)vyZmWBH9||km-SsbN7`-cTh$KTMs-obQrFnouQ~nWC?)>IvG%7+lImJ+`+o|aL
z)5f|<3YEFI9uXU%82nptgN;1D4y6>ALLE0=&H)Yhx3uq>^}2I*=%R3Db*w9cW1RKu
z6G39y2F$5mlwl<&oWTyi@hL$@fESZqFGoxVwSZ?5ideII_iOsh4p%mllN|=*SRS7M
z>GuGM04d8=Yod(p(u0>=s085EYqRKj+p@iO-bmib7CuBX!4|m=ZVfJIc233#t+zX`
zu2lY9UK#S(#e7lv8W&^|);j#ogXn!IO(uzMr~AF;TJXb@TIE@4<=G{jS9|)YZmb)9
zzv8hYZuaR}h@jQCy8_NF8hrTHHwp$%W1J$b>B(;Gih_Pvf#cyX{n`j2%;9d^drLfo
zTp10A@84?}?8tp6p~5@c-M0sk9}a^ux!bgO)Hj1uiYpRi?keAV65B;_UC61JoNVn`
z@d!nnK-*?tf~bnCWfXcns3Bxhs4`Z_X{JIwNm$$}#;pa3DzeRJO+IU*p%$>CRhD_o
zBGT?vgaqFJ870V0rG4{}ENWvkEr&}iV~w{QvdXPqs9_&iAc{pMy43yEzN;|yO=ZTk
zJ1Tqn)9DZQG)a9s9oJdYePm7kiwzmst!?DUa_Tx-2#pJ@Gs!CM84g8`rfA$GQtYyi
ziNGF$@g%w^zxRItJBZ%TJBLqqGO_P9-2$ljB9;#^HAV1<v5mQ0Iq;tDeW8TbbiZ>Y
z`X0JC%27gZ=2pSl;4irhj|pTtW=>l|TWRlArpdH>RmHH?3T~stwwCtBR7T8Jkr@87
zE|jTX!0^>IS}s`;qVYDa_%o~S{&AbZ#+-tpmCtBBaw0{r&giWl4<lDE%BeEg5nMiX
zd9<o+eN#^tV7<6`)ooU<1|-R8;|gZpuW?T6$6g16CR$)n;y#@TD9=?uwNsQSCSF*~
zcMYPTw>wPsK()F1DblA%tHW(i(veM5(>ALucEI*X@DKZ|R=4vx292FcVobEc{oK%q
zy1~FU+^45~Y77gK?e;}Y=XBHwTUDtp7bzW#$jJ&l)-!ZbWsV=JGLJDQXK&!^yR-(9
z{aa>q8n6oY-4|Vym#R@43Jq_5P_J!mRFlCvEAjWt;8G2Ki)XlRm3S_u_^bc&Z>DCO
z;8T1gCQ89C(x~FUB^nT%IQ~AC_X%i1Tjpd3)-f$yCtgfS;&OT)aU>BrXKo&h|Nh(w
z1n%gVB+%Uh38JBTM)Hxf3p-q;rS*}*U#qZMr3gGO5`Ct8RnNqK^IPCL9(1*!-oSs#
zA&p_rGPk3yw{xDbT4O}QJR*y2=Ay;F=n>!l{CHz>Af<OJ>US2o0d=2G?u^iae4`8x
zSg^<if>~2^_UF}>yc{7=otP+&#Hdg1F`M?i9ZFb5ujGCe&Ebt4R`-kX0foPV@*rRj
zGWKrnI*wah<HtJLQeZbQ3JNM4EGzufFdG;Q=ILasnYQ+sRldMqqvLD_dgxkLl~dQY
z@9=x+izyV*Y)0+z6x_zYZgmXHt2PZIS{EsB#n*)ehyBTQ8?`B;8hfQxD5bUAGmo8#
z%w2Lw%fDx3i>d5!x~%!>3@mfCE6RCeTdGE67#%@(mc_kwJ~D}}_w!XFyrWQTUq_Cj
zf=Y+a#t?J6=fJwACGn$5#`ad&<B+j(lO~b74B3Jh)+dy=p@!!rQuW{5zpJ2SW#?nU
zzOYLEsUiO^OQbhH9PS!>P)$j1%lulL&?Dkev$~a&$CxR@TtUXw8tk?!+eLA?Wq^xl
zG;`f#v+<l!60d>H=bet|)$<-})eH)I1O|!k5hO29n!c5avpDQ|HUF%%j}eLvR0Xm;
zQC=ENdPSvGdd<IHaTCvSMx9~d4>44GGG&{Sq5eB3Ev`}!RKI7c%nNYdLXO(kS-LU=
zrOPF!wM(EGJ5XiAqkf+-d)B~;I+C$H&GgNOK^0~zge_<-cM;vOUcaIZ^%GSQ(^T9R
z*eV%9Q`z$v-mxskeg;nSMxmxKt|2{;mi7}ySQmCc7v6F(BE^k2!(#W&LKQN?0MmFT
ziCbjj)jGabU`}ICag{K%`$e2E62V<He~aJ_mZItWF@gl74H9ccAy>-2A<bjO>wAWU
zCU_Ue_MUkT;okWjCK5IrE5DGDRXla=!BLQqtmhmP{o{|o4E27A%*tv(M42$0r0~<}
z@aF->zBjME0b6zMC2tGj(`O0OlWRE|Gc$<bs<o!(4rSyl+OtMw=i?eu-~ICzadV5Y
zcjlnD6<HPD&?LG(64$g%Ym6Rtpv2xtLWuQWc{j2HuR(r@3uMfN^$0;#a69mk6Oqov
zRBO(8Xl+d^qB`+DzJND1p|q6W>~~AC<kE{o%IBPbdFg61e!%O5gL@0fN;HnF!&*(Q
zU36h<)s~Wqcbh3md6XlfL{afHP3No4;O$Ctk!<lC)p8pR_fgKI0;LpmymCg<b(oG9
z^Lo3eZSWm`oKnR^T3BN+a>L1Fe$QowQ6>1^uHTzc70m`wt3v!bLL^(!i9=yeWxdqM
zsc5ckFq<yB?A{r#4jNr@SJ4S4Q#+%S;Ss4%yu{rwnjZkFbdX|AdS1j#Q*9E(bCU-L
zHd5*u-w~8at1Q-QOsO#$?#W99RZCY1vMrg6c_`21G@?n73?K?<I*;+J=i$G^&BYTQ
zkT8haOh;ID65kyy?%8<Hl*MSq+SbQHM%If71>M#C+~5%G+V9p!U%`BDVw4hVyIE*P
zc={7xjmek{Myv73BkLV&J(wcHSd3{coO=FTjmz7Vlb5DmMxCSTj-Vs)2%~?hPwU?L
zq?VP1Pa9d)KJ3u))zb49LfY|emI6<7qF~%LN?fnZCneVKmFuwJsd6RbPae_lGNo3F
z7W$pP3pmGHjL`^86n$UMi;7wA7ts{oRpECWa^$GS+-AtBY*%(}KTi*_b06jf{w9uq
z+nhkk+C?NcnvrSH50!E#hDjr`haZdZempwQZG%F)#m6z)IeWLOOI+|QFjIKKpAd`X
zV_v@|adLV03&wcCRG_LttsJ|jV)m(~Q-<@hld1|uV|`IuX2+C$W``M%wo%qV4|+|i
zI)~s{MYe=>N1u7}W97_~+-8Dv{VrnN>_dQ#;HN2<?4MT{bB9o+-gCU6M{j;Z(g4^C
zQcUTKwgRn;RoCK%mFgsarI>OzE@s&;$o1Rr9tU~&(_MX5Z~tLN*6tvfs27%hvxL(&
z*ih`V)lX6wY#t#BO+FmddBQ<o{D5hY-LXkNW%*4tF4w>BO@%j+W?O2E#AmU;a7D7;
zwI`;Y((ano?c|8qAu>{xNT!kWtqP+F(f&Rw3lc62AHvvXCru=1wa@}9CWn>coz&~G
z>8hQ}nL~?J7bYB4ulJ?V$g_Nx9yVwc#xVVi6!$%Ox2fL?>tFe5NHT`?)~3NYA2rO$
zwjwJ=5h=0x1C&bM^5P=od8755Z`?@5Hs%Vgn6Lh#JquHX2+H-<Cw{Y`!G*#weIp(D
zUBn?!zB<nLejMZvJ1JWmr}U~ELS}I*F%nrr6{$o?$I?03N+E;q=}mrqxhHvWgj>T=
zS4UdJHTxfnJZ6p(+SYfT+=w&1Kg(QWYjSk$NfikRiP_~P9YLda5lp#V*91Ok(#^T;
zYSXW!ahF4hA(B4NS6Nzzzwv}u&zjP&DdH`m<(#m{Da7NCf?kF3Rxf?VAG1fG@*9Il
zztiyM=LlJEmpFd<R>rZaGD)JY`P8sQBeY4cIBj%e!^Kch;XmZ}Ggk)c<F3V*IL;i#
z9np1J5bU@j(GfDNuX35YHMON>*-&c$>zVFlZ=$`Icrhu0{mdN}v*eC>Y=3&X264T7
zeOEn`o!OLiw(?1`Z`Q}ITI_a8I6K>Qx@c1b&isi+gWt*`fir@gJzt5LdSR|RGQgUH
zkDIH{gZ=TWSr$*!^)F^_$NW>QhVD9A|HQF|)^)a(AEO@$8TrfJr`LlawRYlH-x=Cw
ztzh;}e%R{n0o}9rvOY&wscxyOyEHX=B~u-{dvB&VnIkEPiK)C@XNF%X4!frJr9V=)
zQSHe>%r49%S&zN^YO>{m^Frw!lU!95jPe|n@aynuP<c(RuZt~gIE$Bz>nOoR^j+?w
zf6V|+do(dVm1Do=kV_A0lqUQH%%O{*R%vwlCjn`(s5hQW5qrOGIBrQiDeYDBeT5mN
zy3!9h6>M8dA&fWRpN5_`6hG1Ku(GurP~^S*(>Bc~_EroDNlt_lS>1LbPi&}d^5OZ2
z#i6K{*)?Kaqt-#a2VARNtT50VJ>}TtwtEtjMy2Q<$;LCimEIc|`0O<e<U$RN^kVQY
zyI7xl=8VrjNn&K=0)_aK(E>eJQ%vL{)+NkCllXX_mK#0@GjB{w>Fvp4><&>8>vC&y
zPkT~%g=IIXWdQn}W{ZR^#;(Zl!BniBM+<&eGaY=8r6_84x~+aICtF}L>vlJdl~o^%
z@B*z<-s#ST8xm<83Bk8lu9_5<qCi)nUD5p%4&o&`AxyNr_;W*|AA*NXxEC~ZVA=f9
zvGG3#w$wz~W#uPXi+%vC?_a^i{+r$a=1S>P4Ynekhw!51=5s`h=QGm<8qlhg_Bq9W
zKW}o)ZH0<gFv%tL>37?t;7m&Fo6p+}z4k+obZVBdS<{28mgCEHu5?>(q#B{(!>aOa
z@_mB9%Rt~;ubv$slEcBjBwz2c@WDq0)sx1MhR*Kq@CaNBvWghj%(xxfZ<<v(?vS)q
z(TOX6AG_1d<eSm-&V9Jq5fpCtyNJ7$Z>M?T)%8oYvf5n3oUS$HPo#{W0g{nKgR1FF
z`&^<u1M}2PK#0u6P;~dqhWJaSZ4)!E3l-}MuklR%=;N+h^KIo1I8G7<x@HExf#>#}
zAoz0nyiZa6?)K)6;(WOtNkPY=p{1{F!G71A%BL*E*5Y}Da9hWCTbT(4CopB?^)R`1
z5X<l6d2vzxj3*$u5o|%%jw)8DK>Vq#I?6FhZB-8W-^xL>mqse=d%)lescLWU^02!X
z>hRp`JKl#@Cw41~<@*wTClL{rgG7$f7v$-E2ESa&aNgdd7RF7qBtnFV8F$UW9$FHu
zm)`1lal2wciQPysI;<J{3^uaSfrQSDZc~^Nw!15Cjx8E$JiR2;Rk>AUG2aR!J)g%h
z0v8i0er*gGHui(A8h@@#co|dO-H@%O*msXm`VWSUj}JB3_Wc@6;{gWQkZiI)L7q<B
z{mi{+U^C2C`M82(_))*l5ucmKK{L~j>0SE1CS9z6&O53E!{~kW-32#Fm=7teu>l`w
zjGWkmAa6xpyM5JKvXxT5s-L3*KH_af)7v7!VSE%<dsY*w3^g}cnBaH6ez2pw<Dx~6
zo|Pt&z|)<yn8gXN7RhV(=t4}dYN9})?oBeLBdT}rjJY7mFgt1HbCQneJs!`cc?FZr
z!GyJ7h9ui&bb~49HY|Qm+?;FJ!j#rk0i9E2!_;ZnHlnxw@Kx&g+jq}6N2p<>U_3@b
zN-F;^2lm+|BOZCvtP6`nz-K1Ek;L>Pf2fe1Kfg5D^-jRuv88jZ>P2X*d1z2n%N6G;
zj%Rroz=}$>7&9ek8CT(*CQ!SV*RP3EetQN{I$ISw_lH-FN+48`pCsc+GM)b*XoGEp
z1OCZlg1c)N-I;Qupn2%o#$EXtiK)iylce`c<(T-B9h)3*-=%nmQ&@CAcgpr4KR(?X
z+?zjZsq0+aQd&g{6X_X1R%aH6&FkCd{BE782%9GR9`xw#ZHC0@E>FBbImH!NT670)
z3@C&Rv6-xA{#<m4_<D)5WEa`0n<p2d5?<{ch6qW?;xYP=PZyCCbU6mYK*Hc~+=mYk
zeO^(?0W!}4U@)R217vZ_h8HwVF-X&MQFi!=`bei%`p%bn9O+Uc-iP>O9omH3IduxW
zatA8yn?x4u8m~tra=Bbl)s@E486PgU8KeUgiT9EvZRer+YXA}3pjJ~-&H$t=oNj<X
zK|=Byub)d&5`UWS7H?}xwbX}|u#R2v@ME_s+ofotR}6Aj{zd$rki_pEN}p?3hv~SC
z;fEVFsPm@dYhu%eGW8}HC&P7MUe?21+xI;{Ss~asZl<5=1byq{&}+Tey6cB^E{NRt
z6-(Gr80G7S{Q?>?pq;j>B9S#ag$PPPcd05{8MQEt7|Vbuv8O*0{t`6+XYeUmy{%6A
zwu^S(3p3^$1`J-#FQCQ_>B-zL%0c~2aM_HLB{qKT9p_k8XbU}7${Bi>SED*hY${{8
zre1&5^Z?#F956;@A@ZXI*X;g~Io~-blkBTMJJsys(T5z_-MGXh&}G7P(d7crl4|Y^
z+1322UfkiW7j8_et8<A(C$b1zyuqXVT~#54g@hywJ|BhtiSv-R{XCk3Q4=vLE5t}!
zow}-~Ymha}9H}f-LprIiHnnxC1BHFMEw)88ef;4^>+=_rCblLq-B>SV&Yaey6bVW9
zmbOwQb!N;Vy%||Y<<7k~B-wV{y0C7>z3yRBoarue?jB1?Uw=kAnwW-4-R@%q(+PtS
zAvNMczKKVmdk}6~j{hA1czF*R0I<f?mO8rvKDxllO@@kQz;dNxKj4F=I6iqe>ZHw8
zu;%^T{T_>{D>Ppq)*q3wU$lNr2Z6hy4$}e~U8F%wj1_1qsMWtd1`I2Z(e5lgy?Lm2
zl~tFG;Up1zamL+~xUxgeJ&XT>!5tR~BYW^Ll>Y9|Tm~DD@iT5Ly9u7>X7A;KA@GJ1
zu8OqzS9~|FOD3E*+TV|>&>YSizX6ZVsw}#vsX|oOY!ORYd&3^-nnfk`PzGF{2NZxz
zG4F2*dg3q73>Wa5pBt>&T#B0~gD9ngR1a8>JgFRIf~w_CE&Es&(+UWSU`idh$ynWY
zWe0Au404ltuAnd0Rc4kGV^z<~csVN-{3YiK%!U+}$<&$IpE#r#jkr&ip##EOl0EzS
zL^p>;LxtPAeX3{@qvx<k6463#g=a%76P(b*%_%W+P0L>w(OZoV=&!)5bsvpfDEQ`0
z%q0EZu@d6=HLLlN@Y}M#Z8iyuv0BUe_Naw1J7>U6(7<fVd=T6I`0Ftz9gGdSr{&F?
z+kf}0L{+$$-P+xNntkAK1<L13SJe1b4SJNEu4z8x2F%b!GBK8r-BB$8kCN`@u;9?-
zpF)V7!Y@Xvvi<Ua3BUo7Ab*<1gNasP^k2c`@S(6Hn1A(0+tHt$`aW~gPm_Dj?1w=@
zm4!@3eJD2V<p#3q^HS6O?e8BGJF1Mkzw=v-ZP}XYY&eA>x<LMMS!ZU3QxPGegS)zi
zzEeTWj^Xcpx7Cf-LoaX7xmW&(bMAbopkwF5t!1r>4>~*VpwP0L{d5NfF@jp6`e-;d
zn+)%}ciggQryYJgPv`56ck;uB__;Jh3d=BfS@!!L@j1;1m`7trZsY$ZPH<R=KT(;m
zx0X6)iH&B^<ZHRYRtHqup67nv{9f|}nJ4R`#<b!4dp{8?2UJpUrH{S<W61vK%w0Q3
zwFT||*<aU8z-+n^!edUKG`Ie!+ob1Zr6`C{d2H&uu(4sgs#!H_)ueW4vV5oT#Hxxr
zO4t`+YkBQ5O<@#)Gm4-$Q9^t>7Sb{K^9&>QNvP<9hxOM@@{gof@1?}HVJVQH!$)YO
z;=V~}l+Gd*l7a7EW0D$pFm?j)&ubErIhxV$#c98u3Ha5I$L*MW5XPUV6Fv$$M_y#>
zyUVJY63aqzFAAXOARER<`da42GgoLT7OVSy`#_uX_qDlrmbJyQWtXn6^p3~M-4B>)
z56IVjX3w4K6VgD>+sG{^aW;o~bmzI~kHgbpqNpvauF4^PnQtYfDHedTcN-sj!cXcV
zbgjp&!0Ug-9e>O`C%dgE1C?Fm8RADh-Xts!2rbXTUV#A(`q%a(4CCs{sLSq6v;iU<
zh>td#5o#+A#ycdbEPx!ux7S)sr+q+GJ*@-@-crbRDBJp7cAg{q)Z;mCq?dBaz^R9v
zk6@;^NLv{Exze7#tl!(q)Y%@XG?Wd)T6br%3K#Xb-Mg(*{j^`GiTFlj_U!!G16q>G
zK50}7B6eFg+~@rhDd9JKLRVt??H3-Qd%A?LKV}tE2UK3|`c$zxH%O}MV6rD2y+7IW
zOIL0JbXHrRTQPD~x>oFuf+Rq=;SaSQt_rog2l6LnM<yLl-4wwBY8bZ_H?JVsd9K{K
zET{C!p^7EC{0T-=i^c_)!=?2z=F|_=pN0ZsB%IQE<=H=^NJX13+xx}@z`ndekxsx9
zJ&-J=@+XVcQz64^igmruL-^T+w8yG8m_LXuPPbB@hb}`XlY(f<EpH`LE0b&OZLOZf
zZ@zsOB5eJ3f0Y@~D*GKe&qB|G9|NnTOwe>8;;wg96t*`D1CqJs)5Sgr2;IK*DKB0|
zwE5^dvMauQg5xxthx2&xXWB4W`C^$i`Z5CTIN`PJdUDS^77C^RnP(YK^MIc`n5QbM
zXN5$IN{2$ZC*0Oc8IUljE2Y%VdrN8T)8(t=ShPWLx^mH&hv9zy^l{U})9hd0xPl=O
zwpcy?vV(~v@EH~)4+~TAl1rd?wdEkn#iI<UmW_oT4<7`vmq=MXlhbRK$k6uvV!>Wt
zxtKE9;lF0sbMu%diIpzKpHcs+N`_8HJQBh_w1sZhHqWer@L*i^CKdj-2bwR1bW-jq
z95X#tAf-3y(-90BEH_rBRRCFB^#1W?Fs^oj9CEmXZM}52UnT<9gXfm+b!R5TG<c3r
z9Ij}VC;Kmkj-Gd<oA!D0FkaP|i>-8CY(wn%*2b<|L*{k<{K&PWLbUt>GshwL&qm6C
zQ-P1TE_(P>((TF<i0gFa-i7wY0uz4hR~RAA;D6#KkEm6@SJjYM4u-he$4ch)6hIF-
zbL0>h^8yWq5H0=0&I&OwT2#ON!w2ZjVGbkD8?9}<iAA%P=un&*D6{2DT*~)7B(|_X
zLQ}jq(C~Ze?X)`OrEfo7A*Lf%FJSvX{NVO<l7~g6_=1*<M}5?yE?|s;W7r`fGwd0d
zK?w+lY0-lylO2?jWajMc>o%+oW~h#@`naV(2N*pzps8NwFZb4R$RJ+4fmLl6nb8I~
zOQ#v3x>0S6TO?qYJgP|6pz~P*L5FhKFZv*g-G)Z#`DDejto!pvuA?JnzE<ir2Nr00
z%#ee2GEgF4s^H=6%Uzh&*j<gZgq0g6Gdz>;A~gu-0Fo~QjqX3U(?Ai7l2++o(~VZ-
zhaYq_=YfNLLU|DadBH?9?_~gMdQ*?1rQmM?;Jtk;?DK&Svg3k!QhdYXP!n_rv?n%#
zsl7Hm!DxiVfydn=Pme>%pTv~6EW=+&N`UDpk#1;Q2HcQy)Gf1^9{=|;kMkD*fY(On
zR3wAmq_$#T^N$k>T$Jz;T{y_i?yxup-(f*zwo`}ebPB-FjA{YESz`VFvG>+tQGVUO
zFe#;UDJ=~G64Eh>h>C<DqLPBrFm%H(qJp%bbP56%A)SNLAR#R+-QD@_n-IUx`+LrL
zp7ZZHf9S<EGxy$Wt^HZG_uBUo=L&@OWrIDz#`M|DyN+6pp%-Kx!Nc`==q@i6eR{+1
z9CBEx?E^=Gn!=pDC>lBi>?e&8>3CgQB!fgZ=DgnnQ9S-ND|vE>@2oA9J!{WIB1+W1
zfZDdF8<zI%SHQ){TPGKbkjXhhtVV|5x=~&$0l{10vYU}=?A&IZS8q2mNM(Mn3xLHy
z_xMuJ$>$!*h*TA<6uPjP-_%VwxSi1U$}&&kYYIuc-ZPBWYLYdxBycYv20v&1*C#qQ
z>T*Zt;L#sv6-$;bypJZ7romWZ0~Mlw9Mj=q9sLI`k%2o9y3uzHAp3``1epgThK1(I
z-J}qJn|n56@3F8&?}<V$i~6kR`Bk^?BRD$?^reaw(FHeQdk*g{$$^C^$su1mj8l*I
zQV(sQ2NdND<|U0EBJLG*6!5&qZUGa~zK@a_;b@HFOmO;LWw_<}DsTn5W;Y8iH(<Tt
zE9~bN^i-eusk>WJ9cOJiD}#3BI-?H|GvnnL=uI9ce(>-wqz`o9%zqpI=!8KJdV9;+
zh|FTNAo*et$D3-DjdSpGN-2WNu-eY-?mgCVn83qpBSB)*8aD<??T57#Y{5=V+GLH9
z!mV3bn$D&#VgJ*M+m2xV0H6k)O!as#pM(s^O#e+tYN>4T!oGV(0@@6vn0%8k5<NBR
zISi|m6CZh#;DG|x?8E)w=|SfVji2`~!+whyadNU2c3lBCk(7b89Qlx&2E8Bh<bdGt
zuO;ZUyl#0kxrYqjgdFw7{&d3>&r+iO55VeoT73S60bRI?RSQgw7{lrYE=L&hq7nzu
zU$!S~OAWCzO}h*4lur#B8hUmc^P2L*fWO1UVv+dQsc`?iVDV74dM(h!Gg5ot>OKu`
zG<5uI@0%e6mv=8%x3j<9nKF3mzIaDRV4ZXr3&V?1@0sHTX{}FD;X3O5H1N8%X)XHl
zk5_FBU*b23s{w$x5OY=X9K9&cYvhOaKUNMbA9WLe;Ms}JiC>36*H?s&6Z3BVudeBV
zyPP&kN)vvy$?fe4TLnO9iFi&uJ>r<Q;?vXZU(NC#)jNKiN;+ryAX|xU?c7y@x+s2a
z>=o4D*5H$t>sl~ILMS+S3|`awPaJ`l^gwS>5jDH~@$gM?!7UJwuB~*QTw07Yse^8!
z<zcHf+Rz)6?eL6wOm}yubL7f0-T{(*{QdQxK;n-MT!Vb=6E4!DEk$B`u!`@L`s^|P
zqdS?^v$TmtuX*=D^jCADrGJBeSP@E@&G@H}=&gn5b(o2=Z=mV&XfL#M-ji7P(0|7O
zN-<@bg9Y>}4~!NDD!zQ2d5%O}g<-)N-#x<}P+5GIY-0Kz%OO%VIw$|fOPAOS@wBP@
zw)CmJC6daDrP2lg%3|xH!evht14G4MYv-`=y=T++@gX&ZIjP_h%MJNx4djX$4H8b2
zkH@%o4w%I@Z((-!xPBQNTj@V=L(CK-Bwm(HC3kPk8CB|#1-_c>%HYTR$&Dn(W*Ozw
zpYa792mX3N|LR@z86tO~#gxN#Uy7Uwj0vwF-}1%OIcOv3CBPCcZ6S@;apM%uctocu
zlE;Q}9=PygP<lh&6V{BieU6%V4~Hml-}PJ|Iy0fqRc~5aFG9M~QZ&8h3PN?P7C{|H
zBNf=SxNiyPp`JdcElP-MBRto<{jq;oLA{eeQ!;!E8#<j(W|$|St^<Q~*_7z-E&@<b
zGuR&XXPNfFdwz$*Bou>3inu4F4@V8YijL=e#>=qw?<v5z1{j?T0+g344!Z(t5pdwv
z+B+!*9tz+d!OhxFQZc9f9>5gfi#4jueHDZn&tc<H<UBqH?qqt*&LQETp9ah5`Lj_>
zpuGk3)8o02{&)`%wGYbA9(Ga%t;`r1yMA90JN#OOhmk2`-Rj0)KZl-c*Dc?c-BZjx
z>UCSh4P;(yGk?VVdGg?3qszuGj~b``kr?RevBzY9E~o{K3mVHk^VIV08a<*b*YkNv
zPsLHc(Noe?5MW`~L^_}jexN~eI(THhzA)&J@F)LoQU0q%QRJ{1OhN@=H}g!{Jelc)
zr@6r66J<X(aVrN(OfN>*^o-Vr)BY0{K<W-ane@W1^B%3q2Rshkn*opH4`GwAf!$fM
zY}&U9I&sW&T1ZWQMjUu7)e*(fRBZI-%g+^nSCJhe=mcrC@#S!Ogus5m=l2b-cytSk
zrc3WK6Qzk~NQ&wIm~`r`W4~WE8gcYcS`t`maedPxO&9Vi*WQpKSC%R+ke3zPpR5?^
z<1|`NJ16q5^lp(q$TC&zbDL<M5hzrUUZk>a@%e3UqQHDev1fT8&^QO7CHzCeYI9)9
zj(C|8u#^fo)Zg$FcQ8f@q=bhv;?kq#YeCx=Wae86hGLC2PA8P0QX$T?Wmq^;u{-#y
zPr}iPF`o#Gg7@40gKJfav>IM?2b`N%o`^%rft2O~ni6zoAm`9%3}W>6vzE`JZS8AC
z(EU?dX{j(}2Z%Z;=0u)DIkrG5lWtKWdpLyvPfM&e#w=m*R4@(Hbnq|wZ>lG-7h`qP
zF?Og-9X1!<&h#u~B1S_KxPI&U)q7wRX<9e6!#3b<1hexHeYG1C-@qHn{t|&F432AO
z1hKVxgC*yvpSCz)yQR=i<FHvAj2Fw{@cYq=qik3ImF>x<Bet&}v&{>!jX=8tUbO~#
z&GM+s9M4+*|C<$m_VCfk#+$~`hq9dI02q`f%Q&PCsfE}6Rl&0#-G;&@^r$cFAJ#t{
zKYH_u(BZ7;7>SJK-ba*;YUybl%4C88t?kH6{dtZP_h?8}+~>SU<_HHJ8=VdobF{pY
z__OAa97g$v$N!~?dn-lSQ|PN?8nV(uGmL!Z`3x-{^Ju+ru!?%1)pcjwOgXZXe<Z9*
z+WqTLK%BTmM_kZhkz?7RSs!)BUgl~!{JPdGr}3}Olh86J^JQiquDgfi>d~P10Mu@T
zM}#wwOcp@W*}gfX82S$+;wEz(jd_zFt>~z0)jy}aq*4eyxlC(f`!DhV?}#`QfDjv{
z3*?5-F|dJrq>q}oClKM0JK}NN*$QQl6nVLj4`+xf{ctF_zd&h%dvBgp&(Tw;a_tBy
zMU((ZxdDzxRP$ov7h{p{H^tf*@=h43{#lr#KVSyfT!(sUV36o|DA@$YawCWgcP%|l
zfdeC*eYGE3EAJkx))Qp8RYW~FxM5~KkoP{QAwnATgF8E!FMpO!RP@HV^YkMd5<*I1
zR&IBw9UiPU4BYcSHa8INkui`Hd<auaRVH|Vm~8tk;taYg0qik)T@`!+=53eN>&>%R
zni*ReZmJ@xQlRN-Pr79Rx-mV+z*)E=DQ&eGxfFOe^qsEEdvrzWi?V;U1~UVGtdKCH
zj)Viu!Esj<%m-@&#?-hdn3@>K$wgOhYrDg`Uri=(LRWiWCw2;SeoY}3wHdr?UA43j
zbXS(h*msE<>o1XR0WTkXKpoA53<ME^xUVSCXV?ffIhK(0nHvy0_pry)U8K|9m)DK^
zzjAhX*x!J@KeNEkkuJXUJwkH0wwkCK_YWcuUGkdup-Y~<SH4}L<Xi%@9@!3tOjb&l
z1p*LKN(lBx%)RQ>Z^+{bpm`pLM{Jx{PQSPA(;U0XB!_-3;91k5X*dMlD7d8{TQ*|m
zfMrSo0usLvGcZ?hAh14mF>BYr$S(=V^QLyZ<xvJko-gIUqu~naB&d8i;7fJ?-i#w8
zO%8E!%rK)P;L(OkmF!}R1rTL_iY+tvW*V}k=`j}oTw%8O=Dm45>2dD1k_Xev<FpBP
zNf?8RV82E7(#6(7K>VmX?LHHHG9H-S4IiwwkyfKGOd0F5%<A>#Qh>I!AVA)>sObyv
zLq(p;pT=Gl{GKX~a`8U{g2io&a79Uxlt5|Dy}-4<^cltrqPkIm&unrDHGoW)J82Nr
zt2bd+VL_XHP?P6zs_w9}OUr}%nk6~biYr8&xKMl9p`p^3HEZy_-b{Je$Jt|x1wlSo
z0fNifPq#?Y{6L6VblLPdpr;>F84Ga{pj(VI7z8>x7Y>9b!pzTha)80KhZ<7dF0m0x
zTw3$6|C=_Dfy<0?#~I2d3;^1uc|J-(NQSJj1Gfe=R47LNr6LhSUU!yI0}*2gibK0u
zsWq!hZ7wKgslPlz@E;IQW&x_`$xNZ;`6pGnZnMQpKYE`2qW*lB6v)5)`Cd(>#=!1U
z`%VYAkM&2fw@3kaGn}H%Azgs3rRArs1GZI)f$)32XhEpEgRiw*E;9U9aYj(g!3(tW
z-oRd`5fZYLo~a*LxJmS9AkdEa5rA2Gg_#YO%O$<N#G2<9Amz#jsI`l33IIQ>eOc~3
zzh??80xONz70|^=m5RCr9#mk_GoiMi;r;he3J_w4O@y(gdB9Ku?|L9)%>najnr{QO
zOc&s^`j$}^Q)f*B8thKt^;tKCx6a&A{(A^jFa&RfsVV>`7~&Y5jnEJ&Hjo6qaxyYC
z8}|7}!J<HlAe6f%cM9@&utLk{HL@?NC_`~?dpjj~z!dmgmEyPDK(T^vffRwQ!mtHP
zl_EGewf>9XsYDCOfkYcJqsWm(0N82Vsnw7~vw=jTK4<|zAkFb_)@Gj<Nn#65@q8|+
zXyJaEHq@qq^>nN5_>9}G2FRDXk_(7J_5cyKTaE#N;XY9X2~b_;c_Cm_SVlkC%p67)
zU;-eXQ}Cxl0IUDN4*~2F0GJ^c6$G$oz^8e2V;WvEU|m^FQ}<L{%bXx1h_}ANjj;yE
zS5a2907NA?0OyjcSqQa=jD#`?0rNA8ppi75^T)pbSxG)YN@8OQ5p@M5NNJJvFQ9dY
z_>8s|G{rChthcpyg5Ju<Q~#y>Qcy;w23{5plwTWY?A-ly(Af{h2KbCT8-0}wG)TS{
z$Ccl7$Sjxu0Pg=S@&6S|Ed5=4%!jC2mtIsd^2hjt?eG0dYhht-cRtf(>-{{Jqur;!
z_m~Pczy{F52VD6i>w`uB_k@R7ETfI2ui^q^Ngu5n+|5htdi}gaC#2^zR&8;F`~}l`
zg?{y$hLPv!7PcnZg510wyT2vD;I@Z@4}igs(k@sAE*PBRegHJMGc-7v-+a(@(nopF
z;DcarkFZClp+<|w;o!>^!+u8E^r1MpjZgPJy6SKD{c?_YATnP5j>fpSq-wi@_mvhD
zB<PR;r^5aD0toA1E4VjnquD9@8D6pEnAf~Bzl&nVbKbj@dm8g5WI#?+c66+7jN>bZ
zX8S@d*aJBH0kR(qlqvBj9UACplc9%DHtc!Wtp{&-rX5+BGUDHdo$Ao4Ixuj~J|!{5
zv~rYB{kG{IBGQh2kSPJBXz~rYkOn6J4feX)`?xlwMF7w5tK427%jjBmJL#z+mjNrw
zMD#k`Haw~JkYZprkAC0)`rDMx8yAA2WQ^kt35l~0NguI2{$GjBX5NPUAw=<$y~HEA
zmd^wEchm87LAJ~b*s`-{EWDW%t~Ib+s;69&2np_LR#iB*D}b);kH8qkUiWCWw*EQE
zY+!6tm(q1W?wBJ<Gb2&xHW`d({q0+lzRL1ILq=1O#QiU`qaS@*?e{`w?z4B5mW<fT
zhDr}gZC8puM*Yre_LK^7$g3<0FdHV~j`!Ep;GN3p_u;jfM<$KD%VMutx~1v0vp^Cp
zg1Vq^Uz$S3)S2zR{m<5j$EnrDgx&1J0pTOa_oyHvg09?r+aJ;v20bOtvX>s_GJ539
z*75do3d`u%7KqN2FY!N)$JCFP@~-rJGXKIlr{t>;y=5ewtqz|~;mSeHtQ1p<e-v@e
zY&KjV+^17<#-OU`8jUiGh55&VLIOWu?u)P5-~5EXV&0&QC@JEPGl?W4QqR3>pA~w&
zeA_Ds9Z2N@Gw=ue^HBBxGX*l_O`{3+r@C>GX+e^nbh$~p)kXbUTv(3BDMCgyfG6t8
zq7&R6vF@+rpQAE=r7OAGvDx&JE+c+_yt!s;hl+lHYCo*TUw2Rb2VCOA_J&$2f-_~V
ze_eIvqwDZ+VK(;w!-Y0>_e)I-&af&oIzo{Qe+KFGgW<p~E(TAk^ba1mW!qH`ttVbG
z4<i_yoz70SRIayu`82XFk0Q%=Xl?T646niKh4+vT79T`CaNMjJS<aI43JmxX5Sb14
z*VLI3jq@Sdi6uF(+U*@qV|pR*D*Yf%)6G?DuTM~0mpEx;x{cRYZKMBFgW3JhZjAdT
z1734gcpa28WD`^BO<u!f><G32!4k>zHNGbQDP^f&Pj?1Xh=;&i{?L#&pzPpHi3jBN
zL%`;k?WA4k(syc>(OCIw*9Hm|iZZxxZ+2<IPm#CGp||&#{citGtaa~H>RbAc`Iq)R
z+_no@=`5+Ky6)_K66M<Jbm<)obJAPSU23GG4^j4^X)3%-Xo@nmZ}_npo$5!F=v|$v
zyt5-}HmHC1YSx#geO;=289VL1N9qwOd&DK##SU&3_I-8-=d3qq-Y(qBU#Wi?kTn>b
z&QO`(UntB;yLo>%`D1L-Nc4o8sPh}$-od`Dt{M#;m%>m#vR=+t7OCpzI>PxL+S$4}
zm?$jkuhEKAVrgBT^4+YheS-6Rc(C)W^`4hVwY&NVU)j{bJD^JMo*zIWfVTeZO4q<H
zBuGeDMzw=e!~ChX!-ExSi#KV7>l#Rx+3=n}K8;puGa)s^hCkU|d807WJ&ZZkMISU3
zv|F-mgem@6jr@^j*6ezL`Qx?x0eSyTSfA)t!Fp3(W$CS-<@vpSXPRgc54FVdN(9Tt
zJFAukmHVk2Q6Z8;^rE~e${+;@=tfDl&{f|BB5`{x5cW2xrk}?zlr=DEWKUkvcklKK
zg1WpNGsCK?AQ>&|Ev24^SNP_2*3Bz*<ZE`Sm3=X}dVZCxBR5+Nh{Ae*t@v*?=PL(%
z>(%{5uAmdcfHIAwA`mwB`GzT9nZw-t%H*vClX(PH8^iXkTr-;m?9lYv^aC2?EG!Z<
zeZ`Aqn{(VW2CE(;BQeZMudKa#eL3nSc<(hQer43F&kC;|Gq@2}6G@KQ_l6wv9+lji
zL5F*kAk@mU0#+R<1m$)gzVLylMhFJGHbCJbUgwnPh*$W$<dgE_>=Irkc-T#9oKtf<
z3+#Wl^X!28F2z!vtnVO)E{#az_Wi!nT(@RUdF>1F5+%b-w!go0Vp~ta=gkMdm(BI8
zgg8jwH#b@tj<6mi>OtI3sK}oZx#Yu5UnCgzwz%74b^cX&6}vo@-x*<6Z0v(aTpW{|
zUpDhJyQ=uc`^X2Ko!txHBjLUXnVr(R=B)bmS~4>)3o?Y_r@g1D91NSvIJX{p);lQq
z(=<t=a(b^`mk&=|dUcB-utFChTvojJ?Pfi$!)CGZvbyzepLOp&&F~r#!##P)d(P?t
zozbCL^BQgzD_=LO-3Pyvu{p!*Nf-heLgQ~l9IUSKC%w;XfUVK`Vxy<}?>V_yx>YGN
zaGc?&?_5Q#c}GQPK{70YB2I}9X8=lDw18<#ANjchgb2rTzFAwmPb^#~@jqh|2R@m(
zG90GH_Les)-W)EIlvBEwu-QJPQI%6FVY!Cl_1GM;x2~C~>b+6zpUoRU)`Q6N*sG7P
zT6IPZ?vF?Oq^hzf3o=Drc5XSSy|Ogd<-4K2J1DbNhx{-WPx~N367AsoI?m7wvyTkV
z<UjjG25C{{+qEjyV7#23+ctwwJZIh)H>4H&C{#Y}aGTH3`SSSClL2<}iBf(`#9~iD
z?x^}^NcH==biA=^e!pxpUYXsunEqP2Ow(cOG*%V4gwPS^O6Q(y3fB5So$y0_<n@~O
zg+wh#KgA(|2&Rn#Ti#+0352<|7YM`%&-v=rYdR{%<1%>8g7P)pr?&oyEZA;H9~R;*
zlU~cv*V>`nn$c+VowDuC|Fy6fT=w<-3j(-5-zCjo>#f20HHbK8P?NJwl0D(U>|D^l
z9<cM#Vo5}XN~6zlhOihj=Su6+)s5!ikklSud|+PgQPSQEG}*Bh2-6J7I%|PQGL50b
zCvfOdTFyqxXOSULF`p=WQl>#QQ7oGpTcQFQCMSCi_xNJ?63S3z+CTgevDUv%M<H(V
zY5KisYIhO;qn!oyuNr4nUZ}6U0w6d_u8P1R%W=-t;s$t*tx9$bUAopxy8P_f^OA&?
z9|+QA!@$6-zjCgZz(8r&OuY*YotyKf%FpKm9bm*S{*uzO>77T9*3~55$fqZ1>&gEH
z*WQ6??RI<h(q!xl@6~TsXINgca7PRzkEUYXphSc)7P`%Zb@$Z;3)j%|7nE`&E;?9q
z@8&6dVtA&3>PpN)rm|@+p+4nMAk0*UtgN%j6AiAGe{>BQ_Wnh8!B}Q4^F3lFDmk{M
zmw=UPo?85gR*d6frKln5HNV?p@DswhV$Rh;K|<<2%bs7`vdf_u3?}(~yFE$Pb<8M#
zUk0AE$;6SzxpHg8njx{cWsh>nuCDDg6@mP|<*k1gq!iF8mrIw%4DeLO1)k5{CYUB0
zpOmy@Lvp!w6}UFEHX$IM6ucM6zwGyCNIc%@E}(ARdSTXVq&LIdmy_&(mzSaRVExQ}
zzC91O{f@Sg>S5u{y5>c9i%vvkOxpfKWapJziRB{}FEC!v$k_Kx81$6UA#C)z3``a2
zJ9V{O9_a27yQN~I^9$@d*T1)(^~{sLe`znH!2D<S9NoO3gj%RWk01HR-dj;KGQ8>1
zTYJ{i`xI4#+De~BwktA6*(rG!R@o_w%-^lva3*~5-FL37FN&7DrqJ9_D{rx`wS&-<
z3|QCb&`$u}DsYg<u2FVC9qps;z^;|8c&-`>=uAEYS`ZveMIN=Kd~M*zPk!N(v=klV
z7cqERHfB4X`apVZS2SU-m7*cUdy*i$rUPCqphVZVK3rj2MyreXvfR6&Is98pHy{Hg
z$z&-y@m(}+Z(vJVmqGB64zIoV-sq>1-QQlfC%8K=1=?E#WhrFXOHvbO)Knk}nCG1=
z)IhzX_s|O}2OVN7JGYe>qMFHd30Ktzmzg;)i6)k2Cb*;`f8P4}jrILIul02OmGOWq
zkG2^L3C3AFZ_hw%^g1Q%m7?ws3EfUp2ZWRvyndafHI?WT#oRw)9o^lYJ{3FjUX#ua
zr1yym7vNx76EuLUS>?*8h7jR|j<?0D-{N;{6&`C~qXR`zWj<gT4QTHYIdwN~xL_-T
zHLxy!SGoA(uHt^DGyh&9>(ZCxn|i3Zd@95lJ!AFP<<rSlLxS8&KAK8m>7}8$)@`5R
zRsApEpYspY=Tr(zuHHcmHC@QB=F3yrL{-Qx##*i+O#5usi}j6n=9+nm#L{(oT0Qb4
z=1MrXrjQ$99xe%AV>xSdD8qv|!<1RD@y#ZxMB+;%#!GZA>D?@viSLuibwbpvd5@;j
zayxMNANe|e^|_?JEd<^8;_#1x<@ZU$)pb?W<nuZ-GH#2Sz>G`4>x!R(q~|FCbb5AE
z4Qw?;^=yN@4F;+!MvJd4fNG;donU0*;}BYje_j%qWMF<8-F;;Ovdj~Wy}UlcZ?GG&
z?x#`1N4Y09Ah_Q>H}Mu_t-E%4Hy4}VwtrIeAUH3c!l#Qq0K_|Ar;!KFq3OOs0ezp^
z=hw0=eRjC;&zRC^ugNZUUdaxLXLTxQ(}Y5xj*6uh%7fIp#t(maSa>^hvdO>~yS-xb
z1(&_7N0RflsCd)NQ>P#Ar%Vj{;#dYerPDnB;Gs%O-L~xT@@xF?XwvZdYrcVvZ<{|&
zsPyst?yqZ>aQnJ9L6@gnZ1Q+_1XIR$IEeMlf@6Cm(CnsrC6KEafX<V4s$HOcBv}yF
z6^}1``47ZUEjkzJmc2hW2Jh4u==i$1votjkmQ$KDs9R}~8rL_Ka-a|bA3@};TI}XE
zd_s`&>({Le1~u<zm43-nFx|}GW^(%daw5bbeIPNGP&eI2ami0U{nbLr{n>Zx4$|)1
z>eihDt~rAbeks}0%xLUi`Za&BQAK$BfI({8YYD+lNr3O5g%DjyQy8hQkPl1G5a2C+
zBuY(56@bvJj5n(K!k01Vv0s(V8&o%k`mS;bmqW{OEi%03gKWJ>hVB*al;*h-t9Nd1
zlR%j?&f!^+&<y|wgT6Iz_=9W*aJZtfq52;f3bUAx2tvIb?HBOnjSM$x9VdG&H}`4X
zssi7^&x0`~;*51!aLAY2ds|FP=%6?aW%j%ZQr;H?AQBt%P>HUAeguRvQh`$_q5ZWf
zZ|=O73=iDFPTlJbUtNc735>!WSe!OC6-Gi08i;-w$o@_x@=$d_jVKe5?^u}J>Txc5
z7i$peP;J+*)Io@zC0^!uaBeA7#P^F_jM)0S0-N2tV^rb~5k7=66z6X(eV^TW)u8Y+
zoWG*Uhg&J;!bphs!Hn)5e4;oma{7CkZwN3#@<W8-H$BFGC-}xu@s@~{Wq$56tkNXp
z20PgI^hBXuIbYyPR4Y3vpp23UlqJZO=7%g@8w437J_gHZt{ZP#@r`S7ak+7)vBju5
z$Rp=oOWE!|wI1un%p1%U<2*yH;xvgm^6e42KYz%v>rzk=!gtPl4p(d$YZHg>k2m>x
zZ;sI@QSWrsHIw*rp@M01^U?#2G*HCc!WMz<I7C5N6*p?GdiA2#%j~UpM?N#$Gj{~O
zrQ~Dcml^%KsNAfsvZUdJt5xvTd~JT$0g>UTw=duwR0klf98ZqT)y@$VF)>mvjJ=(j
z7uHp^`_xaru@jwtyByEDJ$T)jym;<2Bct;|$w-Dz5ZzbhsgK{kjaNRcdwDLaIoPY7
zzHTOi1sgql_9G)>q2;6xh$HJl@fC9qEc`*7N0a}?;TA{P{K0KtZ{A)Agz~32kUy<{
zUV{SGmtdR6%pl{Az)Yk+l}mW=LV+yon;aCG1%k-Tw(=Xtsq~&a1d*BLb@;*ukW(7n
z+oOfeMBxk%*D!oGeez?{Z@B2y+d<Eu2U)AA;jePq2l{*1WPE->{+8UrX{MjELz5YY
ze3KdV9!`}$=4bxJcJO@IcD*q=#Pr4Rt*Lh(y(k(CtDh3Ye|GsYl0PF+@@vYZ;cM?m
z8$tZk;=ttQ1ZQ|<7N&Sf-><24ZOWn^smD*gHXg8tSnPiyIPYL?s30l1(7UwumX95-
zu6b{cxW!{6vQ7z4<No}cOlRvK1q(Rpa&!{wKl637K=t|vd>uN#0(v$wy9S-f+=KK?
zU_)O(hZ_03Bzx{G>*y5^ao0ToJm(CunLnHIp0Ihap*E}J6AEuZ@oc$oe;achZ$?QQ
zmfUk9)?VsDTywLXe!*X~s=8dhlgNS^P;p6Y^GcF06WpJVsN*jxAcNI>%CqzjyW%%I
z(cI))tjmpHmf0F`b=zJ=1!b>Wx?1g*&zcP*)?+Aj#pg#w6GmjW8qEyWZ5^wwG=$li
zONnI+Fb%z>GO9i>5xXqy*m~Ytg?&!4WHNozMZsu}MRARRE<Sb_DQd8}FR|KI^w`=B
zG0!(rP#0c(UKSsoq2O_UsOV!n1;?O}5U=>U*HRh3!MkUrdviQlE_2@tY`-aw%%8hO
zQn`*Y^;>R2pM%2>;3{s@jq$HccBuT=?$;bT4g4y+eQ^p9)N%SzK`wj-3hH7XKu5sF
zpFs?F|6o9|njk4S*pZR|&)JB}1jWXrtf_@KbzsZvV0&W2KwN*QB`-SfbC9~W^mTf2
z<}-wS9{trKo$_NNJKAfac0-vFnH%4F7ZC0<G+FZj8Y6EzbC+gkB+TBIqIlpe23*p#
zLDbnB1)`>lWm!fCqig5*s$#mt$@%V`ODSSZSngdb?oyIVs?$>9Y<z0)`BA>mI7)|B
z*ZPNq?WMdc9DxI_=CtBZGP(u%AFkb4ZbP5B?=Uq;ne^Shs?2xp%>hGHW!7Q^Ax)@g
z`hq~<*v!r{NNmbz-EG-n39kXq7d~XbLAaL8$jCG(H9DXKczz9dCOhQ06!5I@Nain|
zxxwxvDyx4l(q5Z5bH}2PSs6OwAy>3zf-x$9;l7gd7(jbsA^?p2u!cDv(&fIFdER89
z!5hRabEgC0K3~IOc=i=|&aW?${=Hh$d>=@Ty<HnEbom@Z*z=O#OqbD4W6MbBz<7(e
z(;7Oa@rnGD0yd$!V%TIoVJ|`H!4r-LFCq6c53ECRQdpNO%cygJx$*=n)53>@9kApl
zhq0OaLxL)l)RclvMUqO??d$d1>Km1-h1m^oiRo-G^tSn=VhkGc49EhFt<db0!I%S-
z!ND7OR$)Ei!A6{qOaj4PUrJutsg)UpPMxGjdP*Oj^Hq*rkBrEJYs!^Rhea-lD9ijR
zP3e2f4J=t9erg@CWK1BaK93)k2yKT;fK+QfZETGm&sm4Lx6S!htt;20$0^Ieb8Ma^
zX3T^hFD6}<27bc@YzxB{3QR%kK@3G^MkaWa3N<b=1)QgeSQwxE>s-qaJp6?1-kIA8
zj{#Q~Ze$pM&D{cEMy2=BFS~;p7Cvy0hwyI<hAD%{MT){s=1<&;4jynjgG=1~7D{69
zoS~YRQfLR%Q7adcaS92TO_Ag5b66WVnTi$`Is<~C<EI$~!NUS%T$rpamjTu1lDhbz
zItM^B!vR_Z;9!d?ICw&)+VEyVD&Rg2zv!@{=2)0BMADd8xU=B(a~0{&OAciZZSYH^
zKY~!!25s=Ok)OGiU;;>1q`823TIdmc9?TYr_ZCTN43#y${5cZ=ij_{Qc96TE*l>lx
zK#-+H4IITOWA}s6PdJ9+81T0PD^PKbYXeXv!UA+^L8tKrS|$^KZbdSDOs19`Kyu2t
z0OVhJus@jX$Mbp^p3ohDf{ID|JDxBGC@!p#K}%8ggzW=Tw}P_HlTLmBb|&@NJXE)I
zJTcf_ZU%oBgKRUCn`r@5gC#fuEUyNBx(^vCA!s%ztu%fFNN#&sU4DwWCpW-shS#1Z
zU|j%ZiHVO_#lazS5CHAu2q+L@hcO;tFcfWk%5v@v+f{Bqi$^>eR_^KHT4~WHJ^017
zA2`wz=FyOU_9-VJ7L2%bpkrfkpx&+4o#5>nU<Ru?%t0Rw;V<w92hco)e-5+9>61Yt
z>OUN{tb)~#lD>ZCW<nx_y7~;;e?{G5RZSU9^Jnd_gI7`DK)IhZBJ&_(vp!m8;QxTE
zhIg(8<E`=+I#D1>Ft$Xl)Wp%Z)hL_IU%l{mIhrCL5Yd$E6HlxQ(5ZIft~fA<{}k3q
zJ;EPhg)478xI^pkAb;K-ymR8zl=)&Pqjpm_TVoa|l=mQnasl9}(<*_b3H}Jw>s}!!
zR6#?oV&}1H>+JU;{KAFPZ=r0ZNEut&59@5w5i^4~P$~59zx^e+U~DkTL!S_SQey~E
z)de$<g3AG0A%}MWaKTuEk^LynhbFF!yGBsx3I<jYv(>LkTZ8Gz&?4JUuBW&F*1`)6
zKzFkQtRcAE`mF|9=>Q4<$Onj0Xe0`xMQ>hJM>ZTP)rq@}5NCoVY+(oXIo{K<oo4-+
z5x<8XCG+UUX%Pmf*63vTO2VGR0*>C-ypPWOkxfvA!u+s05Y4C(RQ<C=6y(AFDBrxk
zzweF@8nT~^x}+vyGrUcjB<Ur6rmIL1xO8<Y$6~NkkV(J@C!3T7qi?HZD!v7V1u79~
z|IIH7e%G#{H~(>B#7w!5QZvuu1H9r9GYl9P*VSHT5JY(EFZ(bH3L0VpyKpirqb5Wr
z1z!?t3q-Mtta>z9wn->-oG&bd%FrSyI9SHIq@9anF$8F?VzRfmBd<N(S7+BrqfXd)
zJ`Y0lld%$Rfc3a?t<WDv2%Se>PD{D&2}=PiKM{931FiZz9(mqE@%#sdnw1RR1s%-!
zi!er8j2DBm#lxE$JCUA0<eEHBz0MQpG|0igXcVgmxYWd>N@LgpbnGgn$ph*A2kbnH
zUP_dXG~c||t_oCUqZZUL1jsKd|K@rwh=|t1u*9G}87c(Yps`{9OOjYcP-;zMY{>*l
zuxE&ls-s(sAUhJN63qdADGthaN_JNp6h@Y0WN7?!oSDMl56ET)jRP8c^XxplKs}`K
zBP2SggG$82sYzq1Fxd6*uI9uE48p4*BzTIZNF(r<r3FLd&k!}2?50MnOvr(7fPU>-
zChNPxz^}*ESH!i6K;*P%I^G<@5~hKnyR*S?uXL>twPoB<NOlT>BdvltVn4dSD`pw#
z+`QgP5ZzAavRJ!039eFG+8!5VV@)#x??dPlb!2HC0-q54_U8G2NC6zT#+4KBeeqv7
z7!7}q3=-Qc-<)(_;EI(vHczd<C<m7n(jTr0tOCeK$X}=CRIwpq88<KxF4l6p6WS=Q
z#+6K2LSMgTsZ_i9V_e+S1%7OM+~o);=g0tBFT2oz<@<vhfQ&wZOWOOYyNjtCVdG*B
z?N^sxZ*byrAfcK$fUa}I;2|_SZQxhHZ~r<a`)dr~Gs1F8$n*C<YY|_zT>WPK(=~Mr
zF>H9Gl2H!;5o9<uEl1KV1)yx#yyyB)Mm%A6^_B?usu6o`_m_kSWmbbX7j^IO{MW+J
z%9FI*smf4Tk<|Z@w%Ou3a97;%n9^iEP+I5?88(QMm(Y11bt#mr{mscdcARb}>A{}g
z&g~V+<;<T;r~#?>|E)YF^H*PN{*>AXA9r5umL2)-7_0qXQ=wgS$r3ezY?Z7Dk`Ur`
zn)vnJ77G3Wv7jyvcsh|Ts3H$!1K|DFo`=!H-ztVXs-yQa<f(NHUjsIJ4Xrerv{lo?
z!uWi=BjybuyY*)$RK*CGZTmAFwEq|Z?5C1GDA-h9l0ms-+Ih^9cvtBvxw=mELFdbW
zkl->f@oM97VcrEc0Qf_v{ui{+F$$@i#)A|_YBu&$gqrc>0|Pdc-8KK~A-1<z`E5Jl
z3M(;AqXnXfX-$QRqw-tGZGjUtc)I){Ng#s5Mn8(+{zg}AY5B8>uu5eQZC+f_`7~?m
z0SR)fQRzjtLwqWN+ZPERDh#X+A4w<!!kwP^06f;Au>aWCON;H<2>;@F*MimWOY#i#
z6G~#)|1B<l=&sgmPVJ37^CYWgAX$*u@$YNy#X8b&K`4G7pQNTalx`YSNG9%OdUWsP
z6rvn>l3U&rBSu7$s^T(B5zHf{MzK2oEw;va+;~0qhZX?Br@E7drQisK|9VM=BaKF=
zP|i6*&2?mffsUxToYumlDr^{|J6MIO=o#<^B_KqhJ3#vnqs$Xg9s<OM@A5{Zob?9W
zFnoL~<&}I*@xVvM1gzmB^nk<Bt1!$K`=cuO3#?#;?k;ct<vO9CZBaS7ePb97Cz84!
zHCb0fN46lj()eF%iIOVu;wRr{o@#+IY)xXaS7Gy*@MqB4gXjnJ(Giyfm8cNq)6k8Z
zvN+(>k4QXOlX{FGsocx+?oLWmFGS+4%<o9-z4@<2;kqx#Kl8c<Sgo~6JpMHv_V6aU
z;|Zn!E^ZEL1s$RDF`(%vHToN!!LCU8csFs6z2ZS&a(a?qEd{m>-230bV)VA&N>sQ3
z*#AkgUutz4sS4L`^QFjI%RQHsn|md%bm>O=xT(M|;z<!Jy;TND(d`8(mNRsADrY4}
zhp62)ySvSXv-tHkGtKXO2NkhLR#c35v%dt}dN9dWLD0D&c|^b7B=mo$tjHe(C0RD=
zpIs+kKiF7Y&{u2li;NG#Tctx@O(J^b-sGe(Ydb#0Z#C*uCTJ~q0s<k}&};TM-yI{F
zyVF~%p@Dwc%Id@_7}iJ2a{=<d=#xc9jxT@|m^%*VJ<{5A*i3eFO%%g{P-nBdKxAd!
ztWsqy-gOkU_*NzL{{BYQP*Tw7pSu+;1Q<lk?p*Xvz^_?VkB*Fd7Kv{skTQWPCBb^6
zsRNXLQB6OBgcxv?!Cs6}7|1tR0}rwU_IFDes<+wkU!d*djw<L)-eRvtGVI(uD{1_s
zjLlH^*t~$eU2=72YiTIP`TgCPtrW81xzsy<#{ioLXlQ5$2X%z_&L_PkXZ!J-)YJ#g
zEaoe2w8rM;<dEZIV_jDXmLtCIaGerc!|pmx&3OtsEt!04n()_mWA4h|cuGt`@l>50
z9sR?lXOzB-wVkc4*AzBNO<EWFk_+oBT1yozLqwz_Y@4NK7QU~*nh)Ye?s7{Hd1H_#
zpkZ^s(DR9%Os3?0ou$i$?pIym1E1i-c2^h?{av-X+32~Cz9<qC1)T9HCH*~^!RJ<7
zRUwf_P;%|s(9{AB5gZ<EA8`vANFMBwG0n|&SM33=#k$zN*t+XguanXwt?_fkV;j@o
z4}SWcogufGtA<WQ6#X>f7COF)=h5^n0?5&LwJfz=0rwl)!o*2cd>#-1(AQQmo;a8o
zwBF5eoJXImQ|iGyORIh{V8<xHH17G^!g=JjGUUw(`!Y0?v4ZGcB>a~BeV$k^`>Y^m
z0vo!!v)JwRS=pua*q1|Sng#^aEkxS;U(uq1^)&M%<^Li91Ie(?P#J`x4KdRa8zt4U
zo~l~DLUt@2{BB)O@WxjWqoCstyzwqGmOoydjllRwmDW^W{VSX@iH&d2^z**EEA#Mn
z<V!mA&z1sS7)loz=ct1>svg~=-Rn24)FJsjxxIODv$Fa@zrh(u?ng3!tzbLMN_c8>
zqUtHC&(b}A?S)g@b>~DpdI<D0Slxp$QmRMtqGc=hMDzZcZGfNlC}H{Dg|9mM>~`<p
z`&yem^CA&jxPhh3ul2f_0ADm4Ru|+NTs*8c>FY<))?zpPyt`%}A5}T;>!x!uI3Pht
zH^Bo|-ra!nxRMdPR8TjV^;p((eC3{=>mpD6j=Ao@zsv~B4SI>0<XM509E&b+upXj*
z83sG>^Y2abekp2h4g^BSn!tTYfIi52Q$&tRRRz{J2wW*TKE>&b$Z-Pm-sopiI7AH;
z=@*2lEBL1PbOo;-%ffRHo0?b;VY`0w7y%Jz001|d1343Jqif&gZ<5@K>EK6a8p*iU
zPM42CPydlt1V;|(K$7-FuIVcUN6%O7pD}iBuzaexmuxH#AVK`$6`6uvHn>BuPA_?p
zidJM-^(;-da+%??6D8Oo0IRw`KKuIUgQ3en?xOy2bZRhn41NC9*+HtL-OMd-`&PyZ
zBP}l<8pBWU5?T^$@tceb*&VgI8*ksOd7|&NtS!l%^}U<6_-9;vA)ZY8=H^Y#juL{l
z4rbnpF)H15JGrnU)x%dwsKBBoZh4$z9&t2rf;5;oZ6VU?I=R&w*nUq&@Wz&@+{VjT
z^zml3(WPe?^NhhO-@NZjU|;_c8?YGJRZy`iCjW=c7E26GhlQFlS^2T`>LA)@iJ05<
z{}GyQ!(63trh+72Jo<8<UIQ#^%i00`FwM`exMY^BdfogZSF#LVZdnKejb|y@mMlq1
z>hpaT`u@;>K(kwrbeEVhtRJ}CvDE)gA<LhPVAzVnJE3b9pb2d!I{TPV03mAPq024~
zchJ@Go|JB%sV7XXH)zGeVg5a4l!$lk^-4s7XEEL+zF+Wuw_pneRf8H4tq^fmkR;<N
zSisaR1?7%1^A*kBjp*oPa<KBJXK{^b100VbOm_)DnDC6@$}xnm0L6tVDtj3udKzGH
z1;t;l7Ubg+Usw*u#x2q>xEMr5ZY7TlVb~bz(^Q~P3qq{pZL+T2gJgbU3RKGT%2P&5
zH^*wNx5h_*h8rx(m5!OQo#=8V3cz(1-b8;)03jK$R~3`L__6OX2d@ROawv##1l6G6
z@Jgw@2)9No>^^PAmBR45)~k+@Oje7mKJHG5(8nj^CBP~$2Iu?y-VFXgM_0Q+RFU8p
zav{B3;)EQ#0x+L=Oa$FA$lIBLl-DE)0-s|961R+N!Fn)*eACUw=11b(u=e*3kx<@`
z%@s&1H%^f8=(1D74oyb6#K&wo`p}ax!BBZvWm}Jl2x+C52BTcYth8G5!~ddcoeD6u
z*Z7P1h|KcG7-w;<sHG%QJh`xzH8SJ}sLaN)HrJ+KZBE1mXG8*=`(vC}MtRngr9KJt
z5z8i)HY@sTIPwHf3uK1l?2YNH(B(!GgByB!4D=`#ugk|a0rczvCcv|a_gJQZq+t4_
z(O-Pn?M%V@i)3li(L6+K)9Jk=0+#-V<LZ%fY<u9?3~2J&ZrTN0{Vt>P=8%jNsb=yl
zcC2fQt`>`BE=OfCTU#$&?|l)eaAJbA0W|ff3>~f=eW2nE=5Jr36~)IFy_Ud+LQ7rH
zW^tTL{K>e~&$@UPHyA(_VsU%fCZ@=h$<$svGPwptRlzNJ=P&DmuTuU<uOg3OX=bTy
zIbcd7pwg4&3|1}UiJhlq1S^M=kgaf}FrG<}esDOiE1=g9ykS|WF3dmRCaOd!lMcr@
zYaNcOg8xK%hm<RjE?ls9cPj|@!j)_PI$tR+uBbT)vDI7wcMD2`Xy)0E#A9_Ww*-rp
zNpnTw-O&f4I>5yRBF@mFW7D!iPJ`TICAP2Bj=so_S6t?BiAvPXf>DNEZi068*RMAf
z-~HFg`a7S{ibb*wMp&<Ltj_$>{_FdHYg)^HV?4|#Lw?2luq>)ixqm+P<+;}xk&_RQ
zx^ZrJS5tq$quCqd@%&MFBjRs8aC@_(jR&(wwvFFCEp9G+wUo2!Fg37OtFxS^#beb1
ztCU{${3ot*%X_{^EcMpeZB_qRO0vGI|Lm{t|2>Q=uv;mm2rbr~ooV}ZoC(X8tU)k9
z$GsSei;J5r4};yJP^FT>IA|qhDP6lrOxc!2W|nMU+*tUUKWFTIN95TU=h^dxcncB6
zcDlPEf6WNQm|GsjBQrGlL2x<XAzAwML3-5$E+F3HMYs(uLWmLS_yZhV;E~WLXG1W!
zNJQ;7u1(&)J^GVn-w03W+tovgT7LSCxbW|0D-6hw4KR$oVkzC>B5r?Jmgo2`X`=7v
z%1?^$q4s#n`hMeQ&w@ASN&m9PKo`uA9np?M-BV|`s_n^Y5*#<2{`&sk+iP!vn1Vga
zcGKKtQ5PNrs2U&mL(5y%E42l#NPW_?xGGjTo7c8iF76fbyC=)=wZ_x@iRu8i7brKE
zi|00_c+_~U_LBK;-Ucdt_WQBjD@TV63YvIv^1q73s-%1=dV>4R>(x3OUo#!M&oFr$
zEaL{V*A88=zPAAPzTHfWs;`Zj{Q~2%rN+O@h^(s^GMtFFAf%isI&Z|ONQ_ahDLHHM
zZFy3?*3@}h-oqaZxk0m*8C8?09R*sCc!2Y`-<EX|J4UD6o=VuPDtpPedd0+2?B_j8
zX%($Yr0<mOkP{Pk`>)H9m<;a!xCGO*P~Qk=*S*&AVZ=t_)`}6vNXFX?idP{vjO;ZL
ztaHOd3*40J66hYo#mGWa+lJu0MQJ&~TYNHvb_%Ma54A@reF`Z%p8Db0&EPvJ><O*3
z>DXEtI<E7M7a=TXdFu90444%avKiI?GSsN4zAaW_jBC}O3Q;rqC!9ZxPY*dejUZt>
z80lX#BeS0JamieU_s$P~IAg6KlcO)qQ{VC64cVvFo7>m9CXl{1QUVJ_4eylR7Hsf0
zxi6i&eLv%Ctq5z?-o^k468&4s*{XbUQ!9rl_O$LYx!3TLwCk<QW1`#Z_{QsO4I38N
zSmbW2ti0yCk9ZBZU)wdD)r;Cx-^j`p^qh*@(u~@%v7X{IqCk|=O~~XqgyKJ!_r5s%
zenJlIS_P7L?uwB!j7zbgKAz_7vdx1(YnM=NH0TzjcK+hcym{M-H`X`(gRW>VN1r(6
zQ&l-yOb#e`yB)WuTE2A1@>@5wr*IUfS2df%jUj@J`mU7gdp6acXd~~ORw#ce@<gIS
zb@pYJ&bag0zP#Dtqq|dOeU`+xFNN<CCPs4jEP}-1xsZ0F%0-h040^wlUfQjU>l5Mz
zR~KunvaU-RFNdzS@0H7WeXh@~iTQFt-Q?w`-NL(^eBN>=K7|0^t;m{N$;hxlu-JOK
zW0Hi5`81CC_d)NF6}ra5?$4+e2KqT~pRU2Y<uAJFQWzM?N+Dqf3g#c+9=6h3-`I)W
z2X--)KOu#JAD<_-8un96)82cC$!cK~U48eVs+WH;RW~oo#B?PgdPC(~b_c!(K27gg
zmt#{%Z^27(pK~HSd+BX0KkDZ8Ilh$<F<lxJ{R1?2<Xc_%)t+Cr%h%yi!u0*c4!}Mi
zn=6&_eaMNR#9U7l^$xIKgh@s<<W>cqpDvkq>Q2JJTcVRS4be4}udO8xzTV%K`4Xqu
zn#r={us`y0_vJv7@&yU<0<}x68dHliWX<2ZZj^g+GQwPX_tTsV1~q<$Iwc{N8emk`
zou($NN@dI9tEqw9w^^hPG!iDzCacyl-Y@XT%IV<w649x=!3!dk-=r|`tjBQbbD_E2
zG&<5}K*U*(cJYDU(jam&onyyC<g4^%#;}J|4hpxxNukLsNUR}1?CN**{XS9jE8fRR
zM}nsxuG?~lVX{$dxRLG3m66xP4W4M{pC1Rao|uqtMzeD`PGYUzKmiJCvj^vp6SQ2j
zwSecUW;A}h<%(7fjGFOg@9-FA)=G@+8vUPr6*wr~EwnP%PzuLT%Sik?#X7IUw?`Eg
zGf)XK2)4`nk1C#(Ijo%-rN1dx^&#}7%dG{TGZ^1Tg-zwAtx6Nn)nLdEDuvWD5Bcvm
zD7U&E5YI&r31$w^!G4S}^HV7^6!yGuM<ou~-)$Z?=m~(;n+Az#3Vqp5h5#ugg!6~P
z23)t2$AV2yqA@WnBc;*%_1|e5dc@!!hjiyb7B=Ls9AJ=gWP)>4!ODJlZg2&^z!O?o
zhkGzskl)Dfwax7N$~~P9`zaQy2vUN*$G$K2xw5Vt$iF*BBqxzK@DXs8k*4RI*m1RZ
z1FdyH81<g7KV5gwkYS+=AIn}ihYg#8mi#LAcm?5gn*2MI-w15aZSWlA%fAuyCgIrm
z+7QEoGcuF|h_}AXT%3ADj7oU`mh>YO-uVfevGap2bJr^!UxoY^s3gMmQJnQJr>gw!
zSgO2d<JtZ4Aav~A8+LQvI2n6BtDo=J9+BkMA2}7bHk#eF!Ga*gvs4Doig)i91yhb7
zDE(%cC>^KyCZp?}$=|?sR<4rI^?E;(^}b}v5xO?hOPeYOg9Q+ZN-G!kUbWK~!8-R*
z#^{{V=Y7?mkxzB!q>SX`xk{{ns&OTc1^-dCyGV)|VWyQ5F~*_1^Pw$Q#9QTz8cgmU
zIina^umDX<F`~DR;zL+5hz%07sej>O$EcR8Qwq=Ut#-+b46IsBhnop7>eUT;)>@`a
zFXuPDSeK`QA?mD>J6%TxP-^Ff!#p^;uCPXt5eM&7b#Z`~_rX8HXL@a3>lDFlV<^$l
zkDd6Jl&Bwqb1Vr|ti85PiVmNjVWcll+`xWAi*b^jSYBNGT?DsY-^F&$%WsVFPrqBO
z{b}^hX)^Q)=*4V(W79E<ffT^Y8|?j(z^3IK;v$F+;91q&egwA|1a?WG(i;8sQkWuj
zt1wj$l?=A~9imTFOD`R`jky?yS`-eR4JML*DhoL8;^csjEX%oWje3uco;RLoocYu5
zVpj3@@JtHgmL4&Yo>*VYBH%kHUfXc|@f`)_%ejM$-0aG6V{;c78N<-gzv7&1?#M$i
z7RmH%=yBH12ssYixPDa_Hsm;dJw`{*zjG#~G1o;kZ{V}C%LWA_2WcIVG;(s~mrX1n
zFf%vU@=*(4Bkzs%cQ~WM{&;jD^t%LBAG(`#N1oR93|79z%%j{5z2tz~VuDo5Z`N2f
zpkDCvLw@9vlP;00%Ee)f6=ZaGeHHwYaRiAo$8Yr1Xc{yMkrA1`KR)>f9IVKvX2Qc-
zmSvLfB@C72!kd1BpzDOef4@IPNM-f*h2o5-C)d*Yw)}UEOIn(4>wZ<+#Nb~_;90cW
zauV^HIeK^Ec8%#)X}UO<6$$3nsA`x75|y_n>B`%5@0N|;k#3S&55Cw8y5=4R4o(`*
z@G8xV#N~ZA4A8Mtd=;^=ZWfc%es-+9+S*Q1{skd)<?((K1>6qX9%I+7(b@jPdPKH*
z5?9k9;@QSq{xHRleEJFG?AW%jayJrU;zmz2D%biL!b5zCMg#D~%)PQMIpPv23<3U}
z)92gh>=09ppGUnoTwPxco3QYBkow$uvvM2J09#*auI;M6J|chS=F<?vAe?m6!*mTb
zl~-+ut!y`oJNJCckwJ2;m?pXlp6erHzB|8vB7L0pbZz2vK98pkh%+E<0{I`~<7N_C
z5sz#>`M~j{?>vml{qf*k@{;|JS^E74iff9Id6*df66Yi8XDP0d{`O_W`x#!vi=kR*
z`z|A7+g+*%t>8&PVkF?%M6zjdjtgNK^DWBY*h8w6U%`^zTsDho<_>1Jov?2srXXSa
z&jJA?S^i+aqc7beW%F$_hy$c|P|#GXN!bcf+_eF2zIK`nC&7cCILOL@TJ0@X{Cou8
zyuw0<g63efv?31HP1cGeSrY4oJr1R<a}ydF0_tI?P{SaKtC;!c(?3<2ZLq^5;aPU@
zOXGueRMtV#7^C6C`CYpCMSO1scqV&$m=b!cN{4nPlP-?KyoLjMt@lTW0?ujf%1kwj
zpe3=@iRFQq#M+Ktfb@JXitOr{hPyT?EvBg$ACSp72Uur|$ltoEy<S>JjR^<fnRH>2
zBn+ACmbTK{rgtGt`OH3jvK}V-o-#l3dn7>TKy7|puc!uovT?*Q#EXFw6kATTL-@U-
zLUxxF@$`zDg2_n6aEPk)@|#sh>ycF32e>7rCFEmLGxaaAaUR#dtu9wnbM`n6<T+ZP
zIK>#DmUry^RK5Ug-P<u1y^L>HQ2wEq>Y9e?#f{L-c-9slhH|l9dGXHu)sn3*)D9~c
z7#H9VObsGA^gUb;DygDXinp_?Km95&!^chg!6RG!eaHNbu_U+2ETi7HJsTzq)?i^2
z6IJYk_JfSacM%iMUQDW*?z=OJw7@P-g?%W`nW1n5P0{5HxXN0Nb2H|4ENrGF?Xh|C
zWyL?HGr=<&*VxQ-ah=^vMdxA1_<3DH2Q1$C{_MuN%;S&}BvD`=1~wvHa=dY2#R*JT
zLHo$)6ONXP$Q-#K*=Tp2^tQRT6GJo%?79+a7guH&RF;+wF3{PGR$;z&<>+{KM-vmH
zGJ2W8Ckbu$vlmBeSo(8^9YepeY4+Sj-}#pp{N}b5(a}}wk`$yp4dFI>w-vQCUJX4D
zx_*A?(f$63n&=7Udb_&|5>sEOkeSpKWq8FjoJJ3Mg!%E2d?n_Qtf_$6LM96Kk4;a8
zei)1=v6mRU`{}-<z(vpRed7-!v&@-0<&Vt|INvMAzVOC+{H@RIoCHqJ2d4YS;fG4X
zEx?=5t;&;dzl#L8k{L;brso(u6tymE=ibm=<_oU5v@0lnj;6KM@Sa+k{$R#U*S&bk
zg=rdZ%Ghp-Z_T?5rjmOzb1W*Hlr1upFC_KMT-{BwP?D*%Q$bRu9Vw3q4r(e%(CEiw
z(WhmN5ehZ0CgO8HMvIy=3K1;GH+>T#e@JT|ygCtG8FoN6YIr*oaW${QVXu|s%x@p3
zCC*7HS*x!DglLBW+mDH?>B?8cocYc2K7Aj>UaumZvimPaBnoU9#W?NoY)1Ljavmso
z__!`VPS7M0Yrg;Pi)~&<O4Rc0jd|Ji5XVs_Y{CmZ-SYHD8)(NSbDm3uC-9=H!YrxE
zL-l^sXJ$14*A8_0HMQd@jyK21jmrSGqu^B`$Ic-Y+N^7nxu)ca@rANhdx;YtwWXBK
zAZ;doar{R}Myzn+7xYRZmfs&p2nMQc=cA+i8a+K7b<v+)3{Y3JxUI3TU)NWW{ei7<
zgS(1IZf#f#Q~7SqW%?DG-SKOAYPlDClS;ljsYL~4;KGb=4W<~r7u5VTooBU1!FJ*2
zeOZRm$z0VK5xq^HocM^0c1HziiwIkVqAbT>$Gb^=7L#vY`NTLT{k=_MWrQ5nRn4+R
zi47I7QpQ$Xv+7#wvU2ncOUSx(6nrF{gEShG{?qZHNQ@#B9<5i3>fq<Z!)`5G#<*(6
zFzaqCErdQVFrpXHF6zji^YqjJahXxR&CnAXs#>>o)_b%Pyj0W66EYW#+j0Ne``{RA
z!g$-!;iL)Vtj_byR&z7*iiglP8(U5$rQaW;@(4gO=YHVY@!BYHfDJr$H)C1>?4DaE
z+l2Y!Oam8`-5l{GF)>CZ9dChHLp#oHX5s@MUk$K3@9wiZxTfu_Iw{cJC80De8WlN-
zt;nrhk#swRdK&c^JT^XoxD~rIDY<Ec1b=21hGuUJ$~|6pB~~zds*4uwCF~w;#=YO{
zD(=FXmLey+qI0}>z&135TJA~ul?@_eHo_Xt{f}FtXk1*M7CY;&3}f+G`)dfwbSYo(
zN`Ag+7-q<SVvu{FP;@S_R``VRixA_^Dzt3iECeP_q%BU>zq&NjLAKN^^|;6`dZ9k#
z!jryI82@0hqw^C_jLJqnfjAHJx9tBPV{aK1W!r@f!_eI!9ZIK2Nev*Ow1AYfbW3-4
z8-z3{AdMj1sURiY-Q7KW*U0!hKJR+hdcPm{5AFrdb)Dzl$ByIJdlY}7<2jnrdW|{#
zd-h=XoR+G_W`luN`o5*G@TeAQQw57xTEwtMrE=yiP<;*hBv^;vgF&VTa1!|tJO@9*
z4P|(nex%PL2l*R0ul5-Ce#$J&mzH|%VuzEJW845=_klOUJjgY>1#R4&KgGpe!yaCz
zNWsk)cuSbf83u=Ux$M7Z*8tkj?|+N^pX3T?hfDi^i+IsMzl%?E`=~yAV1{{lkVmvC
z{AGgz48p*k0C$wxC^boSe}CXkz&w=?+ZP9!3>f{3eA&dcdc<q_@0uF%&QFY?nVY?<
z|F3mD>CT~flaQ9yM4Ge3;C~W2;4@$Nv)7*+&u8WI{PNJy%@JA#YJ%<6qj!H1&=Z=s
zQuXWv!cGAndI~Gz_N0XNnc&sK_dndE-HAOCo7upFMD3IUEG`Q0&Zr-5YEahav<pb(
zZz_~pIKSpWDUZL^ydTKa|MwAkI|n@P(?-Dxy{%k}<)KEaM335r|70&z(1Jho@ipvk
z@}B{wz~YWefs91K7I(Tu&LkAa5-UMK5fzk}5zO%9S-&wrS1|yTpv0B&09fNSo07=?
zwNY#1ukcfBF_C^vH-SygIWoMBeV9?(l>6`b`cXnzK^bcoSU<(S5&$`hTf_-5fCI=B
z$p}1=NtY;o#frm}c_+1T<%<JPMfH{nIAwDGDectTYbz$Pn-pP_|1wuA!v77ma7fk|
zgoz1@Vi_fYigt~1EyZ-CG<t|g2a<oAH^$I<pVam2#r^-V4}*SsTfZW}N&4S>*Qeb-
z9*rmuj%r3%IbLTzaubJl#r<))AW3L5S(0Sgfi+I+)%8S*>JP0B+${9K$%rQ|+Nmgn
zJtR~zWnPoa2sk(Va}^UBz_Fg4n%cqcCKO;^Te5C;QbAkzTn%`Qnhki~&$vqt9*om0
zg-k{W>nXQ<L^=}HiN0~xXU-+%%A~FnZ3+`IWl{s4<*(b4kuWiFwEi9#mn<#)h%v|K
z__$8mIpP0L*{uA<uOy$;EZqy6*Znf$@PP|@&GIXb5EeDJ#kU|jCI+)f^ujdw2D-MP
z-Qc_|G&Gl5W=Dztm{n#DQqxouMyQXN$wsbObxD%YWkJl|yWRgFSr9Z}!7bU`Kd2uo
zlwALq&af`we})IJ>(XoUdI2SsYC{H4N^+GGBNGivW#t$sM`-}NYOAeIh@gDzqbe^m
z{FPt{awgzqWK4M3@L!`QG*1Wn7;-0+O!;Z!dAWD*eBJmh*x*j26#;W4e<(=@4juYt
z2z!Dn;JP!L%-Zl&z*wM<dB5XMkHm@tKu=m*fj~tcP(oS~V)z!5(3}KH71FqN<^l91
z>(u)Icq8g-)*JkK)+6`-9y=2tZ*bOmuaYyoSQl=r{VM*;-$=cI3%INkDl0jRLd{nN
zZhgy(gMtWYgob99(EjX8=c{fMS>xmVX>z>rfgs=JCQDM5Zm|C=G&Ksrhz8EF?4^zU
zSEpZ$L4WQWLGvdU3=RNZzw$K=e>3j)rRMyDvIGrNtiN_Jr3-~`#U5nXb8JDYa*qrw
z8EJT4)QyM;hrRjVd|QB|qWk|LsmK>L6z;8pT!605B@;b64@qfTPwfsr!A=#hyG%u}
zz8<`dZOMf*Jg*>0W@8+q%WD?yoyWPX%s>r~c~xLJGBy&XuYD+ImcP09#XmH$`eGFc
z7`g_E{2&G<)ZcsZpB8A`Tx0w+)XdyuUNqBnHuKzA0D6KyZUh#BqHdb_Bn1q0`=F?M
zJiIu;l!*`TFlGj+D~)fKPQCs*Iz{mzR2rdKFFb@2;s2#yQA4yDgX&lOD(U?Q5tUi1
z3csJm`;>+Ze2O`EFbs!-qa&5{U+u`uOK{5j$ev}!&iSv8RoEeV>L267Kiz=pHQmB>
zk-V0d7w92ri_`4bKF>uKDTyo+n<mljAGbvv+GHzGN;rmvwh3I|Ca?%iftC*+Qsug1
zT>TBf2TIxR?itC1_NM+V;s|)|*L?>uF>lu_?05d_V7iC}JOkOnr(7&PVlffMjF|-D
z36@vp&ko9cGxU};>=0ki;D|ctjy@5N3BJFbe`4kzNAW*{y1=#8w@2tTk-${FGN3w8
zPM||V9;xfC6jVwiJOD2&_@idHM=vVyB&O0a{_ShSA$_7%*3pgr7TBD9vp{?3jS4_S
zU;dYLIza4#+OT4T7^d%^i0KCus~*VR@i6pLgQiMEqJ-G65I(2^T-*keR#hRg|5n}Z
zF0T=}eKZ;JijnbPgrkJqJJ+l?=Xz=xeJ<sb4o^$i7KV9|#py%oHzM$i>L>e4gw^|_
z|6_Gem}n@=AF@Ld_aJB{%@jdR1qH3&`kmT`$4UGX^#T;>IrtIL4p4c_JUl2^|6Ig`
z929Nenf|5Wh=9lnM#5>`lN>af?<y^OR8ds24vuQxBg2fg|L8c^8~?6>TqyQU`x8lv
z?09eKr5NtRAJ3H}P2;hfL?K~O(Ngkd7IP(gzssA4J|9bBtyg3yhVorg6bxj9HdRtw
z^}LW3GY80;GvYX(gYC_AlmSKfgYcLTS9y{PKyC|od0c<i>VL=_^qNAj`qcwM?>mGS
zJ~LR}?!j_AZpatp0bt24U9|ZiTMiKo#hCl|AB1KBmCqtg{$_<7(A3P=ub9k-h_Cc@
z@a?0uo<N4at`9+Qjv>Rj1!azXEDzVGK7j=o^j-(<V-xAjM75@2l!P31*lW0yCw)s{
zaDMcKX|9}r7bzG3zxOFD_EY~cJU<Xnj}#W;)qCzrFOJ#dKmE9tfY}s2i|28w4zST6
zsyRJdi<ajwpqB^knCtlgjImij27a^;47KL%WU(fIhxdF9xH6rm*xZEuh-Ft-l&pM1
zKKlHv=>uHcaCcXEiB!Y)aO2Jva2@R5SYseD+3eHGSHlDO#b3D*5rPzx7l<9#AN~ba
zs7YtCvP%uE*)ZMMvI0_@JL0$c<O;G}5{!D$acCOi!(ZQDOW3ddd6R`P=#y-B5B&V|
zpn&KEh(ELGHBa=%buUDd8;~=o%Y~WXHYV+8jN&3yJL7BE4j%GRR5VaW)w;fpOb7n>
zs~GClx5tG0Gr`%#(<(sX&0QU&kshk#rSZQ}pJ~AoRJVjrSTr9dfk&aEqq}Q4Y?XNF
zc5y+YhKLlTkb$mXuUudGQyP|8_d_#lGxwJijQ5C<NeNATvBMO{gSL?oKR+t%?xA0+
z*7K^vY0nOSenh~cpwt?%ADgXQNZ?NP@Ps^sT>4SOhZ6@~lJ=9C1>cX|N@M|WFV1cr
z`fPmt{;8bdAtErPZ~Jio^KWc`er`>KUr8lqu)c3(n_V?nUwxHjcx%wz?dpoo>Buce
zF@?<q6Ln{>X+i)7y6nL5Dfhl#_{$l&Kv9e`PJKMMICx($>D@wMU3`@jIN5W|SgJsf
zhQ?_DafU~@F1c^wZ8H07&?l{oP6}FpB;ZO7X4yqnc4nv;q6IW;6o61KbLeryKSDt;
zycuEs=%#X|1?$nP($J=cnFo0b2i%^>h%`oL-%*pDc!i&Il{tjsL?FPzzf&BLTRcTg
z=!2DsBT(Ss6(!=%?Kz&fX)k5UhqrX%J-|_H3F7w75|}MxLzv&WphQ{{T?qcs0iQIe
zUwfe&?@c(Ln;Lu~(V$k)-O|fV*NQUzs-!I)|9B=;DI?mSh_P&Q-S`Jben4f`=U87F
z{P)jN+TVY;{Ztt4px4rb(7d>?>Bz*wJr-Dv9G}I#A+|vGI-OAW{H(G3U5NlC`TN-H
zj)MRnrjk@HOouv*iP~+m&!5+`e;vH6M$U?Ns4==QAtfD7?Q|3Q{qlTK*&q9nR$iPf
zHzy5g;FYs<bdvJETxd?>x|UbsP5p+xxp@OFu`6B|R+P;mHoV75>J^qJPDaNjhKbRy
z-)|n48a#B_j>!r{q2ZVq7BGY~w<8uP=7sMnRp&U3&zUw~5_+F|A;vx!H8eJA|Hsn_
z?SsHtFIYIdPM8ZS1_ZM`6Ss#Mb1|OId(eYWaGYvu9VB4C{T?`SdHfq#=cdLV_;KVi
zj`i{RQgn1TQ6RbJY#%9}p`Llk9iK36xY&#!8uw8orpIUN3&eSCiY%%rJBqyrM21AT
znH%|#U|%}oU*zFo9+y&iXG^>6J=|lgprA*FtviNc`Q)lnR~!xHn;%}YaWNpzO-?d>
zaQqMsuc6R=@)_48cT^p~Jk8)+qF4Nc4-mQry4?EUrS1+CJG@<^iZI;F`?2ArCK^oX
z&(_HT;Rq=;Ut{7gr~h85VQ1l*WP`Wp9mdClQ-0VlUi>s|uIOn(u*c0dubWhm&VS32
zKXg<cQ9d)%vwjp-<uk{K;ePQx1e^wIuI#meKn>0OPoY1{VGNEoP@((1Dlf-}MSnpc
z`e*)L&lQSY-M5oY=sYkAmG9b3bSdc_GFmSfh<k0I0)E)t-vCda-LU=m`0(;~w19=m
z=Y4e^F4mtOp>UCOeDC7}85c^j)@D%(Dpbqd+6_}oiXR&zFUN1*V%aTDqdS$cl>R{N
zZV<|)>wog7Q)D<8*iS7)wWG0vX;5bdp?YG$*JX*#jKCi7?x01XeZh`t4B+)Xa_O6x
z*zSoZlW~FsLbMU>nf8wg9)Z-&9xGQmhc24KZHD=cd3~<-!Y96K<W<-DZ=?dk`xZVR
z#2h*ovR{0!ZoWGoJIYIY8q+mAPn~9$9vJ6f45Uw|*dOR~?wPzwWgzsjBN{uvGH)Ir
zp#v8yDaCq|i?%0NNAeHRqZkbp`5(lG6!o<onas0-kU#HemfQP!&bBpj>~qasJnk&J
zZFa&z?bw+%&5F%9ZL2<Px@fL0Wl~qKc5Y6^2-5}a5!54+#<DSy*sYYlYKq^dj5%Bm
z$#G4h`ubBSK2^(9MJw>9qg~5_veF0+YTOzfr4o%dD9}rVA%-&l?!m*kos4%A6GQOY
zJJU79I{lHxa9dUT)z<CZ^CY80yrhp}q)4*~gb+3N8WuP~pfz4jnoP(Z@=NM+?+}BY
zg_1#C0srs7+6|Yd2jS!aQmWV5*uk5xP}RPqiLX^~@?LBDh18*@31G+j)_l*J{`HsR
zgw~0Es;DC?tIIP&`&mmrRPsnm3o(B;>+3t!u5;`Otg+yHIKIa@E*igPG+4~AeF#9@
zspw8ayH5FuOyn&DFD9j9`e?Ru`e=0Wx|95h&j*fhj5=}+lMfMV<+E+uwddPD0?aMe
zxe#i)xsYl~TwEdhC$?niG+PPA>z_tttMV<e8Q`1*zq&cw6x8bCNpLN9X>E{L_k5dc
zY;jW)FH#5ll}ihl4y5^sX3Z`6L}-?2><QyenPKidAh5G+7}~E~In{LktjVF;Y<ug6
z_yib$i=4F*ZFj+V-=atFa98uJmUG(-pDlg-d&v4D5~FN&&__lk`fX~tOjbUz=>$H)
z<AuhJCnvuXUKzXp8>#Z8Gv5q|t~4}LTzz{x8uc>`dFcVEU%rr?%-})R-V>YtkAJeF
z*J^-~aa<V)vcs&59Y~TUUaCCTJ9KEc+|<)-vJ&&!qIgZT9{EdTyPWR3t%KT>qP`WG
zBiCAl)JFQ8Q7C*lAUa<vx}IoV`r)7TJ04*S9zOoIYoSDCP0CeQuV6x#M%~9#A00J`
z)rDkZ6UAiyWwnvYt>`AZXWASWYIGMt@-?54)QhG??W+t6!#PWFJw(A@O(rZ?h@T>~
z_oEC7tXPI7Ttkr%!zdrj5ePlj>_7lN4KR2SK<yNwKp~tp6lqMAphb0TFcqIwj(4o*
zh*T+9D{y@zmL=laRIC1LRaj)maWmxr)7&}_&CwwjW(<EIIg`PEYRhtk?HaXH=-ucO
zwrWbbgCv!(y5(1H7o=zVjyfocsecYCRR=hz{@WV?kNblHM?%vLIu0Qcj&6P<D+mIy
zOfLC+Wh|lDq_3%PuO1$z0mWS0bAAH}2|Q7)EB4>3cvf7HI`Xal%4%#>QaTV8Ll_w0
z()c@^EjDU?^9IMb#Y02wk!p0*I9GNq4Ml=hY*vL<Y`ST+@z>dlYPaR1rB<W9j;^SK
zrVD8%LWDA)C&K8%loiR$q4PEbgC9T8ZGV51FYNP83hVN8$NyqI!%~Hk_%B89$6?42
zKetTm_(I45v>M@}h{;lHsn!uTf_QK?<j`5b1fBLT00R(MHD1nyWsJqp>SudqN4*dN
z;{S|vQhRuD<9(d6AqpW=(;(GT<;RpmC)4Cw0O{Qdj|$803$WD~v(aG+0#?vfJ<C3q
zPK>dzAC6>yOn$i5X;a9Z>}kP8#8h?LtZ#iie-Y47?s0pz&AG)t5neN-HrsV=*U{ON
zQ?8P<=MW0_{+XwboSjVC^?5zhY{u^$Q<%7%zg`#vmbLu3OrRBEf`Yv`qqBb$2FELm
zNp2h$gS&B*SdS;LVMOkl46DeLtD*7s)=S_i><;UJ-chEm;B;g8Rw^Nzp65jNti62G
zWAynu`$}6OUo2?_vXCf+`d{_%Kv<O?cv&=^!9I?$!>gU@nxX7E`=hP;Yse_bZ5bZk
zA3|J@ku;TmJvIi{$k|Lbd>vY^3HIXz-EJ$qY9f4pCf5>OAw&0q-t6&^9_ah`AG#1U
z^ycZQB4U{Mn6Hox0~QSbzEbeKt@K`m68xd7zK<H)!lM5VcYYwxL?ps_CkcxYnowE(
zRFEJny-0+%E2gM-gFSTa#;NTDAY}%RACG$lu&<3@Zj-ddJztXbLmbZb28gXOgVp%Q
zwKy4j?Pcah@4RL;vk&=CqIpw1dYjA7QVOQs?xJhdBIprBD}^7okPO?V2Ku)~M~9q0
z)y`Zfv;!g-=QDn+ySS0|ZgP>kYhvMs#-|<v)){|%1?FHjByj=yVz0y76m+KMh;_<R
zz#E?r!y0xOz=)`S`-k?(P;+ZnT_S~<+b#gnel7t!Ev7H|OFG7ryXfJ)o{5dV)Sp{Q
ze077q9V@ejDLu!Tascr$dFH2yBK2Jjd9h|Q=IaK>D7P1x)&(Dt#hXw+>mgthvNx}<
z)lC=4N^~0k_k26D?Bf00ExtKldXBo|i)R$WakfJiaxss~^1I%U1FCNbHqe4zef7d+
zzw^>{PR1sB;$v$U<H8aII+sH3n)KhY9(X@zG(h9|!{?at!>t!s7h&1_(<5BBNt%us
z-&j=XguBDpA`iA__pKOvXb+Dft6voMhS*SvcHn}}pv}->nww{eJM&b-AWjE%y5DrD
zw4{a`shwB)OV=nk8We2V+h^Ea^c7d_4UXRQ81uOfy!g0&OUs%!n|igJl0^Hm@+ra;
z-Z=r!#Ga~s__$#GiUAwqg2{-{&b>cYh{x!|@Ehu2$GOC(3X+wlvwz%cX7z__VHrp9
ziy@n~miQz-CaScC&Z6%hnb>}G{+w4bm@l^msA_nAeX?SvfygQ}Lc8hk<2&7uxWaC_
ztr#76B_+u~BAFPv?Tot+pvou+?B^d4pWsz3I!gYhu?L3dMcZI4j60pem-Ve)?RH1{
zoYP}Ot&OTAHjM4vFGLb^538@Cuv&8KB`5@oKN7&t=-AGBYPpfSTdvuIT^rJU4e&WR
zpQ~{q%1kGbDR_5KGubANBQ}$!#X9IJ4ukC^Tf0D@OqrgLfdiW=hjCD32)XPhS6p*1
z@j1=LuTr<jPr2Xlt5+XF$X(+DIP{3bN&0T>QT*3l@Rq)w^q2fWEJjm2x{XByLeV$!
zy6)0I_r<F>e3RZesi7yMpx3lGb<%9hDT**pg_bM#AKDx!29?3ipqB=PC$5t~hfAHG
z4?BMq1T?aSPKQu{F{{C&o+8+RltI(}9mGCcm}6K%t3a}J3031Vy?nkgT)Vk>K_Um|
zQpmJNAZ3~JnD^g)gb#|sr)Xw0VzHw9U%29^LTmxJzap<fw5N_QZgTnrEa>4{X9}2C
zBWtVs#FfORg%D@>?MR;{M?~xcSI!=x{V1itij}5i#&?)w@++{IQ)Keh?Nkry4iEBq
zY<RVEq&qudTnvJ&=K*)8QFG`73q2(HPL=I!oRE-C?uO?3mV8JSib9^EEWptX99n1b
z|A*fL-hM&}jE?-nYmqwt1<yXZS@YbastnqNixPO|Jq{03W{%$^$Dd@rQVY0I8-_Os
zFpOG<veS;jg$?b~<tN?podyW?IPLlj3_oSy)!yVT>_&$Y>0DkvJL}Fc!wPB6HYIW?
z(GFe#Ij-ezI&wYjGLn<DAx_}DrqX&FZ$IPIt>&ab5v&<AvNAj2^N`%+t)K}V7ZU{u
zP7{U3>8^E+N?KY#CpmTsM))B+{xVO~vdyplnQA=Nm%r@XyRj)kr$f6xZ9jR}Gef_X
z`)Qj2GnuVwm;a1i-Kycvv?h%2MMbQU@eyq*n=%!(0aXI0QT=&K2Wu#eG@|&yuqbHM
ztfEs#_3l|;uy8xbcSnC;YQZG1m~31_jpq8aS{bs9=S0Rw$c?dI&eHxreS~~*@Kc6`
z9l25mGaz0?VUq?L=J|C~FCD^D8uT*!0gB9Bpm$(iPpbnf*9D>hBT8LUfqyDeaOymL
z;%T{%!=0W{lIqWt!)vq3+2c0NVqBCpY)SiZ#LYuewYnE9X=BkK^<Y&Yl2znIq@420
zSK%ya*m|O(2j_=UU}fAJ8})bVLkAa5Pr3Ol%r21EErz@sKi8I2a}~I%0&7R_a&@C@
zwklVd*f?aQq<Ae6GfQKsK{q$J_~v+;hB=<5-}S&6nn4w%O)(4Q8gx!eHOS-zM9nyk
z2^@j?84rV^$cGIC=U|Wjr@ILZZdi6UcYihp0Yf&<Be)Z#l!!Oir@R!@3$zf0J{(xr
zL;>1086IBHg!#)qlS<%1#Lv`muhM=7=?_pvT>U<Tr_$4lXb9o3EG$@Dw5q*(Ciy5?
z3DyJuQ%4D*kBmXVN@8*VWoLr9{_O`aa7nn=<JWE<l5?owuJ0L!6yP(<ezwWOV8{x}
zD)DBpnn}Uu5#x%{^Z`)cjw741UrQiPA0l|_B;a=coA<SvCi)7;9b#}wm8L28?h+{L
zeHZ=FS&FV#Lh3!~DF8)))J+SAqI)m!=YwV*(SAihyS}m>ychA2>BiJix1MUl>zE=)
zm#232+At92Fn>O$tQx#nof3b&_`=h*7otXk>prc3nkFocM8Aj&J0+v#PuhpH{~3?k
zqXlZ6bGQD~M@Xqs&{@dG>0Wx6<2Oq988syvXKktn2a9KS{YMmnivPTc6)<iR3JhcM
zcj!C!`Hp|*=%h#_IyeCDwByj&4|Z}0NhwC%=fg74eE7IX;N|^agHwQ#eb7{b56Z6m
znXa^l%;G5Ps3Me>adn8DBLWoIbS(+rf5`#hv9Hn09p5^vg_~t@vR3Qo?L2n|rTfEg
zoGtMj#6+mgP6*Ka`N!=!fh3`3{CLg!k7u;>LAimoW_ST_^nA5Up!!SoTo*Y+?vuE1
ziPYF+5@h@5g@6G=Xb(OrPyg9ya#SuxMNlt>>|IlQKzc30r(Q8j#W>(~{0gA`hOO@Q
zR#*x)1tl4Gw||Z?f&CLO)XXvh8EBxBu~H@$p>Q~yod0L*(i*gWcMKolE9+8a=-5EX
zgez=Hn7yAq?=Mnj0Xv^%s5{Su{++(#fNByFJyKIKkx~_*Zp5S142QER+y{)IW+ZVa
z@}pqGMjoM&#t(#r_F-o-)X}bKc+h68z8su*y)O<_a<*(OU+-J9^w2|*^*)2q!etfE
zn1k8B2OP5&SYIm`VALhlryfYAGjQQ@<ILmS%{_nn;9sJbX`u)N5EQb$I~E(gJ!#J9
z6s{=fZpg?qi>vDkM0j)ljep<8&jwl~x)|OAymHGU=tsYc{rEl`D9Tq#^<n|`jirn1
zsf93|U9(nv_djE%@aO_*U>o+w`Zp+02&l_)Y&j!1*dHfxP!h&0H~Dn?)I<qp_fY$V
z@WJ4tCLVa5nGHk70z%~!KfTygoL89}*OVdgNZ3t?<&k>`!Xl%5FJu0v-NKF!op`;`
zJ#Qx-H8eaY4Ey9uF3}b1Jn++T?9XTXcZ&6%c>ZUs2h0qNb0PHj2>R79QU`~Y#vU=0
z!u;(1Pv3xmuD`7B29V{jq*|{~l+Ysz-`>U_Ohq1`V>mxMhiPVKp!K!w)q>zXgKMt@
zwd8fj^&(1oWfd(XUorh|r;>MitUhAccX}elF7QCt9-#UXUr7Hngb_l2J~s0dq!oD=
z{4GOOdmhfJE)9xd(e+<yXMYJA-uuXZboTf5f(^|v5C+-niip-<P>IHe%%b>o))*#c
z11vMKE6@)1A85Ly>il9t%54sJb-u+B6Yf;%NY{%)B{3$JKx1$K?wGk|+(TZlY;F~#
z{>Py{eEA&FeB30ChF+-&C^JxSnIOd-FywCezeylsJaH||1{PD&Je4(HTarE--{`Ng
z=~}@iS9b0<yfL#u@7eM|-4#W2Roua_9h@^<i3l0c{n7nxlzg>ea6$2+{TH)sg)w+^
z)9H=q-Nk3rM}Kz#JU%f>MBH2+XT>YWVGm*ukmWP{XBO2D)X%0|IK23aUMcJ8bt(@q
z*y<YRrzB6}<az4uX8r`548Hyz`dy(3xsb@;mdMPXX}@dsxc3@<=gl|T+<x68GX*ua
z1CbFYjc&%n4vz03;Wc)1vQCfJxkmj#h5Y+1<--r&;s9d;_Pr<JN8bw>VH%#~JZ2Xe
zU~H8ZgmQ>Q%7d=@52OQ6S92(|;&bwqN6FvVwG6yc3{-ao*Ed2#tus66P*l=^R(HkJ
zVvP3zZ4Wx!el2nswL{SnDP_<*P@phvPj_2H+dDjr5Ig4_xw`A3pz$Wc&o3HKaX)u6
znB%&rw&Jw@mEh;}q+?vjC32Zo5fC`=64t_|Y)ClSn5EWgDKKSUd^mp146G*zE7F*Q
zGHUIWba(cw5{xm9Uzp$C&w$<Al`UH)flS~Rkprfa)m7V~mao<7Ej%=Ev-569pA`LV
zY$8r!Wll6S!l_Wr!Q?SD34jAXg}AS+kr)lfiixA6)?9u%lnvXZbN%$u5uV!a0-NM~
zFMKiZivCId^4z!?*zea~Sy1Ih^LmTnYbK_S;&H{7QSF2jbh{K>hY`Ja52y-i_R&cI
z#_&xugxIUzRdPLLt)}gR0LnkcicX5i;dO<CK9&-TN{@l0&5A2(Oh#v0Q}TUOEB3xt
z9b^Ms@=0WPFwDJ60NnA5@s1Ir77YPZM!j~yuGko@Y2ylkd3kv=4#5Jdv-1NQO?&x>
z!27(YTHSpigzOf^eyotOyqSDqH0(0`<>GeHf7(n@91x<vO&@;LLBSeB8R|Pf7m+o-
zb#j1vOaS-4TLzR{w2+)SAIa)mpq{9!_di97(UAhBH#KcEt*Dy^1gbq@!M^9FUqh9A
zC1=n6IwY7L8dMPTC~eb-gy4!a&)GYs@^5M_Ck!x~KR0{XlmgGV^Jw<SC&8zQ%00OA
zt<<J@xK5tXd2M_x>#OX86!s0T-q%42s(T?cN+13+jt)JE8o!p{SW%#~QsCesP!wke
z8LBd79T)TGn+Q;#{K?a5GJzX?eUSC`#l2Pghd?`Gaq`<oay>nGgru4IH+}sg0teG*
zl6s}Ky4;HqS-T!j{7No_eO}yRh4Q>rQF|F|X@>>61>sT8Q%a&>gI||9@Pi8d{K_CT
zcBXXL;fK3&12W047`yVt&EHUzkor78?qXUuO#MJSxyg9AU0xwO&?}>2f>j_TLOqmM
zt&i$)BHQt!_X<cg-hpF{uYEcO)}zcULLTXbFy9K%U%R1KQ408<fR=Thh(i2j<;nce
z+TR--FCgj)#!v_cAuv|hXI0{ByM>E-4?Uv86mKG{Z6`}Zz74^Y8mMz8x7&z!+~VI6
z@xssJ{4m-_ba03xZN$I$WMbzb|3iEt!A)6FdqT$k^_;S{4T6pR(0<)zhsj4IIZDs2
zcXntfAC+BpdkZ+M6&bqvT~_2V$6)^8d>4Quj7zmdVHZYddxKp|?aiVZqDU1Bbb1^#
z;I#e@RsBgaHSh*MCM=ya;$&6TO{wR0xaWgg+PhIiAh%>s(ySrdnn?63_qkxpBs3uJ
zD8((q8s?Q?z;4)EEI*q^D~1BAG>rCJ+iP5Am`*l_6gb!^(GE7dib<U(J7r&lB_2=H
z$2&SP&fU>A#^*jE^_@K>WqGwx3~0T-KAI)7A9a#fLg!9ok?TH+b*1Y~9R{=D4zKmM
zv?vdkqpD9d7!jRmBt=|jn_=2No+d>#==s=uOHghwC;RNj13DEi^j@*q(Ws{AkH`w2
z0-4crJFn=h^(yeL9ls#mhKL1rc;#vS;y+F-)+`sRUqnakQUF-wy@-WS=?MPivBMM0
zc18G8*SHJwTZT95YlcY^T1KBy^$va~A<%ppD$<P{Ss|g>ZS7Vr9PPRF2oBDgp3m?H
zHeEoKcK<+c2@N#3AH6De2>xo1%|Z~C#DlR|ky~i3MsYu1Q4;|*?bYXRsbHpU3Z1Wb
zAge$q=qXCFU40wYw)9f+=Yk@<CfB*Po2NUkN`+0e-0=C5eo74g<d4kf6`f0N;7A0J
zpZ%|TN0z0nv2>pEqV5Q_<Epc07d97aH-mnI3vzUI!|5LN2~|3d&z+9PPaOgko&jy3
z`Vi^yS<bc)6Y>Kqo~>juipS2_3?0wm;ngQ<Es5S?$h(r=QTfjH(Ydt|)HSrbo%Vj{
z!l1{kuuBOR^-&<STHcjx&gjsXcI_<=LUwJVHdXX*o}d&j&NymsroBG(l>~%GO1{1w
zBFCg&_22EdqO{lh9scP(*2IE~tB~{deNmsb$LQ_x*!7Qyf?k51WBK(1LtVQe)~%uy
zhMa#+CKIZ(&EE~T7ls`aHX+b0o_63QBwP&SYz|Q@O(cImchCeN(q-K(!6T!1ue4FR
zS|!cYi7oxWljY4H#X4X+MKIVPj<cu30pV0Euq)Ca;MwvJyagSN!50eLg~+B`k1R7M
zfrf(P^8Lj2AMae@;<U?OvsI&_#@U81BN+&!gI`=nyi+&A@ZAjQl-a?z&zN`wo}ws!
z>c~lKCv595OwwLjho30DbuipdUEVyWh=AsRR%1Ovv_T((nJ+sZ%+HthEgz%f>_Gr?
zV7-LvBI1~>V3b5;y{Lm^nYpDtpe1PSp*L9*f^aAC`Eb=;Z8+#rB$sV3I4o}eX}t_!
zW1{94j4g>}6ic}WUrs)J)UkN=+_=wJ)uMofo?x=HF+5)k0uPUH_0{PE1@V2Ad!KS@
zb1FC3F!tZMYHgDnD4;)~#l7to!u1;6V0dxJcmIo-t5A@yeP9L42UA}`Ym?)Rs$GRv
zDu>s8C!2%|v4`}b3)vk(XBIQktfR@-ophHfooPROjP1vnhIJ-9K7ZM3y%O0Z753(n
z?!MqFlLW&!so(J+W;f#;2khJs$?K?A5o4g@j~FiZ*+z4s;(}{`m%V7r^3XexvO9%(
zKiC~@mV^iB1p9<gE^Q+rj*Lc93Xt(*DdFyZ_``<vf43f_P>yqTV@-gV&($@rAAC&`
z;+oOaObkAsyQ6wLn%Si3G#pn~Zc*;pXEwnxPiTnVD7^%62!AUxI@#tB_$B9%6mEy8
z6-VY*J?%4WLLp*I{#{KP_3`XV`B+7N%DV(e{CkUux@)r!5!JhmjZZF?Q#Vo3UXBaC
zt81g%U}0Gx7?!H~i2r?w2@8ja+Afon?O$Oj)1ZVukCJF;fvN?2QRfmc4&Y~J<m%+P
zxVffb@cce)0P_IYIVjIW4C}Dh1OQN=4Iw-S(t(XIF6cBRs}(SOGDo5>?&0ZqVv^W0
zo=1t3km$+HSTtuKgSq$Gp7$61<3!#sEFCFlc1&}XB&~4O@=_UKRWy+^n+r^xZ_c@x
zn!tLCWIlp1A>t$#hPbNT#8}My!a__vzlm%yB0I0-2+P`C@Zs4lTl@6+>AIyTHkic=
zzBkb)l1)|Q?qPXF3s-wTXfVRS--NgolpW<D?}NKNvb2mA4G~V@oVG5}udeVPpX0r_
zNfK-jXQ7;I6l2hz!*R%>q(-DUHM@*=L7%uh7MCmwue=UgHS0^D#-%2RroFw^G@WKI
zE-jK+bL7lglMpqcuA}y8^qefVbAffU@9QxcG_@}ot;yYYYx#SVrQ~Q%o||?D3L9(E
zJZozAHTwUp66o{A1tte3YK-|~()z*525@@~wx5<L&Oeb+Hgu5BoLzi=#5!+)v%@jx
zm0|94JUd2O1OjzTpWuX5Z{D(_v&JI%0rM9PJ5CgW?qqr2FqGA_&>XCD7gcSZB4?H~
z0$tz_kyqIPqf3o~G%c3XcV!P}1ieYKZz=^68XgqJu8f~DH9Z5jAkfjYa535-&uLXj
zIz05NHIQUBZZ0R;LQzWUy+-U@cu|hfF&KpFm>c*~><d-vm`F3J$Nn%qm1=jCUq-Ca
zeh4<DR<UAi(Re~8AnTJ91C~5&yxj*mk$Gr^p7nOY^4~vzxM1#|YC@f5etaH7g?#Ob
z;2(#!jO*N8Y|Evpc)v<%hZ#ufJuNFZ@6FFI5Ndu6C^Wlp2M`kdoXnbMC2^$Gk>t5i
z?@M=+^Qm!hSz<71WJEby&SZhpVIvvXF3|jL<?sg1iKJ}t*zT|}xy41sxi%UJF=>C4
zh&b|mKfKfPcn`AX2lwI2a$~Hk_Ka1{^aSmDhwCqC(MUy8)-~yuF`M}yk(iwe^zE4B
zSS+qY?p%p_oYpjgYnE8WeEocc(t)+tE#2GAfdHU;*5;dmO!Y*xoAx%I9ro)A-1U1#
z*n&98gC?ZTS)mH=e-dyF{QOZ%hplv!Op<PoLrMP_;se5Ne1@iD<j-){f0thDLe(E<
z@80~~+`|aeuHa+p-@tcYl(DXA)CM@Qwe0fb(a=57?61(s9tyrjMjomH<~DcqD$u9<
zSkH(X%@>x711CoH4!Jq6bf_N~G-+sbS{}~P(ZESvyxBzl%&J}Ou$U1hHb9Pc+2~!!
z_vL95YUK>R_)yfuRtqOQe?L`teqA)x(QnnmQJk+oEEm?jL`sulYHwGmh>D$0I)Cz*
zmG51@k?ls4rS=u0{*@tu)ta`#L-W)FHRSC0ey<OfMRNyLnCF&?+r^Y!BB);eUE04T
ze2YY;(;epz$a*vT+oaFnZuE|uQ#~iLw-((lZDaRNQw(I#3$J2RV2h(PNaFe_#b}AK
z$*)p-zfaie5^mu?m{V3c*&+@dO2o20Xeyk~FD~xv*0+(CcEL8HqvvwGF%Lp^e*2?x
z8wC-}7BbIB+)hrekOH{TlE>}tIlU)VYf*e7-r_nlCYjEO-Hsk*#vgZ~ah#Vfl2w6-
zs%HbaTeEo5Q<mp~cQ3ftaM)up4>~K!*9{C<m-r*z{yrR@(=QXNm!EV_5^yn$IhsH+
z@sDX_VPo!`Vi$@}O9>Tx-<7Q)k(w>ZtO-Vcy}6-u81n|I>H|iN0vT$ES|~-pRsVKq
z{apwJ&P(qy-<&J$PSB-fgO@?#^c*sY*N_o6+Bum18<xQusleQ13aNjc$Y64-ly>af
z^vU6Y-{S6aepngb_hq(^6&)@+I_Ec0+YB+{ei<3UJMX@|z45vrmBy(>BvZ1Wo#D=?
z1hfo~fp0{)jeB0fO-l==Qg$|cI_BeuduYsP_$-QZ3LjTF?R`Y2mFjAhzx|D2t6Iko
zL8*x{YXqO~6OURNFu*z>5TFnpWqC;QgVJ#17dh8c`Pko<V0z;E+eUIXY=B{0x$TQc
zLy};R1#|IRr2V!~!Lqv;*(Ee!iF;p1w7>t8Pq&THlxr_#Zr-pPSr#Ea22<dp1MzdT
z!=swd9dje}7g9HRX|yr8VbKLb(&8%F&Ln{Hqn*ErRoLr8J>1Ba)4|{ff|V{w(f<&W
zqv#{AG?qtZF|tYvUha|#mW3eREPf=#I$XxW8`eYI)r#~r=Tnn<bP3d#0Iw51+T5=8
zSQz_W8lMW494TH53cP^@L*u{Qjc6i^BfSi&!z2+y`S+`@vsyT1e7X~Kudy(S!w<`A
z40{Al6$%fSh<%&%*|c?ho{)06p>o6=N}m0spYZur)9ky_;!tDdW(`=PvJ1MMPXor<
z`7$pluQRfAcQ{;755~kzpXtuPs1`QzE)i~-%__?dbGfy4;9waT(ajxRkF4B!AL*_|
zF)T8+TPnPK<4rk(_e#CGW@7G*xbA;=Ox{5YRu#>-$oI_|EltLg8^UiuwoOmSEPh&*
z9myt7xEpXu<Lm?{8R(ZE=>>S}R2#^B(gL(9<>q4sp~#4uJxRaKq`<uZ&hgw(C4e-b
z8{*`yPx)qTPhIcZPmjHpmT<2RB+Mx)C8Y})TO#h$-h0F|&jD|WI=pV#7Usx|j>68L
zLsHqlp`;~dZ2DMqA(nc*mWt5zyN<({im)3QbG014c-Z(}b(0UQfAhPdYk;XW1Zu%L
zu4wjov+&rrKIr;3^IzPSj5(>J@B*(`k0^YzI`?=p4C@{Gnuiu20)!QDtxz>P4LBwE
zJi$BmYWDKtI=il|a)G0`BP9?t#YhA9gV=8MZeXeSMw&6wKt9D23ps?$6>E@)s;e*~
z?}=XLQi%l$d?EdV%+!>xFIHO6=qBi<oW4fv_Y_z*+^vo?aqyyW$cn@JrV3FSwu%>1
z<?x+@fCd*{T{fL0`P`7o#?^#At@rWYiJ(8lsw>_PcRRs|rujvVVdpG&7xBb92&K6H
z8uLf*Gm39xUy^y$($OFABdfU1mK>?Pb-Rz2Y(S=KpTOAZ026m;(+no)f@UmS;WmGr
zDm6_-Ig<P`8^dY-OkF~j+s1VB4U_H84dvUX3vVui8*6zb%raoZ%Y1|3#v7Gph(wKr
z|7(_awRZHcJ}2q26->%&BO_W9+g<KgyY<d{m6lkVAkSUeqoA)QfVi)#v^MC|#*|$s
zBE{x(?D!FDGo9Onurc;XBg5*1*nx%Fgfi$eVhmJ_u0?I@-SYm}W4feo8wj3><*fRU
zF`1lOHws7?OwSSCIBoDt&c6f?oD@oD`Ihe4kjb5;>}NU+h)R+F#>x3i{o?TdI4A+{
zdCB~rR*>e%nNF$O;}e+?-+75JU>Ngfgp^Sz+`1rN3o9Lk2;}tB)mK4@KaOdS4wPL2
zoyJQvuw;Xsz<iejey>u<?|EfWHa_c^jf901l4(?Z+m^M9s-U`;6{o@Un(oAVEo%{q
zI|IyGC(^FdSiXjNJs3aQJ2|n}1j+U-60luxahUNt%<2BA@6$4MoBS&B*gyU`>AX&;
zvsn7OX=<Tk<fyPC;_>@pl-;NQvE>y-R1DtqL5ipmO2DcS3dqr3Qoy#(n5E7$aXE#k
z&>^!;4fi1YdD{m_eE!!laSh#|d2DJKk8pQ0PzzmBW{I}NnToZ%XwZ8kEcT;ox++f`
z`G&Ws9pM;*A59kP_s^HWRhR6Z$Ebc2qJi9wYQ9056iNo}`dFLu!;i~+rejHYR`4+!
zFS7Y?p6hEdS4n$gtcFH4hqjd@M*-pl8^?O<`(g{$;p?YUPIDmMj1@JhUi64<qQX-R
zrOA{-73L)y+3INae{r1Is2rg^%+#S`c~t>?Ws;cAFZbV#CG>-r357$<Us)SK-n2_W
z{-4OqBflwES&?%T&15m{57{9b?UTYs3nXLllEj_=wqiP__RkmV11n1q3V-n$0Vld5
zBUy<_w2nPtZtv=*hK$b#9k6nQ=s(NMH_H#3Dxg!#rIczdz)^AOSfX}2kogf9iTk^c
zv_S86`)R6<Rz$wpI(>~*nBh#_$(zq&5b;?bCqvXEZpzkn&-PMB#0D?k16=Qsh}zLt
zL^(%pEF2Bzv;`|kSiVkI!}_?tc?lsR#?jc$Ib)HvYOnJNWron&E7JtdeHzoKwav{D
za%L;=_1vjM4|S&-b@}dh0qijXx#_v*S}ON_!!I0c<$`8^It%}q5<VtXzI`F`9bq#D
zdW0N6Wdu*;_eXe*>X{eDF-B{#y^~yKuM)>3v=h~2t4TpF8P3t>WKXwRShksYHSg4W
zQao(YIeEO)qxxZJf{A`_orpLqJDZGmDfFdy>tYz{2VzL4MBVFgoe|zQKktSur0SPm
zEN^0|^mWNZDX@Nw%cbcF+uz!`r3+ikryV$G_OQDnKkA8D`VxDd(i`UIS8L?zpZ<Ff
zbSnDPMi4!+ceVWb>VmdqV4&)wng-)*jNTxtN0v@x7gs1iQu)Ku_Owo=Z}qOimGMC3
z<2t0p_x*FzcR!m#5#QnBG9$HqW6FLhMQHJHOirgff<!7_Od0GTIaMGvQwDC8Qy&Sy
z@aWX8q(f(_f#YBbTg{e`1)<TRJ!km&F!|S+ui3lFZ!Hg#S5tYKFTENBr>~m^jzwx`
zQUnLw=RG8IE_4UoJ5`HI+e<jljgP(<XN^|Q@t0!sml@xIzAa6XQ0hN3?W?6M)4=>6
z-0<hZ%bz`hXVLdzN1coaU5UI4h{|GaiZ&4rGUiE$>^?1~?i-Q%QE&Srd3p;cYo%nB
zi?2$LSa4PJ<ZhNmgM9nz<B7)=l)j0z*dEqTnkqnF$Z<R<%I&Zv$F|(Vlx)~R=B~fL
zTjARDzP9O9gK$QCy%B+U5&4FQ@0N4sMoV_i9%qg#iqHLK9<1@$vTXM&VB8ar&iU40
ze3w@B_|7kTGq!ca<r`y2+S&Gc;3mIb?B|~vSG5{0_x$f7Q%iuKeZ%&z<Uf76Hi^vo
z3PdJv7dS~{0zKb-$q8K!5;@Rongrwp8EudPqiA;zyO;;!#~6#|X7tMv3#!f{Bz@cV
zJ0I0e2ZinjAYsLjQ`5kUG+&G3S0iKOamk;e=5@UVjhwl4KRuy*8kIyFD3n?q9)YKB
z)=5WMvhr_<g3ctfu+oz^bkN!4$M`w93ekO>@Io|Z5iVx7sz(JkGo1?ssXFGQc=xN4
z!<$8nm}C%Lsa_C--+A3`$?`*=E@I%e!VTM-BHfUVXY(N?TD&Og8PjIyKY$v#H_qUW
zd_Zq#P>bEa7L##LGa#&%HBO|h8~)_l-ui4fTTTU+<|@|p7Hd+<D?2}1mQZ~H1LR>j
zAvNG5LcwqP@QN*Id0cez!5{w%%7eoIwH-I{Sp5kCs099dzwk3xCgFE@;2Nq-Lfv#4
zS{>GRJ8_yxeepuDwz?8I43C5edY<SghCKjPx&6W&B$l^+i~hTVL`wbpD3^f#qCN5_
zVNwhqo)_}MKV$R2j&c}!?$-!vYU6d-j6f4>O<&>duXhViC#n{`u9-Kt!poY2+a}?r
zFdY67`q9iFqMLCBNtNQ*Pf=1E=qOQwFR#uspYChFQ6vMEy3ceFTy{xjWLkHc9vX=0
zH`v@UmR9c?mPq%dkgJ^MAV24^#Z_JR6n((Id_r)n!an!eP9N7m|6Pk9b<(K8vuBJv
zgAX8=Ts?e5g2Gb+Tn1tjN4JV<4do;Sv;^_av$Ca=$ktzk99H(QmRMo~;5_NMPn*5b
zefMLTM3ZV!SyX^;cT&eScsA@h-)g^uXkFJN+u-)_Nm?I^@~5auqTaYv7R9RlS06Am
zqlr~^ih>mgWe8_&^b<1IL*}?qOqJMKIMByRQ03Qm?iJH*FZ__;4V~+g@3$=krTCTJ
zn{ItO>%JG<^*i`}CEE=78_1{deqG3iATYhC$8yGm&axF3^TqByqp{z*>+2>y^$X{|
zF5-qmh>U=W-e!-}#e%=lrXPmxb$@ioKy%yA=3*r4V%GOvx?Jd5cl&(#9WSwO{;eiy
zD3IidJ~C<B+u^>X4sRk~qv<+5&~BjgZO5OO|5EL1w14O$*95t&S8mEV#bFqIRKaC`
zhEz=Q6p{!3QEol!EbdtOn_J`^b7}Pj`+Q?Wo5?ir%@CDU`O=*PvEXK4GBktU6!#$A
zz2)eZfl#zk>h-6nlTjsF=21ax1Ccr;nY)^w&R`M4rleYf8Y}9-<&~LW^L$$k+=T{-
zJA|HBcL=!`j(C(B(RGw4QiiRBE5E3s6K1FFJ(fAT-#PX7s&HW;Bq*LRC2&Q|n0c<u
zl@GQZTp4|^;c#^}oZpDf(vX3l`Kf;?kp1{Kf&i%gPipLMk82<f7ML+vyN^$X><hhY
z@GsISTilQ3dKAMSA-IHnUn~}2Eamj!UBo}6lgNvl7D_oVlSL#u+@0erJDw&mTK!QX
zs*NdXhsZ(gjg9Y)Q7?hdIjwn6N|~|Hy+lCzVV-1Mfr3--#<l5uc<PtslWcQHW7)`P
z?NxYKxOj7DBKZAqw{sNvzllF8qyN>wS@zAQ8A8U}{x^ief}^*5jf=SGb~<|=7nBwD
zf>$w$4xNT>x(#2NYk!o_H)+Dz3@@ZiC!ke?Kk6`&y0(rz>kqx!HA97a#@+HxYLMh<
zXat_!RH?+<+`^ae{Z+EHpi3)TKeJ1FtJis%zbB{pTZu)e+^uXwx+c>uwo8`w+y@g~
zUg8?CJ^LB;g{!XQ)WjI~E#C}Envk&Dlv7eT*lE+d$vJ9{^a}rrSjo>%jzUY_&TKnp
zGV`z{32icfSuZ-4CNtk-&DWMmQ#9qR9k^G8M0j|5?^&0wjUO=y>xDc|d_B0>YMun~
zkQK0D{e+1;LQXa`VdT*9;OiI-10U6MH0^T|Q~Z7~dX`o(pO?b{t~3^9l<fC<k2XCv
zWtKUQp5Fd|@)dy|Dt$CZh3F(v)#x2h5()lFq3!S&w5nbAG&AgY@6gn2W`aJs?%1`X
zTn+p5c<^k^yCbiXpNoqav0TmZOfF~DolEZ4bQ-<5%?h7IAG}m<mK68<gWWIW3-%!$
z;ge`Hs%PyvG+;vRqC+Mldw#+81o*sX;$U4yB>1$(+WpCRmo~zOdiJ75S6}EJYqLU3
zEkp_}t4I9K5$<AwQRdclt^s>Ai}IgQY%+cPJ68c~1$XCuQnL*V#RB{H$#nOv`UQCa
z3LISgvVXsAIRB}4vsREn&n_6=3<r?;p?(T%SO;rWx-m;h^NMv8mx5Yc870!2%dBx;
zeWS89D|E4iwf_$E`5zE45!^MGFSfL1K1`>f+A+I2F=z&T;n|loHn!3faZj=#8ir5<
z|G5I+qFRALky1WW56IbD{VS5-nBR9|!mBo#q6!G9jq@Nnon_7qW!SR4eKm`m7Ax1`
zeog>1w(}Mz9nS`c%G*N)BdTtP$vyupK=!vM0=%qd&VB7(N@VzGa1`*eRLabT0<zMZ
zYlO<mB)sC$h3fYll8OxD(-?*NZVaB%{>4TQ{IhT8vlv9F$P^y>-1V}?e@p<SbS@>)
zE<{DU|7SS|G<X@(*jw-Ea%qesK2q%~j-|De=+f$b+;B|V!v|TYE2#(oaMVE8d&h2!
ze^)#7_xd?fCQS>fRib31e+q_*%eb+*<;kviqj%5U$!Krfhbb*S(}`d4%I<6=2F*SC
zNbpT$F2q_iF;ck?bM8Lnfrfam|Hu&hx$uEkBb~L*z28=`$UX>6v%N^6Y!Pj|iM*Qu
zNvc+Cn*w4-qqF^7nkpMgsc|%0Wg1K*#q@%X_-0}MlPNMU(Um+VIXM}R7x<=%w<e^P
zTqb|QF-)lBL|Dehx47|3kWvY8Da=;*Xl!=pI~(}gu;}Wsnw@s&CrT;3yd~mNVmag*
z{fufNyY~2Neh=N@QN>bI)E{_q$ikboZ~XAo<;-%{lr?hPsm{x3z`rC0eY8NsLumq+
z=llk2Hu#k3#TgZ8cF|w?L(;X7JUm<K^6*;spMd&)L7){OlQv+N5lxNqu+irQ;(P(!
zKoZC$M~C%dOsuzy--Gd6Q1aKGdy#LNOft~Dr}s+B_QmGwAJ-b~$VO3}5sZuSGvW4w
z^3uKWoQ1?3a3}7VFMKw*qEdJWn8Objf3?m0Pn#Q`i#RcJ1%je`?LVWeloT7F6IvfS
z=o`~EIRJi?aQe-c%}B7JN^Eg<ywYZKO(Z0>Je>zaAa8Zw-XavCkp&f33bQslOniH&
z&`J<K);P`X>MT>w`zIUWucnq9jPj02tjNJC?EnE$OhIyDiFIx{@bv@Gw{)ElH`hi)
zw)^lUa)sz&yfLcc=lYh~8+WQ<1}?U3@6S_$e}dRhm5*jkZ0}*k-vyKoII4{c+<=<c
z^%{*R<Or@S=7QNrbj@o(btV@)feuX?3FI;kdc;`7aNK>h+P;7q)N1~z+=0Wv()W&j
z@2g8d7=Vql)|t<j1HWdPlSDi(%G)%-&)=^0Dj;N*I(zY$&h@oquHnMFaNO^Zz1Uii
z`nJCKY&v}z9a;P((qJ@MaL^DvZkijJ2}VMTa`YVg0~%>L4=48D$HH<TxMc`CldlPi
zJa1o^Y=4mHfqjRrFd5pqX?vxa$ctC|`0U=SsNhyLOwFec@JfFD8f>n_B-$quR}-h%
zZh8==befNhJMK<`_>kWCR8{sw`z;vfc5J|4SBQ}N0-G_xCZL!kq+~FlY-qi|HjMnV
zf+nhi_D`7%{t7*_tuzxo*qJFJrdA+MC^4J3z(sn`I&#m7KMT4p1bO;AGRcceNwb)T
zu2?oFC>y|5F1Ho2e#J^RJRHXw0Y8F<#*y)|{4@BKHu{KVc|YUdRRZ@(tfc=GJ9XyK
z>UhBWT3fcO;(7()y7OJ*D<6yqYJ8k;l!@ImCY>ywO+Ca&_v;wXF+r5*cu}GD)?IJI
zt`No<Z4c4QABtyN%{vmqjfUxP9i&I<uJ>0h+HM<*gL{a6=sO~0PdQujkY)XTih;K?
zROfikfeL4|ujRjkw|CK4_n4xkeEL<mm#6K<sJ@@;Z@UJn=kH4~519Tau;7qBu(brh
zJ(|~DgDqs+c-A5+=XdKk+i{qd`f;508Xw-y=8lx1LTbg4Ih$@)ANdC>fwY|e0@@QQ
zfv^Y?J&FEXS6Y@{-6zKx^xX%0{UW4EiGlk14qtNy8QfGH9{!6RvXYr^+oeZrXNfBf
z-cfnKYOvYAp8uwxqp{Et5?FlrB}%6GBR~CA-kLP9OP_D+g-`}<rYs?1lJGZCRdK)D
z$Fr1j@s1W%GLa?x#q)M;L!nh+7~ckcSnkenj?x-CI9|u>3^Di5RzR%hV=X(JR4NaS
z`==i~gYU4hLBbVzveU5KLZR^K3Et*#9#XC&Y@?4MEl{eJ)%3~30DOU1z`3rg{C)DL
z9Z{y?;^GXi7(2+mjLga8gRd96pL_8LcD;1KxzD++(GkU4Of$6Fjfwp@aUj$#JF_S%
z#>*F}ckdm!Ht`2|g#vL2L;pt}j)>SZE*yC^>lujud}QQ0&Ucn3wmd2y=<$6zRZ*6b
z5_jy!?ZEkQpiSIzYd<^5M*TC=jLyWos+;h--?3P%*eJ~}L}{+$E0!k($_T+)=E7L~
zUZmo_<YGgfp#!z}HOdkDwZ7CL!L&#TTsDKe%-Be|kzhax1e-tm%LNz9c#%X7)3Y*?
z|BtJyj*GHu+U&w2-JMH^G)O41G|~tPND7FEAl<bf(xoCGT_TEfhk%mODBU3~-TmFm
zqL1(Qhx+4r-1R>9nKN_EHP_5RLnL!@(d38wy}Sx7QI3Va25x3Ce4EA=5#9S8)4n~P
zCj{!7(Q+qfl}77hwVKCw*A8iWddjqyvNm0s?o=hzPe)`13*X@-ma4T|?iZa&+9o#&
z`CMIj!<z;ViElc97z=mY<QBXtGyC%q08!(sjy}glUO;swR?erN0OV}?(TAeqBk>s*
zT`!W`_8ER+bMKJU=KWXJxr{C3ICGIF82RXg4#k>nZL+lFY&rPRiaHND83lh3u;h?L
zD{CkQ@+dea9^6P6Km5HLwl;BbPQt(IuX}GI13)cZnW8iFcDB-w%cpL=_Mwbg(Jqjw
zIC6vktMtSQd;?p_(#Y7J@e7D?Yzv+@w!5s9kEuI>gh=%p(I4)e7RcIC^M_Cg5NP?_
zBghC1Q1hlYEg+vJJljI;id-)wJ)PV1b}92I4zSewlytiqMRVmf;cS(hAyd8I@@kgy
zck&i&AA)y8*!RQldXsD6mL3&kzAq}hah^F%(qFjTHD-uv@TAxSkJ+pbkNWrOxbtrV
z3Ty-Vv)cJQ!fg-XoeA|IOF0nZ{4JOYY8RV&`ul-e`$iuZ5!^{!)SCCy2ik2ob|Bio
z6r?~p6QT#S&5w8fLi)G6;G8gJp-Xp?R-)~;XWtztqSN5jHF;8I=Sd#fN9IQ3g}g%5
z=jq++;mc0wP)?@Fh8NDIm92}GXPaL1vla_a6+6+i22B0nl=OLPmKt?HKU1!VkXh5>
zp%z=ckWL<xefQ(}tv3PU-~K0U`;Ded=Z?{8-Xh&zJHL0_%4;J39qZ8G=o7=6{=@o@
z#wuXF=;y8dQl9mbbb*>;a!Qc0^WB)!_B2^4)Eh`Smj`wc6gG7j-H%*X0OX-MAcr8r
z%UC(3Z}w9(?XR7ldMh(#&EICyRgK!>_adEI7%j10Od6OPY|$!Jxh~^z|5lEP7wNs%
zL;-ZDH?raP&^|p|+d3J-ci3kkXOv=7;dsiA|F36qR!O(IkciShsu|2xB!9xNTm4um
z#CCXuD`&Lw@|^x1h8mmp_VAZ7iVst3XWgf+5)Qfy;Db@>U0sQc7@GuiWKJOippp#D
zrG&o`#fF=kkLCz3@&;a5+Koq&Mw8#~|BxVgml!ZI+mudx*@8!p^;SW(jXW^A#aiCh
z2=$&m4gs1iUWPL$?`Zl%2*&BJl#OVgyP)tEto#Jm*#9wJcBAyID2N$HeNB2crN_Sa
zUc=L>Ui0$b(}8nr6-V9@ygEVf+rS0iekLCyED|8dCzJ!8km1o%`t=h&0406@<$g3>
zw1iDjFNu=ZpNo-*kxy1EMIBXDY)&H&{=|MMuH=21)vMW8i64}zosPlADh>LGt+Tea
zRk)r8<(I^}bXjo!7~FYuO+H_JbKf)nEWxF3V<QUzdtWvhd~RqF=P)>}z7JWk5Jp)l
zf8c{@E&L^Hl~zg=fBOjqrrfeKMbUFLipO2o;)-b?Hg8q3pI&QJj-aMoJpLC=(OQ?I
zbldW>Z}7Q)dEE`<LEoNlW!&CT$>{D}cVIN}b)y(}^INd;o2o{&U#RL235)pc;AaEm
z(#iTWef^Aehug*@@ry-%1yxog3i!0%iwfd@?tQr`>b%3IIo{MSDo+SVeaXp!tyL`+
zq8ce1Xzt2G{CRND>UbNYYp~;D3c5TZK&{E*OOJjrPx(&1+a3wRl!1qi`7vqAb@d9;
ztw2fcxeqQ^=ms{9Fj~Jc$}f%GcN`1wW>%}h*(Q&E$=Puje9U%JWBz^Rw418I#&54>
zv2zFDOeNQz0cp~aR-<L<qo&1t_B_$`)%*ETje8t#VgP~U?bg53yb!OPU2Ud~`U%*K
zgWH!KN(n0dJTAst_(oL}C-91S{KW>u_v1-H1=TA`P=L5dNC?)j&NSd#gi6MLE-VGV
z%@4Y(s}7rM?o5vgzjO2Z>^HMBuchY+U1V+L{SR@US3fT?r`jzQUWAaO!=lml_Ho^3
z(+v7-Y#hqy1)%i0CY~T6--qCAMd@NfWR{35Mt}ii0bJfwdb$A|=k!xc8>DW+7_qf;
zGe{kxW}_cCuEukqt`t(9Nzpj;;{?|2_vL05+gpVf%vvNs;%JdeJlC6`b6<^nis;!p
z-N9wrXYcSkHr-m+5DC}vmqvW~w(W!9w7Ib2EWSCmrM-IDga65}L$L#`zoUef^3@Sw
z*?)%<%sE*h4n7tk5T9h8Gyg=!=M@Y+Dx6#&x0}|L&w~f8V%1HFqL^j!<bPz}jM)pn
zYt{-M;bFS<uKTF?2<^8WC!!XJrkI{ljOkF5FoV;o^{??0m|Yt`#T>h+IAj7$c$*ge
zv%$P%<Mj*zm<Zsh`_%Z1uV<MpD>qse!!9rIk}sCV&vw#pW|z`bUcO55oGe$Wvj%fo
zuMuzzacQV2i>usB1&E>m4pXwrA)hKY`kp&((2^hb0>p&c{!GY3ynI+A1Zz_dMTIv0
z6kAm2#+E)TB?cbQP`G#OX^do+NUV5)-8o>KxE9dv!5X)^D|0=MZ<Qr;ZAw2Ae#%Sm
z_H8Kd?v7S+Oh{g9<kuo;$U5(=B!ry+>~HNud%+U70pKL`yO<7D3pFONyihD@W}5%W
zf&B^D6aDa2-`@9MN&a##{RUWT<!QUgz8wC;lItO8>GuJ5bf$I<k@jR7xrWLM-Dg=S
z4t#!w8;_LT^e-tB@)le+Ocu1kU^Ve%(BZtV8@~e#A0jXXo&Eszo^4tJ$+{8Kxdn_4
z!H6NUx_@>b>gNCY23^3mUh%|F(=#lhzJp%b4JN+_nhL5&y?FpP@D@zNoy4zVfo2fA
z8~r@ERuh<IStNXmgNZHF^3lCKEw}G2Ra+G+1f(FM$k&gwpyI$3@82rFPkRpwEV9a}
zx{^;+n%h<l+p7LY86<`sD|w(R<a?TutZn)mi?}aEghcFc@?+8G1f=n!X#=bOI<Sbm
z<|G{hw7X&*TWA!VBO6TmD%$XM2&Djpe(4iNfw#}%Iu}y;)fX`JK0mNI8h#L~d;d<{
zPSsgJnlw3aex2OAe-0jy+r<`oknPtV20gx5jkQpm8d{|q`F0PMc(={OnW1EHil=*q
zg7oU7wj%;oNtGH7a^JEUH5(39bi^Cz9>`|t$YAA(GBz8uQ&vtz9APU4-=9*A1K%Uc
z{ahdq(C8<RA1iTiwO$WZK<;1zhR*Ymkg@#nvmf!|x4$cP%)L{hON_*bhO156NpH*E
zArO2_<m{7a`gEY_Xt2#nT<53jeSsgT-W1=(ifvEP2R@$=f0A@dJzS1R`a-0H1nT>r
z@Pz@J2l~{u$N+A`ecI0wDXx*k8fk7S3?nyDm@LrnvH98w=7{0DFtg~YBIJx@jcF>f
z`!~QNFbam?pIq!4^BPdlFb--S==qVauwQANogBaHP=dquTrXhgC2?uY{)9lWcfx7e
z?0&FTMRmIm+`yMmsbSlbS*`vDuTL@Y)mLL^fXL7SmwcWeyRG_gLE7>x>K87!5iD)B
z{bBLw4`E5;_&yuS;kgleF#HyPy6_joNa!Z}J#|UT*<6;XU3hj(S@4VF-v?DPNuSLt
zq@4ySN&T2oq!4=~c`|*wE<B1;(?=;hmLU}aB4tnVqQ@CLVAXFYfq*c%FqXgd`US5~
z`!q+Myt}+@f$T3Ma0MJKMy)|l;8k==zXJ|BzoB)pCuqo+e#c6>Zm2#GHk7O%Ld(w;
zlI6$_+)&10UzSZm|NDZd+yysEwjtG>1O2eqC3R8b-^XiLZ`3mkczsGAYcwH&Df(#J
z+5&IiJ(KtL(~Au!ihg|l?`>Mcd?ZhoJX43~2PR(T0%@v7mDdF8VgHSc?)hnb33LnD
zt1kp<Jx40nhjm$|vEI^jLB%W)mXsfU(_N1U%t`vgj_Bu7=&k)DfVB&_S+qU5&d$m0
zhD*g8=KTC}y}VCOz9!1yzmb=~4m%QEb5o93)osPC+{XTrvXg=+BVm=Z?dQ}+=kjXr
zUie<#qFGfsz4WsS+OEa7_a0>}^Hupq2{zOOO;HqWJe6BE1B+u_-!{U6K%(E>;;XOJ
z<FH;dIS_0iC^FZ_&#QN=^u7|>>w+3EkWGRzVTjBEDhmDp;LNk6%b*rB7aR(<`s|bL
z>`owR6D6aFV*O8aL=uGIEXA=Gp<kXrN))TG!Ca@qSzDn-k~!T0DD)YgF8UVA0w;wY
zpLBhSkQHi8gukS{_LuG$BdV;)XX6hk4%QDvJJhN%nxkm^CH)d`@9V@G%2+0o#C&N)
zR9!dyFHL`G^tQau3JM<u9X0rsG<;M=25E%146KHY&fhc@wb#tR;t#1c$0HJC%GkJr
z@vxT^lpZ`=3*4X(-%mYd__8Lhv+qf(e7+!BLN_1nWT-aK^3zQTHX{&pp}N<KE9-2{
z#Yj_%8}gkZ(o=|>R-v1k+EjF4;Op(3*BnYo;$$_SNpj2c1xfTG6%y2G{4b^pWiP9}
za!T+bNu8mtM|>93wVKkD{G`ak^%5`;nT#HOB)EDF9<pTWh%1!&nbGt*B3k;Gl|ayf
zuY|l?QLb#L61@(X=eqnBe%G5{Pg^${XL}Lre^?mJ0N7xwTCT^FaH4xF%)wk1UjPjD
z<oHeXb{hVC?20F%X6#14NUte$&YwV|=>3ktl%nK8udMg#yLb}8x>E3C>PZMi@opTW
zmraG&1fBuV*IG+}J4ma}z5(00_2!kZ?WegNGnp&oM_>rJ1+?L$tSh5|%RxRzMzWLI
zp#Zs<P9~wi=M4<GG(i-x%m7K54{Pdz#sCC8(n^=_s`@qxKEvoJ_$Pt|uxeh88pleV
z+w`?!Z@@C4Gh$i<Gq(g`Z5TL(QW0TsAD8`p5**%bVxXzD73+#(dU6w^U8Z&Hv66G4
z(#*z(H~ES8oiz77h;_&(0{nM*H-2ID%A)H`NZ_B`>oxC~=((zs80B{TN<c;gG&R7&
zq_Y-bS1W<u2YK-~hQ8PMrl-R-NI<EJk5+c<v0VG>IT>WHF-ncSkJ^7Rj?DXP0d%IR
z6L81(@TQ!?C$FEh<Npq?fi5F5Q4;Pdk>z>xCyf@_64f~0-_2cW*d^6ZI~gV=#F@Om
zFMD~GrkP*eUkhzy#{yd(Js=<eYWbU^kY*_N^rl=3z}-^`5b6&{1}>RkRs2X1bv#6G
z<~EL$l$H2I8u1uFF5E)GRs@2UG_Mu#rFF6iKWwB%*6^`ov?FV55_W`@SC#|^Pa@(-
z<@XWf35aDjHDOKP>t9HwgxwVxWFl`<1s(Fv?SSZ5C$eEs2p%o>w}VNOuYCi*DHg-R
z6&~&Nef6h#?Q@lzUS$oyxrc&ZmXd$V9KMll_tBZE(*33T(T4BK>8r}(FJn%IomF`W
zE(|4wlhqF~v8z1;p3c}&7Y=XM;GW;SNhWSjl;fB2pu+FenG39&L}#+OdKkt><bt_X
zUoOzK#a4eL`+1Y(vr)!>yM(|^(hG~G$X#LqB_;HX)vLmQvvChAy!c2TYT0huwgdW<
z%Pw`;1$0RJAAs*P9HDz1T(-H0N<Ii4{pkyFkqca-_+Pkm!~f0AG=(Pe(_aME(dIaM
ze;7vbORP#>Y0Zjb5}l~G=ZU7_bkTLUL}cf~>Rl*N#=8dF#fQy<P#mUo>hRwdHefdS
zE|7z&M4J^R5?(Ernno=#JimThp3DH=qAR{m6xxj&EoDbdbb(Oa@LT&4_z8Iktr&RJ
ztp`=-Q>jVUP2jodu!V$0=KYL)uvtr6`W02n(0{U;_;;1X(j9&ex?25p1i^R-TaUxn
zJl=VhL2=v49K8T)Du6Yly8n=9=J#F7W&xDlK6m3<eN1txF`UP_=Z9;#W8Qu9xsD<~
z?Gl5s^Vm2=q%DyYs5CKP9(}oD1Xu1_>2A8?c^=^KYhz{1xIkn|iO!H8AEpUrv_>Q#
z>_tAkx<^vQ&W#C=WbH3vq=A@3bUkGk`CKK$R$|6sb6%J1wN<sm_E2o_j=VH{2?z8f
zI?p8t#pfx`>x(*^m8F_^0jueudv(Muhjy@Ml#ZvR9izQobG&_f-CF80UC3Nch81{w
zG5t=aNC){Awhqi)ohahhX>yt%z{=JjAKZVVXGH(apfRHfxYXG!;32KQQu%G1lE?qb
zIF-pnh3yEtKID-mnb~85BZ{bMGfDjJ2$5(0E@<l;81amB?clOFUj<v0rBpthDh9Wu
z>29ckUVY?PZt(P2`o7DKjAQ9Z0KiygrQrQT+E5(O%Z<Ld2`aWgk$S`qjl*fL_X3$I
z;$S!ZdMEI2>_a#>XT@~0NzY}eiNO@sk{V%C2uRHAJDg1-9)~Z}dc|gdW>qqJ5eOUA
z8(7UxT0KRE=o^bi^GpvUKP7x=?rdW+U+fP19vpf_J;AJie2U<qUlcN*k|yE1uao)9
zKiKqE+1sQW4mNl!wEiJ_w2t)0f<U$XJuwMW20Q?Q6RCD|HZI$~{wCDl!-q7PL;IR-
zKzyfWBCILiWd2v!EoGI?w;GLDVCVT)wHuc1^%Hi-zQkDcV{=rsow!B<1G)b1Cv`>m
z-MHkZRZ5MzZ9Yi06u;zUcO8XGVlOd1-|ICzcDx2Debhi;*i(qMMTRtCa77#$&E-!f
zzBrnAwJsbXd+^wV@ABams^(K6f9gO9ZD<#SN{*p%!wzq*@lf%RumON10w{;o@SI3<
z{!y4i*+8dmm@i8g!#{4+Ca)Q*uQ-R?0^X=ucDCX$qeO2hGYa3vbij_TYopH3h>%~Z
zR_OSO6D?V<?4Jv(dJSb+?DHU9sd@j|<Ok97LT&(><1M2ztVi$0Bm>2$#uXp-<ij#X
zY%pWlLlW`QuxWkgqsRrM$Y}W^5U4#l+gy>(=%&ARZymhGD6NCj5}jJlKX99z$!Un&
zpEmG|HZ%gFK0GvAEiy%Tv#cuK>Ue!H-W(=%Xdv;Zt7+icJtMxxf>E>nWHWbq_oZs)
zx^aR(P^pQmf}n0zk1WBH1u@E^F{9)`jCc0T#~SG5HQ1fRf{%*LV{UCm;fd{D`{eWw
z2=n|%GmebHHfXDdzM(q}`ES+gaD?2!`hE$KKvr|Z4i+Wn&qwV3?6ghPP;aioQ`1-K
zZ20ZG(dooB%(^l$_yB~eo~RT3?Ebq>^fJGr4R7|%I<{B3yfT+bL85LgH!p%Uh0MiN
zqnPyDJ)cv~Nf?ib)Lj6Y9`fpf;n1fSPU1PoZYj$aO`LHgqQEbuquqxVscRCYu;9+_
zm+bHANjj1%LCa1b^mt53;<1<Qr#;}{pqB3bKeGT3Z^aYAsL=f^X1F>`?b40jHB>E!
z=a>&<Yg?9n5r~`PRKesv<9S3&M6?gY!lPS2>;zHZ59-4+FGZ&1UmwM71<XpdY&qS4
z<v$2!f;e5JRme?@`3Uc}keU4rDGCD+=>dR9#Q;QlNhiGFp{_dK(DpXR^BWBiseY8>
z7d|~HjVX4eBqE;ta8*CR;|E6Guvvd|wos!DUv4g-+oA5i=S}hU*@KK?5=~M=f63h(
zsPNCMAB|ZJahp;t-`PxH;W7=2p?xjsrt8YNnVI4xi>%j9#SO7*Df9+N>NghBEHubQ
z=Ru?vjHe=|+)8HV4=COG5B+OfD)BxMD1MveNLTeYXH#e7y@O3ics9-dc<PbmfBgcn
zyqeo{oqcwvny*4XIe!lcA^Ui1xberRtm`)XA?<n<O5AFcJmDvjeq*7^u!D-8vC5Ah
z@9kuWeZXhbHp{T)|2n3L>-3oAA=Vdc48!&sF00@Lr~nToXJl3V33J2^zh!X+U8Z9@
zX7xH6O2Ox`evDm6P{GUsux@uJ@z9Y4)eDlo&5_WsC6S|2m4o-1{t*Trm>j<Kk|xsr
z{Fk=5%5tYLD1cE$j+ZaKtOVF{%)EhZWZ}ys0Rwl->q4#=J@%PA;J|smopZT9a3Ci&
z?l5u*lxNy)t1kL1-%MXH5)cx<s9T7J3W#yA&pQxc1(w3K>Tq=orr})!zw9kdH?BU4
z3{e8a?D{)=5ijKh!V_mZ?!pXWq9@+_z1D7zK<dFP7=g9Cn_v$@YBwf{*}bf9;hfg5
z7&95u4uOlAdKC|hcE63mziUG^!NSFXDzl*iG-nwEQe<f`na_Boz9KA|O~oevW|2om
z=^I%Z_N&$8=Tp3Qvf<j$-3m&js^3IQJbu^E@eBxdC=FUAOjn<a34_lj*=Zg8QvMj&
zBx=DN<8ugZPW4NTV6@C7i3vss`yMouVOoX{l5XvB=rXVgPL}un4^OJ3-)Jc?KSEFT
zHM8)IV?u;l4tTX0ZSQj2F*lR(aU!S*c^Wtn8DEE6FmiA&tP)~FhONAD%=Az_&aIZ4
zS`+q@4ZB+748mESNCAjm(jZe~7yNkSaaEq@qcPG|t8@GXKF_aQ#<d@Ut%3*bzP$Kp
zSI4r?N128Lx#ze0Ec@()ic+B`1{nzO0Gp3#GBS&}+Lf8oKS)N>q!*i`&lq~%y7o%w
zxZ@zW8gTl1_hv%$IA<ac-EMo{RSs!tPfHEwZ}R=oX*`OYICq^sd_^$5Gb0o7MWK{M
zM;Y)2G#x73lR|ww7sKR+8jC;a5ibyu+#T$Zb7g*UnLg!9xBB`8NTWN%a9ioj{4rAS
zj&IVF`-QXxi4x&yfF5J&<v;j6a(c`6UQBqsK4ph;)aXCU4UB{h-Ym>ooIGq|HDRT4
z2d;85d|5Vq$+Ly(fQE!E1_;t*J^#rZVzses_9y!yT3?Qh7Fb#%0(fEs7RZ&(C;cEk
zhIrRZ<$rGY2N_T_%mV5(MO2YL@M8PF%Rm8&_Tm#;x_U^weBCvR^@{^A9FHjx1*E!X
z9qs6b#~p%=17)~h%wbq`<Ue5s@u~nR2`@AI$pQK;vHBPSo#%K66bQ9JAc~60)KG*U
z(u{)*cA9n6b0?Q*=)2u28)eoY(>|DN=Qx$|A{VWB4N;HPotcS#xt#Pa>d^~ycCq_^
zs_BSlPv-;i=;szuQ)N0=Sv(4v5ku%I{rN}`LY*n+90V^9dkT&VLZ?Zp#Q+e&`}eKh
zGVJL;tor=A9dqaBWGEoPIq)5{sBjs$-{wT*SPi<OBT$R3I@Z;_$*Tnv2>+g}bgMrE
z7fA}!8|=@plgMGFr#o-2f-llD1p>a~=-D+mCC~L;qfPdm=N?`9ik8h5bCP7jv@krZ
z#LK6^tm2QZEhx!-i8rl7E3I|TF;GEaTA^?84*LaOJ}g@~l39&wXI{|3cMN8je2c_E
zt3LxbEbDJl1ccNgeJ=LurD!WLeLBl`f<}HARwot=hoKFy_YY39?i^fmrJ`BD1NF2w
zy+JxN7oZ>&VeY4g7GAHunjs)biIq!C+;?f$nGqHi`)ChGpA*cQN4ZJj7gZVNn$<tS
z^|pv2H~`K0RsWI8g?tt3CRk2>Yx*W+@?p*&Y7*WI!I}0BFJaSF7FP~pllT8!OAb9a
z+s&q+GDmt}2o`YW{YBn#AfN)Eb*zb&{Q7ap80SOmyJs;F0lOssz)l{_om?7q4)9>B
zr+CGspF>%JDhCHYJ|;GfQhTcplW#bQZCzlNh1Flj3eyKa*2oWfG%eDh95#xk19km%
z++P387}jRGbp4kQ^r5@8JyL3C!KPXA>k$QZxCOZgYFsqD0!m-4a><+qr~GJv_PYh;
z(Dy?8x72Y4tO)T_w2A%AaBu*m$KelKfZ_FD9MB#y0LEj03HkZk4K6Sk-@NJZ<uANG
zM@M&o+|f6{LgeZp2)se&4w%Xtetbu$PR&Kc?LK?bR=bW(Ja()TPM}i(5WaVHsvzoK
zatyZ@gJ~Ma%&UG8r(?J=MF~<yi8%VpQE=Zjb$~X`xTEH7n}B68aho=j*q1J6RL~ZA
z<lh2&EW^_4aCP+3hry)0^*HAh_+FFvchVb2(TLcLqar9pQr87iKfqOH(%K}OZYmya
zzQGQpmL@+sZ|rn1x^$4Hk4OE>D)<+X6ph-?y<+QkUbffE>CN^bMzG~R^i|ZFAHAP7
z=3T!PUqB8APlJx)UZD##T_6Nx*dKuPsKr=J>=&Ax$}o&@0P%AmCnu*kD8Z!?jY_pU
z;e5qfC^4yaFp6BeF%4YPZuR+#JKbDn=J_c1=|ABb;4J^*FLQF;EqhUHx#rcF!;z*C
zRW-~f=!?i~gaM(*yFT@R_f|)+yAC^r&pd}Q4Ybp#!3cV|N=s@@0o$0W0BjKL_i_oZ
zfxKWv&<+!GLios9byY-JhLE4+ze8^0fAYm7^UUtq+Z5)~wO6nqdP}B@Z~YS1oeD_9
z@}B|>I=wQ$2ALx;5VD(`yA5m}Gcud2SZhw|?HS!d?H?P;wK=(*X|B7^r_8DJ7>!uU
z6{lozG6Sd;%flda=Zm+z@9&#mS?iX(sm_>K)#cfmPj&3@Ki>Z6?#zH7Z~F7$55B9B
zlkC#aM`tbV$u0oN_6YClQJ~s@iMQ{y0$Lg1W3ybQ&z?%pem*XuIv$}Gd!x1WODET;
zfj|Kuq^M8s4TGK^-9>oxuY!4i`#T$8s@3|`_&HiPqeJh*z+OUp1lo@>O!vhf#{yvq
z8Gmg7bc{XHP%3)yLD7^;jOWrKLAnr9R(;;LIeX*CNT!fw6m+%udkTQvf9W?jK$>JI
zkl&eA!$}Q!8vWA*D371zeEU-J1q850!M6eS?w4C>uS~H`qZJP|0f8aJ<)n7K6L5bd
zv4q;M@(}KCxKNL4c#HDCEBj*d;U6=JSn$Qs@-nn4#Q3(RuFL@tHW0pjHFerEf_jZ`
z$q@(_LYH*40GJgT=TLs|MUznmrJ;3J2^5;^#=O0=-Jam#q}le%bcgt;(AMvjNneCs
zG1yN1EX&Nv-0a$Y0CA(^iqr>CQKKaS({O77w0X%UFl2$S349BDJ^2yq2%+&x`{<6$
z8<gZ{M(X4NX>OddXh!4<fJoYpR#lU}9PE5?oAt(<G~lfMa_fzy;l~EYdb_=&Mm{zi
ze2+YLvIh4pwXm{;YAZR4|K7^a7@?<TD4v$_*Jk&>g<b{{B=vDzk+nt^5&#DmTfoO$
z;D9WY9bES6@W>>6C7w8aYBZk+4bZIw*5)SD0DmTXeOLYC(qcZq7EW}vPA^<N(0g;e
zm}8s=NtGIogXqd1BT->G3<`Xf0OS4v5}SgE|MU!*o~x9bPnPK`eQ{<l3oX_Rh1x2h
zCSKZ+cbI&X?|CBvo5!jP4}d2ZE1jOBHK)9J(XN-Dg%8l$E1jkz=Y*exH)PhBgZPyU
z-N}iZ=1rySWKs8c3uGoUScft4sr8lWpRmrIjuaAa3(+@yR7{grq2P*6@SWdRO7wnw
z2Y=&UBT!gGsf1L@Aj+(L)2Ir_hzpcv6R<;AP&+PasDgY>n`jute?(t%Ud^uo5)~Pw
zvk{Q{;{;|aGDu2dCL10LQPqzu{VeaOVyEPY=8?5d9cpt1EY&K9M`p@Jwr9fF4}-;x
zJGhview6nDGt;thzu32dQjvb__gJM}t^z>+9vc33_&i@l$3|LCiEO>e%1us)@B^UE
zjETm<&>i5c?)60H{{={JDKr~aVr6<0f1o6J-cNfPlMCyL`PyFX#-O96MHCtH2w4`X
z0^AMMa8rC20imJV{@+HiAN8+2rt&##8tV4K5i=L8>F+!JT6dj7RvrKx$*Y&tuWHOl
zUkfr#+IGEUPpv26-eBtEHjGN{=b%&Uu%8QJv6700w?V>2b=X)lP1mtnel^LR0k0F~
zGO4636@cmKORhHm>B-MHOl^fT0Up=tVmnu=_OS^OVTj}t6vqvdz!0lw5iVvT>Za=u
zSOnadfSlF~rACzO!pJ6WCb@gjFDvbNx!`4vyIBlmwa{RzeQuNW8omWo+>YCc>`vRf
zF1W4#ZR&xUsejIU@3V3FQ=?1qTw_D#;ugfX?b(BF#lfYXwsZY<@8^_6;)$-p;c&$p
zVdGs$BAPUwoOmZ1IAmw@?Z#(Ji1mn;kpK1WGx(rq=1l5bK18jVW`53XlFW?h-MzBY
zEN)CPAKoa*;aqb`GYA8-!{0!%8-b8jsqyfg4{2}h121sZeD(oWS!g0pyR+X`^q?)W
zC^U=z=cerR-4}H|s2c$&*Ud6?OSrj)xADt^lY?KsDn8%{A)hj$?{q87+}ea)BvQ|a
zeN9>E+-HASoVQ;S@R6d(S%A?nALV@4EyGMPvW@Vu9ink>d!9$f^>tT48^W#e(^8`&
zS_VL{$Jb5)0H^8X;Dbz*(;ZMUM>=^3k@ac<C5(%>(F_H1k|YR;(rAHW+~*&7<LczY
zK7sF3i)1XOaNoo2-E?TVD&t9{4rNh279{`Lw@jye#|P7q&7;11lLsT@s&?jHCPF9E
zAF;r<W=2ChLX|{tGv}iBAmIeb!0!?M7~`cjC9t(Kz<Xo$G36qiLU5QC?c0-TlqWyF
z534GSm3;(SnX=*Wz_!$hRuP*aQj{Zf`~ODZ_JzWIj^QN>d3^xjV0+@B!~^D+MQ8Hr
z_vRsn##6V7A`VSpG4T0sM~i|ki0yO)x*JIMf>3WPkhw<BuWJ&Rio(q+^NEO0y}X@u
zp?)cV)?*_8j<+t6=u$rVke~>n^)s%_K)5mF)B92_CwBCwd1(rcpK62c4R{(;J$`RJ
z0{Yxhwq*T#5HIT;R`g3mqgKZ2rK-R2V5SQ!{05WlvVsh7F1_9iy~_6h*om=s++>rR
zDZZo|Ymtj{eeod*8QNAn(%V=tA$t{qd&~CL>6h>1?3z?ep8CF5CHr}*v7a#2;06Ib
z;FoRe4{qkd;mGVupDY2j(%#hE@y6OQ`7&xQp03VCZqFGJhg~!cZ;!RuGue$j{4zra
z83P`)(FDSQ3BYS*w-?2KkprMl7pCSEv5{LpUB4KzbE9;7&vND5(<E^<KW39sWL-6C
z04y;=o6BSBj+_*m&0<RWbDTa!O!1*KL^SaL0zwpmJP*-F#M{=lW-hvb=gjIaEg!B>
z#uY-gRfNu)vBD2J(UVU|Sm>LX4s&Md*1y>S`@VxZB*8s|VPoX`)gwZR!<1Z8SsIoo
zjQV|U`sLyx7ER@eqn&xb26?zuag~z3IWCToa6gn==FDqebQ=6Z!^ds#9eQyluV_as
zj?p10Lo11HdDO~e{MWHLAJ`)=fUg|EeSG`R#<1T@cU=?Kso$f5Vxb+qDuT14C^f7A
zVuD2WStupdH84PALbnsQFs^=7()?3rH?{D`=6Jqsy+=v4M%QQ<lDVSN0!%1Sbot6n
z!FOp^_3VcPV724p$RhV-WN*pfqfwMnkb)0$*~f>vDr^1Sq9<+L1?To-f6zV0<Hgl1
zI1v{3<gr>)$0O8nfr1vNJG$n1OHz`wT(66Ny{;COs@V_Bm@`t9+HwibGka6mT$;s0
zAdk8co#9GPcjSm2Rf~UI<}#XYz%Rl(KK~Hg)u$ZGFK?SiUP+~vOe0N-<`tc8#k9@y
zk8PnpgNw@T*(9xX9{2-G9GkY?_?st!o?;=&2FE{p8?CKkE#Z&o?gI>_K5#LxYjY7_
zyy?l+D}*W{VB~fIza`>eJ!0?M8XOiq9=`SHZT0h6$6pcZ+a1*x`z`F#hEtxOO$B!1
z)L*u)VYx}epHG>$Qzp$i48g-{m!wTr9hOy-XycfyzKmFsmClt*=wr7nfRin*F}Tyl
z4jaS}+;J1b>RV29yt(->aYV?(o9&sSYKox){MQ+)KB||C*zuuGSte2JLKJgcLiThJ
z<>>lADH5`3{A61dHx6S;k*U0*#;NR5nZSb9-_{{aiY858UP`&TJalc-CxF%(w8H-c
zSPXL@`n;d7#W%m}*7>-Jf*a%GGpEz97ql=P1y2Hnd4g;Exdeh;<7Lio<Ul1bRI_#g
zRi~aSrx*J}Z^#OTdvCAA)I}wmo!og8EuR9eT*vztGYK5yoy|rBaE70J_TS|;4;Ha>
z^8Fw#UQvylbnoRC$zdYaBt#0)Fz30avA{)aO;4W$r*Kivh%X#b)^|cierhymsS=AG
zEAtX=Xg2bsHwOUMXG=FGJ>kI6W5fdYNEt}Ohr3Ye8hE)Ci%f?V(w<;exh{hzCfKI3
zUJP~jU=h|mxkE4<$^yo*#2z5DmQ%34ogy|f^YxZ{QC*JgrK30yzQm?(wIXGS04@^6
z9(ni>!Pe%E?>`k4RAN0uR1VBrBQ>AanY6{I!mkC5>@zO_Bl3pLv0S|!0#E-AT<S+A
z+Prm=*Ae#tuBg`q9Rw62-4S+QsayP~+-RzVYqB&<&=zy2fMct!y_~iOSR>)@XXrT^
zX^T5E=#XR}dJ)*Iy4{k6mqHsk%f{{ttzWD<h~J;@bUv5*da0TmrrQ59p(uOb-`Bt|
zC34M(pf6C@Eo=@wdIA53v(#7GrAw-%wSgW3j1ch4Q#t<tqD4#~_dKm|3`erIKzwMw
zo9??ApX=@`5l?{8uU5)S7~`<k9nxU$9KtwL^k=gHZ`tS<_ZxXTCYW8beo=p5bBel=
zFnhFIxr;~>YKdueIPn|jYlT;CngHGTgQ*CsG;45#sLP?vfCmppUrPz-0OgxUHHz28
zwJd*J<T&FhxOuZ<6otP_G7Sllwi%bQ?;gCfb?Q_5h3n2ZW!&MkyS-+^koH04c|KKh
z#X0qoiZpDglitGgJ4>m(Z<&*vN!(p~<D2Vg09$!*{>b_Ifw44aRKbfs2iZ+(@c^1W
zZABn;xAY1pCQ1;$`Z(1odg4KG-4;)RkqB&FfI_$bRisZB0l$xyeA)Wqaz%~2#5S+q
zl*(}<0VBV{2up$g{Bm0No2VtovDLCH<uh!w>(tb0uTJ>7CBilSCFFtZEh<S5;t#^V
zw{4b3)K7M?veS~5eI~Y0!|c3p>gzh!CN;&pYIcJdm+J4leM2C)orEwQE(|O2h{HYo
zsv3=ZNj}`E<JD9K5>r!~?%J<stA+gQ=bT7dBOSj?ZUXDq?W9+w62Pxq5H%+h#7uU1
z7Z}xlcN+s6ob9elLHs8*B3Zst4n`T}jvb+YR#Tg_YFDYfNkGUHr(QQJqEzQCo_^1z
zQmpV=Y^n4B2;8r~+`>Ulniq#$E9O&!zdgTW-L7P{^Ex8{Gww}`)tJdI0nPW!cjyib
z@}8MG(b_f;zQ|=jB^+df5GJyZP~q?mrv)tp)0-Y}LanCNf3KOPM?Lp)si>xmQ}D&i
zSWgR{P`sGHB*TAMd%f~w{EhJsZ9j_1%hgYLeI2fym&@@@k|b|#;RvcJ*QtQRgU_<7
z$EAEZ>uDdRNYHR@CcM0HLo_@OfE^2JGyhD{^^d_wXqi4m&^b-@b}|C>KW;?QdPoX9
zuf}}!y@&D9`zKvzR~rpYM&xPgZb{XMtT(0@)_>+@`swp)2Xq{xr`NjBz#l)%Bz=Jf
zXm~UPw8)gO-=9>q|Jut4f3M#W4cpbWd7EdWY46pcnQ~apzRj*5-}#%vV*9fc(S~(R
zJ3ulLZ4_~HZornw={ua~ISBv15Q7z{_m8+0-+{S<!Wdxjp8_)*Ms|C(6=b@uho|<1
z0x#*d^en>_8jneZ&C+6<e$0DgY#PCC0|ENH*a=jG0RVPz6(YVa_C7Fuk#Lt;IMb)%
z;GB%&vzYs@5(7Tbl6~(d_>1dLu7j%qFA)TUEjbpF9bnLsbUd2h)_gf}J~;3GDd!F3
zZf5Ju%QO?n5|~xd*B$+kENKf7Z5ExRVG=`|dZCs11+z5NZ_p>h#&;(8(;et@{3;;m
zo1GTbZ7ir39^({3e{E1S3*K$!e{oJLdfr?4$X0wj*6+!0P8$t{WoM-?8xNU{Z-F?=
zOZh}?#1fFVcd{D-W{B1BRTVKP8fcM->PhaDa(wG3NcuYXyz>QUZHS$jI%ie`v_OjH
zZ1Uj_1k}dV(^N{F11+~rSX`w&I<KFkMW+>6zMSn5U%F3vv{vzCi}H1`90}Tyq%2%7
zE`86*d)x-ZIG_~K(^$Q7{%Y(&d*5v<V&P5wC|q1xnV1DcSl_AOzfxphxs#bUaCt6>
z-s#2zpi2xduYXxP$-aSICeMWg#C*A9ojY&Vl=9;EYHwi)7(m*o`dsKIqV*M!`Z8Tg
zU{{d6K}vl!pJwuH(f6{mGv&-7Y8*%P7I2>+APYhH*?bR0J4FSQPPXP&&^m5>`D<xr
z8?(~XbQ}i~6z0Z%-Z-53_z)na-P5{16d$j-jHGW`1O*5R$8OvuLsL4O;uH8UTjK?(
z7)e-9O$Cgt(}!-V$L?Nso^-ZNMJs1X{~(QLI3D}1$<};Y`t0DkCK*!)m>9EPI0f`-
z-$o$5bq=hiwjynUPuU5S{X;O4cXw(u6&j0KI059lL5|kUY7&l{6;!)nwNf0v70e`G
z;8XY>y_pEIx$Z%;Mq{^iS_)0a?6ozB$}iA*Tl_Tu<?)1~<$pqCZ^C~C{}S;=Wl0~2
ziDR4>(14<)Y8M8<5;jxeHQHuZ2Mi*t_Pr{i&<Ga*c!Bh;Q_i)|dIZq5aq{+=x4Hy<
z0o`f&jp)TfPi@AjPo{ji`ShH&+8<Y%+K&&MPCgW9?AJ%9tFs{s68o@WCl&yyefR_)
zMd+w$M4p0vxT4_6JV^EOw=D(DdW{KzeYQJ!y%pGT&WS%$!;jf>alo4bThgP6|CzsA
z)Xt>2G~9cWmg(AO0=Q3twCG(|?xi!nwVOAZ`6Dfj+E*@jY^5b%vl<2+g}2F&E}Y5A
z4sq~bXKk=(U;%yRw}p|N(WVIXzp1qomkC;x1)NuT)+2HU3!J#M+Sa+fNEy#8ar(mJ
z)b7P_(uL)AUxV#;l+$X57nZX<bvUOv^QEVGZQDAL2^%^hpu&h+jDFiTe0ooG{MZL&
z>nT2lh5TB)aZGwE#Wd3B8?++C=FYY)=$XR@rNm{p%;WSxyj;&WpZOav8+pO4b41Hh
zXB7Ks>;C0hI<1^X#2MkzXH~^Yb!Ybg{{0^{in9i=DU-W%gI6CXU_|s5gh?5;tbIJw
zgfU+C7BIcCq6msb<b~%fs5FPX);PvT$M=<NYTtDa)&e1(etv8g+ukY2DY92Uyk_0Q
zd!c4_k{e?=yNY2>T>Q=>ta~Xw4_heih_~6N#w=+7r*gNR-}*l@w*$&DXifevtVVVr
zI41P)LHE`$6F+?Vq6<I}(tKefI@cN{4P>Zh!th*pWJ}aF!gWM60UB=7%p-^)0!#2q
zH!k@5sI}>rqqgzRHLHPWBxgSFv&}8+Gk|Uk7(O<*c|FnNtC?ZSjJLt1(2#c>ZbSW^
z=dZF!WuFzx3CCrFXzI1#0F?gmY=&KX1NGN=CY$;ghQW`k0khYi5=Oti8U&zuz?`Pf
z2s?dgf!?c3SfeqssiYBY-}c$0hlO?6{A`0d2}<)-@74S!!w5ang~GG|45&G<ZXtkp
z)3G--g)Zq5IP+qYpn`8wU^<>uJGv4KwN;e%GYGrd4S<(LOwYWVeK9HWol}@8xmIoD
zY}C<aE0L>J3Ighj`WmECDD&AVw-q&Ee{@{)+vVURY4~mqkYW6xH`8IdVD2`Re)laY
ztCLwpAs;_9vM=>{Dzc7-DG4D7PB$1W`^5TiPdS9nlUbS=FoR!QbKVw+o}ST30dxd-
zhW>>Qv+u-9<FeruesqA+sg&8=Tr&eP=%5!H3|$1fdw=7mSmp$8RmJ0`nV+QMn{J7s
z9esqt_EseBNMlcp?}`rHa>r%ur2YRcncyCRBTMuX$1?wpSr$tZynTe3koPQrNE=Wm
zmz|%;ycx$Io2W;SZGgJ!g@EvlKkfvfQdIs@+J!*C@Na0!^rtte8qU=p>GRWyVK4Vk
zhb5nG#5!R`NWc)>k(xA${kw#Ezk;^C^PX|%tr;qDy{QWorAtz@vb2;&&263>`lB(i
zIvc+dD6FC~%KyIze-~4aI;puU@@>>8bvNmKzWXU;DtCsO?(tqcvx1j@Mae6M2$$-g
zJt4Z(r`gV99MqIo2)$$^%ov0+@{p}oiRRAFXQ+o<cbA%`z2xPTpe3xKxVzA8dc9f7
z2wXz6!RUmb5DC!13(r#J&o{n2is8_X4Tqh{lQTZsSa-yXcR<$y7X9TW27KdQoxpSP
zOo`2R`=WFc+xRql;)^2(CepCBQB2Mv%QnHI_Iext2r0lhY<HV4|8)+qAaJzgX^HN@
z;k0kou%z1`Yr&`oB1eE-58>6>0=j7cCO*@3t%9!1f*1=;0s8cZT((9USwhcf-e*Xx
z9zoH{{KANp_)purtuN-6%o1|;sbmLF6E3>RX{q))6NBD1p;yp}(0}!zw{4E5E%-5m
zZ@$@bBzhS7vrT07py_f+a%SxIX_c{gCgzil_vgRSQhJqVs0_)dfd_7}HH-Q0f%y^V
zrYqlq@#;UNLxE_^zHBLQCF52myJqCozH<nOyu-|%c9(d~YQj;POZl7+Emo5tCT^cv
zT+qgzdid#f&e>)1g4(g(#GMWGi2icn{_vFpyA_L?bKlJAw>`cFc;;UVMC|L{B+a?d
zS{M5+S=ZUF{*qyypHf*gQyq5(e~_DPynLoB+Lv!wX1?|9y)HwsZLVFj07T^umv)~%
z%@2vz0F;#}YK7}wcf>IV=5(R3Ox<5ZR?!{Ffo-1Hgw7+P4gu@m2?(sC0%~Fyd(}=n
za|-9Gco_n%P;B-LXrnqAH7WM#YKj^wDvl&oPN*;(^L|bokHOJ|ogCMXf%=F->4!Q4
zlx_PSs$K(xnNs`jPS*s)FjIkl1<eji_P=T(7NALn2iWmkYY;~f73n`Vj=}q<MqBsV
zvf?$_HH*VS%k%;}5`GU0ER)ryb&lYJ{lZJ6{yJ@-*91r<XH;*CUtdXu5eZn3%zTd)
z(t?t}L#?bdDPkXz^4-NCU^YI}$)6#8qtj`N!Qd%iOScYYjQ>|yiP+z72!Z&lYuh{C
zD?ipQ4gBa>r4oVUCTPHIi&GFM7u;Ly1djelE>Nd^-W25rAa{TZZK_l$v;cF_zU+1(
zi{1$14n!2@G8~q2krws;p87QryO%cv=LViKCo4K}Dj1mM!f-nE65;D45jv<I<!0;v
z#IQA}nG^eeYX>1Xeza>FT|p3#o`->i$Z`ewA9~p+`R&GRyGjn!c1Lfy<X-xaLKv(Y
z(3bF}h=PIZTZ1olccQ*7MaYkBvOzbJY2;e1GfGSz2{&c)zIb$~m^)U5Egb#e6N7e)
zggMth)JC4>{<5PUPudH~28t;5wgmKnvo&)oMSMj$i|plI9H-gm$%bEA^60(dS5<Nt
z*2dDp>K~fhPE~_Qll<(Xhq_1L6wEwz*rC-9QIZeq$0K$kaogRO$(VmJ-*zk|@e7+f
zHG#KCgk@L0E_@eJ_Eh`I08$Wp`lR>O9Yo1D3p4sJ#|ktkBH)~V>Eqt(7n_RsD<2$f
zkmevwo_lG-+mYrgygYwk**M~%@=8MZ6vt@U!Er-INT-&!U)3nEZY`(^-?`$wRN(8{
zxTcX2PXWgcpXJM1>5ZH6UqNLL59>!tQn?i6(zv3{udBGxvU9UO9bq3{C9X(X9zQ3>
ziZ3TK+hZ1nV(atr$kr)}k`bnknbY%y=q;9qx6r;As3=*Sh&pm0SLWtwWg-Nehte+v
zKAd1+T}R=7dHh)rfhzF7(6p1xuQm|{;tj~O;dbhX#t*<OnW3hia^?C1yjTcA?HF=-
z0I}$jiFaK17y7_Fwl3+f`Aoe(a@O~*C)|mgF<ni#8x6<knv*(BI)|&-e0nHCd)jS6
zFSFNMhmD(9AsIwWEk1QI9H}@}la%35W_3>AeJ8bbd+9LaL-8m!SRl<HC{V9I?T&af
z;qSIi`?)9<E9;x~Tap}KzMQ>{X5wTr^7Q9tybB~LFrrF-=`z3w;SE^VCW%<qSA+zJ
zuUzc<zJx{*M4GbLjMOdw&<@#Bpu(Ie7))5{e(MCMTnb`$O3|sgzhhu!(+9Qe5@n90
z3&>SsQV*@%19E|trErmz%U}Df5?zD29!^ZFz5~#wt++~E+shi_MpEa^-a4Ch0YHa^
zWSl+;=14qb>ms54Ohk3*oalD1$gV^f)^A;}LvyJ)F1=+B8)FFQfT!ih4SOy{(`g6a
zPg=rGgg6517@Ej(+>@EJyZ#8}+A{1LDg$CE7~5k1Wuq9fz-j_#)t+=*tr+To*w_m)
ze%RH9Zjp#q?>rUqF7Dlpv8bFUD<pt`LJN*mf&QoEP@@7LD5VzUVFFesZJSPf*SE$|
za`$ABbjKC(0Xj!IWrfzU571P_TFJOgW740;cALMXeb-om^4GMA=b6j0(7&CnkjYKe
zfJd3cZ^PXQq;$nY><mhv+q}<S@i%6f!5Z*imZk-jlNY<NW7sPcUV<LyU4pdFszajk
z6egoy^a#GbxUP>ftx!-J{_%ku|5n_9@Br8*8iL62-+#P$K@N<1N?+-FBt(BR=q^{~
zsN*WhXWYmlVUZ?Ffnz_|ff68y0_J-#Fy5vjbhvFLAV|m(R~EUE77WN)3E#b@v82jS
zi3i+Z=~DaE`|3mWA3Lnb*m)l*VMTeyis@$@+2tfLy?jHp<y7<dB#H009XEI@g7YBN
z6@M-AN_*T@L(%rQqLuY}3`&7z+@?sz7Q=S>bh!n5jU=(6fS?oPE@iQ4Ly6k7hM#5Q
z^vX&U$47)qE@DXl_0EHk1u$NwNU_VqzeCoV-gZAYQTrL=ye~J}+zETZyM<Ii1W55I
zX2b6IE4`&EG%2o{)Y|w@i~#^rd%!3#lDWMO(f~yS7Lejd14zk=Lt>>NY80T%`nW-A
z>h#S(FX~)dBxz@9j!Pal??x(c-fNax@~&bNv>D9JrmW@NOD{|F(yqzvAZBXxhb6o0
zdV`7LpyeUz>46}YXraW<ULI_)9RF8-FMjFZ))z6mb3VqM=z8ImGt1{m={2w}O}=Tb
zpnx!z-E>|wPhx{75Kz!Cc{pPrp!uc!_IAd<j_m@hHcf-6&>EA?$hS6sKUZMrE(=X7
zVJrCQ7@D}#${8P->FU2n7STFX)FNi=h6VuQuvNcv>L9y%(r%l{ryb9L?oK#XE`isD
zhtlyNFQHElaLpD;K}zXAwQ+NQ^Ifv9-Zi#SUU!!WUt~-1%AQoGYVUd7u;G{rojVn2
zyx?)rpsO(ehMOtgNn&V(Vu7EpeTKp!m@FBW=gVzil*-Tbz~!Q;^B#4!)$pm-ArEP|
z(*v*_{>M%EoSgK_)rEWbZ?<3R&Gg$DH|gG&3KGQvRGWYFJ9qyh1^^9WI^dF^Rs%G-
z)ZiR#(p<yKPYK08jWHU5%kH3${YMCw7|s`|3EsYASm1k1PK^z=aO<StyE1&8&j$EF
zqqGHTMv4HoenSlkmF*IPNTpimw7xWaaAZIG#EjMIx&-H9D3IPs35HsNtK_@T?2C2z
z%Ae`NZuu|}Njwm>Z++ZQBvQ=r5eh}BUP|L>-Prq#P1m*yw<cx}$LJR&Apt!0<1=~u
zAE$HEqdP%Y7J{r?e$xfc->lar%e(6Cpw;fp%#(aKQ^9w)akbt*VDdEeH<xg-eJ&;U
z_z8mmzt(4uf|tr!D`mL&fVI{msttf(;M?b6V2%}@`F97zK&(Zkmqq%wO&qmJNnggA
zn7oMPXdp1L%=4y?&~*h=rEs37?ntUIo3n3gVOX@<EK;XwO@ODHMLWiEk~E}u&wcfI
z!wE2Fm)`y!*&%&f!?4%vvLf$?fZX)-%n<_lV$cCyXup-2P_g1AmBDW<vu3>j!WN#8
zmwH7nfXo@1zUSHqYTNhqy7V|0dE&NtKs8+9O=nUhxGUZ(F1T5}+cJ5U`flR=L%(i|
zmWzE37y3C#-STbi{Oa@a+iSbxTF<-!Ji%b*QrkwMQd?MdZBWOgKGxcZ{H&{1hHK(F
z*s;qMH1ujDq5`4~gB?m;YK1c4<txnEp{)|Iv-9@fa!R|WC4ZMzS2F^(hTW{#y82FQ
zn1i3QVxPX1m;i<XLPP#GauWtaF~PcE)O?rpVg1rmU0$kiYczYrA2rtdjGcv6OlEd_
zTe2{N0EG5XqftvI`wS8ud$?doOj9(p^kOa;=Ru{E;rozSi?k&Un>rK_D6(=+`Rco+
z2#YeYhK+o_ta^D(@g`DDOB0S|buexYHJ@Mj?u!dg@_ZiS*Im05zt2A`kxj=W5ii53
zGt@oI;g;v~G$k|#xV2|Q7?{VsMo2T`9n$6sdLUU(X^R~Phi@fN?EAS2^w0M25?oj-
znYNyIB-StP2Jy^`gY#MKw;THtM>dxq<fVlX{<qLA78r2JJ!!|-!*njEqzcKSs$Ooz
zdAtz~+Fr^{L&Eg@@s?czSYsu;+^lh<a{B)ECzEGJrna+V^9R(VDN|pD#IUG%VKCTy
zeiaeo<uyj5RY>jIE%aXYL_gH2<tV6JRf+2z+;Dr6XVu~=SX!TU`+VAEwXf|95#04M
z-DOxJzvC;p^-K!e_h*FJVO;B;PiuA-3t!0=hy5Nm*=`EH>Cvp&lJon)BCgvfzVWW5
zG|x9DMz=>MLp*gciYjoc#%!qV15Zz=KECcv9kMJX_4g6Vvi(X#5F@l>?^3&QD2$1T
zwo1(Irn4L+&->KY*wQE70nh&dAw^7b!3_n&g50gde&hTdQBL{4n-6OwgF+i~p#AD#
zmNjAa-3-6nlJv$r2;ukdtKKUR<=ZDpg^mIk&>1Q4@h+LwQfFbF0B>)e7GY?pa>F`r
z*!uKvUb5;u1OvmWj#QTsjsnIwdIkG>XgLn|J36cYh5Gq?vjN4-Wh}1U_x|YpU1e;m
zU3alY^t}YXK5ebAE4b}T08ASd>}^Xu^E~&^6*RbTI#pqciLrb^UTV~6Ux97!ml9*G
z1g#Y^spL6}{;YwAHl_^aX1$9~ziptOMuP!G{F_(5m6Zd=XUpBQD-QYm7F2Pz{`KKk
zl<gaMpNw6_2X_yhQ{7%Gpn&`cbGyC|9(>4Omwe!P>pK?K@^R(3K1ZX<`)x|#-Z;CK
zw^!fh%dC0dxWHw20;;H0Okdtn%kkY!Dy!hM&7FLx>;C7TIh`B2AM?c5MfW{-99x7r
zS<`jyJg-;quv7t=fI!p*?y3s~o<80~czPpVT9NBu;F6DG+XpaM<<eyVbF@4m)^wHb
zyHeqi`=?%v;*#p;X&(0;X=z<d>5MHs0YBhtlvSCsc#k4Q9dBwIRW8tIE8ELN0oA*a
z;LGr5y&x!HizqnvVuXtYL^P5%>MDnXK^*4ln(;Sz_&Xna=6|Qm#&X8?hZ5#~x;GSF
z$nMrdZcJNJfxql?X%wb(_kfe_XA$tmaH$<2h&KpN!xFvJ+WL68(N8<%7g1y47DrU$
z*%j!e7k4h8J5HDKsf00F=1EE6?X!L5_qca;-Mh8DcJWFzU|&Txt=h_tdtQeSU#4F)
zNObv>Kcfb_-CZA;aT>VnaR|$G$k{p%jy-<3exCS=_nGJTXE>av_soccPI{#J@;I+V
zQqX`Mt^JkbkL6W*I@IhhLO&bOKCh!rO;>3Oig@Q`h7ny_)8u1f`5(3GsV#fO_AEQ0
zjiaHpg#5s~_F^!oJz#_w6UEreaY^5s^8NfK>a^;<<xxL<l2Q=0q_M}z^a2I!&s208
zN!gLQ@2~q}9`Ibz<95vLZ7T0)asKB$#6F+MR;#@1)-YJ=|9td3Oe{B;k@yZfR}C<f
z&X&{YAdmAI1nfRBuiDCCy#<qZ(a?5xj{Ss%b^ld^!P|z5Pgo|0iIpQvX6D@~ET6ib
zpLJk9dP@7d5moVk?*5=nP_H-fxaF$7M4Ogb>i;qJ)=^P!?;9u#ASE)2h=9Og0D^$h
z&44I^lG2Sz2og&7jGzcgDP2Q%cY}!_-3%?#3^jD#J>dBs&Tp-I*Zt$TP}Z6K`Rx71
z^FHtM?wQCwkU&i`y{To|k9o4Yz8UnR!yiG7i{HbTU!~6dbXGsd5@UI=;`-{e1qX=}
z7*;6lrNo|D!VQJ_EaSK{7HZ|p@*j#0kJ^#{_yG(7-y?%UJL(P-ch?u4Bs-P_&72*^
zDtQ`G9@aMh1iv09eWu`1*(Z<B&>oXfvYJk8V1_RIPDogCO(F=m2q6@F*;wgCt+^_S
z*8F#L(2TpVG%v#$RW*m$w96n1NF|iy=&6K+kWre+HEN8fo<#eTgV0exAP^eKslP=C
zo1LCLpX5AZwRBVIKkqdT+t^-EsF7NPOi&@=mu&O!)*`j>pQVnFTk7^p1P!NW<moT+
zT-YFoLY3<&&5q;tz8-A(y-msF4$VPL7$0{qQPtrR*$tHKBhVo#yY`PG9Q!K?tb+vt
z-hh;sauxd1{f`_q*G?0c-vdPrl<$&?OjhG)*rxUc5*YLyBuuyx?L0J+)$*%226cPg
zD0S?WcO0uqJ@AE%J=;sip}n0btC^$ZP)RV8r~e=bU($xBl^liyNp53r<|)~G|Fa1i
z-D>}s-apY4Eeqa#^Ce|(dU%dOcB_-*c<+I=SB1QsEYqC&{WJK45JQ;PD8$NZS2#a#
zy=vy%chj>g?AIoB5eU37uF&J?Nf->@Y}qQ^%Z<YCc@j;>24QHAODG{VBb2v$&I-Zj
zC@|SmoVs+8t(9=X{*i)4iS}*)!9STCm+Bx&;29d|i{aKUr;|+`5Z{-2@qdFHC%#<8
z8C)$hbRM3-h~(UoNcpW^kJh|?R#awA(9mW^u7?vulM#VfDcsADK#}siekF%Nf|*%4
zx8ORDcnPFnw?uRf4mTpNUZ5gKtSmW?L|ob)>nAUH)=O7SnSRBt;w=Tbz3tP#=@yQM
zY=FXGu-iXwUe?i$FMUXFUD0cw+PtLLE^4DPJWjAE2Ar3K3;CNmyJYH6R!oFCtxicI
zCxa_atogz21(25_$V`q87oWAja+e;BooK}Gx29XHhcGD8XDia6mg^}}Oh^br8aS4{
zl3Is~78&E5=FKT)!>niI{>=-(;EhP2Q0V2!i)V9N;#cDx>kslq!T`YOSr`>Pc?v~j
ztJ6sSNB)Jyw!$yj3Mw|Q5eQcoAwQf?LD?W-E<0%31I|~W;b-JOJx^yM_i6l=vHVB&
zVo2<t#@v+WB!s^3)US!GhkI|EIoL7h^xY<$Q?D0__)<ti{yiNe-g&Se@H6Zr(Uq&y
zqH1LhF(aS2G!61XI~xaGaK;%6sYH3D=Fk`viPDTDSMQ4LBH~yl{$n2r4NHQfDw{c!
z1O-!kgJXnUZ6XQ`?UF-d(f8b-B=SfyDw2X>8AqGps=M^O<s4#SdR{foPn0*q6#thw
zz(R|_R|xk=_GFLPi?$*$cWp}OsV<#QJZx9gaCWcJzYm`J^<x~^bI>%*&ywGIe*>I-
z#no;RLNj083{Bu@(CfV?S+^c;B9&;je0zb3=nBbVHe%yza_N?u%#$y58lOFYTb@OJ
zNqTbQTO)t+8S7KP0}r_gjyR$A&%sgUlxWe#-qMHf`S`q++^tY+HTs&vhqUu9TNuZ9
zLI??Ac|*7xquMHWHb&90decdsj=!tzQwGjrt*GRWQ7l9YX12+S-f3RIA0~(%9fibk
zSHd$V6|I*|SKR-vpF$LYk09ua1T0s|yu?ypVNL5x*`NMixtm&0;NiL17GbE_b|g`_
ztQ2GWHpk<eFcc2sBXq3ie>})LRxTRjI)99f9OGrI@F5V380FW;R?-0JQ<aLb-jNKm
z8e(jyO_;;nfR5D0xJtf4<)lsvokH9vK9cYpoB>}eM`+&YX1keMfl)~DufAnNkyzoj
zo%_pm`{!7&A*|{Ze^_Jk_cr?3SKm$GHp7agz|os8q1;8!IYzt-D>Zdb9c?>hBktcE
zwmSb1)5jR}w#1^y2vl1FF8&7}d=iN{4#Mdd#r)7<wH|>)LYz6mz@1_=M=33`sIw~u
z9s8S5pu|6O<E&_fIAbgCc@jCKLX_w_=A+5{r_t7(bhnwn=^G&)UJtKdKR?I!7i{6q
z-t#&D)Jzm_QT*R^evj$Qk6{Zo_m^zZH{}^Ua=tu$BBs<EGip1DVIM2|T9>x<b&EYs
zQ%O__g4Ce-$=$0YIGR-P+TBF#0MV1^mMz)UPaw??OR(=YwW`8c$6U{H)7<dbml9P<
zDg%+ZRDtazG(qq!X^UPj(-2E3%}VQ%UO&f_w&Ycrm&@2_2Ov3#d#Sl!oqo-5nUMX8
zC!OfLEm-eg4+Qb?Auc}B<(Iv{1kM<!jYf=ZyFZh8lBC)gpK%e}C@*NAQ@!h|K0PxO
zv2nEZ?A~=&oM)DVBfhHDIIMZ871_ogy!&9r6!KAIaHs5%j|CiVVo=w2aOfH%a`mR%
z0V?hV2&Mp3CzO%iI1XM?Fy%s4S$dnQyMe!d!)7V;&8?6t6+#;>i}?2(A6Q{zRU{!K
z&LlPKOR~)^Xp@Lo2k?cUj2->|H<ki#fffA7=G2YhcZhy9<F37YEms}#QI^R}gW@uW
z<p!cEkUzpOH*4+H-g-ksyt<ZJXdEjNZb=&YN7EeJtLdVy1V_-w#yrbvZZ4S?tS?8I
zcpT{-F^y+{_=2di5(4-LM22w?f;=*FjvkTYOrs1syEgPI^wsZGt5vpm05RN%np?PS
z;+^Ldgs-TVHKDk~Wl3Ka9=qwk5tlF=oEVbdz-ka3*KMHQCTmBx@w4C^$qfd(P?6Y|
zSxMDS*$(aV?^#^JOlm}WIh4*I`z~Z0+^-8=UHoeL2GN$g@zZr7cO?FmNzLxZO4gdu
zz1I`hkC@ESY!{#%eB61*Acf>QGK<~HWn6_iUyJ%dZd$I@EvVo&-bT%&X;i?kq3tHI
zbNGatkvB#KtVi-FqK4Gf^pf5yN|IhY9S=y1fDc2QS9B`ps?+K-#hE;NO41|8danlx
zsWG&PDHI;;p|^O>o3rH%?6&IO=$9we?`lc0FS6=M`PL?`YOpk_+mf_h>-Iq9jzZR#
zx{Bf9`sa@w1lXl{+^RX)(GvPLN#AmI3wqa^M4IJO71NaBa#LyfQuY413t&5DQ&iMa
z`)I{VTU8|_G*;P(VQ1Psys}LshnnU0Bh;ssaOy&hF%QXNce6wRz2({|^B;H1>5I>r
z@jD#$>OE~Q`w_G0u<#`Ma^ml+*u7;AuZ2}D2t@4m16Ppq#*tFTr7CQjkloSDa?;AF
zNyYpS*@%QwAXj{xH(X{7?m6;F8rlAPc7K0@7ZZY-?h?vtc+oZ^D@j^CEUc(ZtAz5g
zL6u3iu;xwenO3itdzGwG+07iG_2Z&5wS6vceBE+?RQv_l`udNlR_~sPX+XRz0vG$h
zjP^KqLnVhIOfq>4JXMCg^wRfPTk1C5f<DMirrt5DD%vy~^)<9;v>(gPPIFLDZzNvk
z{WNJRUHc<M*eR1Ny<*F<y<$^LJwW7M_OiRO@q$Kw1-d!fQQ@FGlcT9om})54Fe?ni
zl#JKzs2N_CI2*KNSzjgErZIwTa*n3t52cq{tA<(4O2tLPT8i)Snxmb0gG_x{?ZvRk
z-^D52EvQ;qj9F!yvu9uYhcV5knz`zt*bVGP|1UC?43}q*L^MS#ax@HGQX4bTRx3iZ
zYE8;VNASnQpAd*N|Ci#pun2D;{ll%5f;n<$8AmI4>l!8uq4HF^Layl?Nr~Z~jzS<A
zAfW&pB^*jQhDMji=Qi2%W?Cy$$fl_)DT^%gP%VAW?nhJ2n@&8uaaR0iUPrWT`@!$*
z+L_jr8W*=w9n~=hwXpD;3#oH$*ghXmt!F7!`g@}N&xPgXOQuGBv)eT_*oJFLNA?ok
zhG)phOE<G5qXq}(twz2~PV$ex@v3Z(DbMXU*pU?-TiFq^JL=xt7+h}Yvc{%Y%Dy=A
zWY;bq&5l+c<Z1BHo^>nMmzK>R6^zZKg&Or1cl10Ry<@ZTb6XP2f5$wd-yzB_A`*e{
zLYutwyMtC&*0H=WTGtR|8)-y@-5Vqcf>Aw=FE)SUD6ty3l`8S-rQgK-&amC|2e+H<
z%W|$WRd^ChCH^^bYcx~JDV}@>ikXvH(cfuh7rFJlvWo}ywE6Sxr$#=lw(^%*v}l)f
z4T#NW)r6py1o+n8B5FT?&8J|%$5+7qw!nEc5|4Udby01~gI^G?t5mFe7q(NOGVi*P
z(w7k}0-!HG_`<aJTnq1R+kE(s$-`GjN-W`ssGoU1TluM$Op8XM?ep!~s$`u6^LB(&
zR??^3SX)|sswyR(|C!iyS%?>Ba{m*X;Z!$a9e#G%`A}wSr-;YOYno`!(-O6}9@Fw{
zZuD#P;+Xx=$P!j1WPVF&>sdTMbG>6%Y2GhtM*3|0$LRw*=$WT2E?eYWfge@vj`%k>
zCQP-luI-JHSZ>#08+7?5S<oK65Yr`wT;vhIjl;5d4#JyXbAL2U{p(C}%RxK3->iLC
zxq8gGv2EG%YV$2-!#cZ&eoW#8=t{B+fn?JR{kFlCQXYN+$h4tDtw`^xfM;%ug4B<0
z$_EU?V-LZ<yN^s}-+DUyVD5rbu>5M7m{sNK8N-O(TMrlL(gT$$ydTjC%Gsdnot}8L
z4l!k0{GgXu$jiPxnVR0>2q9%}%I}!Y&d*vXs+|gJYark-PptewJ?*kU?;f8&4Pwv3
zH#}5#HB8RIPM{BoBNE)TIy7C)s63a}`gv4+x1R(VIa-SY;jxl60>58zN#P+cUDDcI
z(D4x465Zf)8{LpwPD7e{eQA51$+>?q>+V057VfCaE@g1T8eFe=ZpHA%QBCvMWa!Gy
zjOjfQ>~tlNz!o;Ok-E&#FBwk<j91&(p#<xPw2#ttHx(;l1jk!__7O)Fti<%O1p-_7
zI{`C3Wm`U_8`anHv8GC^NbXA3lI#`(j3rk++FD8L?o2EFE<w7s4WA~H#!;W%QoM4>
z=(tUn3sphEbdl>)zRT$LS@#{6{>ivJOD+ecA3B~J@qz${8oGR*^z`l1n>UCS%RyrM
z!trStx0ZKSo?@a$OPaLyCRomge9QsGU9=TRATP#t>uVLuMSv)msSR^K-C1&;`|`du
zYd=iKvr*iCurPPmr*SMEAAcvNsPv#LMyyRojyL3Bdn`3iTy1;D-9*vBYedV;Qt?|q
zH8gm%zWT!9t|l*%F~2t`%5UA|Va||vAcR-L2ECKtGPFDAm?skQvPQcJTRy!|lOZh`
zWkm>Fh|Bp5YYz>yqc`VzA+Ke`mFdF|O<NgBcHFr<?N|fXu}ATehrvC$zG_AgM@CQS
zKstOH+O30obhl;t+$e~+YchV1>@;V0=9lC>mlxd?%6t~|g{$%rr}3ib_E)-e;#MIC
z%|S{@%So!Ej6^dNQj!&<bO@-45ZnaE-Wz<LtsR}IFwOKM@Jmwg94|vICo~?KKT0{A
z3#vj(R0=?^XqoX+${F*oeVEPSK#6r2gXli=|6;ty35f{2cE8~>tSOcXT7p*6RntDD
z{K@6J7q)yHTS*smW?Db)({>+CGLm4er{>>#Ewl-4)o3GOlfAC<HY@HJzm>P)9eEC;
z^QbxB1uc(|IYZ~jL2KBT%Bcp#Olvqk<BZ^lV?<O`zJwW(%z6#>Qh#n+JHwH{MrB)!
zh=`$UqKCxHq%eA?E8DTI&~Ig1$U*2pEj8Zt<CoT~Gkq%AO!<mdFC6gQM%J1hQx|u*
zZFGN-GbMU|C*5u1`INWP%~yj@@_E`32((RJjNG*5BRsfsiAOtEvD!gA-NWAM(a>_P
zHEL+ba)N|^&4G3GIgUH|ePx78O%{gP1kWB_;f$L+fBo5fL7BkH@YTdIsoEC1tn#W1
z4j62bnJToy&B#G_GgAGoNQw~a`Y*GZ{J4jns;gC{ZFaQWVqD*=%P|F`@rRZ7I}qt{
z4v$s*N*q3J`6ttIM~1<FkL13{dudWxvh-@%Oo(+iZY+Q4W!AvstPL;Q{N0Jgi}?7x
zXZQ7SAY149#bYc%SPY-|XwvMyF6Sm$Vzk8Jfn_%Ge5U{^j(qWLcfEV(AtWV9a0983
zv>Ji0rJSi)IZc#PT9@i4-PKIBfPYCXJct#uvLPI?v9Ci_S;~@9%lbK%YK@VqtBusM
zl1AKm&BaoB>}ls8ovnT`o7#z`!rmy}1f%6k<{DnHHVyrDp5wp38=U=;`!KE%&2cmy
zYgDd5TyVG^v;R)>KzE7Xh9hQIZwB1$(q<{`Ia8uZeTk776IZb8ys2$46E|eyI*bx>
zkL=&+qKJv*;HX$C4<FkSxkXQDlW*7B@~3S_Rr_%|e^q$FEL&>4dy+`3OEjQLYL>D$
z94<oe@yDVt5E19vS_2D+yulr=CB!-M%$`RqHd%L~7NdL0>g>X!No|x`KfG58Q50>j
z>Rr%MetLCO-Pb_{gTV9MF>r3<$Y`kIvRqP~QjB_WV~cSKfp}z>*Rc@mR_W2-+h^9-
z<<RW0?HP2{iJ=a}kUZ1zmroCx*5t#u^^zza4`&Bz2|8~MHSf8a{wSW_6Uy9m%e?Wy
zLt+w*O;vfC%i_#Xs(Hb7&sqPnPn7ch5!~)=2m&!Z`;z+@*ucsDxUXkAD!OsPh7^-y
zSUYx#$irNl<yy0SszF-ShKM?vEPS$|dH!oNuFbWp+P-IMQprjqZurCL^E+hjP=+H)
zr4gkLh=qdimU5PQec#gSb*1`<1@o2thtr2_TL<)cg1Tgpa#sC5uFLgf7<I4dNmE)o
zJ2h00a{rj&9KUh>9>%HFy&}qJMAUffb4}P1EmXN+mYA2>hGqL&4(S2OcP62qmXKO^
z*>JlrBZI7uWn2ATXx2-wc9UrgtiJeav!+|u)X0=v;%COr(|WL3mafgFNZ9ATAXe)Y
zePPL~<<s}5GL{st+n;uBGMedqLQ_xc+H9nL`g0g~C%b)XIX5NI*HzEz#<ddDAEE{(
zc_KMq(D?XutceTN))<cBKat|U7HAL7p$*T|PP;WvYVq16{wbw+y{9d~+Qu3nn9UM9
zr*apQVsf#J)o@BO67lBV`x3LkA~X$#b9J#?{SP*Z5g#9fOuG#qx@_7CIz3e3LbTDr
z+3!b`d}g;uNz4Now@#?S97L&1RH+)R>?}!2AVV_XEiQ^Mq@|N=S2o1gxF6KG*4mjM
zJ`?Qjx>!DEJXN=o@ZARi5+PnJDX`32%`$u~)P4Al0oB^QUz%!46}mPJF>+f2haR;o
z!yK*c=i8<hTZLy*Y8!{P0-iJVm!RN>HALvc5|{TiZPy<8$)3|p$Fi_z>Gq4{7b*In
zWfBJK3?zG<i^p<^j5J6hm%1~jEg*Svn2-BpR&~4Vs4YIV*~*Xbr??Hv+l;|blr}ij
zArT0X(G;hVS}cY#?D4gM&kk+<>A%_>^1yS3-yRh+OO#KOSa40j@=gx=wz3nJmP?M5
znuiUJe$G)gVzOqcW_v)DxOs$}K6ectzm@ur=W#x1xOltschr%y{2R$zq%E7>^DLy-
zuL!8kd950l=F3sr-Z{M~$H9t^4VWn0o7z^YgY4ohy%eiYsMW#xZExR<?j19ZG(#rT
zjOC@b;3e}Bi1ov`7Bc*Js?XM`E-cOo??o-S-IgtRh9-;7e5_=_OLXl;?6T~Nb7U@8
zc~Fwv{<XdAp*yPSH6JZhjxJsNoPM$TMWGp$c-Of%tZ6@0f|phL);S5>OPjL4xbpV?
zC@t5yjR6%xxL(GASHdMY6*;KKu3nBfro9P+;OZ`wWfJ>7{+c;t@rs?FbRaLiDV2kC
zk6wgBKV&%sLQWUC$Apu)FsO8O+IR*m*!PVK^>hU)b}xzAB1H6U%W}p>_@+p{`!&4r
zs=NE#;Nc8SB<Zf8Wnoy<#!A1zVl5|Pfpe?*)$@_5Pc=(&IB-ZQW_{@j+XlO4${^iW
zoz|~91Y?z1zL`RquGe1w^U_nF(%DTX^xA)gt#*t|(`Fi&@MOOk@Ga(K5lgzep>d&(
zWsFxWe7Ss?*YCBJ3)*p#BK{tWe&z?sBPo%d7g0vJB2NOB7Y3|9yL9dMcJS(csrZuf
zr=aeK{5e`BNu%A7k>0a=#hVt89H`M`@CuGEe(!zuI9z3r3dzftZhUT3D{{5Ua1g(~
zOCNIwE^b{fH&J+pxzkX@4<Sh|bmd&_(f4w6z9F~C`rLERw5{#LQ53!6&<R}qOVV}X
zNV;hDKU}x;iXKG;iA^jz*|#&A-b47w3%wYS5cYWjhqqec-KqdU=|P;E3$69e3J0~4
zS5tNiHPk3=y|m;<9|7&;effy}wgp!+(-~`CVHDfWcASm})j>RUuao}ta4LH&&*0=M
zU!JrW&KqBn#G4;=`OE$sz3H&X_C{BVY$-Xh$z>}{72{_&xwY2K0)@5Jwe-uM<r3|`
zM<HGeqPUf)a=(y=$q(L<UZELQe0+l|&t8DTenAE}Wx&%VvX8T|cZKgUsn5L)NR)?$
z9t6$}$%-%6XoJqa)S#ru8+Za~&S1qo8;||e;=wzeDs%#DcUi9(C#?YP^IyyjGY6ai
zNp#|i)xe9KhKV^dN7*HIKR8@MqkPWs+Mt#v&->%!3v-m4&w!C?DDS6PB}voKE6aaw
zaYt5b4W)qrOgi3G@#i&s(~rztFkxp}cIa$+Z3OqaX526jZSpEN*yn<;#X0l{b^?&R
zo5wMzozdDKgAo@G^d#O;`GYYH!wX8Drr%Tb)2219s=S)>xqL%BO9fLFDN$<yfvVN=
zARI7U-OJ+qdl+Lg{Yg>SxG|Mj=b#8iEZS1f*h1Ujn(fytp~;s|yK956w0(x6Gq=>*
zddx8H4uI~bgFV{<ZL@|5$VpVV-#|uIP)2E#iWuL1Wt(@_sEibL87B1OlL4V`LyNGX
zWp9;&quDuz8q|+Kk>UT#*3kgAZl$rH)ODPVE4(!BsaA>`#L*B{I=z-{VnsABa;9!Q
zr`TFk;<BViZSB&$nckDv{^Vr(+V@ylGIL;KZEj}>|JXG5Z4Ox%wO3xC^*XHOTUQRd
zwJ#TwzW+<TW~-Z!vE~U&``7HT(R}gBCASMzi3=9>BV4Ht3M!3mt<A*L=XD&G$EYVt
z6<$YOWHNhwf$Pp^(&-g(;iGp^vH9nM2Zo$yeDkRxu1tK&cgjaCo{(P+72JD>iIix?
zUNRFo!3CIChV367eo#rDkbRDgKt;m5BSPzMrVsw8ui<$(QEWEY?r?*LCGgWZNu8Lq
z`qVCyhkD-`QFV=9CSNB!&<G2A-fGj*zc_lWrN)_OrJmpWnx5HC2{5AZg%hhn)<XI=
z@uPwiG*<o9BMA!-rOSG|3jM_jaJ(R91xg8ISJA5j>{NM6pLbvW?W~|*ZFJd;`XlGp
z^Il1uQg-~?{7nhZKc;W1S!?!=+={M#`~=A)-|OkS${SVR+xV=mnrFdmY2IW*+#4cB
z0Liheubg*vz>-|H9a|O+ds!IeBZ0ZH_v|j!K^{4MRa-whex93$mqs+{)=}i+Ua1>(
zEHjpQj^kPBbM0Amyp!9BUFu%1)RWgPJpY;^=Qt{AjNWR-wl(-o(?zJu)f<S(DU1>F
z^Fbi&*tL?SEy02P^Kx?YM>#W>E^gku;07Aj;}8GxLX`L%Rn9|_D3uAyx~sRuxvtMe
zKuCQl)VCz{sn%5{JpGiCq2_R-#wBr`I@dUj9PNB_tj5pY8B}irL+mjf`qxpBa4KMW
z9rthD9;%-BF{EB+<vX%HN;#GtX&{bqzs*XfVck`>cc@`T!^;xbzec<4s&KvkEJ?wa
zGt)6Q=Bj(N-|xw|9&yQ695Fi~<@otJm#Zr7^iOf>XERVrj#s6Qwu49~7w0z6&vygX
zQ1!g`Po}??P=8(hOFvaApB4Ygp4#u<Yg`w3;sreBI`jc=gVs=2%T(7qY<v3H8_l`o
z^=(3@d_^>fD)Bs2x$1ebz{vEd!PUQPKPB-;ey}YWH>DYm`7*%pVq!O=UrEG!-@_w4
zK{@*7haO9Z#IAV!sI;q49*Fw%QDNoI8+irAvr!V=DyI^k^gU3ADAUeuV$7zmDP`F<
zDLG!NGW5#55Ompk##=(=rpdvA@D!JxkyB}-)E>v7Yq5{3yMLV^Ro~4`+TxbOl+~_C
zUUB)XPdDtmI-+kXxe-xTaQQ#{pbk2i;jUYD)Ptz%OSwJqtc;~tRlg`cl=a$Z{ik0B
zRf^S2b@iVY)YS5FKcO@_dA1^5ho6;^3Q1MXLa@^wp=O2c<r};P&cm1OSE|~0AK%`R
zwaPBN@w!x9Dq2Kh#p{(%y17*VHJ(ME_H)N<E%(au!UbB|$E~{ag-gBco4o_-s1|wr
z7{=Z7APjzs1>x2R3&rIWBGVdCw4fILS?(CU4f*qqFN1H8UE=C0Yib{;mA~v-&}H*7
z|FRJZW(<1lMvsF}45mRBHj}JWik<3L5K7yLpz%E-i^M~;MHnRXJXTyA6X@bOwV}t^
zKpGBq6?*xZ<ZRN$URCUo$CL8wR$pl6otFqjnL_<uS(-X~M^!3@seWvAxAAGW)~Wx#
zpBRFV??`mcPSa1De9R@%K1VyFE^rs)ro*9Pz#K)b7bjamdiz~~)hes@edBxI-B89?
zp0->fG~T<7w6=P$rK6*-^r+<GgxjN78ovGk3;WekfyT&&cO>1@P>Fv!b4032;)6ST
z#?=TJPF!OyMEOJ^fY42_Z367vuC_4Q`{6e!`}bjD%myQewxt)|GX4>?N@523CeDH<
zm@^c!y?5_)j)v@yYKHuWYcj$$vM=B7JlYGEbgC;;y5m;5EdG15UAev5#>vEcjn{5T
zm0EFi^qP3CWvqzAYKf*7dD)c3P=MDa`>%@QyoOU=Kz~AXmt2&;*XNW~cVN(CH=p-B
z_&@zEc*Da4G0XI_gGs}pO_tv)Ove=20k@Z$T14AnH=7P<HX49(Yq_(>Ny7dN!4=2x
zLy`RiDgWY8zVTDJ8V{Lp5j-=SZ||~*dPuG8!jW_GNZxI%spF9uD~FiGC>ME|jGX5i
z0YfX6P0K3>K|(U;Y4mTY3#suf6I;ctY6Nh!gyVC^Bp}~a=uBP2=_Ue`uIA!`t9o=T
z?<V6x{Gsnv(a2t2p?R=Sf+C&bN#_83eJeZ1W1QY-IlFR6S{1_*>^{uqQ2G19n|m=+
z6`&8=U_)fuwxg5XXH_)RpKm6pf7|*4=v1Aq6h8y09^5t{U2@BGvehZ$#ezUJkdoKv
z-AoQD#(oaJ{l0slkxmz%FD>Zc+<fZKq2=c-se0aUILRN+!>}R)=O$}Q`=F(H>@0y}
zypIhq2KQ=Z|KkM^N=Tf3aRU`GAl;CzxIm+$OK87?nUWWIC9@#;ffca$#e|MCf97_|
zM>W;MN;~y8UXEraw{GIk<=sLZ!>PZ2K%e1y=!1yemrgkcUvoXa>B}xQ;LkfOGvvKc
z_SE<jVR_K2DVS(;qdD@>FiOxO+Lkin>i8HWX1U7nhGpMiz#?#%R0W~0ZJ$;^D;r@$
zBY%?8G9D*9aVjg5#J&dLJ_}2ySW*KAa)};HGzazIo!lvo^!q@e^YS=1R{W;%D1VXa
z@Bgqj_i=Pyq)^^>)ZI6y9}_6|2nn~_wFuoFHWxcS|4LCFZC&Nv;Wp~>K4*-HXv4Uw
z+H6-8&A<26wMsklgC(n6@@uE>KCU9|nXpR*o=o*PX@=`%oHXM_St#a@%Kfeg(A}$3
zV>|JX1ZI5f56dMp!{_~$Hccve!yUb`HgDn1da)w<_SPFkHpa%S8GgEeB@ibB+K7^8
zQx*=76jZ!4h|PnT$D>X?YDpCMT&w%7-XGx8$)D6KoHMP?J2iODyYyQ*N?gA%MXj1z
znurj-+Opi5l$6!I9{`7vy{Oz`rq18(UDEzia5vNwy8*iLBe+ht)mPe+xJ7p{<L78{
z4vitmtncY-!pWn#f^7$GJ4D%MUKLFdI51s0?KLM!M}Qhwv_j?GL*pCS{TA4fQ8!<w
zy|3y(4f!*;93Ky9MD-I@4j)2!wq@(qE>+$wq$Q|n{<)2lQkIjap1cyDT!QVY5_+R~
zfqkf~R&MKMp$&3&X{2ZFBYEiUMWZnqoI!eWDC?<au^0QxyX)nQm4&=LrO`mZ7eEKE
zLnN<9ryTw_eQh2KGqD}w{<pJxUIJUSB~hFHV*&blI9cXW@P^yudW=m0_WC@)p9!8!
zZO23btiv3c)hs{dxgX`&?yMA;lyrZr@r^ZdW!u>y);Ue}M|=io&Tf&ag7)uih}|@}
znfB^<FaeMKA7<~cP$<)FtMtTE=LG8z10EGU(>S6)!!{O@8c@EE%4+_FiJ7FllEUa!
zEB9nUZpeoah?R^CL<V=a8r9aZ^3~+Vrj{T6Uvyqj^CFyxWYc{`(##f-TvF1s<@=k$
z_)e!hgXnz*MM?GZex!*H;HdK?WXPnC7Zh9^(ts(&9r(Q?>3@?RpptLBkGOP^;1TPo
zYQ-FvrOqIPM%W>P%bp1%Hf<|eq9!e*ZB}fxWKGA-x@QV;X~V*XuBFwJpt#56bb~|e
z!6|$XBw|mLDn=+G0NqMwY6qL6ux~))e6up%sIHJlOwZD7UAg&rx_M9GHSfyobqZuK
zblalyf=9J;<%p)G1HzK)N<Im;w(Y-R4fo+IL4}5!9j@NnpBvRn+}~(ofr3Y$p&d1Q
zA`z1{+M?$T6<;98KhsD_o5NT>_LB@|z)oQX%Kw3P94BvR9uD>k`AYIYS{UV?)~vTB
zA={e8*I<(;|DeO4OF!;29<BFgx1a2lET8QPyk+WES-fLS$7;=TiKS8=)zcQ0ul!Gb
z;y0Yc?2|kRe}_{^T_wQyj+A)Ll+CrdsTYb4WjnNmLGmhmn(lH_^8jiILAuuDx;mx9
zK_KJ!=<)L2vZ{=H5z49IC|VYdI0_);ls;CFsUox1$fnxk@?+cUl!1^?3jJ%hn!39_
zUsXv=s_>fZEJk?DyeE-3+sU<m*XH*vpz;Yte4XfU`lVs9+T6Q4B5cOS!*ewOt@QLX
z&^H<b=y1SEbm>JMTzgu;YG=s1$e?Xi>^CqyoYd}o=FRx;Dd*u}?t$IzRq4Up49@uS
z`|e$5$(k9n*0gtZ0(#~E0Fe`3D(byCP6_b$WH`a+aC^PRVa?8~i`3=jBZnH=6)srG
zx!DkTT8|u@FtdERlM#g78~DD-@)HxrxoV=lC(iX3WJrSAaXcvbf{qpY9qx%|66--a
zQuu#m)YDFCvTrYu)ZT+32-jvfJ8%jkllU$6YK`0QT`Mmz&M^4l=@_Vsz*liE9q%7J
z;T|FIDfJ5bD6(m<^e;>i%_=(Rs~crbHzw}fkr!Hr-Ut-aBlW$KQjn2xCPqy~JCiB=
zDCsWcuo4hvQW&%o0ZhXLnWCmf7d=hi-GE6CN#6I-ICb0|o*+z?pv09N$+b9$UU;mm
z>I@NUX?|lUK#9cj8ocx#9Bt#gPlnv2W-}<1uO9Q%{GRQZ+Y7afLEvn%8L#wNG|)4{
zyK5@wPNJp;70CR&pYeaGgUpx%Lq@yBm!iFOGoCCknf3kgs@eHu`xE-+o~&TibZHFl
z#$3%k^rwjY<hK-^FR#57*frpi0h%!Cf4u12?3gYqqp)6+-zsJZ79V&T9$;9&!quJF
zaXLs?rAzOxKyE{o$wv+Xjz(TLn7lrG47`%K;_Ml?;U~ik$z=oNhw9<$d(C@m^kF&L
zGgvtwOVG603i-H*6?+qa3zVxGddEsX1U!Z;)M_*<$wV@HyT6zH&?JD}&TeRZheG_;
z)f@L-?op}@d(!$#&cg3)&3ATiO0;wDImAh9uj%gT$;ecAx^2$QM>b2YzqojTWIMBA
zDOT)YCXP}~d(O7(HaolOOn|slZFlwV^Y_m$on{_O(m>+N&3rhba0y7YfwV779P6Q-
zZNDq><?7XEM8sMgXTGg3rDm*K`}5Uf$%5Wn_4r5B&8M8jCme?KZN(>7$WTu^4NU=w
z3#g}ZsPS`P2=?M9Ir(38tONiumls{&yZHgb=0VF}itCvFl`G&uFxQpiOCN(A7wyGo
zr4qH{`*?1eGwbJQcS>K4$G&;~Li^5|UB0`1)X$Q0{&T&LJEw`0BS*!l0hy+vFVgSe
z@~Qb(GspUH%<|3pf}eFZ9S8|Juitl$)j-?n4GYDR-MgGai$8AM__mORZBr{DJ^Npb
z+JUQ8*MEpXUG?g&Jrp%`Re$r)lgwwj>pr2h4$OG=^St}cJ^y+1jT8o*DlD+q61I(#
z6xs0>;L#^x%frtP7gg`|afL0TbLEQ{Jx%I%9xKCSr4p~Cnq={~xofJ2F61WHunx8#
zt-8Hwl;IG&BL#*R{2$1x%DnoRB;ug<EJD$L{>8!Ei*UvFmc0hKI`wkAk_S4#$3=jI
zOvG_p`MZp4={#@d6@0>I?t-V9WfIYQaXhU@UO7*{$TiL*JZobN@9>{;Ed(46f&n!6
z>m{CmGJ}#P&n*IKt}+NgmUP;f{YCsE8j{Cf3cSMv4((^&n;(viHdrzPxs;%32@qF<
z_>T0rv@*lgB5AmteC|qzroLz@#_p)%JZOE&8Z~A0q9ZHsnguZSN>Gevp3chSG?2r6
zH{yD{r1PH4%GR&Z*cs34{T*`kvfkSHI77a``!J|9q*J_#V=m)bnEm>LVmhmI=)B92
zQy2nKCOG4F@?j-0c#@Ij^x~AKNd??<!DflJYwvbYzU*-5KnHeLqIPxzfU-~DMAR{o
zTJZfJwwocPTf)Q;5<Vr^Eq3{d!a~zGXy<!Qn5>MYk&8q5LBG#1!7O8R0?R<hH^C~_
zh3v!!Jei>nBqJlj!xk2nBj$q-h%+9_9=@EVF@*C$@UI1%cxo5%ifR&{TYL{b`_wLv
z-vF{jrxgpKzd-M`7D)IoM!l-HCsADi3E%m=Kf_PIzVmunU0E&3+LRpm>jx_7-O5Vz
z2y+nVC*D$?vo%LoGd<tSdjX^dS%t~xG#h(D1+0mJPM3f9UeqL^W1`#HOqjpHnIFVz
za|-o&nPVEOL5T=5L5$@bDqdf6LphT&;%c&;+4BY_&!F%G43R`s`2)%Q{r3k(9Lh7z
zcJ0bK@*j^Sw*SHvX-yc^a~WEde7F5L-ASv1mr-VL**$K6LO()~Yu-E6D39bYOF{J0
zo^n~iIIns0H^uS@D`^OjLa^QB>?XJIO4$E$b+6O=%zEcGRZt=J`o9Z+^D7~OOl_S@
z6qjE==2l=m;3Y^(&!^WP?<zAVl<oK!EayK^hQ%0WsQ5CZB!mA73JQW5MMZ)Tk|Y<y
zLT3-S>w2qNqX65|lj4_tlSQPNDf&MB>4g#~a0OIWPEAr9>w(ksQBB){>6c6cm-a{Y
zYS(pxU0w&Dm{vj<ZWnK8Wu0KH1|}j1V3dlAH`%y(k@&T(5>sHhXWS5ijo8oe6tB+K
zP3JqZxSV?|1O12W(x8s4e^yzyZ!Py;Y;yanuf?AZW=>U_u)lT!|8FhuS`iiuYQYIj
zb@k^X;Z}4V93%bDo52}T6BgO6g@#8Dlkq>kaoWlVqY<Sd4Wa#}SrsWI+6qDM13F7-
z0yXU~as={|e~dYSCgwgMeh0vRU%+`UKH=+ouwViR7!u%Lz*Zi6E6P1~b76=>>+Ks)
z*myal-g+R17UgL*iWXLGJSXXsE4uHPVt)D5x>l?m7qSTpMBqaKG)gBnhd|)fojKWN
z5@w*^BN-^M@*R!C29Ujf7@JH@Pi3{q#grbJ@(oHSUgZxTBKtE<V?O_3ko_j7okWG^
z7MF<SIvWVY<yLo{=}s+0vK<E3cB$09F+Sp9a0Ahczi%P*{G^RSg2RIl??*HzuW3t4
zXaR31i>uyPb7RUb>YAAM=h<EF5q=s}j<d7`6QZ=%-3Pi(i$xp(0GOwm1*&hgF<^L3
znh<|o7a9#|)y6F&jkSDhaNNu)L4obVn6-cUyPI~nw<}1v#A%o+Jm$H~w=k3()5d4R
z&id_pStT>23`~tsz~<L0>+TRktv`!vk;!i@zXcOWr|zv&9mmhVf6SjB=vRkmF(fdm
z{gu9V$m1Z-g<F4t+jtNJc?D|Z(iV#?6-iH>pEV{fjHs0KM0TbnP_c2{>~%A2dHhVq
zr%hs~B4L4v;p80t64xFy0};4SHyW$0JXsd$0jfqL!>J0&lPHdNkz^g{YJb|1lZAbZ
zR0f6yYTytYB=h(GkmKN>KUK<=a`I_^pIG{SLgw+Q|8#%eal&Itf&|&ne#U3|#GpH(
zA)hZnmDSZ#2MxJ9<^y!?qXvh>IQc92cQWXa373AhHFd93N_4LJGG%#hE->|Yq}rX1
znH@Y3h2!1V`4OvgVoc^)VD}ZMCtXjB7YOMi0bk9|zOiIBCghEu!z?GjL8#~0rv+?>
zc!i|X9;6{yeZhlnQ;!_6V)T8jNc-2MWJ14#KV!Nt$Dfcaf3X_=wT=PY9>I*>hQ2*%
zSto+Uq=Yi;Nl*5uitzPK7%r*pf>Dy%Dl~{|`p)Rf`8+%%Fy(qgY1fY)S|)Z&r@;O<
zGbk{B;+E<b7IHcO;1gPq@qxaO260B_{lAoP8Q8M~OpeQi6D!AXf$JvlFHOsi-Rk)r
zmK~Ru+2mJcH0(DY9NV+h#)k(8^KFv@mfEcyJ#{saSOq4~`vUVUG6@deo2L;zT$F^b
zL>@1jpyX@9%7c^L5(5!zr2+OAJQk1>>H>X=DHe2xI9T)HeM2pzt1mxG_^eYRHK>mL
z^>F*4Hiy-t%XT?~A`OcS4gV<*N%*7_>eL~D^mo)`Dd@Z2=~Nu6^?{A(+y&{NPdQcb
zWZ8W+*Z>4_Yr45venz(y^y>`fwX3%>9yXpkPB{&n%4(`f+XGsFz{j*TsavQfUA=m>
zrWsVdr&06<X-}y<T<=9mUajrxq~sbe)BJp{w!aJn{1<M7tSG+cB%2}($qAo=>DiU3
z?0(BlO{~NAXK(xciLdVZ(zFm}&Xp;r_a+`Fz1!9$A`TBIo|B7!^!l&iab6p@#GR2j
zt**t%=_LpQSLBloay#*PlG{jS5|VA}L3xk5apI^E!q~>h5Z~wDq`V<7Qp~v^xvT|0
z-Gf@9j=Zt>g?BndoEAyv2XpNf#Dk+xKHwxDz^)To<Xvc($78;;Xn!Jn#=|8!gjCW$
z=q40iKumZsB6J?d?-{@JQ@F&)n3mlp`k3M4Coq0S;*$k;RE&@39lNHU_l}kz<YQ>U
z7|JXB%h#`W!`^tFo;ib)le&XyzfPy*n>IbL3Ml)@Kn$$o5sn@q{fRl*0K$*BCAFRw
zdT5rVd9C<0H?y}$%ua}4eUcsEM-oWBM<vuqkjKiMqv{MwdUig{&OXq0-))-jyP2zw
zlAHQ>8v#8-2gy^1q_BheBEoyJ_ukxZoco)uJa6G<F(}U|{AJ}*iKLlf4Lm~y4%Ma}
zn*l$9gztNFRhRNz+hB&SKu|5ZDL1k;7HS^f&$gkglZAM~=T0A(=XImp3q}mU3V+My
zCfz)F1fM+MyosWl>i`G?I6+7x4bn9ox@e6I%Oai9&t}t#PMxaH>u!<_Qr6On>=))C
zAxuV;@;3-d?x&o;drn#J#fOo5+3rJaBl62#O<dPb89!W?OsiUpQ@iq>otIX&N&Pbm
zY?*j7H=Byfn`F+I&&4`YFrK2_8H_&}@6RjDH=)$Dc`4ttHs(jAh%rE8?Mu<oAtm0r
z{6zYrw<7M4FkH9_krJQc#4r*tgwi)*32F07;M$)3(MEQzn~(3K;&H`_|A!A5F0?L$
zukR-$C8;h)hw*6G3@0t=i$v$*E2^rcI0ZlIun!OX*L4U#Ail~#+*fv9Da2HE5aRzK
zd{q6M4F`J@G`H0B1tv)1BwXKp@jGkI$l`>176lwX?q{TTQo_Pv<hY>`Pva0=wsax7
zx4E*h*f%IFMaRf!9T5VDX%Wi*YTlTZMOgwdm1D&2#-eo@iI9|g>(KS<|H3S^meEtw
zvL(;8ySaMR$pNUANkFU{5`q>+mYcOu>x<RMX>Nri25@rl4$$s_uHSt`{5Or`*2f8i
zY9;n~r~Xh6TyDJLSfE|BWCUcCNTUn3LRVN|<K($xMXgI37O#@HgeRYY*gs@)YIUeN
z2Xg0q|3ZFHZF<tjwKCW1?ZB@ksow<!bdA}FJig|;f$hH3bqi-F6*v#fTTKx>v7#Oh
zXch>^^2REKquXOM=t8%kzdiIC0}jQj&{>Gd6t(Myw^FIqjI{%1KnfT5K^R4ja-#nY
zDo_M&NLqoiRqfuJ<ogTRYU)vzhkxV(ud1tSe}*iI8WQ;3f`G3~Oe-j0yD4U1e7<Q~
z$$#!{q^9K6YhO18tf)xHR#cgB6E7u!z^Zd6<#SISZ#xyv2E3Kv31{-*!J4{=#Q+rR
zow-Nc`TL_Pn7ho<Wev~9{^Hi7>t#bO#)_q;vbgE%f@sTqiK{O%<SR9ml_%}j(}qn?
zt~ErsKRq2`nR|BpEFs&N>1(`Zbj3Z~a0*%ncI%dovC7ESnKKnA>)eYgW3t>Pdw7DR
zH^I&&sN?W4wZ`9Z{RT-QX>nLXe@3XL+ANU3vT=yYngvMc(0aJ;RDIwf+}APM_|Y1@
zu_MM%bc7dY-$PPw%@Oc#9Yex^FRLELGP3KhkvB5Y`Mj7NzT+s&?&umC0*Du7C`r)b
z3kX3~R9=-~*JZwh>@*2?zc1nj!z4uHyYFxtl?pb>DzmltFK#dcQLcu#VIrez2<4tw
z8pDI3@@3+Cz#1sl0>lsvD55LpeC>!3%i*~tF)qXJ65G^oFG5aZ!IDo6ZYa)fg2xh@
zuC8I))CeOy?h8C5KA~_2Ww=wm#Mn!WR-DUkspFi6OM<wuz3}1`7O*$quloi75-&6F
zg52G@y>6NR#n_w2zWI)<Ge8L7n+n(!;0-0(ptNgyk<Vgq=j9b$BWJ(hf3btPC4R9G
zqOEp`$Z9nFsU#ZB(x6h-iIZ_4J1&w0Elrks!1I?fT^BMrS~mj|=cMw1`yl&plU=26
zGMP>wn<P*jC2Sh)SNzs&-Pv^0rpneAb?h*iR8n~+BZDEoDFsTy%|BBM-)W20bu{wc
zt=I+#TU6le9aR=?`Y+k<<KOU`T6Y~t7Qob}`m50Wq^vBSAfAsP;`>94jXTMLM#k(%
z81Pq?_qaL=K8xQC@s_}amRwwz%cjEO{oN8UfQ&cxG$g9@VR5}df*&hGc1h^7y`-YG
zSDZR!^0Mc|JA^weP%tE1lvE4JA(?NG@4dw|-uqg8K_EJpz_Ul2l`(mpE3T&PG{^#t
zn|Rk9j@q>)P+O{p34^I(g=31xrws0FZ&NG}&kC?@+CE>k)HQiLO$+uZ9EZWCZe^a}
zJp6hb%l7;(-$HSvPNAcBmD5tj>eE0K3)Lsx?Bf=MI?6ECdiXM!dmM6H>I3<s!<bmd
z=5a-kf3v(sxvgFBztG#<44J*;uJBOPx>VPgh(JpUA9n==;)c=j&v}!<QsV2w2Q*bh
z?#I}zBmo#L=Q}y|zusL9{u;oP_?<&@A=%~<TJW2U>|9c}(i1~RT^|`;vYfFh1wj6w
zD>)Gx!$05I>bv&cbQdq1g00{}*$G%jvXI8^4&7{SyIHjSGBoE&HJ+|F7*bWUp|?d)
zgoM-OA05o-{8gkUOyOKu_@Twg3p6YP_S$?H3P$I4+eMko`{VWY-sUlg&K9kvube64
zluqI#dbLKz=kUYV5dg_WQ1#Bee)$w#L@P%Aw?+U@fxJ)tLF9;uJ>PbqU-J?-?;QK_
zYSQ|!N9SJ>50a>aOhoVfF#P{Iiq*Snsv2p7hOPbF3xXUXBC48?gcP3NlyfA~=zu#r
zM;;FjlIQ5uH&x0bHewI<Ho7V%@3RYtRFyJ4JUH3Q<BYiYso}ht<g|mK$*Pip3qb7%
zxXkcp0}}GF$|f+@hkNJ*6Wkuq%Kk-uFc|KyySF`#u-x+R0(ukhJr-lKv$FWC`ef%j
zON#@A7opliq_(gQRY<DI)b6xzYSC*&MG03Q%~DkBk<`s5KRVCxLxZVj{~QQdWJM4J
zqkStGb4th|D*!?#eF)?@t_3dC7-n$dY2%N9d!TM9aP5C4Bz5Pp3BlHV+ZKuwTDuMA
zEz6rWYzZLzL>f6GFw3s`gbXcXW8<pDoI-$AGN(=coWhwaZn)Jv-<iWs;|wGeH{C6B
zCffR>YA_-N0D3>)`^)bO;(I@C<<|}qQ!Zu~-w(3zoa%vgLC*Q!<*qqE0;**2+=xi}
zoZzIA!x`d%H`h<S7YQC%31Sp%eiecN01qxoi5CP~Il;J<p1q9@JXs0+;-Ndmi?OiW
zD7!ihMFV89h-Ebb2Wr6;4_8R|G>yQtge&H&up@t_sT<<GB7JgbicIwfV714Gi2DNx
z1D^u>aKTC@!2@TchF&<zJ@Fd&*VzyJ;wKahf*PVTYnhN#q&miBkoV@HSKlgVF#%{-
zV424^GrGG?&S1Lf+&<g=iwjJiDj<951udUWp9`QB9$x6lX`i0&r--rt#!Nh)VSM)@
z?fD6Z_+z5sFY^5V_Xr5Yr9-*`4blg4@+&%R9-~3O);G2u#wpPaRQoE5xcaENR9C;5
zBB-v4-G_LH*o5@GK+iA!B$`xItB)VSC{kYnw++-t<7}Pwe|Luf$A&0?<N~L^gMJSm
z0(hxob6N~AuF}9_5FJ;XTu*4YBnYL%mcM4ZP5u0Ze6gr$QZ1_5_WF%FP%dNq-%<`5
zvNG_00V%|2cMoOWU3QE9OZ0aAT5LD<XL-Cba5>LECyQ(V@es%ZgBf8RxVh|-vfCTD
zaNY}kUI_y~;QWXLXFpZmwTt}@(FYsuAZD}?-}v@@J`3Bf_QJm8U>s=U05c87lRtBh
z+X`I-@X^U05Scj2O-)_>z~KU@Y_LiUxpm^h*@Oc$AhZ21hQQ$9j7d6>$%7;%iMX`>
zt~D7zwG`aH&P}9akL@Cn1swiD(01G66%VmxQ7Zu(1nT7%6}pd|W1i-DrLP-?n9P4R
zc#6E5MZUOU^o!8!i_V=VpFg5X@7Ps)IxW!}Na3R*^Fx?C57ld{oH_@RDK%$Gdd6iE
zH2*a_W^nlw{O37w2HAuYrL8|XF3p<a-u;$@^$Af3E5L<}>eZr6UnX$M{REQn)yk52
zT9{kKqhw6N_U{52Jm2;6KYM+590YZXId03v-m8kD)+y&ky$~anAB%W$`3<iTM~_3#
z{qG0>O{W6R)(Avmpa0alJvix!K2Ip_JV5&O!5z<7!ljGU3sHatOzJWgOqwQxY?5BU
z=U$mBf4_dPX1M5?l6rj(*WdtU&wq$rq!GXiut?d6I%Yt<fKU2xtrX{N6u9>bhR&P>
z6_TsK%h5Ks%a;Z+x9TF(V{0I0*Hk}IIc&I?MVb5=q54K1ewbr0Qk5aw--hW|jvs!8
zZ}}n@5d`9L*>WofTUWiImu6VtJRa1thWm=({XW*yRCyu{yb;@nSHHGa|Gf81#-8KN
z#)L(fZ_wn=O$71k9y0gL3W8_bZdLApf(tobfrokRj+py9F%S=a<!n*nQI(Y?FPT4>
zu=6n7ayyuS?}hT)k#{4)m9B@mTP9p8N>tF>_8oAB5|o>t%bxTFPiCWlsV;TP5@5dQ
zClJVm-%lJcZ>TQP(i)fBZ1$5sBO=$*y?aHdfIFLDfag@qla>O<qI`Mk($dr4q`PA=
znm^BlaPMeGD7b5J=xpCnoB69}=>Tjii8bz7-Q4FGP9m8B?pa@!SpJAs-qe#g^eA?1
zSnFND2vE><$WAJW{QycENu*c(ori9(u$Z?1BHNlJ_+}^M)JS)#g#1_D;}Z(pf|-Aq
zvwN_PYJDn{w5VTws1$ByC~%Ly)<UV<g(fcLKtx84NSA*ym7C=9${J}7xI_pHy_bL+
zWFVU0B^nq+b^g|TpKu|SM>}RX*ib9wW`1kvSL1Nv0k>GEW>UJ2p<ACSwhBh?w>OU_
zGt(aQ*4oKx-a%Qx3P1rwl~btbO}xH=ZZlpAlAMcK_A1g14u#rikY2VaLz0yLdhovp
z4vaMmyuZ)<Pr>vt;@RG<!>j|nm%T&vor9m^x6YB=mLjlI=z!;7@1#b1VwTsxy`2{O
z<TiwhaGO0dgW!M1(W5?H=G~e&FF^)_7}elaPbgrr)KPBAfuztazbPT0;Z?K!g17LB
zsh~6H6O=yfXEdvO?0YfJari;1)7&!@Yv&roQoy>CW{k5hPrS0NnNrvY@q<CM%Trm=
z6MUn^Zgrdc7~_aT=pbE!ldI+)?hcs$1tw{2+}Sf8n6B4aRw**}e0{V%V>uU*T?2SX
zi|Y71Vea^JwV7*V{2ORXJ`-==uZH++z_#(u(J9==Ln3h59_AZx|HO3*Y{2U*#^~yf
znkev?%}i%{wcGC%iWb|ge;HyLaN$rM528^}lXj2Q*8m!vih;{Oi8psb&)V1eU(Fr*
zm?>!LWvzLUiXl}}|5f1CYu6TwP@dWgXCV(1ifBqp+C%>L;2?H};$r7ir_J{|*1+Ca
zLGDp{XmEC>re69@QJqy6wGrIel(2J$;T{fmp@jg^@tdzzO;O<C!SUo|q|`u6GQ`=<
zmC5`|oSo(GBZdN&$2jys0gP^2Zfokr+SKNAF^Fa;xe98}>_rLo3D47HWMy@sTcbdm
zVPuCDaE^j{j`6iT-VTR`-DVjH83TFd`+kk)pfUS@u4p(BD?NmTInKJh;}XM|Gob6=
zf1J!|n3bP0F`JutgI)i&_t4TQb%A*oD@=Uzv&iG{<b1<DxFJnX-6Ow)7Dr224o-9|
z$3Rwu;qDg$Qlpihh0)IDW_C$>^`3i~qk6HJoP_p*WCt{i>fMNO2A3!XuI~Fv)4a2V
zb~jPEC`&c8WGcITee}#$yKP&{&MzCVfh$9aiN?SZ|4Qq+7*3319#>6BFdT_%&e{Id
zsT)N%dScQZ#d&^FX**cd=RBO4F<ft|xtEu7W?ix0CB1^+Opf5#*A}mMo3bGqU*#k~
z?3_P8K}K$8^L?d<W7%0@+Yk`i8?zP%Yni*-?w=`lJ$JYjyMgoZ7bq#+^YN`##GY`v
zf1!y3=!7T}KZ0LOpX>9r?yn^7FTSB8mzFl_6qI($QK^nnV&<GeOiBI7SAPno`Ja|!
z1=zfAxsT)fD?Ri%hQp%E_r1!uIFIaWZ%;B)1mxBgJ=u7~;BxTDY`SkIZGJd@iF!oO
zp?Ck5_D<UUky!)d{Ari9L)>+RUIE0Q;e{Lrtp%8KV|e@tkX1gJuf*3hvZ8=8P(NoW
z8~N4OzP-+IP~=%W645Ekn04(O<BJ(Dz18gLmLmi4DtiGA68ql61J`UjosGcvoA;!m
zf3~1g9o#hW2Q0d1P@W(AeU98v?Y-@m0t2;@*58yF_+Pw><7Vf2c?Md*;H~hVdyMYm
z(ia<xWDT1FrTA9l556aB`pv!T^!eRX9Qq@(>1Lxfve(2M)%G@{=-1P?vd7lS^XBb-
zpw`>?zv>IJ%{0!@+08V%Vdtg~eHZu0TmBrby0LC8$B8IRRt=W-My;H^nt{ElxE%oe
z#FO_TAE3cs>jBSzF&S0)9v=xJ9sDYu?(-*4kIgIpPkUb-Rn^wDPaGsvQV>PzA|WY~
zg23@2as>&MZb3q6={g}^1u3seNGmERB`tYSDM3oQySwWg&bKyP74GHz#{2vC`{@{t
zaoDleT+f{InRCsx_TIMb1@f)5YpssuWsaa~T07hS{qYRMG7XnWKebyaD#xb8#a>S-
z^ZHZT8P25{ChUa)2aPje*4dHop%fUhG`YnuGJts*OOAhyNokx;XOQ%=N<DRU8HJV_
ziQvE%Rf_H|>+Ggbc!(SEl~vk@>x(w7^|;*gGDkg%HWr=9cU$gUOMazlp^TbBBsls?
z71;M|2dPFb7p;C!y1ae)@V5POFDFjr<`<#OnljSmoFy!w=Snf=j$B*7HvQCcn+X1m
zn!(yT@O0-#Gw$(B-y0eXa`2&G2iqa77sg|VRC<LL{X>_c1c=3JahGn4T6T&(nTIyG
zV!gbrKoo?909-zbge~u`9H0+Df#)%gi4c#VK+~wLbhd|ASPD6^-h3f0dNnL1l*B->
z7KIM)#l@Y=a+OxouNg4*ez2y$T<ElTjFl;26`|ZaDX(Du`U&lzp<$yMCZz=|qddz=
zz2|a->DhqT3ygE<^Lc!M=chiYKCpO`MLNpJH*w+aVTv4w2?|S(^jSmt<3rsZ-&`Wq
z_V7G)yCM*Il_t&5p6SK&tn?c~+DxuK={15|iCP~Pz2t<7x2_o?@AFy3Yh=xBJ)Mm-
zwlQ`Y!KqEGJ$%!?Ve1svasnBbs62=G)ICPYrE^P*>O+Ou3PB4UwTX6^q?S`}kxq+s
z@5p4|m|@~^is`J=L|1|J5HOvM3?Km85<$o)rDQ&;xRVdZPXJ;T?cr~js}kb>w!9|S
z0!pKn+NQPl*N%qAOwpg655bqb0J(NyGI){J%eGfrS@tD~Hgw0Rk2B2}DD-D$sb-|-
z(1HokY<C5l6t7a_XlNku*DzS@L+dEw<dm1+UNBDO1QkDA>0Z&#d;8TpEHpgI^QH6r
zHnBls%nSk_;8B-{4^XZawSuz-$t^H$VLMgyLH*abeWTandLM<A1G5$ekK5$eZq3*H
z6gn3D&zGD1y-hS#cd9?Yt|eQUvU`h6q!C#;=iFw>s&@5)-W<jwr(jNIWr;6u0(|(S
zubTCRL|>sQ&XA8VB9){!vOqmiRZ2Il2c{(Mopi0O<XXaF0eIu6(6nd4XpwtwFADX$
zO7ZGRl@60QP8t&c7pxuCXaLeL9iT-b*KsS!-SkTZs`5-&e7vg|>p_Pw8+8qh@Lz*w
zhlQFt1}~8%*xZ<q;783t+6E?LsUz#GF`MsF)TaC%1vaQW70j;Jj+9ts-Ke*AmHq8E
zgFNi&Z_;yT?Puk%pTI-(AjQDVc8g47K>=T8ZFI}E#OzLHn$+A?X?t7Z`Dv!Pj*YY!
zDXVW~P1D}B<oL369YeP-=T|-W7AErgqHJMOP|)P$=5mjLUIY1a{*ekzaHl@xTBNqg
zE(dZk7p+;oc@pQ+QTEU}l~Nt&J?Fm_&6;TaHHOto%y#~~#GTGp@<r9%&wC=h%i~rS
zDc!EPR2TN%3$>qIXOf#Q@k0^VhY-}$fUSVUe=O0!*-XI9g)HL5%fI)}ibC;yl<AQE
zQ4)pn$h9H0%v_T9+o!q8CLWOwP206bKMn~AXj}=8wT{aJpMlIh?ZDicOVmmMOZ(he
z-Tx)L*V(-GzIV~KL*pfB`&5(p^a+t^?<XGHtU|I~b^0@2lc8>4{HXiyc==2Q#Il-^
zfhi_LQ}tgIS!Z*I?)ix9O}415M1cA_0}IMooJZs>-r{|GlyS)~f2Wtdldk^CbS4ka
z8ArGFs41o%cVoz_qWRrG+jC@_LVfx>&E6ydVi2qc7(OTfW0-9RA9bT9<A;pFy2wgk
z7v5T^G^*>(?wGZ58R_o+p{H%8FjH(Rd83YVtA>v^G%`BLT9DB`uKtTqgGhR@_1KN4
zw9d7E(oK7(={`59P8OLd$}#^KCnQ&2r>}oVN1x#XrL{B~gB|tOZnfc1e^F`d-Sa%}
z9^tp^Ph1)&xWBxsba@tKd|g4o6DwZra&I5qSV85X&LBh_tM{DK4Y4%KCS)$Ju>E4l
zyA3W(%cI={e^s2Y?t$3N5yCk1A&@vOt#1wmfmzW|QUfSBlU)Wa+;h~JpxYhYZbERR
zJc#yvF7x|b#_`_#1RtMkSNs_S^v$_uYhu9n>>3-T9EWeNdRYI7zMUm|T~~L-i?j98
zcATJ#&;)ov0Uj){^GNYlWBoM(^YQHiy){aD`pnLMsG8;@^+Wg8X12k$VH7^(S}jAb
z)P_e))Bqv@*)?hWEIlbQ++&18Gero$Rgbry+fGOoobpB^>j*WDk?_kmrX{I7GNR|!
z*OTf&#E*s;$n&b!z4C8o6iB9FE}k40Yx<KjEay`NtK>%VE7opvJ>9U;h>4SjYm(!G
z=~N#)c@)pX_Rwio)?wAD-C^FQuEU|E&l01fT)*Uvl#Oc}!{+skbqJf)WkwFgJT=2O
z+%|AtPXnJW2rxGEalKmX)hJadomg@%p7dD?6*=ryk5M@dn>rgI8bu`b`8pXj8yr>o
zhJl)_z4=qD8VVG;U^~aaj~F5%!jUbRq>XCS>yWaWbQqTO<($A+SJEU|>y4+5t(8In
zTggkyPG-b}%BG{wM9eC%%LKkp$iWukl$&A7DEMs>7?Dz!)M0Ko)Gm_{8}<7Ii&@a&
z&tA|$$3fTbS?Ch8#cb=rKwR#GUd5;N#WE+;)^8;#cdV{PZPYSi%vPpIje;xVg4@T^
z3*4f-76zDxs+4C9#|D^~$gBdqO0XT0b0sTo+&W_)-;mH#lkr%Y@dpr~r(rOnOzXGz
zc8B=@$RlnubY#yMVPvAJaIgtEENbeC7c0`PTl99^asj@;+Vd)QbgrqW_ai#dfVxl0
zvEF$DeAh#U%iC7rYrzn<y*QG_kA9)}ZDJ+8Q<Hh<MISV3%PyMnbAg?g_o#<s_1f_i
z9Q6<_1V)l>m=X&976PM3HsEhCxB(cBMrmC8z$gKiFW1_d%ynWGU*MV}sb*M<%sstl
zb3LX6tcN3TLrvU1qN^;68V1f^rrmQr%imL#t69XHl-3wiW(^VHGNK9581-V6%b}HQ
z$9QrLzJ56P;i;u_pS~qqf2<Ol$)&a%4EUR_fpYe%ksV1hX2YKpeDIOJv!N$!xqv~`
z!e+pZI?-Yj*iMY6Ab=EwwxFdZvwCBf9Qspdgha$Z`m+wJIFBV#Rg7p_<a_H{jxZr3
z#-&)S8NW{Exywa3=8UdcGt)#G{j~fyGhZZ!+H16s{e2$&-6z`0$;}GtG)FN7n}>y0
zW)-Z{f?h0?TVqZr&OFH__e-=eX5lu}K6<J-L%vk%1-gz@2szQA^WOW?bV<#;&gMh?
zA>Xl{o)uZSM}lnB>dTb6tb|1QWMr`6Z&zF(YbHQT0j*EM?~?D+^RhnBbKia9Rn(c|
zNKP(h(RU?l+C+rh;J=zinvokRYDBG%{vl#}wR0@+IrUm?#N%9Shz_H6oTqAc(fg&$
zMn_!AZQ-=3ErPJR7<$%dPs<rxXa}jRKDodtLngf>qvgTR5*2@ick9P&>N)^8?@3fG
zl2KP(hO@CnY4L*1X~4CXfy@nsfAM|yu^nfN#{*BpNt~+UKDC~qR!$NpdAe7(huoy6
zJiC|$>A9J)J|NH+6g8I8L1^;bOA7AJP;FY<%dSS>c5HljIng(y?t%~(5_!?Q#OG?1
zhk0P1V=X070MgAm5c56}v&wq%hG5ADTD@_^<&~QueF%@}#hJ-q;+6yigC+nbDJDaZ
z2zHl_nye}{VUm5vD(%_XsOK3ZRcZEmEc`P7_vGdC@l+?z-*GN-o3<0a(<NY99%WxK
zsBIjqP><(id2Wn5iRv7gk-D?hLTY6Afyd~rjHU>aZoXY%9Y?xQfMvK~^7*{c6QM(g
ztwY)jn$MpQm!gz&81v&ySFoX9=r&s#^nX2NI08olpP}eJrOW|m;{$-EbiQTWp{My)
z0GR#E5Qud@*a{dfKssJHIQDloOK@>?VX`<8?9pjpBd_dq4)0vqUIy-qVr(BG-!YWG
z?>5On!BNIABJe#6YVggpDi6@;kG6KWN(msL{zzQ+^xpoI0H3LEGVr2GxgZW3E;E8`
zuLbmgpxIF`oDR6N=(Vg+rM-klc#N8i5$>JNrA`Z^d?H$Xj+~kYa=8ipB!ZpcfE`!h
z*%z&}(>q%Ddw}SY!+;xl>SAD#3SgMJQmLv$utRzvwTYMR$L(BXB0@n1v$<@O{@b1#
zp%+%bL>-qxRpV7be^M_DE(0kM;L2sXhM8USy9#7BpA5^P-J|IEB5-hICMJ}w-2ehj
zxzme`+R7C)VSzuYE(ZZ28VcmRk)xlnM+el5XTc?e32UZAuW0}ct0eP3BS1d^GCV6n
zhwa7}aiAv?vup$9J+KfG`2f})PmbOq6Ab~)E-mZ5hLIgf0Wb3_-Sm>))m{oDNN88h
zUgv4Z1_xETJpZIif*jnA_c$0uyfHY48*~Dh6_AZ595k4}X`ZuJPM&0NP*>Wr2PPf|
zIvLGc1@Enngqq0TO810rvpNSx!e#y8?p|X#3kNL|!{%~eN|0r}w9w@xBzg_PCy&b(
zf9#Hn+eCx*Dm?Nd_cA7IlgnY;U%R|Ich!06oq3361@mn?IC#kMaCTYzi!HAE?7sR#
z=&pJtC*qyHK^yQPei{FrHjWtqvE~Ib;n1n?I=aQ~Fnn9Yv~f`4y1-1$n1W(u)J}^|
zhqJS7Xj1iOLaB3EGhDF456(cxK|?{nyse^NbMN>w`V-K}u@VJ_KlW$=%@33H8E_k1
zbHYd8xs6=HB$%}fib?=L^GWm$1^KlKY%BiWj-0M@oC%lxYxEE#PJ<+XsY2J2b{Fd+
zAozg(E%Y8qsjGhPXOh74+HGL)f8CilLhSs22+IKmp9r^Pj2Ahkj$5NbZuLqoJ;f(W
ztvrQ>e3A#yB>ZZ~t|cn~|Kjm{m;xr%KN0XC`|2^6FF9mfQm7@&+*pFWV$AeD%#R&y
zL9ep}-sz=PZGQ#USFk)ch$?ow^8Wy9LnDpjr{`^zaj|pTk*HuzW!^&Ag(wA|M*xO7
zqE!89y$)s*ch6F3x05t|TNT4r6LqAooOZE50xY(fJc)L(2rQMsc$`Ma&B;l8h?UUJ
zZHewOt?G~5=zNM>^VAMR_Mxp=&+W?q2#H({cP|7~4rZQkYcuG}SlqC(_sSTJ0HLgw
zqe063q1B1Z8!8`<Up@a@Fs`aZtnw;k5b=({D1)+=Pw${}wx3AZNdF|>bBj6SU2(Co
z^@--rlX&;R3}NrCn>f$lsJ-?KkM|(y<m-Z6m0Amn*!ub@hg#~T*~sDF39bDZX{{L0
zVmDFDd?T**BxhYit_d$aLi%ZS5sTKOqov5H8418>3E^v?UJaype})8c7cajsu0Kr+
zp2w~X^3guEAwk;a^w#>P(L&Z+dWa;}@I8;LOI__k#bT&fn=`@(K4wSA%xvF!N`f8E
zCWj6S6VRHYc)!{PbJogV(UKqRD_Q)~?y|hPL7(~?=<V1az#+hQ<&N$2+(3rjo~1Q$
zLtS?MD6+4wc;5M_^T@!g#M<E8To<>j<Y|V66GwDb?p)ep3Uz>6TE!=LM#aI%o@vE%
z>gheWlx@c>;G3I_l_<J?Wi5>$#{4Kt_et$o3HDyMQoGlw-#!88)EU62Go7me0MKAA
zlPz0@6BH8Lz_OM111pHGQ!m}n?#<{`C3NYT26AW8j(4BvU(5=jKUDQD`4Kxjz6vN#
zVKz8t*Ck~smR+E>mT9_e_xcZ8Lo$4<jnn{}Q)oIXa@ec5l>|mMd<Ig9<Co*Xt73#6
zx!Pct(lHGHOMFlU|1K=X=#ps&mhE?iU~BizvE9JXs}x_Hz%h#*!3RWH$eluZA{O)w
zCr=R)oggoAN~CdIyze_0L4~ikvVDu&L<LrBP=LEB&H%ov%GEix)6zJmv|<PI?I^EZ
zYyZwm&D`o=NXinN;sQt!TURfv4&PIf><@LfomkZAXf^61Hc&vpZ<0JXVi#ol(3T!N
zICN{eaBN(1S;njELq_5KQ}CPm7B^vJw?Lxw*uyte5u&GBf%n3Nuy*G7d?a`^)*iyz
zGpY>`Y=_%!(C<QdT76EC(3SL$TRVQaCmwzWf{h8N(MInr^)6OfaG63_VAqtP<1i`Z
z>;_@*-dMP=!`C2w^O$$>@6vm-P(v5gQBvQx(0wZV*=78`@QRkDC~AT380UD`wa-|8
z_5%M1<vqP@HGm|6yg}6M4bUA{_tPwY(Et7)Xj2f-k7WsIDeSazQm~<E=MKp%(*H0J
z^e2!qAA3X3@cYgk;;E$t5W*%+o?cRWP~AHwMk@drdKR@t#|AecAnDY~sgw`d7G^;>
zBfk1r+`O>%X;5c#6H>D*DtU2I<%~nAY*%?&p-u57eZB13<*y#t7L^UDdKLmSh<0Y}
z;`-%+(!qWiUV)E%D}wxeD`yydNpmPm?-V`xuBD%tKt~Q;2Z;mQN^unUgZT7(=M>*y
zq1(223BKuk#(Il6aW+LdGZ{MdA?2gb+oLnd#<(RU@=UKz?j5$UftV;=lQLKNq4f|J
zYNXp&FVimD-0rXTYf^jsVvjl)d7!aASp!R%WJeyC)+1$v-t^7axSM}rBF-jCXSPDu
z84^k1K_rNm&e-UaySv^hypl~-dGq0P&W7=9&|ciWdj{ah4xm_Z>3k?hF)@L4c1aIb
zPa$dKK5R9jby0Z?m*btnQFTaHQl6{I;#<E5OPd-*%WQBoc6MfV^v(SF9~#{N8M$~|
zjs&oLlTw(}XM!;`49Bd`_ykMqdtRwd2F1#EZNEu{DJUxHk3<Huq&fK!pzo4pUsA5=
z_X~T`c+RTJ>coYYnbTtIk8|4a1HOIC;VQTY_0mqBiUWJBx(a4ASr2$00yW5xdvA1l
zdA6U3FQ$dLpOMlk(b-t<TdP_d9%V$Ig6Z+zM1`?SYuqEWPk+{=cjNk)Dj^;_vG8}`
z+OJ*+el}KsySL|CT7dg9&-{{ceZb-Lf~-}8%4#d56T&%LC|SntG76qcB#<hf;1VDl
z8bkb`xq1C{R<QqP%8ulnP<fEl!ytu!tjMZ)5oEtCBt~973egUuM;EG}NEFn&Js{M=
zT8<<WYPqtC{05Idvm<w_K%XWZ1><?|sr6n7)d1VPj?6Phj$Qe;%%H`evt;xex(~Cf
zq(hs!RB4)SUYtkf17iqVX@yTW*bpVVQMBI;QR?V1W<BdMxHYs)*VkurY?AXQSNv=o
zz6wG^N1hHyq(qb9UGG*UJr~7*mCvS=j9YCfXQz9=(7n>Ef`W&`ryesWn9oZ;sq~w9
zP+{1H<T^w(NlE_d>3^U;bv*#_x7<1?n1P8D6?XM`gy+U|j-Vd>OwFi*Vv62W1Uukd
zo(5XqmoDQ*q2EYfFDAyxu~Yh}jnxru?-1<2C;~1B<jr@!&J4iUQ8d{+it*Exi+vjG
znq6$r!Q5Z}JvXK7$j?+R?V|lumO$zEHqqyF?a@7M_tRD2@mSE{$lMDGaJnI(ba=@=
zpfc9raa~S&1S|7Q`kQ=0C@wU7D=^HqJI}=q1(6Tii%-9G|HN<~i&R6?wQZJn&}kV8
zZ|84;kTXvhY%S(DHfEfI#IUjhnFo7gK}-Anv%sMjnx5bIFPl5%IjEVDnJN>bpEI3N
z{eferHCJ>Pqo{M={j;|mtS>lh>HeLD|Jyo8p!^m|r3vf+*e0daY<1*Nav1J~g&iPg
z^hNo#<csd>q?T=8RsI81-4Il>aV-!r`-0z0uN?0Ypaluh1Q?2ccL$DCfr$>=-1fU*
z0yGzxyjTs6^2NZRdY{Yh`GNaj``#lbR8+e?#1C<AF;u4F8irm!L5Lvze#O3y9_N91
zKrc>{nUF|@ALR07wc1i>DZqY{_wSzgm+?S7D)9pSe5=qE2fu$##9>5O%Kf44@0;1|
zffW~RB?JDB)B$Oae^k0Nkqd}|&Ez9si_ZZ<J%h5NS3y}e5VddtnW7#qfn@>MI`bZ@
z`)NGzUNAb3HEkE*fEi#gbP~oBut^a7ljy3!R>}i};&}@$yTWAI0nU!AfX*b?$G{3L
z*}U{Y4o-kB0&pzOrcVOHGX;a;vMc#U-V9|~+|Tw+aev&cejQx)M7%B&cy2=!=*<52
zI<O>9-S75O?7hnK08_l-9^)1owg#y1q0;UBnl9-E5KNUP{6H^`e+4e%w2d|gh7>OW
zI_te34fb)emCo&L_UGUif$dZkV%~AU<Nd*4B0p>>ajPc+!D7?}cXOAY*X|$&zXC2(
z>XfVjvmUrT=&YFhyc!AxNA(?O6J)~zfVJI_nu@6Jb&M_D%>iy7Uak_$F~887p$RVx
zopyI|e4LuI*EP`gqs|jkd&?g`<c6C;b*rKAGe9C9Xm&lIcRiTo=$1P6R_oggd6%3T
z){v)i2!#vRVz!=#g7aE48v6^y-!<L}rqMbfWstys2Nek~dNZyv9}%vy_mcs}o;<<Q
z9+xlZ$E0uP`&_*+@!ox{ik(Ioe@YI!T1-SNCOh&RR6`QAwf2^UeheR70!(sQp;iWx
z6Ak1bkJPB*oTbm}aYPh(IkXKLt*=SieRIh{qm-=r(Mnb($t~e2e)@^gEXFa$Ri^y!
zjsv|Jp`!mWuiRAx{0oGCFT4g+p-Ue?dBf=;_jIC!%asFWZfV~Acs=ZPiAT;&R9%!J
zGu>LZr10ewM8lM@Q?;dO1-69_&-WaN^yQ>Q{y!AEi*x%Qpzk1<6L`fbtok=#$ziIY
z4l$pD{k$x2KH6+1SH50Y`5KY&{=SROUEp|}|CQsh)Uuwpz^|7zJ}fhy+YWBG8;@7I
zmOR*^fb_3q-FER_QN$Qys;+HS$}wZ?ZJInrYs($+ZnJ?~;b}<SBV7V-yayk*BLb@P
zUn7H~Fh2I3<R)`#%rva{DP~@7t%@5|+ZQZqb+b1K3t1fgI3?q%Q&#2ZxY)Q=7HLm!
z6@ZVxeO{lLqKOH4#7<L>n>_AVi8W82Tfmq?^^-z5t(^(VKhZ#MLj^YN2B<K{lLR2U
z$aG^ZGdIL35jQ7!6LXEJ#BAeUgvSJ@u$k)G!#S|>a1pFL)H|znVG9TQ&*UX~xH!xP
zP7U4{)^}CW*4VDbFQ;J^S()4L4tjxIcWU3}CR$d0jEgJwygQpCGIZatwT$3h{lvuB
zVt&?O!&|pi=jx1mfTfS6u!qSXL=NafKzvcg<{{vg>c@cAUOK-NnrfGQW9Vfbm_GD*
z&5zS@s##<x*(rIhLm=(B%ax+M#fR7yB$d(9pX=Qrt=LfHScak8YX161OUjhk;Bri%
zScS2>TbsA@$oB1t?bo4HYjW)?1KY<fdygs3MA&upo6JyuJS24YB{lH-KdpQfzB|-D
zE;V@y#I`x7M+NM+v=pFtBn64=MNFSJ_79M4E*61z4RQ~?u|`t&dE7E8>*6yecNk3^
zOv<pILX;oIvpiHO5Hxzr;?b8l_yW1%&=$5G>RS^Rm?ewQ?Z#|kjU2m}$11@Vg7Lmp
zW5?|bJU2qCSVH_1S^JhBx#J?@^H6Q-nqLBCXU<e`uKOf<Ysg=s)!V$3AvFES`Wz{O
zK?IS-Ces-I0SuvhCMfh^7Nr4agVdLg0ERfG4(Jx8^49vwTu_IctVpkJ@#<^E!QrPE
z7B!7ALpeE*1?|BlQcZbczQM|HgrMN2%9=Lm)$MN*gMk>9*jdkQG%_f}aC>TfxZF6k
zyN#J^J*0Y;FizKc4dosHhkLfa=NOFDMY3{evFgzFMY>xUU_@iYc>V%5=O1bQ_Me8i
z!!zT);4EuHH<VqR19bE3h4NIo<J{A_ps4MeacOj+RGUJQGJ=s=+b+V>kJlShkbyA;
zsxpWgu&!lmjn~}vGHYeFte9<yA>cI@m@j@#Rr%Lb%8<!Ca{f4^_9>~6RTq|$0cN6a
ze<lR`d)Y;|)04T&Sg3AX{TdNhck&rjyt!1Hsc~SGUcLy<Qd!x7B?$NlKv2~UuUFb6
z%{#?}Z)0p*qjk33qp=HotzFC}wO=}^W{=}%TN#l9Jz`YdTkCHfn_l6pgI&~&f|J#7
zi61;}uKgvJ&^aa;Bh4o(xl-2|03*61qjZ6ejK^__Kjuel*!#l;;L(g8hUOp7t^rX3
z4Fe)Bq-M6@5k2}iMScD36?G;3Bf+WPjPZ)g>mPlN1RYMtd17Y-_0!hw@2*`**cT7E
z_?QEXsq98BoTgT<E72AELGXKjOoF5;NxK@P7}Pww#M+wEEo3Au65MH?s<t`BZ{{%~
zv_WOKCbS_v$1K7=8zs!{qf$CqX<JrDEOY26NT;Ti7KFff5Fsg#_YUKS-f^G`KOPe6
z1yTle6X54W5@P~kuCpy*6%N^gJC3WD!`&)kknbG~PMW5F&p*4BmtGlozNWQswjDfO
zcbvIoN~*GJP+L2W`No`4cHKhV+w>#jgq&USV0MzL1qw9>c(D$M+Wp7TK%VEofuCh%
zh#8-Fzx<b^&0yP5Xi3<&rdfg(O9AA$y3KWSN2E(E!p;VY4bgWkfPt`>sQ(7!q!p{V
zzOSD4oy8hR!CBe({69hS<{-P`kq>V*9vZ&gR(4{`w#mixrnkr7d132`&9)W9tpk>i
zd&BH}{$4&-SrYRNItt4!moeV9iFWJTETl_WGHD_LLLYm7ChXGpE`KCoP=bC4oE4>R
zN`Q#-G!W%CmxS${X&-DpFg~AeNAWIg%Mt6feTg2$zQk(zY$Yy(u@j4OI2+Ha>z$7x
zTq-v*yu>)D`3AjisD<#2zNz8$-6SGh>yZ?G;L@|Y{&i{a*_@Eh7JCIJw0v?Ufq$nS
z{x6h$Kq5NM5e-$4)SZD8FWs!<r@H>NYTR@7?$_;wiKntBy{J5R1q*JuUeGT#ZGSk(
zouwMY{BG%WNaYE-bU#JjrQ(n{J@Ql2#xisZ-{c*;zlapfrHW8HsBu!CeK~a|0Do4x
zB2L1q)~0z?`0l{V5@hYgwdz1|KqRFW@KuTfUHM2nI7=|-1=+s%Yw-I`b5C~tcIiZT
zg(jVAs>heb^227mPmzHn%32kEc^D4YE}yH@qNX)sZP_v>EKhlLOj2Q`siLKa3M6k{
zZOgC5YHK6e-}Dw+)#eC`mblMI3?&(U6DM3~o~{{sHT4edE9FY2!!6pd(LW+2!*n<-
z#IMKg1dB4>!P<MisIahiOz|%$MeJs_J~%nWgR`6V<K&P#z5?#c-gSNL<r@QRXoPb^
z(q>vZj7T*NMiiT5P&`XXP!m_eM~TDE<kX+obxhk0){L`hvMbSmcgD;UKn0-5)SzvR
zkpDaTZ1H7LdFRsVNfwA_s~3-#KeP|z5X#S!TFEK}0fWRY`1Qfz1e#_Yg)fsq;RK>2
zKf{g>V$Azjio3duLgZv{I@tNJxr$n+)@g#X9-U&26^Jfp!~9iJT#f{*S6%jparuO%
zkBXMD$Dd*_@#p$v-_#bJtC;&>L5kju-|bDtTU0@3jvE`03pmRqY`(9w$6Qd|aCNCf
zPhOJ?0IM?UWobHedpYcfX`Td|0vaTh)j;|Ue*u`Aq9qt1U@@H3xX_zXSe|5?=SOc}
zaw5Rk=RAW9KHU8lV#S)^4l8CVX-1pX-DTjV`|DMWTAN!V1v641MJ4>Ph6O33-I10W
z!9poAMo!npZncj~VoPH<!ipF&G|QYqY6G~#(%eFce{T0UNUWpK{srn+m4K$=tpJb;
zQ+_MdJh4E#3!bJ52hx`nq<aoAnE=2rB;a-)brJqQ;TM5%P;@fZ96Y=5g=QD931P@|
zBEjvAQl>JnM*tD^qF5c8g9L+}1XI0+KUC@=ywDI{%}12k)zyJB-xIIM`~mCU9}Up9
zokJHrp^3>OFojjm4%VSU4?>AvI=9xre03S(tLsf!5L5iv^|ODaU@yNxqKZNh`r>02
zkU64XLXD?#w93c31N6$L{C5lN{~Qr`qYB7*nwO!aho7r6|KF<S`&w^yie?Q<a-cL+
zMnYR0xAF(Y92GM8LwOa%d2yk;3#k7@ALt1I)V#Q+P6DiH{91p)Q;RY_<=#KWI>YOO
zf`dc9m(sG2__wB3aNYmwb6#*<UG$Uxt~ry%jl6O*H9^pv_ScZ$RqZB7wowMF+dYDM
zd8eLIul6`O8z48X{Fmh_P!<n}SQ$D$VW8Mm(^#^&r_y&`?+`|S{py8DRD@@z;(u96
zyD;BnX*xNQ)h3n4+ZkRP5Ui8aDl8AGJlEnm4=GGF6!X5OQW{Z{L;ikhGgjumY&1Ld
zPDlc`F&)?w7gpz%je8AhkcW41q{yc1$jFo~mA<~fk;`<_%@F^b@j{Xqv&eyyQv&oN
zm^eMdJmdwZ!AfRYA@1V`M60iLjD5%|ef=dxFSkETQlCBmPK1UlPc>NeWIA!9W~uPp
zYTn3b#Nbv`yeH>@OEU5KfCD0v``&TF<G;Z66{z{<bacr{u$Immh)qxlaU##oKJxZH
zVK4o)4PBfBRH-bsk7nqy%Q9bi3|2D_$jI0p`vX$q3eq?P99R7G&$_y^B~O3thATyq
zrZC6joYKh{!d%81bce?I*Oe`q=^ip?YPaU_fmbse5a4S;!LA`CMjLGERN<T-v7Ym1
z?Z%BuiRCFOb}2VzES8V^X--9paKhP+gF>iA2ek=Uy~eI8UFk8VYtZd;R16G2ZZEGJ
zC~1-&)I5wVg#+x7qx3ri&fYy{Wk2V4_zj*1vC(it=2_l5+9Nurn3IhH#&xtdc+t7l
zV$3oIW7LF1Bh*&@VPPLbV+bBxu8FthyNIF*HK)?EpJ0_;?{VyC4pFeSuJIf@^&hl*
z0VrW{Jb@R02o_xdIADFI@v|ynaqlD%5$qftw17MPg_Y(|RZ4pG?l!4^0A5-Em~iS*
z1Sp}gIich5o<>(O1L4p@!?|<~4=^e|sJ8rLv1s;;(*f9mHmktQk?r#vUT6zQF?rGI
z=A-r57);O{-dU9&;i79FF0F<F<($hl5~9KQal!?+$|COE9*deM+GZR75b1CAsiy-Q
zD88NsZM}FvWSiVM^g<EONF^sFH!7QTHrDH=BfpQ2M~aPg{d+x58Y{~GZIw=(6vcaB
zdJbm;0pm2q&MuaNG2T`7;}9T>Y_Z1vO?n5I?jHb7|4#>{;`^*-7#PcAH6cwfr`>n_
zUoAcX{k}Z=zlpX($QxiDINYQh`mg){;a+I44d^k?k$)Whmk4lKFpQ1m>zoIx=4TA}
z1>a9BeyZ{pd<PrsFY7zd+kZLlfv~`Sao<7o`zv%DoPqp`yaxsUUx~}Xxz7Kc#AT!e
zM@>L*#0z>Cz^@$e0LJ_kMh*al>{l516-Ge7_`k!0zqs!JH~+<b2Y~X6`~Fq%*`0v>
sN}+$H(5PR<t6#+{hz|bi(1At%p{sG8<!kmi0`TvOg6gHT-%alQ50ZsWzyJUM

literal 0
HcmV?d00001

diff --git a/docs/plugin/README.md b/docs/plugin/README.md
new file mode 100644
index 0000000000..7c51f022b3
--- /dev/null
+++ b/docs/plugin/README.md
@@ -0,0 +1,280 @@
+---
+sidebar: auto
+---
+
+# Plugins
+
+## Writing a Plugin 
+
+Plugins usually add global-level functionality to VuePress. There is no strictly defined scope for a plugin - there are typically several types of plugins you can write:
+
+1. Extend the data generated at compile time. e.g. `the last updated time of each file`.
+2. Generate extra files before or after compilation. e.g. `PWA support`.
+3. Add some extra pages.
+4. Add some global UI. e.g. `back to top`.
+
+A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with plugin's context which provides some compile-time context.
+
+``` js
+// #1
+module.exports = {
+   // ...
+}
+```
+
+``` js
+// #2
+module.exports = (options, context) => {
+   return {
+      // ...
+   }
+}
+```
+
+::: tip
+A plugin module should use `CommonJS` instead of ES6's `export default` because the VuePress plugin runs on the Node side.
+:::
+
+## Using a plugin
+
+You can use plugins by do some configuration at `.vuepress/config.js`:
+
+``` js
+module.exports = {
+  plugins: [
+    require('./my-plugin.js') 
+  ]
+}
+```
+
+When you want to pass in some options to it:
+
+``` js
+module.exports = {
+  plugins: [
+    [
+      require('./my-plugin.js'),
+      { /* options */ }
+    ]
+  ]
+}
+```
+
+### Use plugins from npm
+
+A plugin can be published on npm in `CommonJS` format as `vuepress-plugin-xxx` <Badge type='tip' text='R'/>. Then you can use it like this:
+
+``` js
+module.exports = {
+  plugins: [ 'xxx' /* also can be full name. */ ]
+}
+```
+
+## Options
+
+### name
+
+- Type: `string`
+- Default: undefined
+
+The name of the plugin.
+
+### chainWebpack
+
+- Type: `Function`
+- Default: undefined
+
+Modify the internal webpack config with [webpack-chain](https://github.com/mozilla-neutrino/webpack-chain).
+
+### enhanceDevServer
+
+- Type: `Function`
+- Default: undefined
+
+``` js
+module.exports = {
+  enhanceDevServer(app) {
+    // app: poa instance
+  }
+}
+```
+
+### extendMarkdown
+
+- Type: `Function`
+- Default: `undefined`
+
+A function to modify default config or apply additional plugins to the [markdown-it](https://github.com/markdown-it/markdown-it) instance used to render source files. Example:
+
+``` js
+module.exports = {
+  extendMarkdown: md => {
+    md.set({ breaks: true })
+    md.use(require('markdown-it-xxx'))
+  }
+}
+```
+
+### enhanceAppFiles
+
+- Type: `Array|Function`
+- Default: `undefined`
+
+This option accepts an array containing the file paths, or a function that returns this array, which allow you to do some [App Level Enhancements](../guide/basic-config.md#theme-configuration).
+
+The file can `export default` a hook function which will work like `.vuepress/enhanceApp.js`, or any valid client side code snippets.
+
+``` js
+module.exports = {
+  enhanceAppFiles: [
+    path.resolve(__dirname, 'client.js')
+  ]
+}
+```
+
+### extendPageData
+
+- Type: `Function`
+- Default: `undefined`
+
+A function that exports a plain object which will be merged into each page's data object. This function will be invoking once for each page at compile time.
+
+``` js
+module.exports = {
+  extendPageData ({ 
+    base,      // file's relative path
+    filepath,  // file's absolute path
+    routePath, // url to access this file (client side)
+    content,   // file's raw content
+    key,       // file's key
+  }) {
+    return {
+      // ...
+    }
+  }
+}
+```
+
+e.g.
+
+``` js
+module.exports = {
+  extendPageData ({ content }) {
+    return {
+      size: (content.length / 1024).toFixed(2) + 'kb'
+    }
+  }
+}
+```
+
+Then you can use this value via `this.$page.size` in any Vue component.
+
+
+### clientDynamicModules
+
+- Type: `Function`
+- Default: `undefined`
+
+Sometimes, you may want to generate some client modules at compile time.
+
+``` js
+module.exports = (options, context) => ({
+  clientDynamicModules() {
+    return {
+      name: 'constans.js',
+      content: `export const SOURCE_DIR = '${context.sourceDir}'`
+    }
+  }
+})
+```
+
+Then you can use this module at client side code by:
+
+``` js
+import { SOURCE_DIR } from '@dynamic/constans'
+```
+
+### clientRootMixin
+
+- Type: `String`
+- Default: `undefined`
+
+A path to the mixin file which allow you to control the life cycle of APP's root component.
+
+``` js
+// plugin's entry
+const path = require('path')
+
+module.exports = {
+  clientRootMixin: path.resolve(__dirname, 'mixin.js')
+}
+```
+
+``` js
+// mixin.js
+export default {
+  created () {},
+  mounted () {}
+}
+```
+
+### additionalPages
+
+- Type: `Array|Function`
+- Default: `undefined`
+
+``` js
+const path = require('path')
+
+module.exports = {
+  additionalPages () {
+    return [
+      {
+        route: '/readme/',
+        path: path.resolve(__dirname, '../../README.md')
+      }
+    ]
+  }
+}
+```
+
+``` js
+
+module.exports = {
+  additionalPages () {
+    return [
+      {
+        route: '/readme/',
+        path: 'https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md'
+      }
+    ]
+  }
+}
+````
+
+
+
+
+
+
+
+
+
+
+在正式介绍插件之前，我们需要花一些时间来了解 VuePress 的基本工作原理。
+
+## Lifecycle Diagram
+
+首先，我们都知道 VuePress 有两个主要指令：
+
+``` bash
+vuepress dev
+vuepress build
+```
+
+dev 和 build 的工作过程大抵相同，他们的基本工作流程如下:
+
+![image](/plugin.png)
+
+
+
diff --git a/lib/app/app.js b/lib/app/app.js
index ad4be2cb54..bb0f020d0d 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -5,7 +5,6 @@ import OutboundLink from '../default-theme/OutboundLink.vue'
 import Badge from '../default-theme/Badge.vue'
 import ClientOnly from './ClientOnly'
 import dataMixin from './dataMixin'
-import store from './store'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
 import appEnhancers from '@temp/app-enhancers.js'
@@ -54,7 +53,7 @@ export function createApp () {
       if (saved) {
         return saved
       } else if (to.hash) {
-        if (store.disableScrollBehavior) {
+        if (Vue.$store.disableScrollBehavior) {
           return false
         }
         return {
diff --git a/lib/app/dataMixin.js b/lib/app/dataMixin.js
index ea8ea40c10..f61e6bc790 100644
--- a/lib/app/dataMixin.js
+++ b/lib/app/dataMixin.js
@@ -4,8 +4,12 @@ import { findPageForPath } from './util'
 export default function dataMixin (siteData) {
   prepare(siteData)
   const store = new Vue({
-    data: { siteData }
+    data: {
+      siteData,
+      disableScrollBehavior: false
+    }
   })
+  Vue.$store = store
 
   if (module.hot) {
     module.hot.accept('./.temp/siteData', () => {
diff --git a/lib/app/util.js b/lib/app/util.js
index c11172240e..2d6f62b5d3 100644
--- a/lib/app/util.js
+++ b/lib/app/util.js
@@ -17,3 +17,10 @@ export function findPageForPath (pages, path) {
     frontmatter: {}
   }
 }
+
+// export function loadPage (key) {
+//   return import(${JSON.stringify(filepath)}).then(comp => {
+//     Vue.component(${JSON.stringify(componentName)}, comp.default)
+//     next()
+//   })
+// }
diff --git a/lib/plugin-api/context.js b/lib/plugin-api/context.js
index e79918e765..7ef19cb8a8 100644
--- a/lib/plugin-api/context.js
+++ b/lib/plugin-api/context.js
@@ -1,6 +1,7 @@
+const path = require('path')
 const { writeTemp } = require('../prepare/util')
 
-module.exports = class PluginContext {
+class PluginContext {
   constructor (options) {
     Object.defineProperty(this, '_options', {
       enumerable: false,
@@ -8,7 +9,6 @@ module.exports = class PluginContext {
       writable: false,
       value: options
     })
-    this.writeTemp = writeTemp
   }
 
   get sourceDir () {
@@ -27,3 +27,10 @@ module.exports = class PluginContext {
     return this._options.publicPath
   }
 }
+
+Object.assign(PluginContext.prototype, {
+  resolve: path.resolve,
+  writeTemp
+})
+
+module.exports = PluginContext
diff --git a/lib/prepare/codegen.js b/lib/prepare/codegen.js
index 5522311ade..0978445e36 100644
--- a/lib/prepare/codegen.js
+++ b/lib/prepare/codegen.js
@@ -32,6 +32,7 @@ exports.genRoutesFile = async function ({
     path: ${JSON.stringify(pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
+      loadPageComponent("v-6e489b82c1bb8").then(next) 
       import(${JSON.stringify(filepath)}).then(comp => {
         Vue.component(${JSON.stringify(componentName)}, comp.default)
         next()
@@ -79,7 +80,7 @@ exports.genRoutesFile = async function ({
     `import Vue from 'vue'\n` +
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
-    `import { injectMixins } from '@app/util'\n` +
+    `import { injectMixins, loadPageComponent } from '@app/util'\n` +
     `import rootMixins from '@temp/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index 4edcc86c29..e14211a03d 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -71,5 +71,12 @@ module.exports = (options, context) => ({
         path: path.resolve(__dirname, '../../README.md')
       }
     ]
+  },
+
+  clientDynamicModules () {
+    return {
+      name: 'constans.js',
+      content: `export const SOURCE_DIR = '${context.sourceDir}'`
+    }
   }
 })
diff --git a/packages/vuepress-translation-comparison/TranslationHelper.vue b/packages/vuepress-translation-comparison/TranslationHelper.vue
new file mode 100644
index 0000000000..e23ad2c5a9
--- /dev/null
+++ b/packages/vuepress-translation-comparison/TranslationHelper.vue
@@ -0,0 +1,53 @@
+<template>
+  <div id="translation-helper">
+    <div>Choose a page you want to translate</div>
+    <div class="helper-content">
+      <div id="left">
+        <Content :page-key="key"/>
+      </div>
+      <div id="right"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+// import Vue from 'vue'
+import { findPageForPath } from '@app/util'
+// import { findPageForPath } from '@app/util'
+export default {
+  data () {
+    return {
+      currentPath: '/'
+    }
+  },
+  created () {
+    console.log(this.key)
+  },
+  computed: {
+    key () {
+      return this.currentPage.key
+    },
+    currentPage () {
+      return findPageForPath(this.$site.pages, this.currentPath)
+    }
+  }
+}
+</script>
+
+<style lang="stylus">
+  #translation-helper
+    .helper-content
+      position relative
+    #left, #right
+      position absolute
+      top 0
+      width 50%
+      min-height 100px
+    #left
+      background-color antiquewhite
+      left 0
+    #right
+      background-color aliceblue
+      left 50%
+
+</style>
diff --git a/packages/vuepress-translation-comparison/client.js b/packages/vuepress-translation-comparison/client.js
new file mode 100644
index 0000000000..671533f4fd
--- /dev/null
+++ b/packages/vuepress-translation-comparison/client.js
@@ -0,0 +1,5 @@
+import TranslationHelper from './TranslationHelper.vue'
+
+export default ({ Vue }) => {
+  Vue.component('TranslationHelper', TranslationHelper)
+}
diff --git a/packages/vuepress-translation-comparison/index.js b/packages/vuepress-translation-comparison/index.js
new file mode 100644
index 0000000000..b131eed78e
--- /dev/null
+++ b/packages/vuepress-translation-comparison/index.js
@@ -0,0 +1,14 @@
+module.exports = (options, context) => ({
+  name: 'translation-comparison',
+  clientOnly: true,
+  enhanceAppFiles: [
+    context.resolve(__dirname, 'client.js')
+  ],
+  additionalPages: [
+    {
+      override: false, // will throw warning when '/translation/' has existed
+      route: '/translation/',
+      path: context.resolve(__dirname, 'translation.md')
+    }
+  ]
+})
diff --git a/packages/vuepress-translation-comparison/translation.md b/packages/vuepress-translation-comparison/translation.md
new file mode 100644
index 0000000000..0b6e6dc4eb
--- /dev/null
+++ b/packages/vuepress-translation-comparison/translation.md
@@ -0,0 +1,3 @@
+---
+layout: TranslationHelper
+---

From 3b16c5c37cbbf85ef4ba7ecb319f4ee1e16fcb33 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 14 Jun 2018 23:13:45 +0800
Subject: [PATCH 027/242] feat: support spearate "loadComponent" util

---
 lib/app/util.js        |  7 -------
 lib/prepare/codegen.js | 23 +++++++++++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/app/util.js b/lib/app/util.js
index 2d6f62b5d3..c11172240e 100644
--- a/lib/app/util.js
+++ b/lib/app/util.js
@@ -17,10 +17,3 @@ export function findPageForPath (pages, path) {
     frontmatter: {}
   }
 }
-
-// export function loadPage (key) {
-//   return import(${JSON.stringify(filepath)}).then(comp => {
-//     Vue.component(${JSON.stringify(componentName)}, comp.default)
-//     next()
-//   })
-// }
diff --git a/lib/prepare/codegen.js b/lib/prepare/codegen.js
index 0978445e36..1997b5cf9d 100644
--- a/lib/prepare/codegen.js
+++ b/lib/prepare/codegen.js
@@ -21,19 +21,33 @@ exports.pathsToModuleCode = function (files) {
   return code
 }
 
+exports.getPageComponentsLoadingFile = function (pages) {
+  let code = 'const _l = {}\n'
+
+  code += pages.map(({ filepath, key }) => {
+    return `_l['${key}'] = () => import('${filepath}')`
+  }).join('\n')
+
+  code += `\n\nexport default function loadComponent(key) {
+   return _l[key]()
+}\n`
+  return code
+}
+
 exports.genRoutesFile = async function ({
   siteData: { pages },
   plugin
 }) {
-  function genRoute ({ filepath, path: pagePath, key: componentName }, index) {
+  await writeTemp('components-loader.js', exports.getPageComponentsLoadingFile(pages))
+
+  function genRoute ({ path: pagePath, key: componentName }, index) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
-      loadPageComponent("v-6e489b82c1bb8").then(next) 
-      import(${JSON.stringify(filepath)}).then(comp => {
+      loadComponent(${JSON.stringify(componentName)}).then(comp => {
         Vue.component(${JSON.stringify(componentName)}, comp.default)
         next()
       })
@@ -80,7 +94,8 @@ exports.genRoutesFile = async function ({
     `import Vue from 'vue'\n` +
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
-    `import { injectMixins, loadPageComponent } from '@app/util'\n` +
+    `import { injectMixins } from '@app/util'\n` +
+    `import loadComponent from '@temp/components-loader'\n` +
     `import rootMixins from '@temp/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +

From d210ec035a442f3c59842262f9bbdb7654be1f6e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 14 Jun 2018 23:40:12 +0800
Subject: [PATCH 028/242] refactor: use async components to simplify code

---
 lib/prepare/codegen.js                        | 27 +++----------------
 .../TranslationHelper.vue                     |  3 ---
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/lib/prepare/codegen.js b/lib/prepare/codegen.js
index 1997b5cf9d..c496d5ca33 100644
--- a/lib/prepare/codegen.js
+++ b/lib/prepare/codegen.js
@@ -21,37 +21,16 @@ exports.pathsToModuleCode = function (files) {
   return code
 }
 
-exports.getPageComponentsLoadingFile = function (pages) {
-  let code = 'const _l = {}\n'
-
-  code += pages.map(({ filepath, key }) => {
-    return `_l['${key}'] = () => import('${filepath}')`
-  }).join('\n')
-
-  code += `\n\nexport default function loadComponent(key) {
-   return _l[key]()
-}\n`
-  return code
-}
-
 exports.genRoutesFile = async function ({
   siteData: { pages },
   plugin
 }) {
-  await writeTemp('components-loader.js', exports.getPageComponentsLoadingFile(pages))
-
   function genRoute ({ path: pagePath, key: componentName }, index) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
-    component: ThemeLayout,
-    beforeEnter: (to, from, next) => {
-      loadComponent(${JSON.stringify(componentName)}).then(comp => {
-        Vue.component(${JSON.stringify(componentName)}, comp.default)
-        next()
-      })
-    }
+    component: ThemeLayout
   }`
 
     const dncodedPath = decodeURIComponent(pagePath)
@@ -94,11 +73,11 @@ exports.genRoutesFile = async function ({
     `import Vue from 'vue'\n` +
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
-    `import { injectMixins } from '@app/util'\n` +
-    `import loadComponent from '@temp/components-loader'\n` +
+    `import { injectMixins, loadComponent } from '@app/util'\n` +
     `import rootMixins from '@temp/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +
+    `${pages.map(({ filepath, key }) => `Vue.component('${key}', () => import('${filepath}'))`).join('\n')}\n\n` +
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
   )
 }
diff --git a/packages/vuepress-translation-comparison/TranslationHelper.vue b/packages/vuepress-translation-comparison/TranslationHelper.vue
index e23ad2c5a9..e6b20e004a 100644
--- a/packages/vuepress-translation-comparison/TranslationHelper.vue
+++ b/packages/vuepress-translation-comparison/TranslationHelper.vue
@@ -20,9 +20,6 @@ export default {
       currentPath: '/'
     }
   },
-  created () {
-    console.log(this.key)
-  },
   computed: {
     key () {
       return this.currentPage.key

From 4a4f8ed01cd54337d272f04d1ba9c378ffd7cff5 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 15 Jun 2018 00:10:22 +0800
Subject: [PATCH 029/242] style: change ".content" to "#content"

---
 lib/default-theme/NotFound.vue       | 2 +-
 lib/default-theme/styles/code.styl   | 4 ++--
 lib/default-theme/styles/mobile.styl | 2 +-
 lib/default-theme/styles/theme.styl  | 8 ++++----
 lib/webpack/markdownLoader.js        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/default-theme/NotFound.vue b/lib/default-theme/NotFound.vue
index 6aefe797c4..ed2c0e27c5 100644
--- a/lib/default-theme/NotFound.vue
+++ b/lib/default-theme/NotFound.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="theme-container">
-    <div class="content">
+    <div id="content">
       <h1>404</h1>
       <blockquote>{{ getMsg() }}</blockquote>
       <router-link to="/">Take me home.</router-link>
diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index fb5a8037f0..880b9fb3da 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -1,6 +1,6 @@
 @require './config'
 
-.content
+#content
   code
     color lighten($textColor, 20%)
     padding 0.25rem 0.5rem
@@ -9,7 +9,7 @@
     background-color rgba(27,31,35,0.05)
     border-radius 3px
 
-.content
+#content
   pre, pre[class*="language-"]
     line-height 1.4
     padding 1.25rem 1.5rem
diff --git a/lib/default-theme/styles/mobile.styl b/lib/default-theme/styles/mobile.styl
index b35e59c588..d939b584b9 100644
--- a/lib/default-theme/styles/mobile.styl
+++ b/lib/default-theme/styles/mobile.styl
@@ -31,7 +31,7 @@ $mobileSidebarWidth = $sidebarWidth * 0.82
 @media (max-width: $MQMobileNarrow)
   h1
     font-size 1.9rem
-  .content
+  #content
     div[class*="language-"]
       margin 0.85rem -1.5rem
       border-radius 0
diff --git a/lib/default-theme/styles/theme.styl b/lib/default-theme/styles/theme.styl
index a733861fa6..9443b3c830 100644
--- a/lib/default-theme/styles/theme.styl
+++ b/lib/default-theme/styles/theme.styl
@@ -54,7 +54,7 @@ body
   border-right 1px solid $borderColor
   overflow-y auto
 
-.content:not(.custom)
+#content:not(.custom)
   @extend $wrapper
   > *:first-child
     margin-top $navbarHeight
@@ -67,7 +67,7 @@ body
   img
     max-width 100%
 
-.content.custom
+#content.custom
   padding 0
   margin 0
   img
@@ -105,7 +105,7 @@ strong
 h1, h2, h3, h4, h5, h6
   font-weight 600
   line-height 1.25
-  .content:not(.custom) > &
+  #content:not(.custom) > &
     margin-top (0.5rem - $navbarHeight)
     padding-top ($navbarHeight + 1rem)
     margin-bottom 0
@@ -171,7 +171,7 @@ th, td
     .sidebar-mask
       display: block
   &.no-navbar
-    .content:not(.custom) > h1, h2, h3, h4, h5, h6
+    #content:not(.custom) > h1, h2, h3, h4, h5, h6
         margin-top 1.5rem
         padding-top 0
     .sidebar
diff --git a/lib/webpack/markdownLoader.js b/lib/webpack/markdownLoader.js
index 3c49b747f6..b12bf12f70 100644
--- a/lib/webpack/markdownLoader.js
+++ b/lib/webpack/markdownLoader.js
@@ -82,7 +82,7 @@ module.exports = function (src) {
 
   const res = (
     `<template>\n` +
-      `<div class="content">${html}</div>\n` +
+      `<div id="content">${html}</div>\n` +
     `</template>\n` +
     (hoistedTags || []).join('\n')
   )

From b82b5fdd758c36f39e15b14e7c25a31584d98176 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 15 Jun 2018 00:10:58 +0800
Subject: [PATCH 030/242] chore: extract translation-ui as a separate package

---
 docs/.vuepress/config.js                      |  2 +-
 .../TranslationHelper.vue                     | 50 -------------------
 .../vuepress-translation-comparison/client.js |  5 --
 .../vuepress-translation-comparison/index.js  | 14 ------
 .../translation.md                            |  3 --
 5 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 packages/vuepress-translation-comparison/TranslationHelper.vue
 delete mode 100644 packages/vuepress-translation-comparison/client.js
 delete mode 100644 packages/vuepress-translation-comparison/index.js
 delete mode 100644 packages/vuepress-translation-comparison/translation.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 0868c019a5..ac2c3650b6 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,5 +1,5 @@
 const testPlugin = require('../../packages/vuepress-plugin-test')
-const translationComparisonPlugin = require('../../packages/vuepress-translation-comparison')
+const translationComparisonPlugin = require('../../../vuepress-plugin-translation-ui/src/index')
 
 module.exports = {
   dest: 'vuepress',
diff --git a/packages/vuepress-translation-comparison/TranslationHelper.vue b/packages/vuepress-translation-comparison/TranslationHelper.vue
deleted file mode 100644
index e6b20e004a..0000000000
--- a/packages/vuepress-translation-comparison/TranslationHelper.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <div id="translation-helper">
-    <div>Choose a page you want to translate</div>
-    <div class="helper-content">
-      <div id="left">
-        <Content :page-key="key"/>
-      </div>
-      <div id="right"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-// import Vue from 'vue'
-import { findPageForPath } from '@app/util'
-// import { findPageForPath } from '@app/util'
-export default {
-  data () {
-    return {
-      currentPath: '/'
-    }
-  },
-  computed: {
-    key () {
-      return this.currentPage.key
-    },
-    currentPage () {
-      return findPageForPath(this.$site.pages, this.currentPath)
-    }
-  }
-}
-</script>
-
-<style lang="stylus">
-  #translation-helper
-    .helper-content
-      position relative
-    #left, #right
-      position absolute
-      top 0
-      width 50%
-      min-height 100px
-    #left
-      background-color antiquewhite
-      left 0
-    #right
-      background-color aliceblue
-      left 50%
-
-</style>
diff --git a/packages/vuepress-translation-comparison/client.js b/packages/vuepress-translation-comparison/client.js
deleted file mode 100644
index 671533f4fd..0000000000
--- a/packages/vuepress-translation-comparison/client.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import TranslationHelper from './TranslationHelper.vue'
-
-export default ({ Vue }) => {
-  Vue.component('TranslationHelper', TranslationHelper)
-}
diff --git a/packages/vuepress-translation-comparison/index.js b/packages/vuepress-translation-comparison/index.js
deleted file mode 100644
index b131eed78e..0000000000
--- a/packages/vuepress-translation-comparison/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = (options, context) => ({
-  name: 'translation-comparison',
-  clientOnly: true,
-  enhanceAppFiles: [
-    context.resolve(__dirname, 'client.js')
-  ],
-  additionalPages: [
-    {
-      override: false, // will throw warning when '/translation/' has existed
-      route: '/translation/',
-      path: context.resolve(__dirname, 'translation.md')
-    }
-  ]
-})
diff --git a/packages/vuepress-translation-comparison/translation.md b/packages/vuepress-translation-comparison/translation.md
deleted file mode 100644
index 0b6e6dc4eb..0000000000
--- a/packages/vuepress-translation-comparison/translation.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-layout: TranslationHelper
----

From 4a578d16e675c19f277b034f71761830172350bd Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 15 Jun 2018 01:20:48 +0800
Subject: [PATCH 031/242] Revert "style: change ".content" to "#content""

This reverts commit 4a4f8ed01cd54337d272f04d1ba9c378ffd7cff5.
---
 lib/default-theme/NotFound.vue       | 2 +-
 lib/default-theme/styles/code.styl   | 4 ++--
 lib/default-theme/styles/mobile.styl | 2 +-
 lib/default-theme/styles/theme.styl  | 8 ++++----
 lib/webpack/markdownLoader.js        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/default-theme/NotFound.vue b/lib/default-theme/NotFound.vue
index ed2c0e27c5..6aefe797c4 100644
--- a/lib/default-theme/NotFound.vue
+++ b/lib/default-theme/NotFound.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="theme-container">
-    <div id="content">
+    <div class="content">
       <h1>404</h1>
       <blockquote>{{ getMsg() }}</blockquote>
       <router-link to="/">Take me home.</router-link>
diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index 880b9fb3da..fb5a8037f0 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -1,6 +1,6 @@
 @require './config'
 
-#content
+.content
   code
     color lighten($textColor, 20%)
     padding 0.25rem 0.5rem
@@ -9,7 +9,7 @@
     background-color rgba(27,31,35,0.05)
     border-radius 3px
 
-#content
+.content
   pre, pre[class*="language-"]
     line-height 1.4
     padding 1.25rem 1.5rem
diff --git a/lib/default-theme/styles/mobile.styl b/lib/default-theme/styles/mobile.styl
index d939b584b9..b35e59c588 100644
--- a/lib/default-theme/styles/mobile.styl
+++ b/lib/default-theme/styles/mobile.styl
@@ -31,7 +31,7 @@ $mobileSidebarWidth = $sidebarWidth * 0.82
 @media (max-width: $MQMobileNarrow)
   h1
     font-size 1.9rem
-  #content
+  .content
     div[class*="language-"]
       margin 0.85rem -1.5rem
       border-radius 0
diff --git a/lib/default-theme/styles/theme.styl b/lib/default-theme/styles/theme.styl
index 9443b3c830..a733861fa6 100644
--- a/lib/default-theme/styles/theme.styl
+++ b/lib/default-theme/styles/theme.styl
@@ -54,7 +54,7 @@ body
   border-right 1px solid $borderColor
   overflow-y auto
 
-#content:not(.custom)
+.content:not(.custom)
   @extend $wrapper
   > *:first-child
     margin-top $navbarHeight
@@ -67,7 +67,7 @@ body
   img
     max-width 100%
 
-#content.custom
+.content.custom
   padding 0
   margin 0
   img
@@ -105,7 +105,7 @@ strong
 h1, h2, h3, h4, h5, h6
   font-weight 600
   line-height 1.25
-  #content:not(.custom) > &
+  .content:not(.custom) > &
     margin-top (0.5rem - $navbarHeight)
     padding-top ($navbarHeight + 1rem)
     margin-bottom 0
@@ -171,7 +171,7 @@ th, td
     .sidebar-mask
       display: block
   &.no-navbar
-    #content:not(.custom) > h1, h2, h3, h4, h5, h6
+    .content:not(.custom) > h1, h2, h3, h4, h5, h6
         margin-top 1.5rem
         padding-top 0
     .sidebar
diff --git a/lib/webpack/markdownLoader.js b/lib/webpack/markdownLoader.js
index b12bf12f70..3c49b747f6 100644
--- a/lib/webpack/markdownLoader.js
+++ b/lib/webpack/markdownLoader.js
@@ -82,7 +82,7 @@ module.exports = function (src) {
 
   const res = (
     `<template>\n` +
-      `<div id="content">${html}</div>\n` +
+      `<div class="content">${html}</div>\n` +
     `</template>\n` +
     (hoistedTags || []).join('\n')
   )

From 4c861885ce7f6e84760e3a5c5ab140228981ef1f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 17 Jun 2018 23:59:17 +0800
Subject: [PATCH 032/242] wip commit

---
 docs/plugin/README.md                         | 49 ++++++++++++++-----
 lib/build.js                                  |  2 +-
 lib/dev.js                                    |  2 +-
 lib/plugin-api/context.js                     |  4 ++
 lib/plugin-api/index.js                       | 13 ++++-
 lib/prepare/index.js                          |  3 +-
 .../index.js                                  |  1 +
 7 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/docs/plugin/README.md b/docs/plugin/README.md
index 7c51f022b3..2c7b5234da 100644
--- a/docs/plugin/README.md
+++ b/docs/plugin/README.md
@@ -10,10 +10,10 @@ Plugins usually add global-level functionality to VuePress. There is no strictly
 
 1. Extend the data generated at compile time. e.g. `the last updated time of each file`.
 2. Generate extra files before or after compilation. e.g. `PWA support`.
-3. Add some extra pages.
-4. Add some global UI. e.g. `back to top`.
+3. Add extra pages. e.g. [vuepress-plugin-i18n-ui](https://github.com/ulivz/vuepress-plugin-i18n-ui)
+4. Inject global UI. e.g. `back to top`.
 
-A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with plugin's context which provides some compile-time context.
+A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with [plugin context](#plugin-context) which provides some compile-time context.
 
 ``` js
 // #1
@@ -79,6 +79,21 @@ module.exports = {
 
 The name of the plugin.
 
+### enable
+
+- Type: `boolean`
+- Default: true
+
+Configure whether to enable this plugin. e.g. if you want to enable a plugin only in development mode:
+
+``` js
+module.exports = (options, context) => {
+  return {
+    enable: !context.isProd
+  }
+}
+```
+
 ### chainWebpack
 
 - Type: `Function`
@@ -252,18 +267,18 @@ module.exports = {
 }
 ````
 
+## Plugin Context
 
+```
+module.exports = (options, context) => {
+  return {
+    enable: !context.isProd
+  }
+}
+```
 
 
-
-
-
-
-
-
-在正式介绍插件之前，我们需要花一些时间来了解 VuePress 的基本工作原理。
-
-## Lifecycle Diagram
+## Lifecycle
 
 首先，我们都知道 VuePress 有两个主要指令：
 
@@ -278,3 +293,13 @@ dev 和 build 的工作过程大抵相同，他们的基本工作流程如下:
 
 
 
+
+
+
+
+在正式介绍插件之前，我们需要花一些时间来了解 VuePress 的基本工作原理。
+
+
+
+
+
diff --git a/lib/build.js b/lib/build.js
index 2ce10b0593..f940162d01 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -16,7 +16,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare(sourceDir)
+  const options = await prepare(sourceDir, true /* isProd */)
   if (cliOptions.outDir) {
     options.outDir = cliOptions.outDir
   }
diff --git a/lib/dev.js b/lib/dev.js
index 18bcbdfdce..42ba3ded1f 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -20,7 +20,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare(sourceDir)
+  const options = await prepare(sourceDir, false /* isProd */)
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
diff --git a/lib/plugin-api/context.js b/lib/plugin-api/context.js
index 7ef19cb8a8..62f23d7121 100644
--- a/lib/plugin-api/context.js
+++ b/lib/plugin-api/context.js
@@ -11,6 +11,10 @@ class PluginContext {
     })
   }
 
+  get isProd () {
+    return this._options.isProd
+  }
+
   get sourceDir () {
     return this._options.sourceDir
   }
diff --git a/lib/plugin-api/index.js b/lib/plugin-api/index.js
index af8fdf1b5e..8572275142 100644
--- a/lib/plugin-api/index.js
+++ b/lib/plugin-api/index.js
@@ -22,8 +22,17 @@ module.exports = class Plugin {
       // but also own the inheritance context.
       plugin = plugin(pluginOptions, Object.create(this._pluginContext))
     }
-    plugin = Object.assign(plugin, { name: inferPluginName(pluginRaw, plugin) })
-    this.applyPlugin(plugin)
+
+    plugin = Object.assign({
+      enabled: true,
+      name: inferPluginName(pluginRaw, plugin)
+    }, plugin)
+
+    if (plugin.enabled) {
+      this.applyPlugin(plugin)
+    } else {
+      logger.debug(`\n${chalk.gray(`[vuepress-plugin-${plugin.name}]`)} disabled.`)
+    }
     return this
   }
 
diff --git a/lib/prepare/index.js b/lib/prepare/index.js
index 68c473d329..b1f397e6bb 100644
--- a/lib/prepare/index.js
+++ b/lib/prepare/index.js
@@ -6,9 +6,10 @@ const resolvePlugin = require('./resolvePlugin')
 const { genRoutesFile } = require('./codegen')
 const { writeTemp } = require('./util')
 
-module.exports = async function prepare (sourceDir) {
+module.exports = async function prepare (sourceDir, isProd) {
   // 1. load options
   const options = await resolveOptions(sourceDir)
+  options.isProd = isProd
   const { markdown } = options
 
   // 2. resolve plugin
diff --git a/packages/vuepress-plugin-active-header-links/index.js b/packages/vuepress-plugin-active-header-links/index.js
index 65b8273a5b..ad26c1eeec 100644
--- a/packages/vuepress-plugin-active-header-links/index.js
+++ b/packages/vuepress-plugin-active-header-links/index.js
@@ -2,6 +2,7 @@ const path = require('path')
 
 module.exports = (options, context) => ({
   name: 'active-header-links',
+  enable: context.isDev,
   // This mixin will be applied to the root component of each page.
   clientRootMixin: path.resolve(__dirname, 'mixin.js')
 })

From e659a86906f5a3d2174ca476eb00de5f93ba0632 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 25 Jun 2018 00:39:43 +0800
Subject: [PATCH 033/242] chore: clean store

---
 lib/app/store.js                                      | 7 -------
 packages/vuepress-plugin-active-header-links/mixin.js | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 lib/app/store.js

diff --git a/lib/app/store.js b/lib/app/store.js
deleted file mode 100644
index 115fe0b9e6..0000000000
--- a/lib/app/store.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// It is not yet time to use Vuex to manage the global state
-// singleton object as a global store.
-const state = {
-  disableScrollBehavior: false
-}
-
-export default state
diff --git a/packages/vuepress-plugin-active-header-links/mixin.js b/packages/vuepress-plugin-active-header-links/mixin.js
index ae94fd9b8f..6562c59676 100644
--- a/packages/vuepress-plugin-active-header-links/mixin.js
+++ b/packages/vuepress-plugin-active-header-links/mixin.js
@@ -1,4 +1,4 @@
-import store from '@app/store'
+import Vue from 'vue'
 import throttle from 'lodash.throttle'
 
 export default {
@@ -29,11 +29,11 @@ export default {
           (!nextAnchor || scrollTop < nextAnchor.parentElement.offsetTop - 10))
 
         if (isActive && decodeURIComponent(this.$route.hash) !== decodeURIComponent(anchor.hash)) {
-          store.disableScrollBehavior = true
+          Vue.$store.disableScrollBehavior = true
           this.$router.replace(decodeURIComponent(anchor.hash), () => {
             // execute after scrollBehavior handler.
             this.$nextTick(() => {
-              store.disableScrollBehavior = false
+              Vue.$store.disableScrollBehavior = false
             })
           })
           return

From ddeed7e24673b3e05e40b9aae3e272587aeba995 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 26 Jun 2018 20:27:42 +0800
Subject: [PATCH 034/242] docs: wip commit

---
 docs/plugin/README.md | 45 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/docs/plugin/README.md b/docs/plugin/README.md
index 2c7b5234da..44586fe57c 100644
--- a/docs/plugin/README.md
+++ b/docs/plugin/README.md
@@ -62,7 +62,7 @@ module.exports = {
 
 ### Use plugins from npm
 
-A plugin can be published on npm in `CommonJS` format as `vuepress-plugin-xxx` <Badge type='tip' text='R'/>. Then you can use it like this:
+A plugin can be published on npm in `CommonJS` format as `vuepress-plugin-xxx`. Then you can use it like this:
 
 ``` js
 module.exports = {
@@ -271,12 +271,49 @@ module.exports = {
 
 ```
 module.exports = (options, context) => {
-  return {
-    enable: !context.isProd
-  }
+  // ...
 }
 ```
 
+### context.isProd
+
+- Type: `boolean`
+
+Whether vuepress run in production environment mode.
+
+### context.sourceDir
+
+- Type: `string`
+
+Root path of the docs.
+
+### context.outDir
+
+- Type: `string`
+
+Output path.
+
+### context.themePath
+
+- Type: `string`
+
+The path of the currently active theme.
+
+### context.publicPath
+
+- Type: `string`
+
+See: [base](../config/README.md#base).
+
+### context.resolve
+
+- Type: `Function`
+
+### context.writeTemp
+
+- Type: `Function`
+
+
 
 ## Lifecycle
 

From 8f4bc4ae011986597cbdd395139e8adfc323fadd Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 4 Jul 2018 00:53:03 +0800
Subject: [PATCH 035/242] feat: enhanceAppFiles: support dynamic content

---
 .../option/EnhanceAppFilesOption.js           | 72 ++++++++++++++-----
 .../index.js                                  | 23 +++---
 packages/vuepress-plugin-test/index.js        |  6 +-
 3 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
index 454c4d2253..647fd5218a 100644
--- a/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -6,33 +6,73 @@ const { pathsToModuleCode } = require('../../prepare/codegen')
 const logger = require('../../util/logger')
 
 module.exports = class EnhanceAppFilesOption extends Tapable {
-  tap (pluginName, value) {
-    if (typeof value === 'function') {
-      value = value()
+  /**
+   * In fact, we can quickly implement support for function parameters
+   * by overriding 'tap', but 'tap' will be executed immediately
+   * when the plugin is initialized so that we cannot get the dynamic
+   * returned value.
+   *
+   * A useful use case for 'dynamic return value' is that the user can
+   * write a dynamic file in the 'ready' hook, and add the dest path to
+   * the current plugin context, then return it with a function and
+   * assign it to enhanceAppFiles.
+   */
+  async beforeRun () {
+    const items = this.items
+    this.items = []
+    for (const { name, value } of items) {
+      if (typeof value === 'function') {
+        const res = await value()
+        this.tap(name, res)
+      } else {
+        this.tap(name, value)
+      }
     }
-    super.tap(pluginName, value)
   }
 
   async run (...args) {
+    await this.beforeRun()
     const manifest = []
+    let moduleId = 0
+    let injectedCode = ''
 
     // 1. write enhance app files.
-    for (const [index, value] of this.items.entries()) {
-      const { value: filepath, name: pluginName } = value
-      if (fs.existsSync(filepath)) {
-        const destPath = await writeTemp(
-          `app-enhancers/enhancer-${index}.js`,
-          `export { default } from ${JSON.stringify(filepath)}`
-        )
-        manifest.push(destPath)
+    for (const { value: filepath, name: pluginName } of this.items) {
+      let destPath
+      if (typeof filepath === 'object') {
+        const { name, content } = filepath
+        if (content.includes('export default') || content.includes('module.exports')) {
+          destPath = await writeTemp(
+            `app-enhancers/${name}.js`,
+            content
+          )
+        } else {
+          injectedCode += `\n/* injected by vuepress-plugin-${pluginName} */\n${content}\n`
+        }
       } else {
-        logger.debug(
-          chalk.gray(`[vuepress-plugin-${pluginName}] `) +
-          `${chalk.cyan(filepath)} Not Found.`
-        )
+        if (fs.existsSync(filepath)) {
+          destPath = await writeTemp(
+            `app-enhancers/enhancer-${moduleId++}.js`,
+            `export { default } from '${(filepath)}'`
+          )
+        } else {
+          logger.debug(
+            chalk.gray(`[vuepress-plugin-${pluginName}] `) +
+            `${chalk.cyan(filepath)} Not Found.`
+          )
+        }
+      }
+      if (destPath) {
+        manifest.push(destPath)
       }
     }
 
+    const injectedCodeDestPath = await writeTemp(
+      `app-enhancers/inject.js`,
+      injectedCode + '\nexport default {}\n'
+    )
+    manifest.push(injectedCodeDestPath)
+
     // 2. write entry file.
     await writeTemp('app-enhancers.js', pathsToModuleCode(manifest))
   }
diff --git a/packages/vuepress-plugin-register-global-components/index.js b/packages/vuepress-plugin-register-global-components/index.js
index 986e893add..5ae62210b1 100644
--- a/packages/vuepress-plugin-register-global-components/index.js
+++ b/packages/vuepress-plugin-register-global-components/index.js
@@ -15,12 +15,10 @@ async function resolveComponents (componentDir) {
   return (await globby(['**/*.vue'], { cwd: componentDir }))
 }
 
-const FILE_NAME = 'global-components.js'
-
 module.exports = (options, context) => ({
   name: 'register-global-components',
 
-  async ready () {
+  async enhanceAppFiles () {
     const { baseDirs } = options
 
     function genImport (baseDir, file) {
@@ -35,15 +33,14 @@ module.exports = (options, context) => ({
       const files = await resolveComponents(baseDir) || []
       code += files.map(file => genImport(baseDir, file)).join('\n') + '\n'
     }
-    code = `import Vue from 'vue'\n` + code
-    context.registrationModulePath = await context.writeTemp(FILE_NAME, code)
-  },
-
-  async clientDynamicModules () {
-    const code = `import '${context.registrationModulePath}'`
-    return {
-      name: FILE_NAME,
-      content: code
-    }
+    code = `import Vue from 'vue'\n` + code + '\n'
+    // context.registrationModulePath = await context.writeTemp(FILE_NAME, code)
+
+    return [
+      {
+        name: 'global-components.js',
+        content: code
+      }
+    ]
   }
 })
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index e14211a03d..0223d5bda5 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -24,7 +24,11 @@ module.exports = (options, context) => ({
   },
 
   enhanceAppFiles: [
-    path.resolve(__dirname, 'enhanceApp.js')
+    path.resolve(__dirname, 'enhanceApp.js'),
+    {
+      name: 'app.js',
+      content: 'console.log("app")'
+    }
   ],
 
   chainWebpack (config, isServer) {

From 5fc74045d5108aa593d8a1960f07aa44989d457c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 4 Jul 2018 01:33:41 +0800
Subject: [PATCH 036/242] refactor: enhanceAppFiles: imporve docs and code gen

---
 docs/plugin/README.md                         | 27 ++++++++++++++++---
 .../option/EnhanceAppFilesOption.js           | 13 ++++-----
 packages/vuepress-plugin-test/index.js        | 11 +++-----
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/docs/plugin/README.md b/docs/plugin/README.md
index 44586fe57c..3536b3963e 100644
--- a/docs/plugin/README.md
+++ b/docs/plugin/README.md
@@ -132,12 +132,16 @@ module.exports = {
 
 ### enhanceAppFiles
 
-- Type: `Array|Function`
-- Default: `undefined`
+- Type: 
 
-This option accepts an array containing the file paths, or a function that returns this array, which allow you to do some [App Level Enhancements](../guide/basic-config.md#theme-configuration).
+``` typescript
+type enhanceAppFilesMeta = Array<string | { name: string, content: string }>
+type enhanceAppFiles = enhanceAppFilesMeta | (() => enhanceAppFilesMeta)
+```
 
-The file can `export default` a hook function which will work like `.vuepress/enhanceApp.js`, or any valid client side code snippets.
+- Default: `undefined`
+
+This option accepts an array containing the file paths, or a function that returns this array, which allows you to do some [App Level Enhancements](../guide/basic-config.md#theme-configuration).
 
 ``` js
 module.exports = {
@@ -147,6 +151,21 @@ module.exports = {
 }
 ```
 
+The file can `export default` a hook function which will work like `.vuepress/enhanceApp.js`, or any client side code snippets.
+
+It's worth mentioning that in order for plugin developers to be able to do more things at compile time, this option also supports dynamic code:
+
+``` js
+module.exports = (option, context) => {
+  return {
+    enhanceAppFiles: [{
+      name: 'dynamic-code',
+      content: `export default ({ Vue }) => { Vue.mixin('$source', '${context.sourceDir}') }`
+    }]
+  }
+}
+```
+
 ### extendPageData
 
 - Type: `Function`
diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/lib/plugin-api/option/EnhanceAppFilesOption.js
index 647fd5218a..690fad1632 100644
--- a/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -39,15 +39,16 @@ module.exports = class EnhanceAppFilesOption extends Tapable {
     // 1. write enhance app files.
     for (const { value: filepath, name: pluginName } of this.items) {
       let destPath
+
       if (typeof filepath === 'object') {
         const { name, content } = filepath
         if (content.includes('export default') || content.includes('module.exports')) {
-          destPath = await writeTemp(
-            `app-enhancers/${name}.js`,
-            content
-          )
+          destPath = await writeTemp(`app-enhancers/${name}.js`, content)
         } else {
-          injectedCode += `\n/* injected by vuepress-plugin-${pluginName} */\n${content}\n`
+          injectedCode += `/*
+ * injected by vuepress-plugin-${pluginName} 
+ * file name: ${name}
+ */\n${content}\n\n`
         }
       } else {
         if (fs.existsSync(filepath)) {
@@ -69,7 +70,7 @@ module.exports = class EnhanceAppFilesOption extends Tapable {
 
     const injectedCodeDestPath = await writeTemp(
       `app-enhancers/inject.js`,
-      injectedCode + '\nexport default {}\n'
+      injectedCode + 'export default {}\n'
     )
     manifest.push(injectedCodeDestPath)
 
diff --git a/packages/vuepress-plugin-test/index.js b/packages/vuepress-plugin-test/index.js
index 0223d5bda5..67a32878b7 100644
--- a/packages/vuepress-plugin-test/index.js
+++ b/packages/vuepress-plugin-test/index.js
@@ -23,13 +23,10 @@ module.exports = (options, context) => ({
     }
   },
 
-  enhanceAppFiles: [
-    path.resolve(__dirname, 'enhanceApp.js'),
-    {
-      name: 'app.js',
-      content: 'console.log("app")'
-    }
-  ],
+  enhanceAppFiles: [{
+    name: 'dynamic-code',
+    content: `export default ({ Vue }) => { Vue.prototype.$sourceDir = () => '${context.sourceDir}' }`
+  }],
 
   chainWebpack (config, isServer) {
     if (isServer) {

From 7892556201f48511768d31190d15b576d0ea17f7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 12:01:29 +0800
Subject: [PATCH 037/242] feat: init monorepo

---
 lerna.json                                    |   6 +
 package.json                                  |  74 +----
 packages/@vuepress/core/.npmignore            |   2 +
 packages/@vuepress/core/README.md             |   8 +
 .../@vuepress/core/bin}/vuepress.js           |   0
 .../@vuepress/core/lib}/app/SWUpdateEvent.js  |   0
 .../@vuepress/core/lib}/app/app.js            |   1 -
 .../@vuepress/core/lib}/app/clientEntry.js    |   0
 .../core/lib}/app/components/ClientOnly.js    |   0
 .../core/lib}/app/components/Content.js       |   0
 .../core/lib}/app/components/OutboundLink.vue |   0
 .../@vuepress/core/lib}/app/dataMixin.js      |   0
 .../@vuepress/core/lib}/app/index.dev.html    |   0
 .../@vuepress/core/lib}/app/index.ssr.html    |   0
 .../core/lib}/app/root-mixins/updateMeta.js   |   0
 .../@vuepress/core/lib}/app/serverEntry.js    |   0
 .../@vuepress/core/lib}/app/util.js           |   0
 {lib => packages/@vuepress/core/lib}/build.js |   4 +-
 {lib => packages/@vuepress/core/lib}/dev.js   |   4 +-
 {lib => packages/@vuepress/core/lib}/eject.js |   0
 {lib => packages/@vuepress/core/lib}/index.js |   2 +-
 .../@vuepress/core/lib}/markdown/component.js |   0
 .../core/lib}/markdown/containers.js          |   0
 .../@vuepress/core/lib}/markdown/highlight.js |   0
 .../core/lib}/markdown/highlightLines.js      |   0
 .../@vuepress/core/lib}/markdown/hoist.js     |   0
 .../@vuepress/core/lib}/markdown/index.js     |   0
 .../core/lib}/markdown/lineNumbers.js         |   0
 .../@vuepress/core/lib}/markdown/link.js      |   0
 .../core/lib}/markdown/preWrapper.js          |   0
 .../@vuepress/core/lib}/markdown/slugify.js   |   0
 .../@vuepress/core/lib}/markdown/snippet.js   |   0
 .../core/lib}/plugin-api/constants.js         |   0
 .../@vuepress/core/lib}/plugin-api/context.js |   0
 .../core/lib}/plugin-api/core/Hook.js         |   0
 .../core/lib}/plugin-api/core/Tapable.js      |   0
 .../@vuepress/core/lib}/plugin-api/index.js   |   0
 .../option/AdditionalPagesOption.js           |   0
 .../option/ClientDynamicModulesOption.js      |   0
 .../option/EnhanceAppFilesOption.js           |   0
 .../plugin-api/option/ExtendPageDataOption.js |   0
 .../plugin-api/option/instantiateOption.js    |   0
 .../@vuepress/core/lib}/plugin-api/util.js    |   0
 .../@vuepress/core/lib}/prepare/codegen.js    |   0
 .../@vuepress/core/lib}/prepare/index.js      |   4 +-
 .../@vuepress/core/lib}/prepare/loadConfig.js |   0
 .../core/lib}/prepare/resolveOptions.js       |   2 +-
 .../core/lib}/prepare/resolvePlugin.js        |  10 +-
 .../core/lib}/prepare/resolveSiteData.js      |   0
 .../@vuepress/core/lib}/prepare/util.js       |   0
 .../core/lib}/service-worker/skip-waiting.js  |   0
 .../@vuepress/core/lib}/util/index.js         |   0
 .../@vuepress/core/lib}/util/logger.js        |   0
 .../@vuepress/core/lib}/util/parseHeaders.js  |   0
 .../@vuepress/core/lib}/util/shared.js        |   0
 .../core/lib}/webpack/ClientPlugin.js         |   0
 .../core/lib}/webpack/DevLogPlugin.js         |   0
 .../@vuepress/core/lib}/webpack/HeadPlugin.js |   2 +-
 .../core/lib}/webpack/createBaseConfig.js     |   0
 .../core/lib}/webpack/createClientConfig.js   |   0
 .../core/lib}/webpack/createServerConfig.js   |   0
 .../core/lib}/webpack/markdownLoader.js       |   2 +-
 .../@vuepress/core/lib}/webpack/noopModule.js |   0
 packages/@vuepress/core/package.json          | 118 ++++++++
 packages/@vuepress/core/types/index.d.ts      |  13 +
 .../plugin-active-header-links/.npmignore     |   2 +
 .../plugin-active-header-links/README.md      |   3 +
 .../plugin-active-header-links}/index.js      |   0
 .../plugin-active-header-links}/mixin.js      |   0
 .../plugin-active-header-links/package.json   |  25 ++
 .../@vuepress/plugin-enhance-app/.npmignore   |   2 +
 .../@vuepress/plugin-enhance-app/README.md    |   3 +
 .../plugin-enhance-app}/index.js              |   0
 .../@vuepress/plugin-enhance-app/package.json |  25 ++
 .../@vuepress/plugin-last-updated/.npmignore  |   2 +
 .../@vuepress/plugin-last-updated/README.md   |   3 +
 .../plugin-last-updated}/index.js             |   0
 .../plugin-last-updated/package.json          |  25 ++
 .../.npmignore                                |   2 +
 .../README.md                                 |   3 +
 .../index.js                                  |   0
 .../package.json                              |  25 ++
 packages/@vuepress/plugin-test/.npmignore     |   2 +
 packages/@vuepress/plugin-test/README.md      |   3 +
 .../plugin-test}/enhanceApp.js                |   0
 .../plugin-test}/index.js                     |   0
 .../plugin-test}/mixin.js                     |   0
 packages/@vuepress/plugin-test/package.json   |  25 ++
 packages/@vuepress/theme-default/.npmignore   |   2 +
 packages/@vuepress/theme-default/README.md    |   3 +
 .../theme-default}/components/Badge.vue       |   0
 .../@vuepress/theme-default/enhanceApp.js     |   3 +
 packages/@vuepress/theme-default/index.js     |  11 +
 packages/@vuepress/theme-default/package.json | 122 ++++++++
 .../theme-default/src}/AlgoliaSearchBox.vue   |   0
 .../theme-default/src}/DropdownLink.vue       |   0
 .../theme-default/src}/DropdownTransition.vue |   0
 .../@vuepress/theme-default/src}/Home.vue     |   0
 .../@vuepress/theme-default/src}/Layout.vue   |   0
 .../@vuepress/theme-default/src}/NavLink.vue  |   0
 .../@vuepress/theme-default/src}/NavLinks.vue |   0
 .../@vuepress/theme-default/src}/Navbar.vue   |   0
 .../@vuepress/theme-default/src}/NotFound.vue |   0
 .../@vuepress/theme-default/src}/Page.vue     |   0
 .../theme-default/src}/SWUpdatePopup.vue      |   0
 .../theme-default/src}/SearchBox.vue          |   0
 .../@vuepress/theme-default/src}/Sidebar.vue  |   0
 .../theme-default/src}/SidebarButton.vue      |   0
 .../theme-default/src}/SidebarGroup.vue       |   0
 .../theme-default/src}/SidebarLink.vue        |   0
 .../@vuepress/theme-default/src}/search.svg   |   0
 .../theme-default/src}/styles/arrow.styl      |   0
 .../theme-default/src}/styles/code.styl       |   0
 .../theme-default/src}/styles/config.styl     |   0
 .../src}/styles/custom-blocks.styl            |   0
 .../theme-default/src}/styles/mobile.styl     |   0
 .../theme-default/src}/styles/nprogress.styl  |   0
 .../theme-default/src}/styles/theme.styl      |   0
 .../theme-default/src}/styles/toc.styl        |   0
 .../theme-default/src}/styles/wrapper.styl    |   0
 .../@vuepress/theme-default/src}/util.js      |   0
 .../docs}/.vuepress/components/Bit.vue        |   0
 .../docs}/.vuepress/components/Foo/Bar.vue    |   0
 .../.vuepress/components/OtherComponent.vue   |   0
 .../docs}/.vuepress/components/demo-1.vue     |   0
 {docs => packages/docs}/.vuepress/config.js   |   6 +-
 .../docs}/.vuepress/images/logo.png           | Bin
 .../docs}/.vuepress/public/hero.png           | Bin
 .../public/icons/android-chrome-192x192.png   | Bin
 .../public/icons/android-chrome-512x512.png   | Bin
 .../public/icons/apple-touch-icon-120x120.png | Bin
 .../public/icons/apple-touch-icon-152x152.png | Bin
 .../public/icons/apple-touch-icon-180x180.png | Bin
 .../public/icons/apple-touch-icon-60x60.png   | Bin
 .../public/icons/apple-touch-icon-76x76.png   | Bin
 .../public/icons/apple-touch-icon.png         | Bin
 .../.vuepress/public/icons/favicon-16x16.png  | Bin
 .../.vuepress/public/icons/favicon-32x32.png  | Bin
 .../icons/msapplication-icon-144x144.png      | Bin
 .../.vuepress/public/icons/mstile-150x150.png | Bin
 .../public/icons/safari-pinned-tab.svg        |   0
 .../.vuepress/public/line-numbers-desktop.png | Bin
 .../.vuepress/public/line-numbers-mobile.gif  | Bin
 .../docs}/.vuepress/public/logo.png           | Bin
 .../docs}/.vuepress/public/manifest.json      |   0
 .../docs}/.vuepress/public/plugin.png         | Bin
 {docs => packages/docs}/README.md             |   0
 {docs => packages/docs}/config/README.md      |   0
 .../docs}/default-theme-config/README.md      |   0
 {docs => packages/docs}/guide/README.md       |   0
 {docs => packages/docs}/guide/assets.md       |   0
 {docs => packages/docs}/guide/basic-config.md |   0
 .../docs}/guide/custom-themes.md              |   0
 {docs => packages/docs}/guide/deploy.md       |   0
 .../docs}/guide/getting-started.md            |   0
 {docs => packages/docs}/guide/i18n.md         |   0
 {docs => packages/docs}/guide/markdown.md     |   0
 {docs => packages/docs}/guide/using-vue.md    |   0
 packages/docs/package.json                    |  28 ++
 {docs => packages/docs}/plugin/README.md      |   0
 {docs => packages/docs}/zh/README.md          |   0
 {docs => packages/docs}/zh/config/README.md   |   0
 .../docs}/zh/default-theme-config/README.md   |   0
 {docs => packages/docs}/zh/guide/README.md    |   0
 {docs => packages/docs}/zh/guide/assets.md    |   0
 .../docs}/zh/guide/basic-config.md            |   0
 .../docs}/zh/guide/custom-themes.md           |   0
 {docs => packages/docs}/zh/guide/deploy.md    |   0
 .../docs}/zh/guide/getting-started.md         |   0
 {docs => packages/docs}/zh/guide/i18n.md      |   0
 {docs => packages/docs}/zh/guide/markdown.md  |   0
 {docs => packages/docs}/zh/guide/using-vue.md |   0
 scripts/bootstrap.js                          |  57 ++++
 yarn.lock                                     | 263 +++++++++++++++++-
 174 files changed, 800 insertions(+), 97 deletions(-)
 create mode 100644 lerna.json
 create mode 100644 packages/@vuepress/core/.npmignore
 create mode 100644 packages/@vuepress/core/README.md
 rename {bin => packages/@vuepress/core/bin}/vuepress.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/SWUpdateEvent.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/app.js (97%)
 rename {lib => packages/@vuepress/core/lib}/app/clientEntry.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/components/ClientOnly.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/components/Content.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/components/OutboundLink.vue (100%)
 rename {lib => packages/@vuepress/core/lib}/app/dataMixin.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/index.dev.html (100%)
 rename {lib => packages/@vuepress/core/lib}/app/index.ssr.html (100%)
 rename {lib => packages/@vuepress/core/lib}/app/root-mixins/updateMeta.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/serverEntry.js (100%)
 rename {lib => packages/@vuepress/core/lib}/app/util.js (100%)
 rename {lib => packages/@vuepress/core/lib}/build.js (99%)
 rename {lib => packages/@vuepress/core/lib}/dev.js (97%)
 rename {lib => packages/@vuepress/core/lib}/eject.js (100%)
 rename {lib => packages/@vuepress/core/lib}/index.js (67%)
 rename {lib => packages/@vuepress/core/lib}/markdown/component.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/containers.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/highlight.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/highlightLines.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/hoist.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/index.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/lineNumbers.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/link.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/preWrapper.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/slugify.js (100%)
 rename {lib => packages/@vuepress/core/lib}/markdown/snippet.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/constants.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/context.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/core/Hook.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/core/Tapable.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/index.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/option/AdditionalPagesOption.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/option/ClientDynamicModulesOption.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/option/EnhanceAppFilesOption.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/option/ExtendPageDataOption.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/option/instantiateOption.js (100%)
 rename {lib => packages/@vuepress/core/lib}/plugin-api/util.js (100%)
 rename {lib => packages/@vuepress/core/lib}/prepare/codegen.js (100%)
 rename {lib => packages/@vuepress/core/lib}/prepare/index.js (97%)
 rename {lib => packages/@vuepress/core/lib}/prepare/loadConfig.js (100%)
 rename {lib => packages/@vuepress/core/lib}/prepare/resolveOptions.js (98%)
 rename {lib => packages/@vuepress/core/lib}/prepare/resolvePlugin.js (72%)
 rename {lib => packages/@vuepress/core/lib}/prepare/resolveSiteData.js (100%)
 rename {lib => packages/@vuepress/core/lib}/prepare/util.js (100%)
 rename {lib => packages/@vuepress/core/lib}/service-worker/skip-waiting.js (100%)
 rename {lib => packages/@vuepress/core/lib}/util/index.js (100%)
 rename {lib => packages/@vuepress/core/lib}/util/logger.js (100%)
 rename {lib => packages/@vuepress/core/lib}/util/parseHeaders.js (100%)
 rename {lib => packages/@vuepress/core/lib}/util/shared.js (100%)
 rename {lib => packages/@vuepress/core/lib}/webpack/ClientPlugin.js (100%)
 rename {lib => packages/@vuepress/core/lib}/webpack/DevLogPlugin.js (100%)
 rename {lib => packages/@vuepress/core/lib}/webpack/HeadPlugin.js (90%)
 rename {lib => packages/@vuepress/core/lib}/webpack/createBaseConfig.js (100%)
 rename {lib => packages/@vuepress/core/lib}/webpack/createClientConfig.js (100%)
 rename {lib => packages/@vuepress/core/lib}/webpack/createServerConfig.js (100%)
 rename {lib => packages/@vuepress/core/lib}/webpack/markdownLoader.js (99%)
 rename {lib => packages/@vuepress/core/lib}/webpack/noopModule.js (100%)
 create mode 100644 packages/@vuepress/core/package.json
 create mode 100644 packages/@vuepress/core/types/index.d.ts
 create mode 100644 packages/@vuepress/plugin-active-header-links/.npmignore
 create mode 100644 packages/@vuepress/plugin-active-header-links/README.md
 rename packages/{vuepress-plugin-active-header-links => @vuepress/plugin-active-header-links}/index.js (100%)
 rename packages/{vuepress-plugin-active-header-links => @vuepress/plugin-active-header-links}/mixin.js (100%)
 create mode 100644 packages/@vuepress/plugin-active-header-links/package.json
 create mode 100644 packages/@vuepress/plugin-enhance-app/.npmignore
 create mode 100644 packages/@vuepress/plugin-enhance-app/README.md
 rename packages/{vuepress-plugin-enhance-app => @vuepress/plugin-enhance-app}/index.js (100%)
 create mode 100644 packages/@vuepress/plugin-enhance-app/package.json
 create mode 100644 packages/@vuepress/plugin-last-updated/.npmignore
 create mode 100644 packages/@vuepress/plugin-last-updated/README.md
 rename packages/{vuepress-plugin-last-updated => @vuepress/plugin-last-updated}/index.js (100%)
 create mode 100644 packages/@vuepress/plugin-last-updated/package.json
 create mode 100644 packages/@vuepress/plugin-register-global-components/.npmignore
 create mode 100644 packages/@vuepress/plugin-register-global-components/README.md
 rename packages/{vuepress-plugin-register-global-components => @vuepress/plugin-register-global-components}/index.js (100%)
 create mode 100644 packages/@vuepress/plugin-register-global-components/package.json
 create mode 100644 packages/@vuepress/plugin-test/.npmignore
 create mode 100644 packages/@vuepress/plugin-test/README.md
 rename packages/{vuepress-plugin-test => @vuepress/plugin-test}/enhanceApp.js (100%)
 rename packages/{vuepress-plugin-test => @vuepress/plugin-test}/index.js (100%)
 rename packages/{vuepress-plugin-test => @vuepress/plugin-test}/mixin.js (100%)
 create mode 100644 packages/@vuepress/plugin-test/package.json
 create mode 100644 packages/@vuepress/theme-default/.npmignore
 create mode 100644 packages/@vuepress/theme-default/README.md
 rename {lib/app => packages/@vuepress/theme-default}/components/Badge.vue (100%)
 create mode 100644 packages/@vuepress/theme-default/enhanceApp.js
 create mode 100644 packages/@vuepress/theme-default/index.js
 create mode 100644 packages/@vuepress/theme-default/package.json
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/AlgoliaSearchBox.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/DropdownLink.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/DropdownTransition.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/Home.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/Layout.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/NavLink.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/NavLinks.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/Navbar.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/NotFound.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/Page.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/SWUpdatePopup.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/SearchBox.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/Sidebar.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/SidebarButton.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/SidebarGroup.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/SidebarLink.vue (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/search.svg (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/arrow.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/code.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/config.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/custom-blocks.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/mobile.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/nprogress.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/theme.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/toc.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/styles/wrapper.styl (100%)
 rename {lib/default-theme => packages/@vuepress/theme-default/src}/util.js (100%)
 rename {docs => packages/docs}/.vuepress/components/Bit.vue (100%)
 rename {docs => packages/docs}/.vuepress/components/Foo/Bar.vue (100%)
 rename {docs => packages/docs}/.vuepress/components/OtherComponent.vue (100%)
 rename {docs => packages/docs}/.vuepress/components/demo-1.vue (100%)
 rename {docs => packages/docs}/.vuepress/config.js (94%)
 rename {docs => packages/docs}/.vuepress/images/logo.png (100%)
 rename {docs => packages/docs}/.vuepress/public/hero.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/android-chrome-192x192.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/android-chrome-512x512.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/apple-touch-icon-120x120.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/apple-touch-icon-152x152.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/apple-touch-icon-180x180.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/apple-touch-icon-60x60.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/apple-touch-icon-76x76.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/apple-touch-icon.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/favicon-16x16.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/favicon-32x32.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/msapplication-icon-144x144.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/mstile-150x150.png (100%)
 rename {docs => packages/docs}/.vuepress/public/icons/safari-pinned-tab.svg (100%)
 rename {docs => packages/docs}/.vuepress/public/line-numbers-desktop.png (100%)
 rename {docs => packages/docs}/.vuepress/public/line-numbers-mobile.gif (100%)
 rename {docs => packages/docs}/.vuepress/public/logo.png (100%)
 rename {docs => packages/docs}/.vuepress/public/manifest.json (100%)
 rename {docs => packages/docs}/.vuepress/public/plugin.png (100%)
 rename {docs => packages/docs}/README.md (100%)
 rename {docs => packages/docs}/config/README.md (100%)
 rename {docs => packages/docs}/default-theme-config/README.md (100%)
 rename {docs => packages/docs}/guide/README.md (100%)
 rename {docs => packages/docs}/guide/assets.md (100%)
 rename {docs => packages/docs}/guide/basic-config.md (100%)
 rename {docs => packages/docs}/guide/custom-themes.md (100%)
 rename {docs => packages/docs}/guide/deploy.md (100%)
 rename {docs => packages/docs}/guide/getting-started.md (100%)
 rename {docs => packages/docs}/guide/i18n.md (100%)
 rename {docs => packages/docs}/guide/markdown.md (100%)
 rename {docs => packages/docs}/guide/using-vue.md (100%)
 create mode 100644 packages/docs/package.json
 rename {docs => packages/docs}/plugin/README.md (100%)
 rename {docs => packages/docs}/zh/README.md (100%)
 rename {docs => packages/docs}/zh/config/README.md (100%)
 rename {docs => packages/docs}/zh/default-theme-config/README.md (100%)
 rename {docs => packages/docs}/zh/guide/README.md (100%)
 rename {docs => packages/docs}/zh/guide/assets.md (100%)
 rename {docs => packages/docs}/zh/guide/basic-config.md (100%)
 rename {docs => packages/docs}/zh/guide/custom-themes.md (100%)
 rename {docs => packages/docs}/zh/guide/deploy.md (100%)
 rename {docs => packages/docs}/zh/guide/getting-started.md (100%)
 rename {docs => packages/docs}/zh/guide/i18n.md (100%)
 rename {docs => packages/docs}/zh/guide/markdown.md (100%)
 rename {docs => packages/docs}/zh/guide/using-vue.md (100%)
 create mode 100644 scripts/bootstrap.js

diff --git a/lerna.json b/lerna.json
new file mode 100644
index 0000000000..757fcfd570
--- /dev/null
+++ b/lerna.json
@@ -0,0 +1,6 @@
+{
+  "lerna": "2.5.1",
+  "npmClient": "yarn",
+  "useWorkspaces": true,
+  "version": "1.0.0"
+}
diff --git a/package.json b/package.json
index 8763669e49..b17ce0b52e 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,20 @@
 {
-  "name": "vuepress",
-  "version": "0.14.1",
+  "private": true,
+  "workspaces": [
+    "packages/@vuepress/*",
+    "packages/vuepress",
+    "packages/docs"
+  ],
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
   "bin": {
     "vuepress": "bin/vuepress.js"
   },
   "scripts": {
-    "dev": "node bin/vuepress dev docs",
-    "build": "node bin/vuepress build docs",
-    "lint": "eslint --fix --ext .js,.vue bin/ lib/ test/",
+    "boot": "node scripts/bootstrap.js",
+    "dev": "lerna run --scope docs dev",
+    "build": "lerna run --scope docs build",
+    "lint": "eslint --fix packages/**/*.js packages/**/*.vue packages/**/bin/*",
     "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
     "release": "/bin/bash scripts/release.sh",
     "test": "node test/prepare.js && jest --config test/jest.config.js"
@@ -38,64 +43,6 @@
       "git add"
     ]
   },
-  "dependencies": {
-    "@babel/core": "7.0.0-beta.47",
-    "@vue/babel-preset-app": "3.0.0-beta.11",
-    "autoprefixer": "^8.2.0",
-    "babel-loader": "8.0.0-beta.3",
-    "cache-loader": "^1.2.2",
-    "chalk": "^2.3.2",
-    "chokidar": "^2.0.3",
-    "commander": "^2.15.1",
-    "connect-history-api-fallback": "^1.5.0",
-    "copy-webpack-plugin": "^4.5.1",
-    "cross-spawn": "^6.0.5",
-    "css-loader": "^0.28.11",
-    "diacritics": "^1.3.0",
-    "docsearch.js": "^2.5.2",
-    "escape-html": "^1.0.3",
-    "file-loader": "^1.1.11",
-    "fs-extra": "^5.0.0",
-    "globby": "^8.0.1",
-    "gray-matter": "^4.0.1",
-    "js-yaml": "^3.11.0",
-    "koa-connect": "^2.0.1",
-    "koa-mount": "^3.0.0",
-    "koa-range": "^0.3.0",
-    "koa-static": "^4.0.2",
-    "loader-utils": "^1.1.0",
-    "lodash.throttle": "^4.1.1",
-    "lru-cache": "^4.1.2",
-    "markdown-it": "^8.4.1",
-    "markdown-it-anchor": "^5.0.2",
-    "markdown-it-container": "^2.0.0",
-    "markdown-it-emoji": "^1.4.0",
-    "markdown-it-table-of-contents": "^0.4.0",
-    "mini-css-extract-plugin": "^0.4.1",
-    "nprogress": "^0.2.0",
-    "optimize-css-assets-webpack-plugin": "^4.0.0",
-    "portfinder": "^1.0.13",
-    "postcss-loader": "^2.1.5",
-    "prismjs": "^1.13.0",
-    "register-service-worker": "^1.4.1",
-    "semver": "^5.5.0",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
-    "toml": "^2.3.3",
-    "url-loader": "^1.0.1",
-    "vue": "^2.5.16",
-    "vue-loader": "^15.2.4",
-    "vue-router": "^3.0.1",
-    "vue-server-renderer": "^2.5.16",
-    "vue-template-compiler": "^2.5.16",
-    "vuepress-html-webpack-plugin": "^3.2.0",
-    "webpack": "^4.8.1",
-    "webpack-chain": "^4.6.0",
-    "webpack-merge": "^4.1.2",
-    "webpack-serve": "^1.0.2",
-    "webpackbar": "^2.6.1",
-    "workbox-build": "^3.1.0"
-  },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.16",
     "babel-core": "^7.0.0-0",
@@ -106,6 +53,7 @@
     "eslint-plugin-vue-libs": "^3.0.0",
     "jest": "^23.0.0",
     "jest-serializer-vue": "^1.0.0",
+    "lerna": "^2.11.0",
     "lint-staged": "^7.0.4",
     "vue-jest": "^2.6.0",
     "vuepress-theme-vue": "^1.1.0",
diff --git a/packages/@vuepress/core/.npmignore b/packages/@vuepress/core/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/core/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/core/README.md b/packages/@vuepress/core/README.md
new file mode 100644
index 0000000000..8b45650aa4
--- /dev/null
+++ b/packages/@vuepress/core/README.md
@@ -0,0 +1,8 @@
+# @vuepress/core
+
+> core for vuepress
+
+``` bash
+cd packages/@vuepress/core
+yarn link
+```
\ No newline at end of file
diff --git a/bin/vuepress.js b/packages/@vuepress/core/bin/vuepress.js
similarity index 100%
rename from bin/vuepress.js
rename to packages/@vuepress/core/bin/vuepress.js
diff --git a/lib/app/SWUpdateEvent.js b/packages/@vuepress/core/lib/app/SWUpdateEvent.js
similarity index 100%
rename from lib/app/SWUpdateEvent.js
rename to packages/@vuepress/core/lib/app/SWUpdateEvent.js
diff --git a/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
similarity index 97%
rename from lib/app/app.js
rename to packages/@vuepress/core/lib/app/app.js
index 3d9acd3f34..90d7bc8691 100644
--- a/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -33,7 +33,6 @@ Vue.mixin(dataMixin(siteData))
 // component for rendering markdown content and setting title etc.
 Vue.component('Content', Content)
 Vue.component('OutboundLink', OutboundLink)
-Vue.component('Badge', () => import('./components/Badge.vue'))
 // component for client-only content
 Vue.component('ClientOnly', ClientOnly)
 
diff --git a/lib/app/clientEntry.js b/packages/@vuepress/core/lib/app/clientEntry.js
similarity index 100%
rename from lib/app/clientEntry.js
rename to packages/@vuepress/core/lib/app/clientEntry.js
diff --git a/lib/app/components/ClientOnly.js b/packages/@vuepress/core/lib/app/components/ClientOnly.js
similarity index 100%
rename from lib/app/components/ClientOnly.js
rename to packages/@vuepress/core/lib/app/components/ClientOnly.js
diff --git a/lib/app/components/Content.js b/packages/@vuepress/core/lib/app/components/Content.js
similarity index 100%
rename from lib/app/components/Content.js
rename to packages/@vuepress/core/lib/app/components/Content.js
diff --git a/lib/app/components/OutboundLink.vue b/packages/@vuepress/core/lib/app/components/OutboundLink.vue
similarity index 100%
rename from lib/app/components/OutboundLink.vue
rename to packages/@vuepress/core/lib/app/components/OutboundLink.vue
diff --git a/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
similarity index 100%
rename from lib/app/dataMixin.js
rename to packages/@vuepress/core/lib/app/dataMixin.js
diff --git a/lib/app/index.dev.html b/packages/@vuepress/core/lib/app/index.dev.html
similarity index 100%
rename from lib/app/index.dev.html
rename to packages/@vuepress/core/lib/app/index.dev.html
diff --git a/lib/app/index.ssr.html b/packages/@vuepress/core/lib/app/index.ssr.html
similarity index 100%
rename from lib/app/index.ssr.html
rename to packages/@vuepress/core/lib/app/index.ssr.html
diff --git a/lib/app/root-mixins/updateMeta.js b/packages/@vuepress/core/lib/app/root-mixins/updateMeta.js
similarity index 100%
rename from lib/app/root-mixins/updateMeta.js
rename to packages/@vuepress/core/lib/app/root-mixins/updateMeta.js
diff --git a/lib/app/serverEntry.js b/packages/@vuepress/core/lib/app/serverEntry.js
similarity index 100%
rename from lib/app/serverEntry.js
rename to packages/@vuepress/core/lib/app/serverEntry.js
diff --git a/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
similarity index 100%
rename from lib/app/util.js
rename to packages/@vuepress/core/lib/app/util.js
diff --git a/lib/build.js b/packages/@vuepress/core/lib/build.js
similarity index 99%
rename from lib/build.js
rename to packages/@vuepress/core/lib/build.js
index 0aec171f04..ea9cc9e9ad 100644
--- a/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -9,11 +9,11 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const escape = require('escape-html')
 
   const logger = require('./util/logger')
-  const prepare = require('./prepare')
+  const prepare = require('./prepare/index')
   const createClientConfig = require('./webpack/createClientConfig')
   const createServerConfig = require('./webpack/createServerConfig')
   const { createBundleRenderer } = require('vue-server-renderer')
-  const { normalizeHeadTag, applyUserWebpackConfig } = require('./util')
+  const { normalizeHeadTag, applyUserWebpackConfig } = require('./util/index')
 
   logger.wait('\nExtracting site metadata...')
   const options = await prepare(sourceDir, true /* isProd */)
diff --git a/lib/dev.js b/packages/@vuepress/core/lib/dev.js
similarity index 97%
rename from lib/dev.js
rename to packages/@vuepress/core/lib/dev.js
index 7253b62974..a1b698c32d 100644
--- a/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -11,12 +11,12 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const serveStatic = require('koa-static')
   const history = require('connect-history-api-fallback')
 
-  const prepare = require('./prepare')
+  const prepare = require('./prepare/index')
   const logger = require('./util/logger')
   const HeadPlugin = require('./webpack/HeadPlugin')
   const DevLogPlugin = require('./webpack/DevLogPlugin')
   const createClientConfig = require('./webpack/createClientConfig')
-  const { applyUserWebpackConfig } = require('./util')
+  const { applyUserWebpackConfig } = require('./util/index')
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
   logger.wait('\nExtracting site metadata...')
diff --git a/lib/eject.js b/packages/@vuepress/core/lib/eject.js
similarity index 100%
rename from lib/eject.js
rename to packages/@vuepress/core/lib/eject.js
diff --git a/lib/index.js b/packages/@vuepress/core/lib/index.js
similarity index 67%
rename from lib/index.js
rename to packages/@vuepress/core/lib/index.js
index 8e4d4a19ad..edaa3ed54c 100644
--- a/lib/index.js
+++ b/packages/@vuepress/core/lib/index.js
@@ -1,4 +1,4 @@
 exports.dev = require('./dev')
 exports.build = require('./build')
 exports.eject = require('./eject')
-Object.assign(exports, require('./util'))
+Object.assign(exports, require('./util/index'))
diff --git a/lib/markdown/component.js b/packages/@vuepress/core/lib/markdown/component.js
similarity index 100%
rename from lib/markdown/component.js
rename to packages/@vuepress/core/lib/markdown/component.js
diff --git a/lib/markdown/containers.js b/packages/@vuepress/core/lib/markdown/containers.js
similarity index 100%
rename from lib/markdown/containers.js
rename to packages/@vuepress/core/lib/markdown/containers.js
diff --git a/lib/markdown/highlight.js b/packages/@vuepress/core/lib/markdown/highlight.js
similarity index 100%
rename from lib/markdown/highlight.js
rename to packages/@vuepress/core/lib/markdown/highlight.js
diff --git a/lib/markdown/highlightLines.js b/packages/@vuepress/core/lib/markdown/highlightLines.js
similarity index 100%
rename from lib/markdown/highlightLines.js
rename to packages/@vuepress/core/lib/markdown/highlightLines.js
diff --git a/lib/markdown/hoist.js b/packages/@vuepress/core/lib/markdown/hoist.js
similarity index 100%
rename from lib/markdown/hoist.js
rename to packages/@vuepress/core/lib/markdown/hoist.js
diff --git a/lib/markdown/index.js b/packages/@vuepress/core/lib/markdown/index.js
similarity index 100%
rename from lib/markdown/index.js
rename to packages/@vuepress/core/lib/markdown/index.js
diff --git a/lib/markdown/lineNumbers.js b/packages/@vuepress/core/lib/markdown/lineNumbers.js
similarity index 100%
rename from lib/markdown/lineNumbers.js
rename to packages/@vuepress/core/lib/markdown/lineNumbers.js
diff --git a/lib/markdown/link.js b/packages/@vuepress/core/lib/markdown/link.js
similarity index 100%
rename from lib/markdown/link.js
rename to packages/@vuepress/core/lib/markdown/link.js
diff --git a/lib/markdown/preWrapper.js b/packages/@vuepress/core/lib/markdown/preWrapper.js
similarity index 100%
rename from lib/markdown/preWrapper.js
rename to packages/@vuepress/core/lib/markdown/preWrapper.js
diff --git a/lib/markdown/slugify.js b/packages/@vuepress/core/lib/markdown/slugify.js
similarity index 100%
rename from lib/markdown/slugify.js
rename to packages/@vuepress/core/lib/markdown/slugify.js
diff --git a/lib/markdown/snippet.js b/packages/@vuepress/core/lib/markdown/snippet.js
similarity index 100%
rename from lib/markdown/snippet.js
rename to packages/@vuepress/core/lib/markdown/snippet.js
diff --git a/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
similarity index 100%
rename from lib/plugin-api/constants.js
rename to packages/@vuepress/core/lib/plugin-api/constants.js
diff --git a/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
similarity index 100%
rename from lib/plugin-api/context.js
rename to packages/@vuepress/core/lib/plugin-api/context.js
diff --git a/lib/plugin-api/core/Hook.js b/packages/@vuepress/core/lib/plugin-api/core/Hook.js
similarity index 100%
rename from lib/plugin-api/core/Hook.js
rename to packages/@vuepress/core/lib/plugin-api/core/Hook.js
diff --git a/lib/plugin-api/core/Tapable.js b/packages/@vuepress/core/lib/plugin-api/core/Tapable.js
similarity index 100%
rename from lib/plugin-api/core/Tapable.js
rename to packages/@vuepress/core/lib/plugin-api/core/Tapable.js
diff --git a/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
similarity index 100%
rename from lib/plugin-api/index.js
rename to packages/@vuepress/core/lib/plugin-api/index.js
diff --git a/lib/plugin-api/option/AdditionalPagesOption.js b/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
similarity index 100%
rename from lib/plugin-api/option/AdditionalPagesOption.js
rename to packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
diff --git a/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
similarity index 100%
rename from lib/plugin-api/option/ClientDynamicModulesOption.js
rename to packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
diff --git a/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
similarity index 100%
rename from lib/plugin-api/option/EnhanceAppFilesOption.js
rename to packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
diff --git a/lib/plugin-api/option/ExtendPageDataOption.js b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
similarity index 100%
rename from lib/plugin-api/option/ExtendPageDataOption.js
rename to packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
diff --git a/lib/plugin-api/option/instantiateOption.js b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
similarity index 100%
rename from lib/plugin-api/option/instantiateOption.js
rename to packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
diff --git a/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
similarity index 100%
rename from lib/plugin-api/util.js
rename to packages/@vuepress/core/lib/plugin-api/util.js
diff --git a/lib/prepare/codegen.js b/packages/@vuepress/core/lib/prepare/codegen.js
similarity index 100%
rename from lib/prepare/codegen.js
rename to packages/@vuepress/core/lib/prepare/codegen.js
diff --git a/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
similarity index 97%
rename from lib/prepare/index.js
rename to packages/@vuepress/core/lib/prepare/index.js
index 7d40fa7e3b..e14d9443af 100644
--- a/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -39,11 +39,11 @@ module.exports = async function prepare (sourceDir, isProd) {
   await writeTemp('siteData.js', dataCode)
 
   // 7. handle user override
-  const overridePath = path.resolve(sourceDir, '.vuepress/override.styl')
+  const overridePath = path.resolve(sourceDir, '.vuepress/override.styl').replace(/[\\]+/g, '/')
   const hasUserOverride = fs.existsSync(overridePath)
   await writeTemp('override.styl', hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
 
-  const stylePath = path.resolve(sourceDir, '.vuepress/style.styl')
+  const stylePath = path.resolve(sourceDir, '.vuepress/style.styl').replace(/[\\]+/g, '/')
   const hasUserStyle = fs.existsSync(stylePath)
   await writeTemp('style.styl', hasUserStyle ? `@import(${JSON.stringify(stylePath)})` : ``)
 
diff --git a/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
similarity index 100%
rename from lib/prepare/loadConfig.js
rename to packages/@vuepress/core/lib/prepare/loadConfig.js
diff --git a/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
similarity index 98%
rename from lib/prepare/resolveOptions.js
rename to packages/@vuepress/core/lib/prepare/resolveOptions.js
index 425da5ab16..906760de5a 100644
--- a/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -1,7 +1,7 @@
 const fs = require('fs-extra')
 const path = require('path')
 const globby = require('globby')
-const createMarkdown = require('../markdown')
+const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
 const { sort } = require('./util')
 
diff --git a/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
similarity index 72%
rename from lib/prepare/resolvePlugin.js
rename to packages/@vuepress/core/lib/prepare/resolvePlugin.js
index 24e95f5f4a..191f8d4a58 100644
--- a/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -1,11 +1,11 @@
 const path = require('path')
-const Plugin = require('../plugin-api')
+const Plugin = require('../plugin-api/index')
 const PluginContext = require('../plugin-api/context')
 
-const lastUpdatedPlugin = require('../../packages/vuepress-plugin-last-updated')
-const enhanceAppPlugin = require('../../packages/vuepress-plugin-enhance-app')
-const registerGlobalComponentsPlugin = require('../../packages/vuepress-plugin-register-global-components')
-const activeHeaderLinksPlugin = require('../../packages/vuepress-plugin-active-header-links')
+const lastUpdatedPlugin = require('../../../plugin-last-updated/index')
+const enhanceAppPlugin = require('../../../plugin-enhance-app/index')
+const registerGlobalComponentsPlugin = require('../../../plugin-register-global-components/index')
+const activeHeaderLinksPlugin = require('../../../plugin-active-header-links/index')
 
 module.exports = function (options) {
   const { siteConfig, themeConfig, sourceDir, themePath } = options
diff --git a/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
similarity index 100%
rename from lib/prepare/resolveSiteData.js
rename to packages/@vuepress/core/lib/prepare/resolveSiteData.js
diff --git a/lib/prepare/util.js b/packages/@vuepress/core/lib/prepare/util.js
similarity index 100%
rename from lib/prepare/util.js
rename to packages/@vuepress/core/lib/prepare/util.js
diff --git a/lib/service-worker/skip-waiting.js b/packages/@vuepress/core/lib/service-worker/skip-waiting.js
similarity index 100%
rename from lib/service-worker/skip-waiting.js
rename to packages/@vuepress/core/lib/service-worker/skip-waiting.js
diff --git a/lib/util/index.js b/packages/@vuepress/core/lib/util/index.js
similarity index 100%
rename from lib/util/index.js
rename to packages/@vuepress/core/lib/util/index.js
diff --git a/lib/util/logger.js b/packages/@vuepress/core/lib/util/logger.js
similarity index 100%
rename from lib/util/logger.js
rename to packages/@vuepress/core/lib/util/logger.js
diff --git a/lib/util/parseHeaders.js b/packages/@vuepress/core/lib/util/parseHeaders.js
similarity index 100%
rename from lib/util/parseHeaders.js
rename to packages/@vuepress/core/lib/util/parseHeaders.js
diff --git a/lib/util/shared.js b/packages/@vuepress/core/lib/util/shared.js
similarity index 100%
rename from lib/util/shared.js
rename to packages/@vuepress/core/lib/util/shared.js
diff --git a/lib/webpack/ClientPlugin.js b/packages/@vuepress/core/lib/webpack/ClientPlugin.js
similarity index 100%
rename from lib/webpack/ClientPlugin.js
rename to packages/@vuepress/core/lib/webpack/ClientPlugin.js
diff --git a/lib/webpack/DevLogPlugin.js b/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
similarity index 100%
rename from lib/webpack/DevLogPlugin.js
rename to packages/@vuepress/core/lib/webpack/DevLogPlugin.js
diff --git a/lib/webpack/HeadPlugin.js b/packages/@vuepress/core/lib/webpack/HeadPlugin.js
similarity index 90%
rename from lib/webpack/HeadPlugin.js
rename to packages/@vuepress/core/lib/webpack/HeadPlugin.js
index 2ccb46e07d..b8a96845f7 100644
--- a/lib/webpack/HeadPlugin.js
+++ b/packages/@vuepress/core/lib/webpack/HeadPlugin.js
@@ -1,4 +1,4 @@
-const { normalizeHeadTag } = require('../util')
+const { normalizeHeadTag } = require('../util/index')
 
 module.exports = class SiteDataPlugin {
   constructor ({ tags }) {
diff --git a/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
similarity index 100%
rename from lib/webpack/createBaseConfig.js
rename to packages/@vuepress/core/lib/webpack/createBaseConfig.js
diff --git a/lib/webpack/createClientConfig.js b/packages/@vuepress/core/lib/webpack/createClientConfig.js
similarity index 100%
rename from lib/webpack/createClientConfig.js
rename to packages/@vuepress/core/lib/webpack/createClientConfig.js
diff --git a/lib/webpack/createServerConfig.js b/packages/@vuepress/core/lib/webpack/createServerConfig.js
similarity index 100%
rename from lib/webpack/createServerConfig.js
rename to packages/@vuepress/core/lib/webpack/createServerConfig.js
diff --git a/lib/webpack/markdownLoader.js b/packages/@vuepress/core/lib/webpack/markdownLoader.js
similarity index 99%
rename from lib/webpack/markdownLoader.js
rename to packages/@vuepress/core/lib/webpack/markdownLoader.js
index 3c49b747f6..53edbc2575 100644
--- a/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/core/lib/webpack/markdownLoader.js
@@ -3,7 +3,7 @@ const path = require('path')
 const hash = require('hash-sum')
 const { EventEmitter } = require('events')
 const { getOptions } = require('loader-utils')
-const { inferTitle, extractHeaders, parseFrontmatter } = require('../util')
+const { inferTitle, extractHeaders, parseFrontmatter } = require('../util/index')
 const LRU = require('lru-cache')
 
 const cache = LRU({ max: 1000 })
diff --git a/lib/webpack/noopModule.js b/packages/@vuepress/core/lib/webpack/noopModule.js
similarity index 100%
rename from lib/webpack/noopModule.js
rename to packages/@vuepress/core/lib/webpack/noopModule.js
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
new file mode 100644
index 0000000000..5c919dc1f7
--- /dev/null
+++ b/packages/@vuepress/core/package.json
@@ -0,0 +1,118 @@
+{
+  "name": "@vuepress/core",
+  "version": "1.0.0",
+  "description": "Minimalistic doc generator with Vue component based layout system",
+  "main": "lib/index.js",
+  "bin": {
+    "vuepress": "bin/vuepress.js"
+  },
+  "scripts": {
+    "lint": "eslint --fix --ext .js,.vue bin/ lib/ test/",
+    "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
+    "release": "/bin/bash scripts/release.sh",
+    "test": "node test/prepare.js && jest --config test/jest.config.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress#readme",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "dependencies": {
+    "@babel/core": "7.0.0-beta.47",
+    "@vue/babel-preset-app": "3.0.0-beta.11",
+    "autoprefixer": "^8.2.0",
+    "babel-loader": "8.0.0-beta.3",
+    "cache-loader": "^1.2.2",
+    "chalk": "^2.3.2",
+    "chokidar": "^2.0.3",
+    "commander": "^2.15.1",
+    "connect-history-api-fallback": "^1.5.0",
+    "copy-webpack-plugin": "^4.5.1",
+    "cross-spawn": "^6.0.5",
+    "css-loader": "^0.28.11",
+    "diacritics": "^1.3.0",
+    "docsearch.js": "^2.5.2",
+    "escape-html": "^1.0.3",
+    "file-loader": "^1.1.11",
+    "fs-extra": "^5.0.0",
+    "globby": "^8.0.1",
+    "gray-matter": "^4.0.1",
+    "js-yaml": "^3.11.0",
+    "koa-connect": "^2.0.1",
+    "koa-mount": "^3.0.0",
+    "koa-range": "^0.3.0",
+    "koa-static": "^4.0.2",
+    "loader-utils": "^1.1.0",
+    "lodash.throttle": "^4.1.1",
+    "lru-cache": "^4.1.2",
+    "markdown-it": "^8.4.1",
+    "markdown-it-anchor": "^5.0.2",
+    "markdown-it-container": "^2.0.0",
+    "markdown-it-emoji": "^1.4.0",
+    "markdown-it-table-of-contents": "^0.4.0",
+    "mini-css-extract-plugin": "^0.4.1",
+    "nprogress": "^0.2.0",
+    "optimize-css-assets-webpack-plugin": "^4.0.0",
+    "portfinder": "^1.0.13",
+    "postcss-loader": "^2.1.5",
+    "prismjs": "^1.13.0",
+    "register-service-worker": "^1.4.1",
+    "semver": "^5.5.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2",
+    "toml": "^2.3.3",
+    "url-loader": "^1.0.1",
+    "vue": "^2.5.16",
+    "vue-loader": "^15.2.4",
+    "vue-router": "^3.0.1",
+    "vue-server-renderer": "^2.5.16",
+    "vue-template-compiler": "^2.5.16",
+    "vuepress-html-webpack-plugin": "^3.2.0",
+    "webpack": "^4.8.1",
+    "webpack-chain": "^4.6.0",
+    "webpack-merge": "^4.1.2",
+    "webpack-serve": "^1.0.2",
+    "webpackbar": "^2.6.1",
+    "workbox-build": "^3.1.0"
+  },
+  "devDependencies": {
+    "@vue/test-utils": "^1.0.0-beta.16",
+    "babel-core": "^7.0.0-0",
+    "babel-jest": "^23.0.0",
+    "conventional-changelog-cli": "^1.3.22",
+    "eslint": "^4.19.1",
+    "eslint-plugin-jest": "^21.15.1",
+    "eslint-plugin-vue-libs": "^3.0.0",
+    "jest": "^23.0.0",
+    "jest-serializer-vue": "^1.0.0",
+    "lint-staged": "^7.0.4",
+    "vue-jest": "^2.6.0",
+    "vuepress-theme-vue": "^1.1.0",
+    "yorkie": "^1.0.3"
+  },
+  "engines": {
+    "node": ">=8"
+  },
+  "browserslist": [
+    ">1%"
+  ]
+}
diff --git a/packages/@vuepress/core/types/index.d.ts b/packages/@vuepress/core/types/index.d.ts
new file mode 100644
index 0000000000..22ee557658
--- /dev/null
+++ b/packages/@vuepress/core/types/index.d.ts
@@ -0,0 +1,13 @@
+interface Plugin {
+	name: string;
+	enabled: boolean;
+	clientRootMixin: string;
+}
+
+interface Config extends Plugin {
+
+}
+
+interface Theme extends Plugin {
+
+}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-active-header-links/.npmignore b/packages/@vuepress/plugin-active-header-links/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-active-header-links/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-active-header-links/README.md b/packages/@vuepress/plugin-active-header-links/README.md
new file mode 100644
index 0000000000..5063050105
--- /dev/null
+++ b/packages/@vuepress/plugin-active-header-links/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-active-header-links
+
+> active-header-links plugin for vuepress
\ No newline at end of file
diff --git a/packages/vuepress-plugin-active-header-links/index.js b/packages/@vuepress/plugin-active-header-links/index.js
similarity index 100%
rename from packages/vuepress-plugin-active-header-links/index.js
rename to packages/@vuepress/plugin-active-header-links/index.js
diff --git a/packages/vuepress-plugin-active-header-links/mixin.js b/packages/@vuepress/plugin-active-header-links/mixin.js
similarity index 100%
rename from packages/vuepress-plugin-active-header-links/mixin.js
rename to packages/@vuepress/plugin-active-header-links/mixin.js
diff --git a/packages/@vuepress/plugin-active-header-links/package.json b/packages/@vuepress/plugin-active-header-links/package.json
new file mode 100644
index 0000000000..0ededa2e80
--- /dev/null
+++ b/packages/@vuepress/plugin-active-header-links/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-active-header-links",
+  "version": "1.0.0",
+  "description": "active-header-links plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-active-header-links#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-enhance-app/.npmignore b/packages/@vuepress/plugin-enhance-app/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-enhance-app/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-enhance-app/README.md b/packages/@vuepress/plugin-enhance-app/README.md
new file mode 100644
index 0000000000..8e7f87363b
--- /dev/null
+++ b/packages/@vuepress/plugin-enhance-app/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-enhance-app
+
+> enhance-app plugin for vuepress
\ No newline at end of file
diff --git a/packages/vuepress-plugin-enhance-app/index.js b/packages/@vuepress/plugin-enhance-app/index.js
similarity index 100%
rename from packages/vuepress-plugin-enhance-app/index.js
rename to packages/@vuepress/plugin-enhance-app/index.js
diff --git a/packages/@vuepress/plugin-enhance-app/package.json b/packages/@vuepress/plugin-enhance-app/package.json
new file mode 100644
index 0000000000..652e550f3c
--- /dev/null
+++ b/packages/@vuepress/plugin-enhance-app/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-enhance-app",
+  "version": "1.0.0",
+  "description": "enhance-app plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-enhance-app#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-last-updated/.npmignore b/packages/@vuepress/plugin-last-updated/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-last-updated/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-last-updated/README.md b/packages/@vuepress/plugin-last-updated/README.md
new file mode 100644
index 0000000000..21b3f1fa01
--- /dev/null
+++ b/packages/@vuepress/plugin-last-updated/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-last-updated
+
+> last-updated plugin for vuepress
\ No newline at end of file
diff --git a/packages/vuepress-plugin-last-updated/index.js b/packages/@vuepress/plugin-last-updated/index.js
similarity index 100%
rename from packages/vuepress-plugin-last-updated/index.js
rename to packages/@vuepress/plugin-last-updated/index.js
diff --git a/packages/@vuepress/plugin-last-updated/package.json b/packages/@vuepress/plugin-last-updated/package.json
new file mode 100644
index 0000000000..46f988e281
--- /dev/null
+++ b/packages/@vuepress/plugin-last-updated/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-last-updated",
+  "version": "1.0.0",
+  "description": "last-updated plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-last-updated#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-register-global-components/.npmignore b/packages/@vuepress/plugin-register-global-components/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-register-global-components/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-register-global-components/README.md b/packages/@vuepress/plugin-register-global-components/README.md
new file mode 100644
index 0000000000..930c11fa73
--- /dev/null
+++ b/packages/@vuepress/plugin-register-global-components/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-register-global-components
+
+> register-global-components plugin for vuepress
\ No newline at end of file
diff --git a/packages/vuepress-plugin-register-global-components/index.js b/packages/@vuepress/plugin-register-global-components/index.js
similarity index 100%
rename from packages/vuepress-plugin-register-global-components/index.js
rename to packages/@vuepress/plugin-register-global-components/index.js
diff --git a/packages/@vuepress/plugin-register-global-components/package.json b/packages/@vuepress/plugin-register-global-components/package.json
new file mode 100644
index 0000000000..b9e27b9085
--- /dev/null
+++ b/packages/@vuepress/plugin-register-global-components/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-register-global-components",
+  "version": "1.0.0",
+  "description": "register-global-components plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-global-components#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-test/.npmignore b/packages/@vuepress/plugin-test/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-test/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-test/README.md b/packages/@vuepress/plugin-test/README.md
new file mode 100644
index 0000000000..fc9725b8b3
--- /dev/null
+++ b/packages/@vuepress/plugin-test/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-test
+
+> test plugin for vuepress
\ No newline at end of file
diff --git a/packages/vuepress-plugin-test/enhanceApp.js b/packages/@vuepress/plugin-test/enhanceApp.js
similarity index 100%
rename from packages/vuepress-plugin-test/enhanceApp.js
rename to packages/@vuepress/plugin-test/enhanceApp.js
diff --git a/packages/vuepress-plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
similarity index 100%
rename from packages/vuepress-plugin-test/index.js
rename to packages/@vuepress/plugin-test/index.js
diff --git a/packages/vuepress-plugin-test/mixin.js b/packages/@vuepress/plugin-test/mixin.js
similarity index 100%
rename from packages/vuepress-plugin-test/mixin.js
rename to packages/@vuepress/plugin-test/mixin.js
diff --git a/packages/@vuepress/plugin-test/package.json b/packages/@vuepress/plugin-test/package.json
new file mode 100644
index 0000000000..78476d61ec
--- /dev/null
+++ b/packages/@vuepress/plugin-test/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-test",
+  "version": "1.0.0",
+  "description": "test plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-test#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/.npmignore b/packages/@vuepress/theme-default/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/theme-default/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/README.md b/packages/@vuepress/theme-default/README.md
new file mode 100644
index 0000000000..775ef2f6af
--- /dev/null
+++ b/packages/@vuepress/theme-default/README.md
@@ -0,0 +1,3 @@
+# @vuepress/theme-default
+
+> theme-default for vuepress
\ No newline at end of file
diff --git a/lib/app/components/Badge.vue b/packages/@vuepress/theme-default/components/Badge.vue
similarity index 100%
rename from lib/app/components/Badge.vue
rename to packages/@vuepress/theme-default/components/Badge.vue
diff --git a/packages/@vuepress/theme-default/enhanceApp.js b/packages/@vuepress/theme-default/enhanceApp.js
new file mode 100644
index 0000000000..c78abcc1d4
--- /dev/null
+++ b/packages/@vuepress/theme-default/enhanceApp.js
@@ -0,0 +1,3 @@
+export default ({ Vue }) => {
+  Vue.component('Badge', () => import('./components/Badge.vue'))
+}
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
new file mode 100644
index 0000000000..8da254413e
--- /dev/null
+++ b/packages/@vuepress/theme-default/index.js
@@ -0,0 +1,11 @@
+const path = require('path')
+
+// Theme API.
+module.exports = {
+  layout: path.resolve(__dirname, 'src/Layout.vue'),
+  404: path.resolve(__dirname, 'src/NotFound.vue'),
+  chainWebpack (config, isServer) {
+
+  },
+  plugins: []
+}
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
new file mode 100644
index 0000000000..bf784a17db
--- /dev/null
+++ b/packages/@vuepress/theme-default/package.json
@@ -0,0 +1,122 @@
+{
+  "name": "@vuepress/theme-default",
+  "version": "1.0.0",
+  "description": "Default theme for VuePress",
+  "main": "lib/index.js",
+  "bin": {
+    "vuepress": "bin/vuepress.js"
+  },
+  "scripts": {
+    "boot": "node scripts/bootstrap.js",
+    "dev": "node bin/vuepress dev docs",
+    "build": "node bin/vuepress build docs",
+    "lint": "eslint --fix --ext .js,.vue bin/ lib/ test/",
+    "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
+    "release": "/bin/bash scripts/release.sh",
+    "test": "node test/prepare.js && jest --config test/jest.config.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress#readme",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "dependencies": {
+    "@babel/core": "7.0.0-beta.47",
+    "@vue/babel-preset-app": "3.0.0-beta.11",
+    "autoprefixer": "^8.2.0",
+    "babel-loader": "8.0.0-beta.3",
+    "cache-loader": "^1.2.2",
+    "chalk": "^2.3.2",
+    "chokidar": "^2.0.3",
+    "commander": "^2.15.1",
+    "connect-history-api-fallback": "^1.5.0",
+    "copy-webpack-plugin": "^4.5.1",
+    "cross-spawn": "^6.0.5",
+    "css-loader": "^0.28.11",
+    "diacritics": "^1.3.0",
+    "docsearch.js": "^2.5.2",
+    "escape-html": "^1.0.3",
+    "file-loader": "^1.1.11",
+    "fs-extra": "^5.0.0",
+    "globby": "^8.0.1",
+    "gray-matter": "^4.0.1",
+    "js-yaml": "^3.11.0",
+    "koa-connect": "^2.0.1",
+    "koa-mount": "^3.0.0",
+    "koa-range": "^0.3.0",
+    "koa-static": "^4.0.2",
+    "loader-utils": "^1.1.0",
+    "lodash.throttle": "^4.1.1",
+    "lru-cache": "^4.1.2",
+    "markdown-it": "^8.4.1",
+    "markdown-it-anchor": "^5.0.2",
+    "markdown-it-container": "^2.0.0",
+    "markdown-it-emoji": "^1.4.0",
+    "markdown-it-table-of-contents": "^0.4.0",
+    "mini-css-extract-plugin": "^0.4.1",
+    "nprogress": "^0.2.0",
+    "optimize-css-assets-webpack-plugin": "^4.0.0",
+    "portfinder": "^1.0.13",
+    "postcss-loader": "^2.1.5",
+    "prismjs": "^1.13.0",
+    "register-service-worker": "^1.4.1",
+    "semver": "^5.5.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2",
+    "toml": "^2.3.3",
+    "url-loader": "^1.0.1",
+    "vue": "^2.5.16",
+    "vue-loader": "^15.2.4",
+    "vue-router": "^3.0.1",
+    "vue-server-renderer": "^2.5.16",
+    "vue-template-compiler": "^2.5.16",
+    "vuepress-html-webpack-plugin": "^3.2.0",
+    "webpack": "^4.8.1",
+    "webpack-chain": "^4.6.0",
+    "webpack-merge": "^4.1.2",
+    "webpack-serve": "^1.0.2",
+    "webpackbar": "^2.6.1",
+    "workbox-build": "^3.1.0"
+  },
+  "devDependencies": {
+    "@vue/test-utils": "^1.0.0-beta.16",
+    "babel-core": "^7.0.0-0",
+    "babel-jest": "^23.0.0",
+    "conventional-changelog-cli": "^1.3.22",
+    "eslint": "^4.19.1",
+    "eslint-plugin-jest": "^21.15.1",
+    "eslint-plugin-vue-libs": "^3.0.0",
+    "jest": "^23.0.0",
+    "jest-serializer-vue": "^1.0.0",
+    "lerna": "^2.11.0",
+    "lint-staged": "^7.0.4",
+    "vue-jest": "^2.6.0",
+    "vuepress-theme-vue": "^1.1.0",
+    "yorkie": "^1.0.3"
+  },
+  "engines": {
+    "node": ">=8"
+  },
+  "browserslist": [
+    ">1%"
+  ]
+}
diff --git a/lib/default-theme/AlgoliaSearchBox.vue b/packages/@vuepress/theme-default/src/AlgoliaSearchBox.vue
similarity index 100%
rename from lib/default-theme/AlgoliaSearchBox.vue
rename to packages/@vuepress/theme-default/src/AlgoliaSearchBox.vue
diff --git a/lib/default-theme/DropdownLink.vue b/packages/@vuepress/theme-default/src/DropdownLink.vue
similarity index 100%
rename from lib/default-theme/DropdownLink.vue
rename to packages/@vuepress/theme-default/src/DropdownLink.vue
diff --git a/lib/default-theme/DropdownTransition.vue b/packages/@vuepress/theme-default/src/DropdownTransition.vue
similarity index 100%
rename from lib/default-theme/DropdownTransition.vue
rename to packages/@vuepress/theme-default/src/DropdownTransition.vue
diff --git a/lib/default-theme/Home.vue b/packages/@vuepress/theme-default/src/Home.vue
similarity index 100%
rename from lib/default-theme/Home.vue
rename to packages/@vuepress/theme-default/src/Home.vue
diff --git a/lib/default-theme/Layout.vue b/packages/@vuepress/theme-default/src/Layout.vue
similarity index 100%
rename from lib/default-theme/Layout.vue
rename to packages/@vuepress/theme-default/src/Layout.vue
diff --git a/lib/default-theme/NavLink.vue b/packages/@vuepress/theme-default/src/NavLink.vue
similarity index 100%
rename from lib/default-theme/NavLink.vue
rename to packages/@vuepress/theme-default/src/NavLink.vue
diff --git a/lib/default-theme/NavLinks.vue b/packages/@vuepress/theme-default/src/NavLinks.vue
similarity index 100%
rename from lib/default-theme/NavLinks.vue
rename to packages/@vuepress/theme-default/src/NavLinks.vue
diff --git a/lib/default-theme/Navbar.vue b/packages/@vuepress/theme-default/src/Navbar.vue
similarity index 100%
rename from lib/default-theme/Navbar.vue
rename to packages/@vuepress/theme-default/src/Navbar.vue
diff --git a/lib/default-theme/NotFound.vue b/packages/@vuepress/theme-default/src/NotFound.vue
similarity index 100%
rename from lib/default-theme/NotFound.vue
rename to packages/@vuepress/theme-default/src/NotFound.vue
diff --git a/lib/default-theme/Page.vue b/packages/@vuepress/theme-default/src/Page.vue
similarity index 100%
rename from lib/default-theme/Page.vue
rename to packages/@vuepress/theme-default/src/Page.vue
diff --git a/lib/default-theme/SWUpdatePopup.vue b/packages/@vuepress/theme-default/src/SWUpdatePopup.vue
similarity index 100%
rename from lib/default-theme/SWUpdatePopup.vue
rename to packages/@vuepress/theme-default/src/SWUpdatePopup.vue
diff --git a/lib/default-theme/SearchBox.vue b/packages/@vuepress/theme-default/src/SearchBox.vue
similarity index 100%
rename from lib/default-theme/SearchBox.vue
rename to packages/@vuepress/theme-default/src/SearchBox.vue
diff --git a/lib/default-theme/Sidebar.vue b/packages/@vuepress/theme-default/src/Sidebar.vue
similarity index 100%
rename from lib/default-theme/Sidebar.vue
rename to packages/@vuepress/theme-default/src/Sidebar.vue
diff --git a/lib/default-theme/SidebarButton.vue b/packages/@vuepress/theme-default/src/SidebarButton.vue
similarity index 100%
rename from lib/default-theme/SidebarButton.vue
rename to packages/@vuepress/theme-default/src/SidebarButton.vue
diff --git a/lib/default-theme/SidebarGroup.vue b/packages/@vuepress/theme-default/src/SidebarGroup.vue
similarity index 100%
rename from lib/default-theme/SidebarGroup.vue
rename to packages/@vuepress/theme-default/src/SidebarGroup.vue
diff --git a/lib/default-theme/SidebarLink.vue b/packages/@vuepress/theme-default/src/SidebarLink.vue
similarity index 100%
rename from lib/default-theme/SidebarLink.vue
rename to packages/@vuepress/theme-default/src/SidebarLink.vue
diff --git a/lib/default-theme/search.svg b/packages/@vuepress/theme-default/src/search.svg
similarity index 100%
rename from lib/default-theme/search.svg
rename to packages/@vuepress/theme-default/src/search.svg
diff --git a/lib/default-theme/styles/arrow.styl b/packages/@vuepress/theme-default/src/styles/arrow.styl
similarity index 100%
rename from lib/default-theme/styles/arrow.styl
rename to packages/@vuepress/theme-default/src/styles/arrow.styl
diff --git a/lib/default-theme/styles/code.styl b/packages/@vuepress/theme-default/src/styles/code.styl
similarity index 100%
rename from lib/default-theme/styles/code.styl
rename to packages/@vuepress/theme-default/src/styles/code.styl
diff --git a/lib/default-theme/styles/config.styl b/packages/@vuepress/theme-default/src/styles/config.styl
similarity index 100%
rename from lib/default-theme/styles/config.styl
rename to packages/@vuepress/theme-default/src/styles/config.styl
diff --git a/lib/default-theme/styles/custom-blocks.styl b/packages/@vuepress/theme-default/src/styles/custom-blocks.styl
similarity index 100%
rename from lib/default-theme/styles/custom-blocks.styl
rename to packages/@vuepress/theme-default/src/styles/custom-blocks.styl
diff --git a/lib/default-theme/styles/mobile.styl b/packages/@vuepress/theme-default/src/styles/mobile.styl
similarity index 100%
rename from lib/default-theme/styles/mobile.styl
rename to packages/@vuepress/theme-default/src/styles/mobile.styl
diff --git a/lib/default-theme/styles/nprogress.styl b/packages/@vuepress/theme-default/src/styles/nprogress.styl
similarity index 100%
rename from lib/default-theme/styles/nprogress.styl
rename to packages/@vuepress/theme-default/src/styles/nprogress.styl
diff --git a/lib/default-theme/styles/theme.styl b/packages/@vuepress/theme-default/src/styles/theme.styl
similarity index 100%
rename from lib/default-theme/styles/theme.styl
rename to packages/@vuepress/theme-default/src/styles/theme.styl
diff --git a/lib/default-theme/styles/toc.styl b/packages/@vuepress/theme-default/src/styles/toc.styl
similarity index 100%
rename from lib/default-theme/styles/toc.styl
rename to packages/@vuepress/theme-default/src/styles/toc.styl
diff --git a/lib/default-theme/styles/wrapper.styl b/packages/@vuepress/theme-default/src/styles/wrapper.styl
similarity index 100%
rename from lib/default-theme/styles/wrapper.styl
rename to packages/@vuepress/theme-default/src/styles/wrapper.styl
diff --git a/lib/default-theme/util.js b/packages/@vuepress/theme-default/src/util.js
similarity index 100%
rename from lib/default-theme/util.js
rename to packages/@vuepress/theme-default/src/util.js
diff --git a/docs/.vuepress/components/Bit.vue b/packages/docs/.vuepress/components/Bit.vue
similarity index 100%
rename from docs/.vuepress/components/Bit.vue
rename to packages/docs/.vuepress/components/Bit.vue
diff --git a/docs/.vuepress/components/Foo/Bar.vue b/packages/docs/.vuepress/components/Foo/Bar.vue
similarity index 100%
rename from docs/.vuepress/components/Foo/Bar.vue
rename to packages/docs/.vuepress/components/Foo/Bar.vue
diff --git a/docs/.vuepress/components/OtherComponent.vue b/packages/docs/.vuepress/components/OtherComponent.vue
similarity index 100%
rename from docs/.vuepress/components/OtherComponent.vue
rename to packages/docs/.vuepress/components/OtherComponent.vue
diff --git a/docs/.vuepress/components/demo-1.vue b/packages/docs/.vuepress/components/demo-1.vue
similarity index 100%
rename from docs/.vuepress/components/demo-1.vue
rename to packages/docs/.vuepress/components/demo-1.vue
diff --git a/docs/.vuepress/config.js b/packages/docs/.vuepress/config.js
similarity index 94%
rename from docs/.vuepress/config.js
rename to packages/docs/.vuepress/config.js
index 64dd823aa9..f196d5a4c7 100644
--- a/docs/.vuepress/config.js
+++ b/packages/docs/.vuepress/config.js
@@ -1,5 +1,5 @@
-const testPlugin = require('../../packages/vuepress-plugin-test')
-const translationComparisonPlugin = require('../../../vuepress-plugin-translation-ui/src/index')
+const testPlugin = require('../../@vuepress/plugin-test/index')
+const translationComparisonPlugin = require('../../../../vuepress-plugin-translation-ui/src/index')
 
 module.exports = {
   dest: 'vuepress',
@@ -27,7 +27,7 @@ module.exports = {
     ['meta', { name: 'msapplication-TileColor', content: '#000000' }]
   ],
   serviceWorker: true,
-  theme: 'vue',
+  theme: 'default',
   plugins: [
     testPlugin,
     translationComparisonPlugin
diff --git a/docs/.vuepress/images/logo.png b/packages/docs/.vuepress/images/logo.png
similarity index 100%
rename from docs/.vuepress/images/logo.png
rename to packages/docs/.vuepress/images/logo.png
diff --git a/docs/.vuepress/public/hero.png b/packages/docs/.vuepress/public/hero.png
similarity index 100%
rename from docs/.vuepress/public/hero.png
rename to packages/docs/.vuepress/public/hero.png
diff --git a/docs/.vuepress/public/icons/android-chrome-192x192.png b/packages/docs/.vuepress/public/icons/android-chrome-192x192.png
similarity index 100%
rename from docs/.vuepress/public/icons/android-chrome-192x192.png
rename to packages/docs/.vuepress/public/icons/android-chrome-192x192.png
diff --git a/docs/.vuepress/public/icons/android-chrome-512x512.png b/packages/docs/.vuepress/public/icons/android-chrome-512x512.png
similarity index 100%
rename from docs/.vuepress/public/icons/android-chrome-512x512.png
rename to packages/docs/.vuepress/public/icons/android-chrome-512x512.png
diff --git a/docs/.vuepress/public/icons/apple-touch-icon-120x120.png b/packages/docs/.vuepress/public/icons/apple-touch-icon-120x120.png
similarity index 100%
rename from docs/.vuepress/public/icons/apple-touch-icon-120x120.png
rename to packages/docs/.vuepress/public/icons/apple-touch-icon-120x120.png
diff --git a/docs/.vuepress/public/icons/apple-touch-icon-152x152.png b/packages/docs/.vuepress/public/icons/apple-touch-icon-152x152.png
similarity index 100%
rename from docs/.vuepress/public/icons/apple-touch-icon-152x152.png
rename to packages/docs/.vuepress/public/icons/apple-touch-icon-152x152.png
diff --git a/docs/.vuepress/public/icons/apple-touch-icon-180x180.png b/packages/docs/.vuepress/public/icons/apple-touch-icon-180x180.png
similarity index 100%
rename from docs/.vuepress/public/icons/apple-touch-icon-180x180.png
rename to packages/docs/.vuepress/public/icons/apple-touch-icon-180x180.png
diff --git a/docs/.vuepress/public/icons/apple-touch-icon-60x60.png b/packages/docs/.vuepress/public/icons/apple-touch-icon-60x60.png
similarity index 100%
rename from docs/.vuepress/public/icons/apple-touch-icon-60x60.png
rename to packages/docs/.vuepress/public/icons/apple-touch-icon-60x60.png
diff --git a/docs/.vuepress/public/icons/apple-touch-icon-76x76.png b/packages/docs/.vuepress/public/icons/apple-touch-icon-76x76.png
similarity index 100%
rename from docs/.vuepress/public/icons/apple-touch-icon-76x76.png
rename to packages/docs/.vuepress/public/icons/apple-touch-icon-76x76.png
diff --git a/docs/.vuepress/public/icons/apple-touch-icon.png b/packages/docs/.vuepress/public/icons/apple-touch-icon.png
similarity index 100%
rename from docs/.vuepress/public/icons/apple-touch-icon.png
rename to packages/docs/.vuepress/public/icons/apple-touch-icon.png
diff --git a/docs/.vuepress/public/icons/favicon-16x16.png b/packages/docs/.vuepress/public/icons/favicon-16x16.png
similarity index 100%
rename from docs/.vuepress/public/icons/favicon-16x16.png
rename to packages/docs/.vuepress/public/icons/favicon-16x16.png
diff --git a/docs/.vuepress/public/icons/favicon-32x32.png b/packages/docs/.vuepress/public/icons/favicon-32x32.png
similarity index 100%
rename from docs/.vuepress/public/icons/favicon-32x32.png
rename to packages/docs/.vuepress/public/icons/favicon-32x32.png
diff --git a/docs/.vuepress/public/icons/msapplication-icon-144x144.png b/packages/docs/.vuepress/public/icons/msapplication-icon-144x144.png
similarity index 100%
rename from docs/.vuepress/public/icons/msapplication-icon-144x144.png
rename to packages/docs/.vuepress/public/icons/msapplication-icon-144x144.png
diff --git a/docs/.vuepress/public/icons/mstile-150x150.png b/packages/docs/.vuepress/public/icons/mstile-150x150.png
similarity index 100%
rename from docs/.vuepress/public/icons/mstile-150x150.png
rename to packages/docs/.vuepress/public/icons/mstile-150x150.png
diff --git a/docs/.vuepress/public/icons/safari-pinned-tab.svg b/packages/docs/.vuepress/public/icons/safari-pinned-tab.svg
similarity index 100%
rename from docs/.vuepress/public/icons/safari-pinned-tab.svg
rename to packages/docs/.vuepress/public/icons/safari-pinned-tab.svg
diff --git a/docs/.vuepress/public/line-numbers-desktop.png b/packages/docs/.vuepress/public/line-numbers-desktop.png
similarity index 100%
rename from docs/.vuepress/public/line-numbers-desktop.png
rename to packages/docs/.vuepress/public/line-numbers-desktop.png
diff --git a/docs/.vuepress/public/line-numbers-mobile.gif b/packages/docs/.vuepress/public/line-numbers-mobile.gif
similarity index 100%
rename from docs/.vuepress/public/line-numbers-mobile.gif
rename to packages/docs/.vuepress/public/line-numbers-mobile.gif
diff --git a/docs/.vuepress/public/logo.png b/packages/docs/.vuepress/public/logo.png
similarity index 100%
rename from docs/.vuepress/public/logo.png
rename to packages/docs/.vuepress/public/logo.png
diff --git a/docs/.vuepress/public/manifest.json b/packages/docs/.vuepress/public/manifest.json
similarity index 100%
rename from docs/.vuepress/public/manifest.json
rename to packages/docs/.vuepress/public/manifest.json
diff --git a/docs/.vuepress/public/plugin.png b/packages/docs/.vuepress/public/plugin.png
similarity index 100%
rename from docs/.vuepress/public/plugin.png
rename to packages/docs/.vuepress/public/plugin.png
diff --git a/docs/README.md b/packages/docs/README.md
similarity index 100%
rename from docs/README.md
rename to packages/docs/README.md
diff --git a/docs/config/README.md b/packages/docs/config/README.md
similarity index 100%
rename from docs/config/README.md
rename to packages/docs/config/README.md
diff --git a/docs/default-theme-config/README.md b/packages/docs/default-theme-config/README.md
similarity index 100%
rename from docs/default-theme-config/README.md
rename to packages/docs/default-theme-config/README.md
diff --git a/docs/guide/README.md b/packages/docs/guide/README.md
similarity index 100%
rename from docs/guide/README.md
rename to packages/docs/guide/README.md
diff --git a/docs/guide/assets.md b/packages/docs/guide/assets.md
similarity index 100%
rename from docs/guide/assets.md
rename to packages/docs/guide/assets.md
diff --git a/docs/guide/basic-config.md b/packages/docs/guide/basic-config.md
similarity index 100%
rename from docs/guide/basic-config.md
rename to packages/docs/guide/basic-config.md
diff --git a/docs/guide/custom-themes.md b/packages/docs/guide/custom-themes.md
similarity index 100%
rename from docs/guide/custom-themes.md
rename to packages/docs/guide/custom-themes.md
diff --git a/docs/guide/deploy.md b/packages/docs/guide/deploy.md
similarity index 100%
rename from docs/guide/deploy.md
rename to packages/docs/guide/deploy.md
diff --git a/docs/guide/getting-started.md b/packages/docs/guide/getting-started.md
similarity index 100%
rename from docs/guide/getting-started.md
rename to packages/docs/guide/getting-started.md
diff --git a/docs/guide/i18n.md b/packages/docs/guide/i18n.md
similarity index 100%
rename from docs/guide/i18n.md
rename to packages/docs/guide/i18n.md
diff --git a/docs/guide/markdown.md b/packages/docs/guide/markdown.md
similarity index 100%
rename from docs/guide/markdown.md
rename to packages/docs/guide/markdown.md
diff --git a/docs/guide/using-vue.md b/packages/docs/guide/using-vue.md
similarity index 100%
rename from docs/guide/using-vue.md
rename to packages/docs/guide/using-vue.md
diff --git a/packages/docs/package.json b/packages/docs/package.json
new file mode 100644
index 0000000000..312da6121a
--- /dev/null
+++ b/packages/docs/package.json
@@ -0,0 +1,28 @@
+{
+  "private": true,
+  "name": "docs",
+  "description": "docs of VuePress",
+  "scripts": {
+    "dev": "vuepress dev docs",
+    "build": "vuepress build docs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress#readme",
+  "devDependencies": {
+    "@vuepress/core": "^1.0.0",
+    "@vuepress/theme-default": "^1.0.0"
+  }
+}
diff --git a/docs/plugin/README.md b/packages/docs/plugin/README.md
similarity index 100%
rename from docs/plugin/README.md
rename to packages/docs/plugin/README.md
diff --git a/docs/zh/README.md b/packages/docs/zh/README.md
similarity index 100%
rename from docs/zh/README.md
rename to packages/docs/zh/README.md
diff --git a/docs/zh/config/README.md b/packages/docs/zh/config/README.md
similarity index 100%
rename from docs/zh/config/README.md
rename to packages/docs/zh/config/README.md
diff --git a/docs/zh/default-theme-config/README.md b/packages/docs/zh/default-theme-config/README.md
similarity index 100%
rename from docs/zh/default-theme-config/README.md
rename to packages/docs/zh/default-theme-config/README.md
diff --git a/docs/zh/guide/README.md b/packages/docs/zh/guide/README.md
similarity index 100%
rename from docs/zh/guide/README.md
rename to packages/docs/zh/guide/README.md
diff --git a/docs/zh/guide/assets.md b/packages/docs/zh/guide/assets.md
similarity index 100%
rename from docs/zh/guide/assets.md
rename to packages/docs/zh/guide/assets.md
diff --git a/docs/zh/guide/basic-config.md b/packages/docs/zh/guide/basic-config.md
similarity index 100%
rename from docs/zh/guide/basic-config.md
rename to packages/docs/zh/guide/basic-config.md
diff --git a/docs/zh/guide/custom-themes.md b/packages/docs/zh/guide/custom-themes.md
similarity index 100%
rename from docs/zh/guide/custom-themes.md
rename to packages/docs/zh/guide/custom-themes.md
diff --git a/docs/zh/guide/deploy.md b/packages/docs/zh/guide/deploy.md
similarity index 100%
rename from docs/zh/guide/deploy.md
rename to packages/docs/zh/guide/deploy.md
diff --git a/docs/zh/guide/getting-started.md b/packages/docs/zh/guide/getting-started.md
similarity index 100%
rename from docs/zh/guide/getting-started.md
rename to packages/docs/zh/guide/getting-started.md
diff --git a/docs/zh/guide/i18n.md b/packages/docs/zh/guide/i18n.md
similarity index 100%
rename from docs/zh/guide/i18n.md
rename to packages/docs/zh/guide/i18n.md
diff --git a/docs/zh/guide/markdown.md b/packages/docs/zh/guide/markdown.md
similarity index 100%
rename from docs/zh/guide/markdown.md
rename to packages/docs/zh/guide/markdown.md
diff --git a/docs/zh/guide/using-vue.md b/packages/docs/zh/guide/using-vue.md
similarity index 100%
rename from docs/zh/guide/using-vue.md
rename to packages/docs/zh/guide/using-vue.md
diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
new file mode 100644
index 0000000000..703121e514
--- /dev/null
+++ b/scripts/bootstrap.js
@@ -0,0 +1,57 @@
+// create package.json and README for packages that don't have one yet
+
+const fs = require('fs')
+const path = require('path')
+const baseVersion = require('../packages/@vuepress/core/package.json').version
+
+const packagesDir = path.resolve(__dirname, '../packages/@vuepress')
+const files = fs.readdirSync(packagesDir)
+
+files.forEach(pkg => {
+  if (pkg.charAt(0) === '.') return
+
+  const isPlugin = /^plugin-/.test(pkg)
+  const desc = isPlugin
+    ? `${pkg.replace('plugin-', '')} plugin for vuepress`
+    : `${pkg} for vuepress`
+
+  const pkgPath = path.join(packagesDir, pkg, `package.json`)
+  if (!fs.existsSync(pkgPath)) {
+    const json = {
+      'name': `@vuepress/${pkg}`,
+      'version': baseVersion,
+      'description': desc,
+      'main': 'index.js',
+      'publishConfig': {
+        'access': 'public'
+      },
+      'repository': {
+        'type': 'git',
+        'url': 'git+https://github.com/vuejs/vue-cli.git'
+      },
+      'keywords': [
+        'documentation',
+        'vue',
+        'vuepress',
+        'generator'
+      ],
+      'author': 'Evan You',
+      'license': 'MIT',
+      'bugs': {
+        'url': 'https://github.com/vuejs/vuepress/issues'
+      },
+      'homepage': `https://github.com/vuejs/vuepress/packages/@vuepress/${pkg}#readme`
+    }
+    fs.writeFileSync(pkgPath, JSON.stringify(json, null, 2))
+  }
+
+  const readmePath = path.join(packagesDir, pkg, `README.md`)
+  if (!fs.existsSync(readmePath)) {
+    fs.writeFileSync(readmePath, `# @vuepress/${pkg}\n\n> ${desc}`)
+  }
+
+  const npmIgnorePath = path.join(packagesDir, pkg, `.npmignore`)
+  if (!fs.existsSync(npmIgnorePath)) {
+    fs.writeFileSync(npmIgnorePath, `__tests__\n__mocks__`)
+  }
+})
diff --git a/yarn.lock b/yarn.lock
index 047355ca56..b9e4343b47 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1265,7 +1265,7 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@^1.4.0, async@^1.5.2:
+async@^1.4.0, async@^1.5.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -1735,6 +1735,10 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
@@ -2007,6 +2011,14 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -2023,6 +2035,13 @@ clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
+cmd-shim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "~0.5.0"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -2084,12 +2103,23 @@ colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
+columnify@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  dependencies:
+    strip-ansi "^3.0.0"
+    wcwidth "^1.0.0"
+
 combined-stream@1.0.6, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
+command-join@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
+
 commander@2.15.x, commander@^2.14.1, commander@^2.9.0, commander@~2.15.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@@ -2129,7 +2159,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -2218,7 +2248,7 @@ conventional-changelog-atom@^0.2.8:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-cli@^1.3.22:
+conventional-changelog-cli@^1.3.13, conventional-changelog-cli@^1.3.22:
   version "1.3.22"
   resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz#13570fe1728f56f013ff7a88878ff49d5162a405"
   dependencies:
@@ -2324,14 +2354,14 @@ conventional-changelog@^1.1.24:
     conventional-changelog-jshint "^0.3.8"
     conventional-changelog-preset-loader "^1.1.8"
 
-conventional-commits-filter@^1.1.6:
+conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.1.7:
+conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
   dependencies:
@@ -2343,6 +2373,18 @@ conventional-commits-parser@^2.1.7:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
+conventional-recommended-bump@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
+  dependencies:
+    concat-stream "^1.4.10"
+    conventional-commits-filter "^1.1.1"
+    conventional-commits-parser "^2.1.1"
+    git-raw-commits "^1.3.0"
+    git-semver-tags "^1.3.0"
+    meow "^3.3.0"
+    object-assign "^4.0.1"
+
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -2699,6 +2741,12 @@ default-require-extensions@^2.0.0:
   dependencies:
     strip-bom "^3.0.0"
 
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
 define-properties@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
@@ -2774,6 +2822,10 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+detect-indent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
@@ -2890,6 +2942,10 @@ duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
@@ -3521,7 +3577,7 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^4.0.2:
+fs-extra@^4.0.1, fs-extra@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
   dependencies:
@@ -3624,7 +3680,7 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.3.6:
+git-raw-commits@^1.3.0, git-raw-commits@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
   dependencies:
@@ -3641,7 +3697,7 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.3.6:
+git-semver-tags@^1.3.0, git-semver-tags@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
   dependencies:
@@ -3732,6 +3788,16 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
@@ -3918,7 +3984,7 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-hosted-git-info@^2.1.4:
+hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
@@ -4091,7 +4157,7 @@ ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inquirer@^3.0.6:
+inquirer@^3.0.6, inquirer@^3.2.2:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
@@ -5113,6 +5179,50 @@ left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
 
+lerna@^2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.11.0.tgz#89b5681e286d388dda5bbbdbbf6b84c8094eff65"
+  dependencies:
+    async "^1.5.0"
+    chalk "^2.1.0"
+    cmd-shim "^2.0.2"
+    columnify "^1.5.4"
+    command-join "^2.0.0"
+    conventional-changelog-cli "^1.3.13"
+    conventional-recommended-bump "^1.2.1"
+    dedent "^0.7.0"
+    execa "^0.8.0"
+    find-up "^2.1.0"
+    fs-extra "^4.0.1"
+    get-port "^3.2.0"
+    glob "^7.1.2"
+    glob-parent "^3.1.0"
+    globby "^6.1.0"
+    graceful-fs "^4.1.11"
+    hosted-git-info "^2.5.0"
+    inquirer "^3.2.2"
+    is-ci "^1.0.10"
+    load-json-file "^4.0.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    package-json "^4.0.1"
+    path-exists "^3.0.0"
+    read-cmd-shim "^1.0.1"
+    read-pkg "^3.0.0"
+    rimraf "^2.6.1"
+    safe-buffer "^5.1.1"
+    semver "^5.4.1"
+    signal-exit "^3.0.2"
+    slash "^1.0.0"
+    strong-log-transformer "^1.0.6"
+    temp-write "^3.3.0"
+    write-file-atomic "^2.3.0"
+    write-json-file "^2.2.0"
+    write-pkg "^3.1.0"
+    yargs "^8.0.2"
+
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
@@ -5215,6 +5325,15 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -5660,6 +5779,10 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
+minimist@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
+
 minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
@@ -5717,6 +5840,10 @@ modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
 
+moment@^2.6.0:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -5971,7 +6098,7 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npmlog@^4.0.2:
+npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6178,7 +6305,7 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
-package-json@^4.0.0:
+package-json@^4.0.0, package-json@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
   dependencies:
@@ -6295,6 +6422,12 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  dependencies:
+    pify "^2.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6842,6 +6975,12 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+read-cmd-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
+  dependencies:
+    graceful-fs "^4.1.2"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6849,6 +6988,13 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -6864,6 +7010,14 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -7420,6 +7574,12 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -7693,6 +7853,16 @@ strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+strong-log-transformer@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
+  dependencies:
+    byline "^5.0.0"
+    duplexer "^0.1.1"
+    minimist "^0.1.0"
+    moment "^2.6.0"
+    through "^2.3.4"
+
 stylus-loader@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
@@ -7786,6 +7956,21 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+
+temp-write@^3.3.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
+  dependencies:
+    graceful-fs "^4.1.2"
+    is-stream "^1.1.0"
+    make-dir "^1.0.0"
+    pify "^3.0.0"
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
 tempfile@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
@@ -7840,7 +8025,7 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4:
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -8217,7 +8402,7 @@ uuid@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.1.0:
+uuid@^3.0.1, uuid@^3.1.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
@@ -8376,6 +8561,12 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+wcwidth@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  dependencies:
+    defaults "^1.0.3"
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -8696,7 +8887,7 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
+write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
   dependencies:
@@ -8704,6 +8895,24 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-json-file@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
+  dependencies:
+    detect-indent "^5.0.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    pify "^3.0.0"
+    sort-keys "^2.0.0"
+    write-file-atomic "^2.0.0"
+
+write-pkg@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21"
+  dependencies:
+    sort-keys "^2.0.0"
+    write-json-file "^2.2.0"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -8757,6 +8966,12 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
@@ -8780,6 +8995,24 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"

From 9693ae1092ffbf8619a49cac94091a95d2f2d7fd Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 12:16:51 +0800
Subject: [PATCH 038/242] chore: move all docs to sub dir

---
 .../@vuepress/core/lib/prepare/loadConfig.js  |   1 +
 .../core/lib/prepare/resolveOptions.js        |   3 +
 packages/@vuepress/theme-default/index.js     |   5 +-
 packages/@vuepress/theme-default/package.json |  96 +-----------------
 .../{ => docs}/.vuepress/components/Bit.vue   |   0
 .../.vuepress/components/Foo/Bar.vue          |   0
 .../.vuepress/components/OtherComponent.vue   |   0
 .../.vuepress/components/demo-1.vue           |   0
 packages/docs/{ => docs}/.vuepress/config.js  |   4 +-
 .../docs/{ => docs}/.vuepress/images/logo.png | Bin
 .../docs/{ => docs}/.vuepress/public/hero.png | Bin
 .../public/icons/android-chrome-192x192.png   | Bin
 .../public/icons/android-chrome-512x512.png   | Bin
 .../public/icons/apple-touch-icon-120x120.png | Bin
 .../public/icons/apple-touch-icon-152x152.png | Bin
 .../public/icons/apple-touch-icon-180x180.png | Bin
 .../public/icons/apple-touch-icon-60x60.png   | Bin
 .../public/icons/apple-touch-icon-76x76.png   | Bin
 .../public/icons/apple-touch-icon.png         | Bin
 .../.vuepress/public/icons/favicon-16x16.png  | Bin
 .../.vuepress/public/icons/favicon-32x32.png  | Bin
 .../icons/msapplication-icon-144x144.png      | Bin
 .../.vuepress/public/icons/mstile-150x150.png | Bin
 .../public/icons/safari-pinned-tab.svg        |   0
 .../.vuepress/public/line-numbers-desktop.png | Bin
 .../.vuepress/public/line-numbers-mobile.gif  | Bin
 .../docs/{ => docs}/.vuepress/public/logo.png | Bin
 .../{ => docs}/.vuepress/public/manifest.json |   0
 .../{ => docs}/.vuepress/public/plugin.png    | Bin
 packages/docs/{ => docs}/config/README.md     |   0
 .../{ => docs}/default-theme-config/README.md |   2 +-
 packages/docs/{ => docs}/guide/README.md      |   8 +-
 packages/docs/{ => docs}/guide/assets.md      |   0
 .../docs/{ => docs}/guide/basic-config.md     |   2 +-
 .../docs/{ => docs}/guide/custom-themes.md    |   0
 packages/docs/{ => docs}/guide/deploy.md      |   0
 .../docs/{ => docs}/guide/getting-started.md  |   2 +-
 packages/docs/{ => docs}/guide/i18n.md        |   0
 packages/docs/{ => docs}/guide/markdown.md    |   0
 packages/docs/{ => docs}/guide/using-vue.md   |   0
 packages/docs/{ => docs}/plugin/README.md     |   0
 packages/docs/{ => docs}/zh/README.md         |   0
 packages/docs/{ => docs}/zh/config/README.md  |   0
 .../zh/default-theme-config/README.md         |   0
 packages/docs/{ => docs}/zh/guide/README.md   |   8 +-
 packages/docs/{ => docs}/zh/guide/assets.md   |   0
 .../docs/{ => docs}/zh/guide/basic-config.md  |   2 +-
 .../docs/{ => docs}/zh/guide/custom-themes.md |   0
 packages/docs/{ => docs}/zh/guide/deploy.md   |   0
 .../{ => docs}/zh/guide/getting-started.md    |   2 +-
 packages/docs/{ => docs}/zh/guide/i18n.md     |   0
 packages/docs/{ => docs}/zh/guide/markdown.md |   0
 .../docs/{ => docs}/zh/guide/using-vue.md     |   0
 53 files changed, 22 insertions(+), 113 deletions(-)
 rename packages/docs/{ => docs}/.vuepress/components/Bit.vue (100%)
 rename packages/docs/{ => docs}/.vuepress/components/Foo/Bar.vue (100%)
 rename packages/docs/{ => docs}/.vuepress/components/OtherComponent.vue (100%)
 rename packages/docs/{ => docs}/.vuepress/components/demo-1.vue (100%)
 rename packages/docs/{ => docs}/.vuepress/config.js (95%)
 rename packages/docs/{ => docs}/.vuepress/images/logo.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/hero.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/android-chrome-192x192.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/android-chrome-512x512.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/apple-touch-icon-120x120.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/apple-touch-icon-152x152.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/apple-touch-icon-180x180.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/apple-touch-icon-60x60.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/apple-touch-icon-76x76.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/apple-touch-icon.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/favicon-16x16.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/favicon-32x32.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/msapplication-icon-144x144.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/mstile-150x150.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/icons/safari-pinned-tab.svg (100%)
 rename packages/docs/{ => docs}/.vuepress/public/line-numbers-desktop.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/line-numbers-mobile.gif (100%)
 rename packages/docs/{ => docs}/.vuepress/public/logo.png (100%)
 rename packages/docs/{ => docs}/.vuepress/public/manifest.json (100%)
 rename packages/docs/{ => docs}/.vuepress/public/plugin.png (100%)
 rename packages/docs/{ => docs}/config/README.md (100%)
 rename packages/docs/{ => docs}/default-theme-config/README.md (98%)
 rename packages/docs/{ => docs}/guide/README.md (93%)
 rename packages/docs/{ => docs}/guide/assets.md (100%)
 rename packages/docs/{ => docs}/guide/basic-config.md (96%)
 rename packages/docs/{ => docs}/guide/custom-themes.md (100%)
 rename packages/docs/{ => docs}/guide/deploy.md (100%)
 rename packages/docs/{ => docs}/guide/getting-started.md (95%)
 rename packages/docs/{ => docs}/guide/i18n.md (100%)
 rename packages/docs/{ => docs}/guide/markdown.md (100%)
 rename packages/docs/{ => docs}/guide/using-vue.md (100%)
 rename packages/docs/{ => docs}/plugin/README.md (100%)
 rename packages/docs/{ => docs}/zh/README.md (100%)
 rename packages/docs/{ => docs}/zh/config/README.md (100%)
 rename packages/docs/{ => docs}/zh/default-theme-config/README.md (100%)
 rename packages/docs/{ => docs}/zh/guide/README.md (93%)
 rename packages/docs/{ => docs}/zh/guide/assets.md (100%)
 rename packages/docs/{ => docs}/zh/guide/basic-config.md (98%)
 rename packages/docs/{ => docs}/zh/guide/custom-themes.md (100%)
 rename packages/docs/{ => docs}/zh/guide/deploy.md (100%)
 rename packages/docs/{ => docs}/zh/guide/getting-started.md (96%)
 rename packages/docs/{ => docs}/zh/guide/i18n.md (100%)
 rename packages/docs/{ => docs}/zh/guide/markdown.md (100%)
 rename packages/docs/{ => docs}/zh/guide/using-vue.md (100%)

diff --git a/packages/@vuepress/core/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
index aa913ba013..9b3bbb2c41 100644
--- a/packages/@vuepress/core/lib/prepare/loadConfig.js
+++ b/packages/@vuepress/core/lib/prepare/loadConfig.js
@@ -4,6 +4,7 @@ const yamlParser = require('js-yaml')
 const tomlParser = require('toml')
 
 module.exports = function loadConfig (vuepressDir, bustCache = true) {
+  console.log(vuepressDir)
   const configPath = path.resolve(vuepressDir, 'config.js')
   const configYmlPath = path.resolve(vuepressDir, 'config.yml')
   const configTomlPath = path.resolve(vuepressDir, 'config.toml')
diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
index 906760de5a..f1cf435853 100644
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -42,6 +42,8 @@ module.exports = async function resolveOptions (sourceDir) {
   let themeLayoutPath = null
   let themeNotFoundPath = null
 
+  console.log(useDefaultTheme)
+  console.log(siteConfig)
   if (useDefaultTheme) {
     // use default theme
     themePath = defaultThemePath
@@ -51,6 +53,7 @@ module.exports = async function resolveOptions (sourceDir) {
     // resolve theme Layout
     if (siteConfig.theme) {
       // use external theme
+      // backward-compatible
       try {
         themeLayoutPath = require.resolve(`vuepress-theme-${siteConfig.theme}/Layout.vue`, {
           paths: [
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 8da254413e..3197b03e82 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -3,9 +3,6 @@ const path = require('path')
 // Theme API.
 module.exports = {
   layout: path.resolve(__dirname, 'src/Layout.vue'),
-  404: path.resolve(__dirname, 'src/NotFound.vue'),
-  chainWebpack (config, isServer) {
-
-  },
+  notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: []
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index bf784a17db..ba26f669a2 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -2,19 +2,7 @@
   "name": "@vuepress/theme-default",
   "version": "1.0.0",
   "description": "Default theme for VuePress",
-  "main": "lib/index.js",
-  "bin": {
-    "vuepress": "bin/vuepress.js"
-  },
-  "scripts": {
-    "boot": "node scripts/bootstrap.js",
-    "dev": "node bin/vuepress dev docs",
-    "build": "node bin/vuepress build docs",
-    "lint": "eslint --fix --ext .js,.vue bin/ lib/ test/",
-    "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
-    "release": "/bin/bash scripts/release.sh",
-    "test": "node test/prepare.js && jest --config test/jest.config.js"
-  },
+  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vuepress.git"
@@ -38,85 +26,5 @@
       "eslint --fix",
       "git add"
     ]
-  },
-  "dependencies": {
-    "@babel/core": "7.0.0-beta.47",
-    "@vue/babel-preset-app": "3.0.0-beta.11",
-    "autoprefixer": "^8.2.0",
-    "babel-loader": "8.0.0-beta.3",
-    "cache-loader": "^1.2.2",
-    "chalk": "^2.3.2",
-    "chokidar": "^2.0.3",
-    "commander": "^2.15.1",
-    "connect-history-api-fallback": "^1.5.0",
-    "copy-webpack-plugin": "^4.5.1",
-    "cross-spawn": "^6.0.5",
-    "css-loader": "^0.28.11",
-    "diacritics": "^1.3.0",
-    "docsearch.js": "^2.5.2",
-    "escape-html": "^1.0.3",
-    "file-loader": "^1.1.11",
-    "fs-extra": "^5.0.0",
-    "globby": "^8.0.1",
-    "gray-matter": "^4.0.1",
-    "js-yaml": "^3.11.0",
-    "koa-connect": "^2.0.1",
-    "koa-mount": "^3.0.0",
-    "koa-range": "^0.3.0",
-    "koa-static": "^4.0.2",
-    "loader-utils": "^1.1.0",
-    "lodash.throttle": "^4.1.1",
-    "lru-cache": "^4.1.2",
-    "markdown-it": "^8.4.1",
-    "markdown-it-anchor": "^5.0.2",
-    "markdown-it-container": "^2.0.0",
-    "markdown-it-emoji": "^1.4.0",
-    "markdown-it-table-of-contents": "^0.4.0",
-    "mini-css-extract-plugin": "^0.4.1",
-    "nprogress": "^0.2.0",
-    "optimize-css-assets-webpack-plugin": "^4.0.0",
-    "portfinder": "^1.0.13",
-    "postcss-loader": "^2.1.5",
-    "prismjs": "^1.13.0",
-    "register-service-worker": "^1.4.1",
-    "semver": "^5.5.0",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
-    "toml": "^2.3.3",
-    "url-loader": "^1.0.1",
-    "vue": "^2.5.16",
-    "vue-loader": "^15.2.4",
-    "vue-router": "^3.0.1",
-    "vue-server-renderer": "^2.5.16",
-    "vue-template-compiler": "^2.5.16",
-    "vuepress-html-webpack-plugin": "^3.2.0",
-    "webpack": "^4.8.1",
-    "webpack-chain": "^4.6.0",
-    "webpack-merge": "^4.1.2",
-    "webpack-serve": "^1.0.2",
-    "webpackbar": "^2.6.1",
-    "workbox-build": "^3.1.0"
-  },
-  "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.16",
-    "babel-core": "^7.0.0-0",
-    "babel-jest": "^23.0.0",
-    "conventional-changelog-cli": "^1.3.22",
-    "eslint": "^4.19.1",
-    "eslint-plugin-jest": "^21.15.1",
-    "eslint-plugin-vue-libs": "^3.0.0",
-    "jest": "^23.0.0",
-    "jest-serializer-vue": "^1.0.0",
-    "lerna": "^2.11.0",
-    "lint-staged": "^7.0.4",
-    "vue-jest": "^2.6.0",
-    "vuepress-theme-vue": "^1.1.0",
-    "yorkie": "^1.0.3"
-  },
-  "engines": {
-    "node": ">=8"
-  },
-  "browserslist": [
-    ">1%"
-  ]
+  }
 }
diff --git a/packages/docs/.vuepress/components/Bit.vue b/packages/docs/docs/.vuepress/components/Bit.vue
similarity index 100%
rename from packages/docs/.vuepress/components/Bit.vue
rename to packages/docs/docs/.vuepress/components/Bit.vue
diff --git a/packages/docs/.vuepress/components/Foo/Bar.vue b/packages/docs/docs/.vuepress/components/Foo/Bar.vue
similarity index 100%
rename from packages/docs/.vuepress/components/Foo/Bar.vue
rename to packages/docs/docs/.vuepress/components/Foo/Bar.vue
diff --git a/packages/docs/.vuepress/components/OtherComponent.vue b/packages/docs/docs/.vuepress/components/OtherComponent.vue
similarity index 100%
rename from packages/docs/.vuepress/components/OtherComponent.vue
rename to packages/docs/docs/.vuepress/components/OtherComponent.vue
diff --git a/packages/docs/.vuepress/components/demo-1.vue b/packages/docs/docs/.vuepress/components/demo-1.vue
similarity index 100%
rename from packages/docs/.vuepress/components/demo-1.vue
rename to packages/docs/docs/.vuepress/components/demo-1.vue
diff --git a/packages/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
similarity index 95%
rename from packages/docs/.vuepress/config.js
rename to packages/docs/docs/.vuepress/config.js
index f196d5a4c7..2de5a74bf3 100644
--- a/packages/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -1,5 +1,5 @@
-const testPlugin = require('../../@vuepress/plugin-test/index')
-const translationComparisonPlugin = require('../../../../vuepress-plugin-translation-ui/src/index')
+const testPlugin = require('../../../@vuepress/plugin-test/index')
+const translationComparisonPlugin = require('../../../../../vuepress-plugin-translation-ui/src/index')
 
 module.exports = {
   dest: 'vuepress',
diff --git a/packages/docs/.vuepress/images/logo.png b/packages/docs/docs/.vuepress/images/logo.png
similarity index 100%
rename from packages/docs/.vuepress/images/logo.png
rename to packages/docs/docs/.vuepress/images/logo.png
diff --git a/packages/docs/.vuepress/public/hero.png b/packages/docs/docs/.vuepress/public/hero.png
similarity index 100%
rename from packages/docs/.vuepress/public/hero.png
rename to packages/docs/docs/.vuepress/public/hero.png
diff --git a/packages/docs/.vuepress/public/icons/android-chrome-192x192.png b/packages/docs/docs/.vuepress/public/icons/android-chrome-192x192.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/android-chrome-192x192.png
rename to packages/docs/docs/.vuepress/public/icons/android-chrome-192x192.png
diff --git a/packages/docs/.vuepress/public/icons/android-chrome-512x512.png b/packages/docs/docs/.vuepress/public/icons/android-chrome-512x512.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/android-chrome-512x512.png
rename to packages/docs/docs/.vuepress/public/icons/android-chrome-512x512.png
diff --git a/packages/docs/.vuepress/public/icons/apple-touch-icon-120x120.png b/packages/docs/docs/.vuepress/public/icons/apple-touch-icon-120x120.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/apple-touch-icon-120x120.png
rename to packages/docs/docs/.vuepress/public/icons/apple-touch-icon-120x120.png
diff --git a/packages/docs/.vuepress/public/icons/apple-touch-icon-152x152.png b/packages/docs/docs/.vuepress/public/icons/apple-touch-icon-152x152.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/apple-touch-icon-152x152.png
rename to packages/docs/docs/.vuepress/public/icons/apple-touch-icon-152x152.png
diff --git a/packages/docs/.vuepress/public/icons/apple-touch-icon-180x180.png b/packages/docs/docs/.vuepress/public/icons/apple-touch-icon-180x180.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/apple-touch-icon-180x180.png
rename to packages/docs/docs/.vuepress/public/icons/apple-touch-icon-180x180.png
diff --git a/packages/docs/.vuepress/public/icons/apple-touch-icon-60x60.png b/packages/docs/docs/.vuepress/public/icons/apple-touch-icon-60x60.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/apple-touch-icon-60x60.png
rename to packages/docs/docs/.vuepress/public/icons/apple-touch-icon-60x60.png
diff --git a/packages/docs/.vuepress/public/icons/apple-touch-icon-76x76.png b/packages/docs/docs/.vuepress/public/icons/apple-touch-icon-76x76.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/apple-touch-icon-76x76.png
rename to packages/docs/docs/.vuepress/public/icons/apple-touch-icon-76x76.png
diff --git a/packages/docs/.vuepress/public/icons/apple-touch-icon.png b/packages/docs/docs/.vuepress/public/icons/apple-touch-icon.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/apple-touch-icon.png
rename to packages/docs/docs/.vuepress/public/icons/apple-touch-icon.png
diff --git a/packages/docs/.vuepress/public/icons/favicon-16x16.png b/packages/docs/docs/.vuepress/public/icons/favicon-16x16.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/favicon-16x16.png
rename to packages/docs/docs/.vuepress/public/icons/favicon-16x16.png
diff --git a/packages/docs/.vuepress/public/icons/favicon-32x32.png b/packages/docs/docs/.vuepress/public/icons/favicon-32x32.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/favicon-32x32.png
rename to packages/docs/docs/.vuepress/public/icons/favicon-32x32.png
diff --git a/packages/docs/.vuepress/public/icons/msapplication-icon-144x144.png b/packages/docs/docs/.vuepress/public/icons/msapplication-icon-144x144.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/msapplication-icon-144x144.png
rename to packages/docs/docs/.vuepress/public/icons/msapplication-icon-144x144.png
diff --git a/packages/docs/.vuepress/public/icons/mstile-150x150.png b/packages/docs/docs/.vuepress/public/icons/mstile-150x150.png
similarity index 100%
rename from packages/docs/.vuepress/public/icons/mstile-150x150.png
rename to packages/docs/docs/.vuepress/public/icons/mstile-150x150.png
diff --git a/packages/docs/.vuepress/public/icons/safari-pinned-tab.svg b/packages/docs/docs/.vuepress/public/icons/safari-pinned-tab.svg
similarity index 100%
rename from packages/docs/.vuepress/public/icons/safari-pinned-tab.svg
rename to packages/docs/docs/.vuepress/public/icons/safari-pinned-tab.svg
diff --git a/packages/docs/.vuepress/public/line-numbers-desktop.png b/packages/docs/docs/.vuepress/public/line-numbers-desktop.png
similarity index 100%
rename from packages/docs/.vuepress/public/line-numbers-desktop.png
rename to packages/docs/docs/.vuepress/public/line-numbers-desktop.png
diff --git a/packages/docs/.vuepress/public/line-numbers-mobile.gif b/packages/docs/docs/.vuepress/public/line-numbers-mobile.gif
similarity index 100%
rename from packages/docs/.vuepress/public/line-numbers-mobile.gif
rename to packages/docs/docs/.vuepress/public/line-numbers-mobile.gif
diff --git a/packages/docs/.vuepress/public/logo.png b/packages/docs/docs/.vuepress/public/logo.png
similarity index 100%
rename from packages/docs/.vuepress/public/logo.png
rename to packages/docs/docs/.vuepress/public/logo.png
diff --git a/packages/docs/.vuepress/public/manifest.json b/packages/docs/docs/.vuepress/public/manifest.json
similarity index 100%
rename from packages/docs/.vuepress/public/manifest.json
rename to packages/docs/docs/.vuepress/public/manifest.json
diff --git a/packages/docs/.vuepress/public/plugin.png b/packages/docs/docs/.vuepress/public/plugin.png
similarity index 100%
rename from packages/docs/.vuepress/public/plugin.png
rename to packages/docs/docs/.vuepress/public/plugin.png
diff --git a/packages/docs/config/README.md b/packages/docs/docs/config/README.md
similarity index 100%
rename from packages/docs/config/README.md
rename to packages/docs/docs/config/README.md
diff --git a/packages/docs/default-theme-config/README.md b/packages/docs/docs/default-theme-config/README.md
similarity index 98%
rename from packages/docs/default-theme-config/README.md
rename to packages/docs/docs/default-theme-config/README.md
index 2553476644..0b26ada30c 100644
--- a/packages/docs/default-theme-config/README.md
+++ b/packages/docs/docs/default-theme-config/README.md
@@ -12,7 +12,7 @@ All options listed on this page apply to the default theme only. If you are usin
 
 ## Homepage
 
-The default theme provides a homepage layout (which is used on [the homepage of this very website](../README.md)). To use it, specify `home: true` plus some other metadata in your root `README.md`'s [YAML front matter](../guide/markdown.md#front-matter). This is the actual data used on this site:
+The default theme provides a homepage layout (which is used on [the homepage of this very website](../../README.md)). To use it, specify `home: true` plus some other metadata in your root `README.md`'s [YAML front matter](../guide/markdown.md#front-matter). This is the actual data used on this site:
 
 ``` yaml
 ---
diff --git a/packages/docs/guide/README.md b/packages/docs/docs/guide/README.md
similarity index 93%
rename from packages/docs/guide/README.md
rename to packages/docs/docs/guide/README.md
index 2ab95d5003..58f39edf50 100644
--- a/packages/docs/guide/README.md
+++ b/packages/docs/docs/guide/README.md
@@ -16,13 +16,13 @@ Each markdown file is compiled into HTML with [markdown-it](https://github.com/m
 
 ## Features
 
-- [Built-in markdown extensions](./markdown.md) optimized for technical documentation
-- [Ability to leverage Vue inside markdown files](./using-vue.md)
-- [Vue-powered custom theme system](./custom-themes.md)
+- [Built-in markdown extensions](markdown.md) optimized for technical documentation
+- [Ability to leverage Vue inside markdown files](using-vue.md)
+- [Vue-powered custom theme system](custom-themes.md)
 - [Automatic Service Worker generation](../config/README.md#serviceworker)
 - [Google Analytics Integration](../config/README.md#ga)
 - ["Last Updated" based on Git](../default-theme-config/README.md#last-updated)
-- [Multi-language support](./i18n.md)
+- [Multi-language support](i18n.md)
 - A default theme with:
   - Responsive layout
   - [Optional Homepage](../default-theme-config/README.md#homepage)
diff --git a/packages/docs/guide/assets.md b/packages/docs/docs/guide/assets.md
similarity index 100%
rename from packages/docs/guide/assets.md
rename to packages/docs/docs/guide/assets.md
diff --git a/packages/docs/guide/basic-config.md b/packages/docs/docs/guide/basic-config.md
similarity index 96%
rename from packages/docs/guide/basic-config.md
rename to packages/docs/docs/guide/basic-config.md
index e333472466..3c38da0633 100644
--- a/packages/docs/guide/basic-config.md
+++ b/packages/docs/docs/guide/basic-config.md
@@ -34,7 +34,7 @@ You can also use YAML (`.vuepress/config.yml`) or TOML (`.vuepress/config.toml`)
 
 A VuePress theme is responsible for all the layout and interactivity details of your site. VuePress ships with a default theme (you are looking at it right now) which is designed for technical documentation. It exposes a number of options that allow you to customize the navbar, sidebar and homepage, etc. For details, check out the [Default Theme Config](../default-theme-config/README.md) page.
 
-If you wish to develop a custom theme, see [Custom Themes](./custom-themes.md).
+If you wish to develop a custom theme, see [Custom Themes](custom-themes.md).
 
 ## App Level Enhancements
 
diff --git a/packages/docs/guide/custom-themes.md b/packages/docs/docs/guide/custom-themes.md
similarity index 100%
rename from packages/docs/guide/custom-themes.md
rename to packages/docs/docs/guide/custom-themes.md
diff --git a/packages/docs/guide/deploy.md b/packages/docs/docs/guide/deploy.md
similarity index 100%
rename from packages/docs/guide/deploy.md
rename to packages/docs/docs/guide/deploy.md
diff --git a/packages/docs/guide/getting-started.md b/packages/docs/docs/guide/getting-started.md
similarity index 95%
rename from packages/docs/guide/getting-started.md
rename to packages/docs/docs/guide/getting-started.md
index ab48f0ad6b..9432ce2d15 100644
--- a/packages/docs/guide/getting-started.md
+++ b/packages/docs/docs/guide/getting-started.md
@@ -63,4 +63,4 @@ To generate static assets, run:
 yarn docs:build # Or npm run docs:build
 ```
 
-By default the built files will be in `.vuepress/dist`, which can be configured via the `dest` field in `.vuepress/config.js`. The built files can be deployed to any static file server. See [Deployment Guide](./deploy.md) for guides on deploying to popular services.
+By default the built files will be in `.vuepress/dist`, which can be configured via the `dest` field in `.vuepress/config.js`. The built files can be deployed to any static file server. See [Deployment Guide](deploy.md) for guides on deploying to popular services.
diff --git a/packages/docs/guide/i18n.md b/packages/docs/docs/guide/i18n.md
similarity index 100%
rename from packages/docs/guide/i18n.md
rename to packages/docs/docs/guide/i18n.md
diff --git a/packages/docs/guide/markdown.md b/packages/docs/docs/guide/markdown.md
similarity index 100%
rename from packages/docs/guide/markdown.md
rename to packages/docs/docs/guide/markdown.md
diff --git a/packages/docs/guide/using-vue.md b/packages/docs/docs/guide/using-vue.md
similarity index 100%
rename from packages/docs/guide/using-vue.md
rename to packages/docs/docs/guide/using-vue.md
diff --git a/packages/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
similarity index 100%
rename from packages/docs/plugin/README.md
rename to packages/docs/docs/plugin/README.md
diff --git a/packages/docs/zh/README.md b/packages/docs/docs/zh/README.md
similarity index 100%
rename from packages/docs/zh/README.md
rename to packages/docs/docs/zh/README.md
diff --git a/packages/docs/zh/config/README.md b/packages/docs/docs/zh/config/README.md
similarity index 100%
rename from packages/docs/zh/config/README.md
rename to packages/docs/docs/zh/config/README.md
diff --git a/packages/docs/zh/default-theme-config/README.md b/packages/docs/docs/zh/default-theme-config/README.md
similarity index 100%
rename from packages/docs/zh/default-theme-config/README.md
rename to packages/docs/docs/zh/default-theme-config/README.md
diff --git a/packages/docs/zh/guide/README.md b/packages/docs/docs/zh/guide/README.md
similarity index 93%
rename from packages/docs/zh/guide/README.md
rename to packages/docs/docs/zh/guide/README.md
index 28dbfb1919..e48bd4c9f1 100644
--- a/packages/docs/zh/guide/README.md
+++ b/packages/docs/docs/zh/guide/README.md
@@ -12,13 +12,13 @@ VuePress 由两部分组成：一部分是支持用 Vue 开发主题的极简静
 
 ## 特性
 
-- 为技术文档而优化的 [内置 Markdown 拓展](./markdown.md)
-- [在 Markdown 文件中使用 Vue 组件的能力](./using-vue.md)
-- [Vue 驱动的自定义主题系统](./custom-themes.md)
+- 为技术文档而优化的 [内置 Markdown 拓展](markdown.md)
+- [在 Markdown 文件中使用 Vue 组件的能力](using-vue.md)
+- [Vue 驱动的自定义主题系统](custom-themes.md)
 - [自动生成 Service Worker](../config/README.md#serviceworker)
 - [Google Analytics 集成](../config/README.md#ga)
 - [基于 Git 的 “最后更新时间”](../default-theme-config/README.md#最后更新时间)
-- [多语言支持](./i18n.md)
+- [多语言支持](i18n.md)
 - 默认主题包含：
   - 响应式布局
   - [可选的主页](../default-theme-config/README.md#首页)
diff --git a/packages/docs/zh/guide/assets.md b/packages/docs/docs/zh/guide/assets.md
similarity index 100%
rename from packages/docs/zh/guide/assets.md
rename to packages/docs/docs/zh/guide/assets.md
diff --git a/packages/docs/zh/guide/basic-config.md b/packages/docs/docs/zh/guide/basic-config.md
similarity index 98%
rename from packages/docs/zh/guide/basic-config.md
rename to packages/docs/docs/zh/guide/basic-config.md
index 3ac5f459d1..686ff82940 100644
--- a/packages/docs/zh/guide/basic-config.md
+++ b/packages/docs/docs/zh/guide/basic-config.md
@@ -34,7 +34,7 @@ module.exports = {
 
 一个 VuePress 主题应该负责整个网站的布局和交互细节。在 VuePress 中，目前自带了一个默认的主题（正是你现在所看到的），它是为技术文档而设计的。同时，默认主题提供了一些选项，让你可以去自定义导航栏（navbar）、 侧边栏（sidebar）和 首页（homepage） 等，详情请参见 [默认主题](../default-theme-config/README.md) 。
 
-如果你想开发一个自定义主题，可以参考 [自定义主题](./custom-themes.md)。
+如果你想开发一个自定义主题，可以参考 [自定义主题](custom-themes.md)。
 
 
 ## 应用级别的配置
diff --git a/packages/docs/zh/guide/custom-themes.md b/packages/docs/docs/zh/guide/custom-themes.md
similarity index 100%
rename from packages/docs/zh/guide/custom-themes.md
rename to packages/docs/docs/zh/guide/custom-themes.md
diff --git a/packages/docs/zh/guide/deploy.md b/packages/docs/docs/zh/guide/deploy.md
similarity index 100%
rename from packages/docs/zh/guide/deploy.md
rename to packages/docs/docs/zh/guide/deploy.md
diff --git a/packages/docs/zh/guide/getting-started.md b/packages/docs/docs/zh/guide/getting-started.md
similarity index 96%
rename from packages/docs/zh/guide/getting-started.md
rename to packages/docs/docs/zh/guide/getting-started.md
index bbbf2b706a..c24afc4990 100644
--- a/packages/docs/zh/guide/getting-started.md
+++ b/packages/docs/docs/zh/guide/getting-started.md
@@ -67,4 +67,4 @@ yarn docs:dev # 或者：npm run docs:dev
 yarn docs:build # 或者：npm run docs:build
 ```
 
-默认情况下，文件将会被生成在 `.vuepress/dist`，当然，你也可以通过 `.vuepress/config.js` 中的 `dest` 字段来修改，生成的文件可以部署到任意的静态文件服务器上，参考 [部署](./deploy.md) 来了解更多。
+默认情况下，文件将会被生成在 `.vuepress/dist`，当然，你也可以通过 `.vuepress/config.js` 中的 `dest` 字段来修改，生成的文件可以部署到任意的静态文件服务器上，参考 [部署](deploy.md) 来了解更多。
diff --git a/packages/docs/zh/guide/i18n.md b/packages/docs/docs/zh/guide/i18n.md
similarity index 100%
rename from packages/docs/zh/guide/i18n.md
rename to packages/docs/docs/zh/guide/i18n.md
diff --git a/packages/docs/zh/guide/markdown.md b/packages/docs/docs/zh/guide/markdown.md
similarity index 100%
rename from packages/docs/zh/guide/markdown.md
rename to packages/docs/docs/zh/guide/markdown.md
diff --git a/packages/docs/zh/guide/using-vue.md b/packages/docs/docs/zh/guide/using-vue.md
similarity index 100%
rename from packages/docs/zh/guide/using-vue.md
rename to packages/docs/docs/zh/guide/using-vue.md

From 3f65817c37db127a2cd18c56956372fd427e1596 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 14:10:27 +0800
Subject: [PATCH 039/242] feat: new theme api

---
 packages/@vuepress/core/lib/prepare/index.js  |  2 +-
 .../core/lib/prepare/resolveOptions.js        | 85 ++++++++++---------
 .../core/lib/prepare/resolveSiteData.js       |  3 +
 packages/@vuepress/plugin-test/index.js       |  2 +-
 .../theme-default/components/Badge.vue        |  2 +-
 5 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index e14d9443af..9d960fd400 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -26,7 +26,7 @@ module.exports = async function prepare (sourceDir, isProd) {
 
   await plugin.hooks.ready.run()
 
-  // 4. Apply plugin options to extend markdown.
+  // 4. apply plugin options to extend markdown.
   plugin.options.extendMarkdown.run(markdown)
   plugin.options.clientDynamicModules.run()
 
diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
index f1cf435853..f53c3af24d 100644
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -6,6 +6,15 @@ const loadConfig = require('./loadConfig')
 const { sort } = require('./util')
 
 module.exports = async function resolveOptions (sourceDir) {
+  function requireResolve (target) {
+    return require.resolve(target, {
+      paths: [
+        path.resolve(__dirname, '../../node_modules'),
+        path.resolve(sourceDir)
+      ]
+    })
+  }
+
   const vuepressDir = path.resolve(sourceDir, '.vuepress')
   const siteConfig = loadConfig(vuepressDir)
 
@@ -33,54 +42,48 @@ module.exports = async function resolveOptions (sourceDir) {
     : path.resolve(sourceDir, '.vuepress/dist')
 
   // resolve theme
-  const useDefaultTheme = (
-    !siteConfig.theme &&
-    !fs.existsSync(path.resolve(vuepressDir, 'theme'))
-  )
-  const defaultThemePath = path.resolve(__dirname, '../default-theme')
+  const localThemePath = path.resolve(vuepressDir, 'theme')
+  const useLocalTheme = fs.existsSync(localThemePath)
   let themePath = null
   let themeLayoutPath = null
   let themeNotFoundPath = null
+  let themeIndexFile = null
+  let themePlugins = []
 
-  console.log(useDefaultTheme)
-  console.log(siteConfig)
-  if (useDefaultTheme) {
-    // use default theme
-    themePath = defaultThemePath
-    themeLayoutPath = path.resolve(defaultThemePath, 'Layout.vue')
-    themeNotFoundPath = path.resolve(defaultThemePath, 'NotFound.vue')
-  } else {
-    // resolve theme Layout
-    if (siteConfig.theme) {
-      // use external theme
-      // backward-compatible
+  if (useLocalTheme) {
+    // use local custom theme
+    themePath = localThemePath
+    themeLayoutPath = path.resolve(localThemePath, 'Layout.vue')
+    themeNotFoundPath = path.resolve(localThemePath, 'NotFound.vue')
+    if (!fs.existsSync(themeLayoutPath)) {
+      throw new Error(`[vuepress] Cannot resolve Layout.vue file in .vuepress/theme.`)
+    }
+    if (!fs.existsSync(themeNotFoundPath)) {
+      throw new Error(`[vuepress] Cannot resolve NotFound.vue file in .vuepress/theme.`)
+    }
+  } else if (siteConfig.theme) {
+    // use external theme
+    try {
+      // backward-compatible 0.x.x.
+      themeLayoutPath = requireResolve(`vuepress-theme-${siteConfig.theme}/Layout.vue`)
+      themePath = path.dirname(themeLayoutPath)
+      themeNotFoundPath = path.resolve(themeLayoutPath, 'NotFound.vue')
+    } catch (e) {
       try {
-        themeLayoutPath = require.resolve(`vuepress-theme-${siteConfig.theme}/Layout.vue`, {
-          paths: [
-            path.resolve(__dirname, '../../node_modules'),
-            path.resolve(sourceDir)
-          ]
-        })
-        themePath = path.dirname(themeLayoutPath)
+        themeIndexFile = requireResolve(`vuepress-theme-${siteConfig.theme}/index.js`)
       } catch (e) {
-        throw new Error(`[vuepress] Failed to load custom theme "${
-          siteConfig.theme
-        }". File vuepress-theme-${siteConfig.theme}/Layout.vue does not exist.`)
-      }
-    } else {
-      // use custom theme
-      themePath = path.resolve(vuepressDir, 'theme')
-      themeLayoutPath = path.resolve(themePath, 'Layout.vue')
-      if (!fs.existsSync(themeLayoutPath)) {
-        throw new Error(`[vuepress] Cannot resolve Layout.vue file in .vuepress/theme.`)
+        try {
+          themeIndexFile = requireResolve(`@vuepress/theme-${siteConfig.theme}`)
+          themePath = path.dirname(themeIndexFile)
+          themeIndexFile = require(themeIndexFile)
+          themeLayoutPath = themeIndexFile.layout
+          themeNotFoundPath = themeIndexFile.notFound
+          themePlugins = themeIndexFile.plugins
+        } catch (e) {
+          throw new Error(`[vuepress] Failed to load custom theme "${siteConfig.theme}". File vuepress-theme-${siteConfig.theme}/Layout.vue does not exist.`)
+        }
       }
     }
-
-    // resolve theme NotFound
-    themeNotFoundPath = path.resolve(themePath, 'NotFound.vue')
-    if (!fs.existsSync(themeNotFoundPath)) {
-      themeNotFoundPath = path.resolve(defaultThemePath, 'NotFound.vue')
-    }
   }
 
   // resolve theme config
@@ -118,7 +121,7 @@ module.exports = async function resolveOptions (sourceDir) {
     themePath,
     themeLayoutPath,
     themeNotFoundPath,
-    useDefaultTheme,
+    themePlugins,
     isAlgoliaSearch,
     markdown
   }
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index 8d34ce5fe8..a48065823b 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -58,6 +58,9 @@ module.exports = async function ({
   // resolve additional pagesData
   const additionalPagesData = await Promise.all(
     plugin.options.additionalPages.values.map(async ({ route: routePath, path: filepath }) => {
+      if (!fs.existsSync(filepath)) {
+        throw new Error(`[vuepress] Cannot resolve additional page: ${filepath}`)
+      }
       return getPageData({ filepath, routePath })
     })
   )
diff --git a/packages/@vuepress/plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
index 67a32878b7..b6693c6d43 100644
--- a/packages/@vuepress/plugin-test/index.js
+++ b/packages/@vuepress/plugin-test/index.js
@@ -69,7 +69,7 @@ module.exports = (options, context) => ({
     return [
       {
         route: '/readme/',
-        path: path.resolve(__dirname, '../../README.md')
+        path: path.resolve(__dirname, '../../../README.md')
       }
     ]
   },
diff --git a/packages/@vuepress/theme-default/components/Badge.vue b/packages/@vuepress/theme-default/components/Badge.vue
index 17e6ba6e7a..2035600e29 100644
--- a/packages/@vuepress/theme-default/components/Badge.vue
+++ b/packages/@vuepress/theme-default/components/Badge.vue
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-@import '../../default-theme/styles/config.styl'
+@import '../src/styles/config.styl'
 
 .badge
   display inline-block

From 014c86b216a9748a06c90a89690edc35c632e41e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 15:07:05 +0800
Subject: [PATCH 040/242] feat: init @vuepress/plugin-translation-ui

---
 .../plugin-translation-ui/.npmignore          |   2 +
 .../@vuepress/plugin-translation-ui/README.md |   3 +
 .../@vuepress/plugin-translation-ui/client.js |   5 +
 .../@vuepress/plugin-translation-ui/index.js  |  18 ++
 .../@vuepress/plugin-translation-ui/index.md  |   3 +
 .../@vuepress/plugin-translation-ui/index.vue | 154 ++++++++++++++++++
 .../plugin-translation-ui/package.json        |  25 +++
 7 files changed, 210 insertions(+)
 create mode 100644 packages/@vuepress/plugin-translation-ui/.npmignore
 create mode 100644 packages/@vuepress/plugin-translation-ui/README.md
 create mode 100644 packages/@vuepress/plugin-translation-ui/client.js
 create mode 100644 packages/@vuepress/plugin-translation-ui/index.js
 create mode 100644 packages/@vuepress/plugin-translation-ui/index.md
 create mode 100644 packages/@vuepress/plugin-translation-ui/index.vue
 create mode 100644 packages/@vuepress/plugin-translation-ui/package.json

diff --git a/packages/@vuepress/plugin-translation-ui/.npmignore b/packages/@vuepress/plugin-translation-ui/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-translation-ui/README.md b/packages/@vuepress/plugin-translation-ui/README.md
new file mode 100644
index 0000000000..24e2832c18
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-translation-ui
+
+> translation-ui plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-translation-ui/client.js b/packages/@vuepress/plugin-translation-ui/client.js
new file mode 100644
index 0000000000..de396cb1c6
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/client.js
@@ -0,0 +1,5 @@
+import Layout from './index.vue'
+
+export default ({ Vue }) => {
+  Vue.component('I18nUI', Layout)
+}
diff --git a/packages/@vuepress/plugin-translation-ui/index.js b/packages/@vuepress/plugin-translation-ui/index.js
new file mode 100644
index 0000000000..7b3cd85830
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/index.js
@@ -0,0 +1,18 @@
+module.exports = (options = {}, {
+  isProd,
+  resolve
+}) => ({
+  name: 'i18n-ui',
+  // Only use this plugin at development mode.
+  enabled: !isProd,
+  enhanceAppFiles: [
+    resolve(__dirname, 'client.js')
+  ],
+  additionalPages: [
+    {
+      override: false,
+      route: options.route || '/i18n-ui/',
+      path: resolve(__dirname, 'index.md')
+    }
+  ]
+})
diff --git a/packages/@vuepress/plugin-translation-ui/index.md b/packages/@vuepress/plugin-translation-ui/index.md
new file mode 100644
index 0000000000..59204d7226
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/index.md
@@ -0,0 +1,3 @@
+---
+layout: I18nUI
+---
diff --git a/packages/@vuepress/plugin-translation-ui/index.vue b/packages/@vuepress/plugin-translation-ui/index.vue
new file mode 100644
index 0000000000..86a4c29a03
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/index.vue
@@ -0,0 +1,154 @@
+<template>
+  <div id="vuepress-plugin-i18n-ui">
+
+    <div class="tool-box">
+      <span class="select-lang">Language:&nbsp;</span>
+      <select>
+        <option v-for="locale in localeList">
+          {{ locale.label + '(' + locale.url + ')'}}
+        </option>
+      </select>
+      <span class="select-page">Page:&nbsp;</span>
+      <select @change="handlePageChange">
+        <option v-for="page in pages">{{ page.path }}</option>
+      </select>
+    </div>
+
+    <div class="helper-content">
+      <div id="left">
+        <transition name="slide-left">
+          <Content :page-key="key"/>
+        </transition>
+      </div>
+      <div id="right">
+        <transition name="slide-left">
+          <Content :page-key="rightKey"/>
+        </transition>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { findPageForPath } from '@app/util'
+
+export default {
+  data () {
+    return {
+      currentPagePath: '/'
+    }
+  },
+
+  mounted () {
+    syncScroll()
+  },
+
+  computed: {
+    key () {
+      return this.currentPage.key
+    },
+
+    currentPage () {
+      return findPageForPath(this.$site.pages, this.currentPagePath)
+    },
+
+    rightKey () {
+      return this.rightPage.key
+    },
+
+    rightPage () {
+      return findPageForPath(this.$site.pages, this.rightLocale + this.currentPagePath.slice(1))
+    },
+
+    rightLocale () {
+      return this.localeList[0].url
+    },
+
+    localeList () {
+      const locales = this.$site.themeConfig.locales
+      const localeList = []
+      Object.keys(locales).forEach(url => {
+        if (url !== '/') {
+          localeList.push(Object.assign({ url }, locales[url]))
+        }
+      })
+      return localeList
+    },
+
+    pages () {
+      return this.$site.pages
+        .filter(page => this.localeList.every(locale => page.path.indexOf(locale.url) !== 0))
+        .filter(page => page.path !== '/translation/')
+    }
+  },
+
+  methods: {
+    handlePageChange (e) {
+      this.currentPagePath = e.target.value
+    }
+  }
+}
+
+function syncScroll () {
+  const left = document.querySelector('#left')
+  const right = document.querySelector('#right')
+
+  function getOther (el) {
+    if (el === left) return right
+    return left
+  }
+
+  function onScroll (e) {
+    const el = e.target
+    const other = getOther(el)
+    other.removeEventListener('scroll', onScroll)
+    const percentage = el.scrollTop / (el.scrollHeight - el.offsetHeight)
+    other.scrollTop = percentage * (other.scrollHeight - other.offsetHeight)
+    setTimeout(() => other.addEventListener('scroll', onScroll, false), 10)
+  }
+
+  left.addEventListener('scroll', onScroll, false)
+  right.addEventListener('scroll', onScroll, false)
+}
+</script>
+
+<style lang="stylus" scoped>
+  #vuepress-plugin-i18n-ui
+    .helper-content
+      position relative
+
+    .tool-box
+      height 4rem
+      line-height 4rem
+      text-align center
+      .select-lang ~ select
+        margin-right 10px
+
+    #left, #right
+      padding 70px
+      box-sizing border-box
+      position absolute
+      top 0
+      width 50%
+      min-height 100px
+      max-height calc(100vh - 3.6rem - 4rem)
+      overflow scroll
+    #left
+      left 0
+    #right
+      left 50%
+
+  .slide-left-enter-active
+    transition all .5s
+    opacity 1
+
+  .slide-left-enter
+    opacity 0
+    position absolute !important
+    transform translate(-5%) !important
+
+  .slide-left-leave-to
+    opacity 0
+    position absolute !important
+    transform: translate(5%) !important
+</style>
diff --git a/packages/@vuepress/plugin-translation-ui/package.json b/packages/@vuepress/plugin-translation-ui/package.json
new file mode 100644
index 0000000000..97a9113388
--- /dev/null
+++ b/packages/@vuepress/plugin-translation-ui/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-translation-ui",
+  "version": "1.0.0",
+  "description": "translation-ui plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-translation-ui#readme"
+}
\ No newline at end of file

From e2a784d7165ba2a564fd2ba310dff1c7f7e5575d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 15:43:12 +0800
Subject: [PATCH 041/242] refactor: Extract default-theme-only webpack aliases

---
 .../@vuepress/core/lib/plugin-api/context.js  |  8 +++++++
 .../core/lib/prepare/resolveOptions.js        |  8 -------
 .../core/lib/prepare/resolvePlugin.js         |  3 ++-
 .../core/lib/webpack/createBaseConfig.js      |  4 ----
 .../plugin-active-header-links/mixin.js       |  3 +++
 .../@vuepress/theme-default/enhanceApp.js     |  3 ---
 packages/@vuepress/theme-default/index.js     |  5 +++-
 .../@vuepress/theme-default/noopModule.js     |  1 +
 packages/@vuepress/theme-default/plugin.js    | 24 +++++++++++++++++++
 packages/docs/docs/.vuepress/config.js        |  4 +---
 packages/docs/{ => docs}/README.md            |  0
 .../docs/docs/default-theme-config/README.md  |  2 +-
 12 files changed, 44 insertions(+), 21 deletions(-)
 delete mode 100644 packages/@vuepress/theme-default/enhanceApp.js
 create mode 100644 packages/@vuepress/theme-default/noopModule.js
 create mode 100644 packages/@vuepress/theme-default/plugin.js
 rename packages/docs/{ => docs}/README.md (100%)

diff --git a/packages/@vuepress/core/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
index 62f23d7121..83d56b9598 100644
--- a/packages/@vuepress/core/lib/plugin-api/context.js
+++ b/packages/@vuepress/core/lib/plugin-api/context.js
@@ -30,6 +30,14 @@ class PluginContext {
   get publicPath () {
     return this._options.publicPath
   }
+
+  get themeConfig () {
+    return this._options.themeConfig
+  }
+
+  get siteConfig () {
+    return this._options.siteConfig
+  }
 }
 
 Object.assign(PluginContext.prototype, {
diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
index f53c3af24d..b17b75028c 100644
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -89,13 +89,6 @@ module.exports = async function resolveOptions (sourceDir) {
   // resolve theme config
   const themeConfig = siteConfig.themeConfig || {}
 
-  // resolve algolia
-  const isAlgoliaSearch = (
-    themeConfig.algolia ||
-    Object.keys(siteConfig.locales && themeConfig.locales || {})
-      .some(base => themeConfig.locales[base].algolia)
-  )
-
   // resolve markdown
   const markdown = createMarkdown(siteConfig)
 
@@ -122,7 +115,6 @@ module.exports = async function resolveOptions (sourceDir) {
     themeLayoutPath,
     themeNotFoundPath,
     themePlugins,
-    isAlgoliaSearch,
     markdown
   }
 
diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
index 191f8d4a58..bf203380ea 100644
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -8,13 +8,14 @@ const registerGlobalComponentsPlugin = require('../../../plugin-register-global-
 const activeHeaderLinksPlugin = require('../../../plugin-active-header-links/index')
 
 module.exports = function (options) {
-  const { siteConfig, themeConfig, sourceDir, themePath } = options
+  const { siteConfig, themeConfig, sourceDir, themePath, themePlugins } = options
   const pluginContext = new PluginContext(options)
   const plugin = new Plugin(pluginContext)
 
   plugin
     // user plugin
     .useByConfigs(siteConfig.plugins)
+    .useByConfigs(themePlugins)
     // built-in plugins
     .use(enhanceAppPlugin)
     .use(registerGlobalComponentsPlugin, {
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 4a427bfda7..4c349f46a4 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -44,10 +44,6 @@ module.exports = function createBaseConfig ({
       .set('@app', path.resolve(__dirname, '../app'))
       .set('@temp', path.resolve(__dirname, '../app/.temp'))
       .set('@dynamic', path.resolve(__dirname, '../app/.temp/dynamic-modules'))
-      .set('@default-theme', path.resolve(__dirname, '../default-theme'))
-      .set('@AlgoliaSearchBox', isAlgoliaSearch
-        ? path.resolve(__dirname, '../default-theme/AlgoliaSearchBox.vue')
-        : path.resolve(__dirname, './noopModule.js'))
       .end()
     .extensions
       .merge(['.js', '.jsx', '.vue', '.json', '.styl'])
diff --git a/packages/@vuepress/plugin-active-header-links/mixin.js b/packages/@vuepress/plugin-active-header-links/mixin.js
index 6562c59676..50658fa65c 100644
--- a/packages/@vuepress/plugin-active-header-links/mixin.js
+++ b/packages/@vuepress/plugin-active-header-links/mixin.js
@@ -5,10 +5,12 @@ export default {
   mounted () {
     window.addEventListener('scroll', this.onScroll)
   },
+
   methods: {
     onScroll: throttle(function () {
       this.setActiveHash()
     }, 300),
+
     setActiveHash () {
       const sidebarLinks = [].slice.call(document.querySelectorAll('.sidebar-link'))
       const anchors = [].slice.call(document.querySelectorAll('.header-anchor'))
@@ -41,6 +43,7 @@ export default {
       }
     }
   },
+
   beforeDestroy () {
     window.removeEventListener('scroll', this.onScroll)
   }
diff --git a/packages/@vuepress/theme-default/enhanceApp.js b/packages/@vuepress/theme-default/enhanceApp.js
deleted file mode 100644
index c78abcc1d4..0000000000
--- a/packages/@vuepress/theme-default/enhanceApp.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default ({ Vue }) => {
-  Vue.component('Badge', () => import('./components/Badge.vue'))
-}
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 3197b03e82..d06ad67522 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -1,8 +1,11 @@
 const path = require('path')
+const plugin = require('./plugin')
 
 // Theme API.
 module.exports = {
   layout: path.resolve(__dirname, 'src/Layout.vue'),
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
-  plugins: []
+  plugins: [
+    plugin
+  ]
 }
diff --git a/packages/@vuepress/theme-default/noopModule.js b/packages/@vuepress/theme-default/noopModule.js
new file mode 100644
index 0000000000..b1c6ea436a
--- /dev/null
+++ b/packages/@vuepress/theme-default/noopModule.js
@@ -0,0 +1 @@
+export default {}
diff --git a/packages/@vuepress/theme-default/plugin.js b/packages/@vuepress/theme-default/plugin.js
new file mode 100644
index 0000000000..9fbf8c13e2
--- /dev/null
+++ b/packages/@vuepress/theme-default/plugin.js
@@ -0,0 +1,24 @@
+const path = require('path')
+
+module.exports = (options, context) => ({
+  name: 'default-theme',
+
+  chainWebpack (config, isServer) {
+    const { themeConfig, siteConfig } = context
+
+    // resolve algolia
+    const isAlgoliaSearch = (
+      themeConfig.algolia ||
+      Object.keys(siteConfig.locales && themeConfig.locales || {})
+        .some(base => themeConfig.locales[base].algolia)
+    )
+
+    config.resolve
+      .alias
+      .set('@default-theme', path.resolve('.'))
+      .set('@AlgoliaSearchBox', isAlgoliaSearch
+        ? path.resolve(__dirname, './src/AlgoliaSearchBox.vue')
+        : path.resolve(__dirname, './noopModule.js'))
+      .end()
+  }
+})
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 2de5a74bf3..d491d23cdb 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -1,5 +1,4 @@
 const testPlugin = require('../../../@vuepress/plugin-test/index')
-const translationComparisonPlugin = require('../../../../../vuepress-plugin-translation-ui/src/index')
 
 module.exports = {
   dest: 'vuepress',
@@ -29,8 +28,7 @@ module.exports = {
   serviceWorker: true,
   theme: 'default',
   plugins: [
-    testPlugin,
-    translationComparisonPlugin
+    testPlugin
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
diff --git a/packages/docs/README.md b/packages/docs/docs/README.md
similarity index 100%
rename from packages/docs/README.md
rename to packages/docs/docs/README.md
diff --git a/packages/docs/docs/default-theme-config/README.md b/packages/docs/docs/default-theme-config/README.md
index 0b26ada30c..2553476644 100644
--- a/packages/docs/docs/default-theme-config/README.md
+++ b/packages/docs/docs/default-theme-config/README.md
@@ -12,7 +12,7 @@ All options listed on this page apply to the default theme only. If you are usin
 
 ## Homepage
 
-The default theme provides a homepage layout (which is used on [the homepage of this very website](../../README.md)). To use it, specify `home: true` plus some other metadata in your root `README.md`'s [YAML front matter](../guide/markdown.md#front-matter). This is the actual data used on this site:
+The default theme provides a homepage layout (which is used on [the homepage of this very website](../README.md)). To use it, specify `home: true` plus some other metadata in your root `README.md`'s [YAML front matter](../guide/markdown.md#front-matter). This is the actual data used on this site:
 
 ``` yaml
 ---

From 642968a08913944becb73e40b674fa40e7e29cb0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 16:31:33 +0800
Subject: [PATCH 042/242] refactor: Move `active-header-links` to default
 theme.

---
 .../@vuepress/core/lib/prepare/resolvePlugin.js     | 13 +++----------
 packages/@vuepress/core/package.json                |  3 +++
 .../@vuepress/plugin-active-header-links/index.js   |  1 -
 packages/@vuepress/plugin-last-updated/README.md    |  4 +++-
 packages/@vuepress/plugin-test/package.json         |  1 +
 packages/@vuepress/theme-default/index.js           |  6 ++++--
 packages/@vuepress/theme-default/package.json       |  3 +++
 packages/docs/docs/.vuepress/config.js              |  2 +-
 packages/docs/package.json                          |  3 ++-
 9 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
index bf203380ea..403d823b86 100644
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -2,10 +2,9 @@ const path = require('path')
 const Plugin = require('../plugin-api/index')
 const PluginContext = require('../plugin-api/context')
 
-const lastUpdatedPlugin = require('../../../plugin-last-updated/index')
-const enhanceAppPlugin = require('../../../plugin-enhance-app/index')
-const registerGlobalComponentsPlugin = require('../../../plugin-register-global-components/index')
-const activeHeaderLinksPlugin = require('../../../plugin-active-header-links/index')
+const lastUpdatedPlugin = require('@vuepress/plugin-last-updated')
+const enhanceAppPlugin = require('@vuepress/plugin-enhance-app')
+const registerGlobalComponentsPlugin = require('@vuepress/plugin-register-global-components')
 
 module.exports = function (options) {
   const { siteConfig, themeConfig, sourceDir, themePath, themePlugins } = options
@@ -25,12 +24,6 @@ module.exports = function (options) {
       ]
     })
 
-  // whether to use active header links
-  const { activeHeaderLinks = true } = themeConfig
-  if (activeHeaderLinks) {
-    plugin.use(activeHeaderLinksPlugin)
-  }
-
   // whether to use last updated
   const shouldUseLastUpdated = (
     themeConfig.lastUpdated ||
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 5c919dc1f7..abf66f0d33 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -39,6 +39,9 @@
   "dependencies": {
     "@babel/core": "7.0.0-beta.47",
     "@vue/babel-preset-app": "3.0.0-beta.11",
+    "@vuepress/plugin-last-updated": "1.0.0",
+    "@vuepress/plugin-enhance-app": "1.0.0",
+    "@vuepress/plugin-register-global-components": "1.0.0",
     "autoprefixer": "^8.2.0",
     "babel-loader": "8.0.0-beta.3",
     "cache-loader": "^1.2.2",
diff --git a/packages/@vuepress/plugin-active-header-links/index.js b/packages/@vuepress/plugin-active-header-links/index.js
index ad26c1eeec..a6c4763f3e 100644
--- a/packages/@vuepress/plugin-active-header-links/index.js
+++ b/packages/@vuepress/plugin-active-header-links/index.js
@@ -3,6 +3,5 @@ const path = require('path')
 module.exports = (options, context) => ({
   name: 'active-header-links',
   enable: context.isDev,
-  // This mixin will be applied to the root component of each page.
   clientRootMixin: path.resolve(__dirname, 'mixin.js')
 })
diff --git a/packages/@vuepress/plugin-last-updated/README.md b/packages/@vuepress/plugin-last-updated/README.md
index 21b3f1fa01..00877feabf 100644
--- a/packages/@vuepress/plugin-last-updated/README.md
+++ b/packages/@vuepress/plugin-last-updated/README.md
@@ -1,3 +1,5 @@
 # @vuepress/plugin-last-updated
 
-> last-updated plugin for vuepress
\ No newline at end of file
+> last-updated plugin for vuepress
+
+Please do not use this plugin directly, this plugin has been included in the core.
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-test/package.json b/packages/@vuepress/plugin-test/package.json
index 78476d61ec..53e5d2c4b3 100644
--- a/packages/@vuepress/plugin-test/package.json
+++ b/packages/@vuepress/plugin-test/package.json
@@ -1,4 +1,5 @@
 {
+  "private": true,
   "name": "@vuepress/plugin-test",
   "version": "1.0.0",
   "description": "test plugin for vuepress",
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index d06ad67522..f1411fcf9d 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -1,11 +1,13 @@
 const path = require('path')
-const plugin = require('./plugin')
+const themePlugin = require('./plugin')
+const activeHeaderLinksPlugin = require('@vuepress/plugin-active-header-links')
 
 // Theme API.
 module.exports = {
   layout: path.resolve(__dirname, 'src/Layout.vue'),
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: [
-    plugin
+    themePlugin,
+    activeHeaderLinksPlugin
   ]
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index ba26f669a2..34a740dead 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -26,5 +26,8 @@
       "eslint --fix",
       "git add"
     ]
+  },
+  "dependencies": {
+    "@vuepress/plugin-active-header-links": "1.0.0"
   }
 }
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index d491d23cdb..03d118e7f3 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -1,4 +1,4 @@
-const testPlugin = require('../../../@vuepress/plugin-test/index')
+const testPlugin = require('@vuepress/plugin-test')
 
 module.exports = {
   dest: 'vuepress',
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 312da6121a..8f7cd1c337 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/vuejs/vuepress#readme",
   "devDependencies": {
     "@vuepress/core": "^1.0.0",
-    "@vuepress/theme-default": "^1.0.0"
+    "@vuepress/theme-default": "^1.0.0",
+    "@vuepress/plugin-test": "^1.0.0"
   }
 }

From ca78f66a637d3e156da38d09086b85d8122564c5 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 10 Aug 2018 16:40:29 +0800
Subject: [PATCH 043/242] feat: support shortcut usage of @vuepress/plugin-xxx

---
 packages/@vuepress/core/lib/plugin-api/util.js    | 11 +++++++++--
 packages/@vuepress/plugin-translation-ui/index.js |  2 +-
 packages/docs/docs/.vuepress/config.js            |  3 ++-
 packages/docs/package.json                        |  3 ++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 8fe5ca9d16..0edf6d27ef 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -12,8 +12,15 @@ exports.resolvePlugin = function (pluginRaw) {
         : `vuepress-plugin-${pluginRaw}`
       )
     } catch (err) {
-      console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
-      throw new Error(err)
+      try {
+        return require(pluginRaw.startsWith('@vuepress/plugin-')
+          ? pluginRaw
+          : `@vuepress/plugin-${pluginRaw}`
+        )
+      } catch (e) {
+        console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
+        throw new Error(err)
+      }
     }
   }
   logger.warn(`\n[vuepress] Invalid plugin usage: ${chalk.yellow(pluginRaw)}\n`)
diff --git a/packages/@vuepress/plugin-translation-ui/index.js b/packages/@vuepress/plugin-translation-ui/index.js
index 7b3cd85830..28410020e0 100644
--- a/packages/@vuepress/plugin-translation-ui/index.js
+++ b/packages/@vuepress/plugin-translation-ui/index.js
@@ -3,7 +3,7 @@ module.exports = (options = {}, {
   resolve
 }) => ({
   name: 'i18n-ui',
-  // Only use this plugin at development mode.
+  // This plugin will be enabled only at development mode.
   enabled: !isProd,
   enhanceAppFiles: [
     resolve(__dirname, 'client.js')
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 03d118e7f3..6db8a8e711 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -28,7 +28,8 @@ module.exports = {
   serviceWorker: true,
   theme: 'default',
   plugins: [
-    testPlugin
+    testPlugin,
+    'translation-ui',
   ],
   themeConfig: {
     repo: 'vuejs/vuepress',
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 8f7cd1c337..dcc81bf18c 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -24,6 +24,7 @@
   "devDependencies": {
     "@vuepress/core": "^1.0.0",
     "@vuepress/theme-default": "^1.0.0",
-    "@vuepress/plugin-test": "^1.0.0"
+    "@vuepress/plugin-test": "^1.0.0",
+    "@vuepress/plugin-translation-ui": "^1.0.0"
   }
 }

From f1e6dd4ad94c38c17d889754277946b9a4e65dc9 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 03:57:42 +0800
Subject: [PATCH 044/242] refactor: handle when theme isn't given

---
 packages/@vuepress/core/lib/prepare/resolveOptions.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
index b17b75028c..7dacd8c871 100644
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -84,6 +84,8 @@ module.exports = async function resolveOptions (sourceDir) {
         }
       }
     }
+  } else {
+    throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
   }
 
   // resolve theme config

From c004fb345d9b1aef8946b1e2e455212d8758ca38 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 05:00:41 +0800
Subject: [PATCH 045/242] feat: extract @vuepress/cli

---
 packages/@vuepress/cli/.npmignore             |  2 ++
 packages/@vuepress/cli/README.md              |  3 ++
 .../{core/bin/vuepress.js => cli/index.js}    | 34 +++++++++++++------
 packages/@vuepress/cli/package.json           | 28 +++++++++++++++
 packages/@vuepress/core/lib/config.js         |  0
 packages/@vuepress/core/package.json          |  3 --
 packages/@vuepress/plugin-docs/.npmignore     |  2 ++
 packages/@vuepress/plugin-docs/README.md      |  3 ++
 packages/@vuepress/plugin-docs/package.json   | 25 ++++++++++++++
 packages/docs/docs/.vuepress/config.js        |  7 ----
 packages/docs/package.json                    |  5 +--
 11 files changed, 87 insertions(+), 25 deletions(-)
 create mode 100644 packages/@vuepress/cli/.npmignore
 create mode 100644 packages/@vuepress/cli/README.md
 rename packages/@vuepress/{core/bin/vuepress.js => cli/index.js} (84%)
 mode change 100755 => 100644
 create mode 100644 packages/@vuepress/cli/package.json
 create mode 100644 packages/@vuepress/core/lib/config.js
 create mode 100644 packages/@vuepress/plugin-docs/.npmignore
 create mode 100644 packages/@vuepress/plugin-docs/README.md
 create mode 100644 packages/@vuepress/plugin-docs/package.json

diff --git a/packages/@vuepress/cli/.npmignore b/packages/@vuepress/cli/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/cli/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/cli/README.md b/packages/@vuepress/cli/README.md
new file mode 100644
index 0000000000..aea4c4ff7c
--- /dev/null
+++ b/packages/@vuepress/cli/README.md
@@ -0,0 +1,3 @@
+# @vuepress/cli
+
+> cli for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/core/bin/vuepress.js b/packages/@vuepress/cli/index.js
old mode 100755
new mode 100644
similarity index 84%
rename from packages/@vuepress/core/bin/vuepress.js
rename to packages/@vuepress/cli/index.js
index 36433168e6..8562d48e8b
--- a/packages/@vuepress/core/bin/vuepress.js
+++ b/packages/@vuepress/cli/index.js
@@ -1,8 +1,18 @@
-#!/usr/bin/env node
-
 const chalk = require('chalk')
 const semver = require('semver')
-const requiredVersion = require('../package.json').engines.node
+
+try {
+  require.resolve('@vuepress/core')
+} catch (err) {
+  console.log(chalk.red(
+    `\n[vuepress] @vuepress/cli ` +
+    `requires @vuepress/core to be installed.\n`
+  ))
+  process.exit(1)
+}
+
+const pkg = require('@vuepress/core/package.json')
+const requiredVersion = pkg.engines.node
 
 if (!semver.satisfies(process.version, requiredVersion)) {
   console.log(chalk.red(
@@ -14,12 +24,12 @@ if (!semver.satisfies(process.version, requiredVersion)) {
 }
 
 const path = require('path')
-const { dev, build, eject } = require('../lib')
+const { dev, build, eject } = require('@vuepress/core')
 
 const program = require('commander')
 
 program
-  .version(require('../package.json').version)
+  .version(pkg.version)
   .usage('<command> [options]')
 
 program
@@ -94,12 +104,6 @@ enhanceErrorMessages('optionMissingArgument', (option, flag) => {
   )
 })
 
-program.parse(process.argv)
-
-if (!process.argv.slice(2).length) {
-  program.outputHelp()
-}
-
 function wrapCommand (fn) {
   return (...args) => {
     return fn(...args).catch(err => {
@@ -108,3 +112,11 @@ function wrapCommand (fn) {
     })
   }
 }
+
+exports.program = program
+exports.bootstrap = function () {
+  program.parse(process.argv)
+  if (!process.argv.slice(2).length) {
+    program.outputHelp()
+  }
+}
diff --git a/packages/@vuepress/cli/package.json b/packages/@vuepress/cli/package.json
new file mode 100644
index 0000000000..464b0ae7dd
--- /dev/null
+++ b/packages/@vuepress/cli/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@vuepress/cli",
+  "version": "1.0.0",
+  "description": "cli for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "peerDependencies": {
+    "@vuepress/core": "^1.0.0"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/cli#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/core/lib/config.js b/packages/@vuepress/core/lib/config.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index abf66f0d33..6158bf3ce3 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -3,9 +3,6 @@
   "version": "1.0.0",
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
-  "bin": {
-    "vuepress": "bin/vuepress.js"
-  },
   "scripts": {
     "lint": "eslint --fix --ext .js,.vue bin/ lib/ test/",
     "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
diff --git a/packages/@vuepress/plugin-docs/.npmignore b/packages/@vuepress/plugin-docs/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-docs/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-docs/README.md b/packages/@vuepress/plugin-docs/README.md
new file mode 100644
index 0000000000..4dd982f7c1
--- /dev/null
+++ b/packages/@vuepress/plugin-docs/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-docs
+
+> docs plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-docs/package.json b/packages/@vuepress/plugin-docs/package.json
new file mode 100644
index 0000000000..392c8d5705
--- /dev/null
+++ b/packages/@vuepress/plugin-docs/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-docs",
+  "version": "1.0.0",
+  "description": "docs plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vue-cli.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-docs#readme"
+}
\ No newline at end of file
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 6db8a8e711..c8b1dd5394 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -1,5 +1,3 @@
-const testPlugin = require('@vuepress/plugin-test')
-
 module.exports = {
   dest: 'vuepress',
   locales: {
@@ -26,11 +24,6 @@ module.exports = {
     ['meta', { name: 'msapplication-TileColor', content: '#000000' }]
   ],
   serviceWorker: true,
-  theme: 'default',
-  plugins: [
-    testPlugin,
-    'translation-ui',
-  ],
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
diff --git a/packages/docs/package.json b/packages/docs/package.json
index dcc81bf18c..3b13a017a0 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -22,9 +22,6 @@
   },
   "homepage": "https://github.com/vuejs/vuepress#readme",
   "devDependencies": {
-    "@vuepress/core": "^1.0.0",
-    "@vuepress/theme-default": "^1.0.0",
-    "@vuepress/plugin-test": "^1.0.0",
-    "@vuepress/plugin-translation-ui": "^1.0.0"
+    "vuepress": "^1.0.0"
   }
 }

From 0d7fce7c796189220c750bcb8f5458729dbd7252 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 05:21:19 +0800
Subject: [PATCH 046/242] feat: pass plugins and theme via cli

---
 .gitignore                                    |   1 -
 packages/@vuepress/cli/index.js               | 161 +++++++++---------
 packages/@vuepress/core/lib/build.js          |   2 +-
 packages/@vuepress/core/lib/dev.js            |   2 +-
 .../@vuepress/core/lib/plugin-api/index.js    |   2 +-
 packages/@vuepress/core/lib/prepare/index.js  |   8 +-
 .../@vuepress/core/lib/prepare/loadConfig.js  |   1 -
 .../core/lib/prepare/resolveOptions.js        |  22 ++-
 .../core/lib/prepare/resolvePlugin.js         |   3 +-
 packages/vuepress/package.json                |  40 +++++
 packages/vuepress/vuepress.js                 |   9 +
 11 files changed, 157 insertions(+), 94 deletions(-)
 create mode 100644 packages/vuepress/package.json
 create mode 100755 packages/vuepress/vuepress.js

diff --git a/.gitignore b/.gitignore
index 96930bdd73..9496595310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 node_modules
 *.log
 .temp
-vuepress
 TODOs.md
diff --git a/packages/@vuepress/cli/index.js b/packages/@vuepress/cli/index.js
index 8562d48e8b..49d452b23e 100644
--- a/packages/@vuepress/cli/index.js
+++ b/packages/@vuepress/cli/index.js
@@ -23,98 +23,101 @@ if (!semver.satisfies(process.version, requiredVersion)) {
   process.exit(1)
 }
 
-const path = require('path')
-const { dev, build, eject } = require('@vuepress/core')
-
 const program = require('commander')
 
-program
-  .version(pkg.version)
-  .usage('<command> [options]')
-
-program
-  .command('dev [targetDir]')
-  .description('start development server')
-  .option('-p, --port <port>', 'use specified port (default: 8080)')
-  .option('-h, --host <host>', 'use specified host (default: 0.0.0.0)')
-  .option('--debug', 'start development server in debug mode')
-  .action((dir = '.', { host, port, debug }) => {
-    wrapCommand(dev)(path.resolve(dir), { host, port, debug })
-  })
+exports.program = program
+exports.bootstrap = function ({
+  plugins,
+  theme
+} = {}) {
+  const path = require('path')
+  const { dev, build, eject } = require('@vuepress/core')
+
+  program
+    .version(pkg.version)
+    .usage('<command> [options]')
+
+  program
+    .command('dev [targetDir]')
+    .description('start development server')
+    .option('-p, --port <port>', 'use specified port (default: 8080)')
+    .option('-h, --host <host>', 'use specified host (default: 0.0.0.0)')
+    .option('--debug', 'start development server in debug mode')
+    .action((dir = '.', { host, port, debug }) => {
+      wrapCommand(dev)(path.resolve(dir), { host, port, debug, plugins, theme })
+    })
 
-program
-  .command('build [targetDir]')
-  .description('build dir as static site')
-  .option('-d, --dest <outDir>', 'specify build output dir (default: .vuepress/dist)')
-  .option('--debug', 'build in development mode for debugging')
-  .action((dir = '.', { debug, dest }) => {
-    const outDir = dest ? path.resolve(dest) : null
-    wrapCommand(build)(path.resolve(dir), { debug, outDir })
-  })
+  program
+    .command('build [targetDir]')
+    .description('build dir as static site')
+    .option('-d, --dest <outDir>', 'specify build output dir (default: .vuepress/dist)')
+    .option('--debug', 'build in development mode for debugging')
+    .action((dir = '.', { debug, dest }) => {
+      const outDir = dest ? path.resolve(dest) : null
+      wrapCommand(build)(path.resolve(dir), { debug, outDir, plugins, theme })
+    })
 
-program
-  .command('eject [targetDir]')
-  .description('copy the default theme into .vuepress/theme for customization.')
-  .action((dir = '.') => {
-    wrapCommand(eject)(path.resolve(dir))
-  })
+  program
+    .command('eject [targetDir]')
+    .description('copy the default theme into .vuepress/theme for customization.')
+    .action((dir = '.') => {
+      wrapCommand(eject)(path.resolve(dir))
+    })
 
-// output help information on unknown commands
-program
-  .arguments('<command>')
-  .action((cmd) => {
-    program.outputHelp()
-    console.log(`  ` + chalk.red(`Unknown command ${chalk.yellow(cmd)}.`))
+  // output help information on unknown commands
+  program
+    .arguments('<command>')
+    .action((cmd) => {
+      program.outputHelp()
+      console.log(`  ` + chalk.red(`Unknown command ${chalk.yellow(cmd)}.`))
+      console.log()
+    })
+
+  // add some useful info on help
+  program.on('--help', () => {
+    console.log()
+    console.log(`  Run ${chalk.cyan(`vuepress <command> --help`)} for detailed usage of given command.`)
     console.log()
   })
 
-// add some useful info on help
-program.on('--help', () => {
-  console.log()
-  console.log(`  Run ${chalk.cyan(`vuepress <command> --help`)} for detailed usage of given command.`)
-  console.log()
-})
-
-program.commands.forEach(c => c.on('--help', () => console.log()))
-
-// enhance common error messages
-const enhanceErrorMessages = (methodName, log) => {
-  program.Command.prototype[methodName] = function (...args) {
-    if (methodName === 'unknownOption' && this._allowUnknownOption) {
-      return
+  program.commands.forEach(c => c.on('--help', () => console.log()))
+
+  // enhance common error messages
+  const enhanceErrorMessages = (methodName, log) => {
+    program.Command.prototype[methodName] = function (...args) {
+      if (methodName === 'unknownOption' && this._allowUnknownOption) {
+        return
+      }
+      this.outputHelp()
+      console.log(`  ` + chalk.red(log(...args)))
+      console.log()
+      process.exit(1)
     }
-    this.outputHelp()
-    console.log(`  ` + chalk.red(log(...args)))
-    console.log()
-    process.exit(1)
   }
-}
 
-enhanceErrorMessages('missingArgument', argName => {
-  return `Missing required argument ${chalk.yellow(`<${argName}>`)}.`
-})
-
-enhanceErrorMessages('unknownOption', optionName => {
-  return `Unknown option ${chalk.yellow(optionName)}.`
-})
-
-enhanceErrorMessages('optionMissingArgument', (option, flag) => {
-  return `Missing required argument for option ${chalk.yellow(option.flags)}` + (
-    flag ? `, got ${chalk.yellow(flag)}` : ``
-  )
-})
-
-function wrapCommand (fn) {
-  return (...args) => {
-    return fn(...args).catch(err => {
-      console.error(chalk.red(err.stack))
-      process.exitCode = 1
-    })
+  enhanceErrorMessages('missingArgument', argName => {
+    return `Missing required argument ${chalk.yellow(`<${argName}>`)}.`
+  })
+
+  enhanceErrorMessages('unknownOption', optionName => {
+    return `Unknown option ${chalk.yellow(optionName)}.`
+  })
+
+  enhanceErrorMessages('optionMissingArgument', (option, flag) => {
+    return `Missing required argument for option ${chalk.yellow(option.flags)}` + (
+      flag ? `, got ${chalk.yellow(flag)}` : ``
+    )
+  })
+
+  function wrapCommand (fn) {
+    return (...args) => {
+      return fn(...args).catch(err => {
+        console.error(chalk.red(err.stack))
+        process.exitCode = 1
+      })
+    }
   }
-}
 
-exports.program = program
-exports.bootstrap = function () {
   program.parse(process.argv)
   if (!process.argv.slice(2).length) {
     program.outputHelp()
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index ea9cc9e9ad..2097f371ed 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -16,7 +16,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util/index')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare(sourceDir, true /* isProd */)
+  const options = await prepare({ sourceDir, cliOptions, isProd: true })
   if (cliOptions.outDir) {
     options.outDir = cliOptions.outDir
   }
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index a1b698c32d..a9e9f6a954 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -20,7 +20,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare(sourceDir, false /* isProd */)
+  const options = await prepare({ sourceDir, cliOptions, isProd: false })
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 8572275142..4ac50a4f43 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -104,7 +104,7 @@ module.exports = class Plugin {
     clientRootMixin,
     additionalPages
   }) {
-    logger.tip(`\nApply plugin ${chalk.cyan(name)}...`)
+    logger.tip(`\nApply plugin ${chalk.gray(name)}...`)
 
     this
       .registerHook(HOOK.READY, ready, name, [Function])
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 9d960fd400..1e3e3cfa8e 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -8,9 +8,13 @@ const { writeTemp } = require('./util')
 const logger = require('../util/logger')
 const chalk = require('chalk')
 
-module.exports = async function prepare (sourceDir, isProd) {
+module.exports = async function prepare ({
+  sourceDir,
+  isProd,
+  cliOptions
+}) {
   // 1. load options
-  const options = await resolveOptions(sourceDir)
+  const options = await resolveOptions(sourceDir, cliOptions)
   options.isProd = isProd
   const { markdown } = options
 
diff --git a/packages/@vuepress/core/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
index 9b3bbb2c41..aa913ba013 100644
--- a/packages/@vuepress/core/lib/prepare/loadConfig.js
+++ b/packages/@vuepress/core/lib/prepare/loadConfig.js
@@ -4,7 +4,6 @@ const yamlParser = require('js-yaml')
 const tomlParser = require('toml')
 
 module.exports = function loadConfig (vuepressDir, bustCache = true) {
-  console.log(vuepressDir)
   const configPath = path.resolve(vuepressDir, 'config.js')
   const configYmlPath = path.resolve(vuepressDir, 'config.yml')
   const configTomlPath = path.resolve(vuepressDir, 'config.toml')
diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
index 7dacd8c871..1c0e2ced65 100644
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -1,11 +1,13 @@
-const fs = require('fs-extra')
 const path = require('path')
+const chalk = require('chalk')
+const fs = require('fs-extra')
 const globby = require('globby')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
 const { sort } = require('./util')
+const logger = require('../util/logger')
 
-module.exports = async function resolveOptions (sourceDir) {
+module.exports = async function resolveOptions (sourceDir, cliOptions) {
   function requireResolve (target) {
     return require.resolve(target, {
       paths: [
@@ -44,6 +46,8 @@ module.exports = async function resolveOptions (sourceDir) {
   // resolve theme
   const localThemePath = path.resolve(vuepressDir, 'theme')
   const useLocalTheme = fs.existsSync(localThemePath)
+  const theme = siteConfig.theme || cliOptions.theme
+
   let themePath = null
   let themeLayoutPath = null
   let themeNotFoundPath = null
@@ -51,6 +55,8 @@ module.exports = async function resolveOptions (sourceDir) {
   let themePlugins = []
 
   if (useLocalTheme) {
+    logger.tip(`\nApply theme located at ${localThemePath}...`)
+
     // use local custom theme
     themePath = localThemePath
     themeLayoutPath = path.resolve(localThemePath, 'Layout.vue')
@@ -61,29 +67,30 @@ module.exports = async function resolveOptions (sourceDir) {
     if (!fs.existsSync(themeNotFoundPath)) {
       throw new Error(`[vuepress] Cannot resolve NotFound.vue file in .vuepress/theme.`)
     }
-  } else if (siteConfig.theme) {
+  } else if (theme) {
     // use external theme
     try {
       // backward-compatible 0.x.x.
-      themeLayoutPath = requireResolve(`vuepress-theme-${siteConfig.theme}/Layout.vue`)
+      themeLayoutPath = requireResolve(`vuepress-theme-${theme}/Layout.vue`)
       themePath = path.dirname(themeLayoutPath)
       themeNotFoundPath = path.resolve(themeLayoutPath, 'NotFound.vue')
     } catch (e) {
       try {
-        themeIndexFile = requireResolve(`vuepress-theme-${siteConfig.theme}/index.js`)
+        themeIndexFile = requireResolve(`vuepress-theme-${theme}/index.js`)
       } catch (e) {
         try {
-          themeIndexFile = requireResolve(`@vuepress/theme-${siteConfig.theme}`)
+          themeIndexFile = requireResolve(`@vuepress/theme-${theme}`)
           themePath = path.dirname(themeIndexFile)
           themeIndexFile = require(themeIndexFile)
           themeLayoutPath = themeIndexFile.layout
           themeNotFoundPath = themeIndexFile.notFound
           themePlugins = themeIndexFile.plugins
         } catch (e) {
-          throw new Error(`[vuepress] Failed to load custom theme "${siteConfig.theme}". File vuepress-theme-${siteConfig.theme}/Layout.vue does not exist.`)
+          throw new Error(`[vuepress] Failed to load custom theme "${theme}". File vuepress-theme-${theme}/Layout.vue does not exist.`)
         }
       }
     }
+    logger.tip(`\nApply theme ${chalk.gray(theme)}`)
   } else {
     throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
   }
@@ -117,6 +124,7 @@ module.exports = async function resolveOptions (sourceDir) {
     themeLayoutPath,
     themeNotFoundPath,
     themePlugins,
+    cliPlugins: cliOptions.plugins || [],
     markdown
   }
 
diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
index 403d823b86..bf97b818aa 100644
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -7,12 +7,13 @@ const enhanceAppPlugin = require('@vuepress/plugin-enhance-app')
 const registerGlobalComponentsPlugin = require('@vuepress/plugin-register-global-components')
 
 module.exports = function (options) {
-  const { siteConfig, themeConfig, sourceDir, themePath, themePlugins } = options
+  const { siteConfig, themeConfig, sourceDir, themePath, themePlugins, cliPlugins } = options
   const pluginContext = new PluginContext(options)
   const plugin = new Plugin(pluginContext)
 
   plugin
     // user plugin
+    .useByConfigs(cliPlugins)
     .useByConfigs(siteConfig.plugins)
     .useByConfigs(themePlugins)
     // built-in plugins
diff --git a/packages/vuepress/package.json b/packages/vuepress/package.json
new file mode 100644
index 0000000000..f4bff4e902
--- /dev/null
+++ b/packages/vuepress/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "vuepress",
+  "version": "1.0.0",
+  "description": "Minimalistic doc generator with Vue component based layout system",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "generator"
+  ],
+  "bin": {
+    "vuepress": "vuepress.js"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress#readme",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "dependencies": {
+    "@vuepress/core": "^1.0.0",
+    "@vuepress/cli": "^1.0.0",
+    "@vuepress/theme-default": "^1.0.0",
+    "@vuepress/plugin-test": "^1.0.0",
+    "@vuepress/plugin-translation-ui": "^1.0.0"
+  }
+}
diff --git a/packages/vuepress/vuepress.js b/packages/vuepress/vuepress.js
new file mode 100755
index 0000000000..5a34d0f4ce
--- /dev/null
+++ b/packages/vuepress/vuepress.js
@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+require('@vuepress/cli').bootstrap({
+  theme: 'default',
+  plugins: [
+    'test',
+    'translation-ui'
+  ]
+})

From 2e923d5772644e5aaf6404de688a6982c21dc652 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 05:32:01 +0800
Subject: [PATCH 047/242] chore: correct deps

---
 packages/@vuepress/cli/package.json           |  4 +++
 packages/@vuepress/core/package.json          |  4 ---
 .../plugin-active-header-links/package.json   |  3 +++
 packages/@vuepress/plugin-docs/.npmignore     |  2 --
 packages/@vuepress/plugin-docs/README.md      |  3 ---
 packages/@vuepress/plugin-docs/package.json   | 25 -------------------
 .../plugin-last-updated/package.json          |  3 +++
 .../package.json                              |  6 ++++-
 packages/@vuepress/theme-default/package.json |  4 ++-
 9 files changed, 18 insertions(+), 36 deletions(-)
 delete mode 100644 packages/@vuepress/plugin-docs/.npmignore
 delete mode 100644 packages/@vuepress/plugin-docs/README.md
 delete mode 100644 packages/@vuepress/plugin-docs/package.json

diff --git a/packages/@vuepress/cli/package.json b/packages/@vuepress/cli/package.json
index 464b0ae7dd..5af747fdce 100644
--- a/packages/@vuepress/cli/package.json
+++ b/packages/@vuepress/cli/package.json
@@ -21,6 +21,10 @@
   "bugs": {
     "url": "https://github.com/vuejs/vuepress/issues"
   },
+  "dependencies": {
+    "chalk": "^2.3.2",
+    "semver": "^5.5.0"
+  },
   "peerDependencies": {
     "@vuepress/core": "^1.0.0"
   },
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 6158bf3ce3..365c861fcd 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -50,7 +50,6 @@
     "cross-spawn": "^6.0.5",
     "css-loader": "^0.28.11",
     "diacritics": "^1.3.0",
-    "docsearch.js": "^2.5.2",
     "escape-html": "^1.0.3",
     "file-loader": "^1.1.11",
     "fs-extra": "^5.0.0",
@@ -62,7 +61,6 @@
     "koa-range": "^0.3.0",
     "koa-static": "^4.0.2",
     "loader-utils": "^1.1.0",
-    "lodash.throttle": "^4.1.1",
     "lru-cache": "^4.1.2",
     "markdown-it": "^8.4.1",
     "markdown-it-anchor": "^5.0.2",
@@ -70,13 +68,11 @@
     "markdown-it-emoji": "^1.4.0",
     "markdown-it-table-of-contents": "^0.4.0",
     "mini-css-extract-plugin": "^0.4.1",
-    "nprogress": "^0.2.0",
     "optimize-css-assets-webpack-plugin": "^4.0.0",
     "portfinder": "^1.0.13",
     "postcss-loader": "^2.1.5",
     "prismjs": "^1.13.0",
     "register-service-worker": "^1.4.1",
-    "semver": "^5.5.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
     "toml": "^2.3.3",
diff --git a/packages/@vuepress/plugin-active-header-links/package.json b/packages/@vuepress/plugin-active-header-links/package.json
index 0ededa2e80..602497887d 100644
--- a/packages/@vuepress/plugin-active-header-links/package.json
+++ b/packages/@vuepress/plugin-active-header-links/package.json
@@ -16,6 +16,9 @@
     "vuepress",
     "generator"
   ],
+  "dependencies": {
+    "lodash.throttle": "^4.1.1"
+  },
   "author": "Evan You",
   "license": "MIT",
   "bugs": {
diff --git a/packages/@vuepress/plugin-docs/.npmignore b/packages/@vuepress/plugin-docs/.npmignore
deleted file mode 100644
index 18f0a334a4..0000000000
--- a/packages/@vuepress/plugin-docs/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__tests__
-__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-docs/README.md b/packages/@vuepress/plugin-docs/README.md
deleted file mode 100644
index 4dd982f7c1..0000000000
--- a/packages/@vuepress/plugin-docs/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-docs
-
-> docs plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-docs/package.json b/packages/@vuepress/plugin-docs/package.json
deleted file mode 100644
index 392c8d5705..0000000000
--- a/packages/@vuepress/plugin-docs/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "@vuepress/plugin-docs",
-  "version": "1.0.0",
-  "description": "docs plugin for vuepress",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
-  },
-  "keywords": [
-    "documentation",
-    "vue",
-    "vuepress",
-    "generator"
-  ],
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vuepress/issues"
-  },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-docs#readme"
-}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-last-updated/package.json b/packages/@vuepress/plugin-last-updated/package.json
index 46f988e281..dae113c0ae 100644
--- a/packages/@vuepress/plugin-last-updated/package.json
+++ b/packages/@vuepress/plugin-last-updated/package.json
@@ -22,4 +22,7 @@
     "url": "https://github.com/vuejs/vuepress/issues"
   },
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-last-updated#readme"
+  "dependencies": {
+    "cross-spawn": "^6.0.5"
+  }
 }
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-register-global-components/package.json b/packages/@vuepress/plugin-register-global-components/package.json
index b9e27b9085..33d4c88315 100644
--- a/packages/@vuepress/plugin-register-global-components/package.json
+++ b/packages/@vuepress/plugin-register-global-components/package.json
@@ -21,5 +21,9 @@
   "bugs": {
     "url": "https://github.com/vuejs/vuepress/issues"
   },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-global-components#readme"
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-global-components#readme",
+  "dependencies": {
+    "fs-extra": "^5.0.0",
+    "globby": "^8.0.1"
+  }
 }
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index 34a740dead..9c34da917a 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -28,6 +28,8 @@
     ]
   },
   "dependencies": {
-    "@vuepress/plugin-active-header-links": "1.0.0"
+    "@vuepress/plugin-active-header-links": "1.0.0",
+    "docsearch.js": "^2.5.2",
+    "nprogress": "^0.2.0"
   }
 }

From 590c1c46d68a361fb647a7dbf976986d4ad3bf3b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 05:45:34 +0800
Subject: [PATCH 048/242] chore: update package.json

---
 packages/@vuepress/core/package.json          |  2 --
 .../plugin-active-header-links/package.json   |  2 +-
 .../@vuepress/plugin-enhance-app/package.json |  2 +-
 .../plugin-last-updated/package.json          |  4 ++--
 .../package.json                              |  2 +-
 packages/@vuepress/plugin-test/package.json   |  2 +-
 .../plugin-translation-ui/package.json        |  2 +-
 packages/@vuepress/theme-default/package.json | 21 ++++++++-----------
 packages/vuepress/package.json                | 11 +---------
 scripts/bootstrap.js                          |  2 +-
 10 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 365c861fcd..5a3c7590e5 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -73,8 +73,6 @@
     "postcss-loader": "^2.1.5",
     "prismjs": "^1.13.0",
     "register-service-worker": "^1.4.1",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
     "toml": "^2.3.3",
     "url-loader": "^1.0.1",
     "vue": "^2.5.16",
diff --git a/packages/@vuepress/plugin-active-header-links/package.json b/packages/@vuepress/plugin-active-header-links/package.json
index 602497887d..e3f613584a 100644
--- a/packages/@vuepress/plugin-active-header-links/package.json
+++ b/packages/@vuepress/plugin-active-header-links/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
+    "url": "git+https://github.com/vuejs/vuepress.git"
   },
   "keywords": [
     "documentation",
diff --git a/packages/@vuepress/plugin-enhance-app/package.json b/packages/@vuepress/plugin-enhance-app/package.json
index 652e550f3c..ee5a2e43f9 100644
--- a/packages/@vuepress/plugin-enhance-app/package.json
+++ b/packages/@vuepress/plugin-enhance-app/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
+    "url": "git+https://github.com/vuejs/vuepress.git"
   },
   "keywords": [
     "documentation",
diff --git a/packages/@vuepress/plugin-last-updated/package.json b/packages/@vuepress/plugin-last-updated/package.json
index dae113c0ae..ff57f71051 100644
--- a/packages/@vuepress/plugin-last-updated/package.json
+++ b/packages/@vuepress/plugin-last-updated/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
+    "url": "git+https://github.com/vuejs/vuepress.git"
   },
   "keywords": [
     "documentation",
@@ -21,7 +21,7 @@
   "bugs": {
     "url": "https://github.com/vuejs/vuepress/issues"
   },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-last-updated#readme"
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-last-updated#readme",
   "dependencies": {
     "cross-spawn": "^6.0.5"
   }
diff --git a/packages/@vuepress/plugin-register-global-components/package.json b/packages/@vuepress/plugin-register-global-components/package.json
index 33d4c88315..30fdefd303 100644
--- a/packages/@vuepress/plugin-register-global-components/package.json
+++ b/packages/@vuepress/plugin-register-global-components/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
+    "url": "git+https://github.com/vuejs/vuepress.git"
   },
   "keywords": [
     "documentation",
diff --git a/packages/@vuepress/plugin-test/package.json b/packages/@vuepress/plugin-test/package.json
index 53e5d2c4b3..75450ef59e 100644
--- a/packages/@vuepress/plugin-test/package.json
+++ b/packages/@vuepress/plugin-test/package.json
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
+    "url": "git+https://github.com/vuejs/vuepress.git"
   },
   "keywords": [
     "documentation",
diff --git a/packages/@vuepress/plugin-translation-ui/package.json b/packages/@vuepress/plugin-translation-ui/package.json
index 97a9113388..2ecfb58cfc 100644
--- a/packages/@vuepress/plugin-translation-ui/package.json
+++ b/packages/@vuepress/plugin-translation-ui/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuejs/vue-cli.git"
+    "url": "git+https://github.com/vuejs/vuepress.git"
   },
   "keywords": [
     "documentation",
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index 9c34da917a..fe43290022 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -3,6 +3,9 @@
   "version": "1.0.0",
   "description": "Default theme for VuePress",
   "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vuepress.git"
@@ -10,6 +13,7 @@
   "keywords": [
     "documentation",
     "vue",
+    "vuepress",
     "generator"
   ],
   "author": "Evan You",
@@ -17,19 +21,12 @@
   "bugs": {
     "url": "https://github.com/vuejs/vuepress/issues"
   },
-  "homepage": "https://github.com/vuejs/vuepress#readme",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme",
   "dependencies": {
     "@vuepress/plugin-active-header-links": "1.0.0",
     "docsearch.js": "^2.5.2",
-    "nprogress": "^0.2.0"
+    "nprogress": "^0.2.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/vuepress/package.json b/packages/vuepress/package.json
index f4bff4e902..46b7fc7e81 100644
--- a/packages/vuepress/package.json
+++ b/packages/vuepress/package.json
@@ -2,7 +2,7 @@
   "name": "vuepress",
   "version": "1.0.0",
   "description": "Minimalistic doc generator with Vue component based layout system",
-  "main": "index.js",
+  "main": "vuepress.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vuepress.git"
@@ -21,15 +21,6 @@
     "url": "https://github.com/vuejs/vuepress/issues"
   },
   "homepage": "https://github.com/vuejs/vuepress#readme",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
   "dependencies": {
     "@vuepress/core": "^1.0.0",
     "@vuepress/cli": "^1.0.0",
diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
index 703121e514..65e8599121 100644
--- a/scripts/bootstrap.js
+++ b/scripts/bootstrap.js
@@ -27,7 +27,7 @@ files.forEach(pkg => {
       },
       'repository': {
         'type': 'git',
-        'url': 'git+https://github.com/vuejs/vue-cli.git'
+        'url': 'git+https://github.com/vuejs/vuepress.git'
       },
       'keywords': [
         'documentation',

From c390e40d65029fd0d2f9723fabe2dc5d455fe12c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 06:26:06 +0800
Subject: [PATCH 049/242] feat: refine @vuepress/plugin-register-components

---
 packages/@vuepress/core/lib/config.js         |  0
 .../core/lib/prepare/resolvePlugin.js         |  4 +-
 packages/@vuepress/core/package.json          |  2 +-
 .../.npmignore                                |  0
 .../plugin-register-components/README.md      | 54 +++++++++++++++++++
 .../index.js                                  | 16 ++++--
 .../package.json                              |  4 +-
 .../README.md                                 |  3 --
 8 files changed, 72 insertions(+), 11 deletions(-)
 delete mode 100644 packages/@vuepress/core/lib/config.js
 rename packages/@vuepress/{plugin-register-global-components => plugin-register-components}/.npmignore (100%)
 create mode 100644 packages/@vuepress/plugin-register-components/README.md
 rename packages/@vuepress/{plugin-register-global-components => plugin-register-components}/index.js (65%)
 rename packages/@vuepress/{plugin-register-global-components => plugin-register-components}/package.json (85%)
 delete mode 100644 packages/@vuepress/plugin-register-global-components/README.md

diff --git a/packages/@vuepress/core/lib/config.js b/packages/@vuepress/core/lib/config.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
index bf97b818aa..2481be0885 100644
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -4,7 +4,7 @@ const PluginContext = require('../plugin-api/context')
 
 const lastUpdatedPlugin = require('@vuepress/plugin-last-updated')
 const enhanceAppPlugin = require('@vuepress/plugin-enhance-app')
-const registerGlobalComponentsPlugin = require('@vuepress/plugin-register-global-components')
+const registerGlobalComponentsPlugin = require('@vuepress/plugin-register-components')
 
 module.exports = function (options) {
   const { siteConfig, themeConfig, sourceDir, themePath, themePlugins, cliPlugins } = options
@@ -19,7 +19,7 @@ module.exports = function (options) {
     // built-in plugins
     .use(enhanceAppPlugin)
     .use(registerGlobalComponentsPlugin, {
-      baseDirs: [
+      componentsDir: [
         path.resolve(sourceDir, '.vuepress/components'),
         path.resolve(themePath, 'components')
       ]
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 5a3c7590e5..26f2200d9b 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -38,7 +38,7 @@
     "@vue/babel-preset-app": "3.0.0-beta.11",
     "@vuepress/plugin-last-updated": "1.0.0",
     "@vuepress/plugin-enhance-app": "1.0.0",
-    "@vuepress/plugin-register-global-components": "1.0.0",
+    "@vuepress/plugin-register-components": "1.0.0",
     "autoprefixer": "^8.2.0",
     "babel-loader": "8.0.0-beta.3",
     "cache-loader": "^1.2.2",
diff --git a/packages/@vuepress/plugin-register-global-components/.npmignore b/packages/@vuepress/plugin-register-components/.npmignore
similarity index 100%
rename from packages/@vuepress/plugin-register-global-components/.npmignore
rename to packages/@vuepress/plugin-register-components/.npmignore
diff --git a/packages/@vuepress/plugin-register-components/README.md b/packages/@vuepress/plugin-register-components/README.md
new file mode 100644
index 0000000000..930a70ea57
--- /dev/null
+++ b/packages/@vuepress/plugin-register-components/README.md
@@ -0,0 +1,54 @@
+# @vuepress/plugin-register-components
+
+> register-components plugin for vuepress
+
+## Plugin Options
+
+### componentsDir
+
+- Type: `Array | String`
+- Default: `[]`
+
+All components in this directory will be registered as global components, naming of components will follow the components found in [.vuepress/components](https://vuepress.vuejs.org/guide/using-vue.html#using-components).
+
+- Usage:
+
+``` js
+module.exports = {
+  plugins: [
+    [ 
+      'register-components', 
+      {
+        componentDir: somepath
+      }
+    ]
+  ] 
+}
+```
+
+### components
+
+- Type: `{ name: string, path: string }`
+- Default: `[]`
+
+Register global components by explicit name and path.
+
+- Usage:
+
+``` js
+module.exports = {
+  plugins: [
+    [ 
+      'register-components', 
+      {
+        components: [
+          {
+            name: 'V-Card',
+            path: 'somepath/components/card.vue'
+          }
+        ]
+      }
+    ]
+  ]
+}
+```
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-register-global-components/index.js b/packages/@vuepress/plugin-register-components/index.js
similarity index 65%
rename from packages/@vuepress/plugin-register-global-components/index.js
rename to packages/@vuepress/plugin-register-components/index.js
index 5ae62210b1..33e0a86041 100644
--- a/packages/@vuepress/plugin-register-global-components/index.js
+++ b/packages/@vuepress/plugin-register-components/index.js
@@ -19,22 +19,32 @@ module.exports = (options, context) => ({
   name: 'register-global-components',
 
   async enhanceAppFiles () {
-    const { baseDirs } = options
+    const { componentsDir = [], components = [] } = options
+    const baseDirs = Array.isArray(componentsDir) ? componentsDir : [componentsDir]
+
+    function importCode (name, absolutePath) {
+      `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
+    }
 
     function genImport (baseDir, file) {
       const name = fileToComponentName(file)
       const absolutePath = path.resolve(baseDir, file)
-      const code = `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
+      const code = importCode(name, absolutePath)
       return code
     }
 
     let code = ''
+
+    // 1. Register components in specified directories
     for (const baseDir of baseDirs) {
       const files = await resolveComponents(baseDir) || []
       code += files.map(file => genImport(baseDir, file)).join('\n') + '\n'
     }
+
+    // 2. Register named components.
+    code = components.map(({ name, path: absolutePath }) => importCode(name, absolutePath))
+
     code = `import Vue from 'vue'\n` + code + '\n'
-    // context.registrationModulePath = await context.writeTemp(FILE_NAME, code)
 
     return [
       {
diff --git a/packages/@vuepress/plugin-register-global-components/package.json b/packages/@vuepress/plugin-register-components/package.json
similarity index 85%
rename from packages/@vuepress/plugin-register-global-components/package.json
rename to packages/@vuepress/plugin-register-components/package.json
index 30fdefd303..a83fd80569 100644
--- a/packages/@vuepress/plugin-register-global-components/package.json
+++ b/packages/@vuepress/plugin-register-components/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@vuepress/plugin-register-global-components",
+  "name": "@vuepress/plugin-register-components",
   "version": "1.0.0",
   "description": "register-global-components plugin for vuepress",
   "main": "index.js",
@@ -21,7 +21,7 @@
   "bugs": {
     "url": "https://github.com/vuejs/vuepress/issues"
   },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-global-components#readme",
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-components#readme",
   "dependencies": {
     "fs-extra": "^5.0.0",
     "globby": "^8.0.1"
diff --git a/packages/@vuepress/plugin-register-global-components/README.md b/packages/@vuepress/plugin-register-global-components/README.md
deleted file mode 100644
index 930c11fa73..0000000000
--- a/packages/@vuepress/plugin-register-global-components/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-register-global-components
-
-> register-global-components plugin for vuepress
\ No newline at end of file

From 82f06bf17fd0c91f8bad4dd1d87799810b5d797a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 06:33:57 +0800
Subject: [PATCH 050/242] chore: rename @vuepress/plugin-translation-ui to
 "@vuepress/plugin-i18n-ui"

---
 .../{plugin-translation-ui => plugin-i18n-ui}/.npmignore      | 0
 .../{plugin-translation-ui => plugin-i18n-ui}/README.md       | 2 +-
 .../{plugin-translation-ui => plugin-i18n-ui}/client.js       | 0
 .../{plugin-translation-ui => plugin-i18n-ui}/index.js        | 0
 .../{plugin-translation-ui => plugin-i18n-ui}/index.md        | 0
 .../{plugin-translation-ui => plugin-i18n-ui}/index.vue       | 0
 .../{plugin-translation-ui => plugin-i18n-ui}/package.json    | 4 ++--
 packages/vuepress/package.json                                | 2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/.npmignore (100%)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/README.md (52%)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/client.js (100%)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/index.js (100%)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/index.md (100%)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/index.vue (100%)
 rename packages/@vuepress/{plugin-translation-ui => plugin-i18n-ui}/package.json (86%)

diff --git a/packages/@vuepress/plugin-translation-ui/.npmignore b/packages/@vuepress/plugin-i18n-ui/.npmignore
similarity index 100%
rename from packages/@vuepress/plugin-translation-ui/.npmignore
rename to packages/@vuepress/plugin-i18n-ui/.npmignore
diff --git a/packages/@vuepress/plugin-translation-ui/README.md b/packages/@vuepress/plugin-i18n-ui/README.md
similarity index 52%
rename from packages/@vuepress/plugin-translation-ui/README.md
rename to packages/@vuepress/plugin-i18n-ui/README.md
index 24e2832c18..8f5e377212 100644
--- a/packages/@vuepress/plugin-translation-ui/README.md
+++ b/packages/@vuepress/plugin-i18n-ui/README.md
@@ -1,3 +1,3 @@
-# @vuepress/plugin-translation-ui
+# @vuepress/plugin-i18n-ui
 
 > translation-ui plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-translation-ui/client.js b/packages/@vuepress/plugin-i18n-ui/client.js
similarity index 100%
rename from packages/@vuepress/plugin-translation-ui/client.js
rename to packages/@vuepress/plugin-i18n-ui/client.js
diff --git a/packages/@vuepress/plugin-translation-ui/index.js b/packages/@vuepress/plugin-i18n-ui/index.js
similarity index 100%
rename from packages/@vuepress/plugin-translation-ui/index.js
rename to packages/@vuepress/plugin-i18n-ui/index.js
diff --git a/packages/@vuepress/plugin-translation-ui/index.md b/packages/@vuepress/plugin-i18n-ui/index.md
similarity index 100%
rename from packages/@vuepress/plugin-translation-ui/index.md
rename to packages/@vuepress/plugin-i18n-ui/index.md
diff --git a/packages/@vuepress/plugin-translation-ui/index.vue b/packages/@vuepress/plugin-i18n-ui/index.vue
similarity index 100%
rename from packages/@vuepress/plugin-translation-ui/index.vue
rename to packages/@vuepress/plugin-i18n-ui/index.vue
diff --git a/packages/@vuepress/plugin-translation-ui/package.json b/packages/@vuepress/plugin-i18n-ui/package.json
similarity index 86%
rename from packages/@vuepress/plugin-translation-ui/package.json
rename to packages/@vuepress/plugin-i18n-ui/package.json
index 2ecfb58cfc..c717bee364 100644
--- a/packages/@vuepress/plugin-translation-ui/package.json
+++ b/packages/@vuepress/plugin-i18n-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@vuepress/plugin-translation-ui",
+  "name": "@vuepress/plugin-i18n-ui",
   "version": "1.0.0",
   "description": "translation-ui plugin for vuepress",
   "main": "index.js",
@@ -21,5 +21,5 @@
   "bugs": {
     "url": "https://github.com/vuejs/vuepress/issues"
   },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-translation-ui#readme"
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-i18n-ui#readme"
 }
\ No newline at end of file
diff --git a/packages/vuepress/package.json b/packages/vuepress/package.json
index 46b7fc7e81..67184e481d 100644
--- a/packages/vuepress/package.json
+++ b/packages/vuepress/package.json
@@ -26,6 +26,6 @@
     "@vuepress/cli": "^1.0.0",
     "@vuepress/theme-default": "^1.0.0",
     "@vuepress/plugin-test": "^1.0.0",
-    "@vuepress/plugin-translation-ui": "^1.0.0"
+    "@vuepress/plugin-i18n-ui": "^1.0.0"
   }
 }

From d41344e771c108d48c16b622a7257ba4a6ae8e1a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 06:39:34 +0800
Subject: [PATCH 051/242] docs(@vuepress/plugin-i18n-ui): enhancement

---
 packages/@vuepress/plugin-i18n-ui/README.md    | 11 ++++++++++-
 packages/@vuepress/plugin-i18n-ui/index.js     | 16 ++++++++--------
 packages/@vuepress/plugin-i18n-ui/package.json |  2 +-
 packages/vuepress/vuepress.js                  |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/@vuepress/plugin-i18n-ui/README.md b/packages/@vuepress/plugin-i18n-ui/README.md
index 8f5e377212..f748c745b0 100644
--- a/packages/@vuepress/plugin-i18n-ui/README.md
+++ b/packages/@vuepress/plugin-i18n-ui/README.md
@@ -1,3 +1,12 @@
 # @vuepress/plugin-i18n-ui
 
-> translation-ui plugin for vuepress
\ No newline at end of file
+> i18n-ui plugin for vuepress
+
+## Plugin Options
+
+### route
+
+- Type: `string`
+- Default: `/i18n/`
+
+Path to the i18n ui page.
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-i18n-ui/index.js b/packages/@vuepress/plugin-i18n-ui/index.js
index 28410020e0..ad57388657 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.js
+++ b/packages/@vuepress/plugin-i18n-ui/index.js
@@ -1,18 +1,18 @@
-module.exports = (options = {}, {
-  isProd,
-  resolve
-}) => ({
+module.exports = (pluginOptions = {}, context) => ({
   name: 'i18n-ui',
+
   // This plugin will be enabled only at development mode.
-  enabled: !isProd,
+  enabled: !context.isProd,
+
   enhanceAppFiles: [
-    resolve(__dirname, 'client.js')
+    context.resolve(__dirname, 'client.js')
   ],
+
   additionalPages: [
     {
       override: false,
-      route: options.route || '/i18n-ui/',
-      path: resolve(__dirname, 'index.md')
+      route: pluginOptions.route || '/i18n/',
+      path: context.resolve(__dirname, 'index.md')
     }
   ]
 })
diff --git a/packages/@vuepress/plugin-i18n-ui/package.json b/packages/@vuepress/plugin-i18n-ui/package.json
index c717bee364..ed3407529b 100644
--- a/packages/@vuepress/plugin-i18n-ui/package.json
+++ b/packages/@vuepress/plugin-i18n-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vuepress/plugin-i18n-ui",
   "version": "1.0.0",
-  "description": "translation-ui plugin for vuepress",
+  "description": "i18n-ui plugin for vuepress",
   "main": "index.js",
   "publishConfig": {
     "access": "public"
diff --git a/packages/vuepress/vuepress.js b/packages/vuepress/vuepress.js
index 5a34d0f4ce..84a9026531 100755
--- a/packages/vuepress/vuepress.js
+++ b/packages/vuepress/vuepress.js
@@ -4,6 +4,6 @@ require('@vuepress/cli').bootstrap({
   theme: 'default',
   plugins: [
     'test',
-    'translation-ui'
+    'i18n-ui'
   ]
 })

From b8e7953c3318d46b53b85e6e610e9106a11967be Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 06:43:56 +0800
Subject: [PATCH 052/242] docs($plugin): enhancement

---
 packages/docs/docs/plugin/README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index 3536b3963e..8d8de014cd 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -10,7 +10,7 @@ Plugins usually add global-level functionality to VuePress. There is no strictly
 
 1. Extend the data generated at compile time. e.g. `the last updated time of each file`.
 2. Generate extra files before or after compilation. e.g. `PWA support`.
-3. Add extra pages. e.g. [vuepress-plugin-i18n-ui](https://github.com/ulivz/vuepress-plugin-i18n-ui)
+3. Add extra pages. e.g. [@vuepress/plugin-i18n-ui](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/plugin-i18n-ui)
 4. Inject global UI. e.g. `back to top`.
 
 A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with [plugin context](#plugin-context) which provides some compile-time context.
@@ -62,7 +62,7 @@ module.exports = {
 
 ### Use plugins from npm
 
-A plugin can be published on npm in `CommonJS` format as `vuepress-plugin-xxx`. Then you can use it like this:
+A plugin should be published on npm in `CommonJS` format as `vuepress-plugin-xxx` or `@vuepress/plugin-xxx`. Then you can use it like this:
 
 ``` js
 module.exports = {
@@ -70,6 +70,10 @@ module.exports = {
 }
 ```
 
+::: tip
+The plugin whose name starts with `@vuepress/plugin-` is the official plugin.
+:::
+
 ## Options
 
 ### name

From 1c170c220ecc676d0b5701bb86d7107890f76f69 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 06:53:16 +0800
Subject: [PATCH 053/242] docs: add theme part

---
 packages/docs/docs/.vuepress/config.js |  4 ++++
 packages/docs/docs/plugin/README.md    | 17 +----------------
 packages/docs/docs/theme/README.md     | 23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 packages/docs/docs/theme/README.md

diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index c8b1dd5394..ee1ebb39d3 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -58,6 +58,10 @@ module.exports = {
             text: 'Plugin',
             link: '/plugin/'
           },
+          {
+            text: 'Theme',
+            link: '/theme/'
+          },
           {
             text: 'Default Theme Config',
             link: '/default-theme-config/'
diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index 8d8de014cd..f6af3fee3f 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -340,24 +340,9 @@ See: [base](../config/README.md#base).
 
 ## Lifecycle
 
-首先，我们都知道 VuePress 有两个主要指令：
-
-``` bash
-vuepress dev
-vuepress build
-```
-
-dev 和 build 的工作过程大抵相同，他们的基本工作流程如下:
-
 ![image](/plugin.png)
 
-
-
-
-
-
-
-在正式介绍插件之前，我们需要花一些时间来了解 VuePress 的基本工作原理。
+- TODO
 
 
 
diff --git a/packages/docs/docs/theme/README.md b/packages/docs/docs/theme/README.md
new file mode 100644
index 0000000000..959997de04
--- /dev/null
+++ b/packages/docs/docs/theme/README.md
@@ -0,0 +1,23 @@
+---
+sidebar: auto
+---
+
+# Themes
+
+## Writing a theme
+
+TODO. integrate with the old docs.
+
+## Theme API
+
+### layout
+
+TODO
+
+### notFound
+
+TODO
+
+### plugins
+
+TODO

From 397d01a5c3f9c2ef2338f41189068e5c34ea6bf5 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 14:46:37 +0800
Subject: [PATCH 054/242] feat: init @vuepress/plugin-google-analytics

---
 .../@vuepress/core/lib/app/clientEntry.js     | 25 -----------------
 .../core/lib/webpack/createBaseConfig.js      |  1 -
 .../plugin-google-analytics/.npmignore        |  2 ++
 .../plugin-google-analytics/README.md         |  6 ++++
 .../plugin-google-analytics/index.js          | 23 +++++++++++++++
 .../plugin-google-analytics/inject.js         | 28 +++++++++++++++++++
 .../plugin-google-analytics/package.json      | 25 +++++++++++++++++
 packages/@vuepress/theme-default/index.js     |  4 ++-
 packages/@vuepress/theme-default/package.json |  1 +
 9 files changed, 88 insertions(+), 27 deletions(-)
 create mode 100644 packages/@vuepress/plugin-google-analytics/.npmignore
 create mode 100644 packages/@vuepress/plugin-google-analytics/README.md
 create mode 100644 packages/@vuepress/plugin-google-analytics/index.js
 create mode 100644 packages/@vuepress/plugin-google-analytics/inject.js
 create mode 100644 packages/@vuepress/plugin-google-analytics/package.json

diff --git a/packages/@vuepress/core/lib/app/clientEntry.js b/packages/@vuepress/core/lib/app/clientEntry.js
index 2d6f6b34ed..aa84ea6146 100644
--- a/packages/@vuepress/core/lib/app/clientEntry.js
+++ b/packages/@vuepress/core/lib/app/clientEntry.js
@@ -11,31 +11,6 @@ window.__VUEPRESS_VERSION__ = {
   hash: LAST_COMMIT_HASH
 }
 
-// TODO Separate it into a plugin ('vuepress-plugin-ga')
-// Google analytics integration
-if (process.env.NODE_ENV === 'production' && GA_ID) {
-  (function (i, s, o, g, r, a, m) {
-    i['GoogleAnalyticsObject'] = r
-    i[r] = i[r] || function () {
-      (i[r].q = i[r].q || []).push(arguments)
-    }
-    i[r].l = 1 * new Date()
-    a = s.createElement(o)
-    m = s.getElementsByTagName(o)[0]
-    a.async = 1
-    a.src = g
-    m.parentNode.insertBefore(a, m)
-  })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga')
-
-  ga('create', GA_ID, 'auto')
-  ga('send', 'pageview')
-
-  router.afterEach(function (to) {
-    ga('set', 'page', to.fullPath)
-    ga('send', 'pageview')
-  })
-}
-
 router.onReady(() => {
   app.$mount('#app')
 
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 4c349f46a4..f77dce940d 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -278,7 +278,6 @@ module.exports = function createBaseConfig ({
     .plugin('injections')
     .use(require('webpack/lib/DefinePlugin'), [{
       BASE_URL: JSON.stringify(siteConfig.base || '/'),
-      GA_ID: siteConfig.ga ? JSON.stringify(siteConfig.ga) : false,
       SW_ENABLED: !!siteConfig.serviceWorker,
       VUEPRESS_VERSION: JSON.stringify(require('../../package.json').version),
       LAST_COMMIT_HASH: JSON.stringify(getLastCommitHash())
diff --git a/packages/@vuepress/plugin-google-analytics/.npmignore b/packages/@vuepress/plugin-google-analytics/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-google-analytics/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-google-analytics/README.md b/packages/@vuepress/plugin-google-analytics/README.md
new file mode 100644
index 0000000000..90fa170113
--- /dev/null
+++ b/packages/@vuepress/plugin-google-analytics/README.md
@@ -0,0 +1,6 @@
+# @vuepress/plugin-google-analytics
+
+> google-analytics plugin for vuepress
+
+## Options
+
diff --git a/packages/@vuepress/plugin-google-analytics/index.js b/packages/@vuepress/plugin-google-analytics/index.js
new file mode 100644
index 0000000000..286ab84279
--- /dev/null
+++ b/packages/@vuepress/plugin-google-analytics/index.js
@@ -0,0 +1,23 @@
+const path = require('path')
+
+module.exports = (options = {}, context) => ({
+  name: 'google-analytics',
+
+  ready () {
+    const { siteConfig = {}} = context
+    const ga = options.ga || siteConfig.ga
+    context.GA_ID = ga ? JSON.stringify(ga) : false
+  },
+
+  chainWebpack (config) {
+    config.plugin('injections').tap(([options]) => [
+      Object.assign(options, {
+        GA_ID: context.GA_ID
+      })
+    ])
+  },
+
+  enhanceAppFiles: [
+    path.resolve(__dirname, 'inject.js')
+  ]
+})
diff --git a/packages/@vuepress/plugin-google-analytics/inject.js b/packages/@vuepress/plugin-google-analytics/inject.js
new file mode 100644
index 0000000000..a2e1be9de4
--- /dev/null
+++ b/packages/@vuepress/plugin-google-analytics/inject.js
@@ -0,0 +1,28 @@
+/* global GA_ID, ga */
+
+export default ({ router }) => {
+// Google analytics integration
+  if (process.env.NODE_ENV === 'production' && GA_ID) {
+    (function (i, s, o, g, r, a, m) {
+      i['GoogleAnalyticsObject'] = r
+      i[r] = i[r] || function () {
+        (i[r].q = i[r].q || []).push(arguments)
+      }
+      i[r].l = 1 * new Date()
+      a = s.createElement(o)
+      m = s.getElementsByTagName(o)[0]
+      a.async = 1
+      a.src = g
+      m.parentNode.insertBefore(a, m)
+    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga')
+
+    ga('create', GA_ID, 'auto')
+    ga('send', 'pageview')
+
+    router.afterEach(function (to) {
+      ga('set', 'page', to.fullPath)
+      ga('send', 'pageview')
+    })
+  }
+}
+
diff --git a/packages/@vuepress/plugin-google-analytics/package.json b/packages/@vuepress/plugin-google-analytics/package.json
new file mode 100644
index 0000000000..5763de58f3
--- /dev/null
+++ b/packages/@vuepress/plugin-google-analytics/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-google-analytics",
+  "version": "1.0.0",
+  "description": "google-analytics plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-google-analytics#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index f1411fcf9d..4e5e932d16 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -1,6 +1,7 @@
 const path = require('path')
 const themePlugin = require('./plugin')
 const activeHeaderLinksPlugin = require('@vuepress/plugin-active-header-links')
+const googleAnalyticsPlugin = require('@vuepress/plugin-google-analytics')
 
 // Theme API.
 module.exports = {
@@ -8,6 +9,7 @@ module.exports = {
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: [
     themePlugin,
-    activeHeaderLinksPlugin
+    activeHeaderLinksPlugin,
+    googleAnalyticsPlugin
   ]
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index fe43290022..a29b79eb3a 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme",
   "dependencies": {
     "@vuepress/plugin-active-header-links": "1.0.0",
+    "@vuepress/plugin-google-analytics": "1.0.0",
     "docsearch.js": "^2.5.2",
     "nprogress": "^0.2.0",
     "stylus": "^0.54.5",

From 17f0acdf5025143a6b3e223f7b912e317b4a9b65 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 14:49:32 +0800
Subject: [PATCH 055/242] docs: document for default theme

---
 packages/@vuepress/theme-default/README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/theme-default/README.md b/packages/@vuepress/theme-default/README.md
index 775ef2f6af..ea4d09cd78 100644
--- a/packages/@vuepress/theme-default/README.md
+++ b/packages/@vuepress/theme-default/README.md
@@ -1,3 +1,10 @@
 # @vuepress/theme-default
 
-> theme-default for vuepress
\ No newline at end of file
+> theme-default for vuepress
+
+## Plugins
+
+The default theme has the following plugin built in:
+
+- @vuepress/plugin-active-header-links
+- @vuepress/plugin-google-analytics
\ No newline at end of file

From 5f07c39596d142b514aad112a97c1a913dc622fb Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 17:05:43 +0800
Subject: [PATCH 056/242] feat($plugin): 'globalUIComponents' option

---
 packages/@vuepress/core/lib/app/app.js        |  4 ++-
 .../core/lib/plugin-api/constants.js          |  4 ++-
 .../@vuepress/core/lib/plugin-api/index.js    |  4 ++-
 .../option/GlobalUIComponentsOption.js        | 11 +++++++
 .../plugin-api/option/instantiateOption.js    |  4 +++
 packages/@vuepress/core/lib/prepare/index.js  |  1 +
 packages/@vuepress/plugin-test/BackToTop.vue  | 14 +++++++++
 packages/@vuepress/plugin-test/enhanceApp.js  |  4 ++-
 packages/@vuepress/plugin-test/index.js       | 17 +++++++---
 packages/docs/docs/plugin/README.md           | 31 +++++++++++++++++--
 10 files changed, 84 insertions(+), 10 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
 create mode 100644 packages/@vuepress/plugin-test/BackToTop.vue

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 90d7bc8691..9e7b2be5e7 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -4,6 +4,7 @@ import dataMixin from './dataMixin'
 import { routes } from '@temp/routes'
 import { siteData } from '@temp/siteData'
 import appEnhancers from '@temp/app-enhancers.js'
+import globalUIComponents from '@dynamic/global-ui.js'
 
 // generated from user config
 import('@temp/style.styl')
@@ -96,7 +97,8 @@ export function createApp () {
       router,
       render (h) {
         return h('div', { attrs: { id: 'app' }}, [
-          h('router-view', { ref: 'layout' })
+          h('router-view', { ref: 'layout' }),
+          h('div', { class: 'global-ui' }, globalUIComponents.map(component => h(component)))
         ])
       }
     })
diff --git a/packages/@vuepress/core/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
index b992f1b445..4c0f09f91e 100644
--- a/packages/@vuepress/core/lib/plugin-api/constants.js
+++ b/packages/@vuepress/core/lib/plugin-api/constants.js
@@ -12,6 +12,7 @@ const EXTEND_MARKDOWN = 'extendMarkdown'
 const CLIENT_DYNAMIC_MODULES = 'clientDynamicModules'
 const CLIENT_ROOT_MIXIN = 'clientRootMixin'
 const ADDITIONAL_PAGES = 'additionalPages'
+const GLOBAL_UI_COMPONENTS = 'globalUIComponents'
 
 const HOOK = {
   READY,
@@ -29,7 +30,8 @@ const OPTION = {
   EXTEND_MARKDOWN,
   CLIENT_DYNAMIC_MODULES,
   CLIENT_ROOT_MIXIN,
-  ADDITIONAL_PAGES
+  ADDITIONAL_PAGES,
+  GLOBAL_UI_COMPONENTS
 }
 
 exports.HOOK = HOOK
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 4ac50a4f43..6fe3f3c9c1 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -102,7 +102,8 @@ module.exports = class Plugin {
     generated,
     clientDynamicModules,
     clientRootMixin,
-    additionalPages
+    additionalPages,
+    globalUIComponents
   }) {
     logger.tip(`\nApply plugin ${chalk.gray(name)}...`)
 
@@ -122,5 +123,6 @@ module.exports = class Plugin {
       .registerOption(OPTION.CLIENT_DYNAMIC_MODULES, clientDynamicModules, name, [Function])
       .registerOption(OPTION.CLIENT_ROOT_MIXIN, clientRootMixin, name, [String])
       .registerOption(OPTION.ADDITIONAL_PAGES, additionalPages, name, [Function, Array])
+      .registerOption(OPTION.GLOBAL_UI_COMPONENTS, globalUIComponents, name, [String, Array])
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
new file mode 100644
index 0000000000..a6d7ccf698
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
@@ -0,0 +1,11 @@
+const Tapable = require('../core/Tapable')
+const { writeTemp } = require('../../prepare/util')
+
+module.exports = class GlobalUIComponentsOption extends Tapable {
+  async run () {
+    writeTemp(
+      `dynamic-modules/global-ui.js`,
+      `export default ${JSON.stringify(this.values, null, 2)}`
+    )
+  }
+}
diff --git a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
index 68091211e5..7afcf74774 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
@@ -2,6 +2,7 @@ const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ExtendPageDataOption = require('./ExtendPageDataOption')
 const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
 const AdditionalPagesOption = require('./AdditionalPagesOption')
+const GlobalUIComponentsOption = require('./GlobalUIComponentsOption')
 const Tapable = require('../core/Tapable')
 const { OPTION } = require('../constants')
 
@@ -19,6 +20,9 @@ module.exports = function instantiateOption (name) {
   case OPTION.ADDITIONAL_PAGES:
     return new AdditionalPagesOption(name)
 
+  case OPTION.GLOBAL_UI_COMPONENTS:
+    return new GlobalUIComponentsOption(name)
+
   default: return new Tapable(name)
   }
 }
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 1e3e3cfa8e..bc031451bd 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -33,6 +33,7 @@ module.exports = async function prepare ({
   // 4. apply plugin options to extend markdown.
   plugin.options.extendMarkdown.run(markdown)
   plugin.options.clientDynamicModules.run()
+  plugin.options.globalUIComponents.run()
 
   // 5. generate routes code
   const routesCode = await genRoutesFile(options)
diff --git a/packages/@vuepress/plugin-test/BackToTop.vue b/packages/@vuepress/plugin-test/BackToTop.vue
new file mode 100644
index 0000000000..ace3e74772
--- /dev/null
+++ b/packages/@vuepress/plugin-test/BackToTop.vue
@@ -0,0 +1,14 @@
+<template>
+  <h1 class="back-top">
+    ^
+  </h1>
+</template>
+
+<style>
+  .back-top {
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+  }
+</style>
+
diff --git a/packages/@vuepress/plugin-test/enhanceApp.js b/packages/@vuepress/plugin-test/enhanceApp.js
index b231205031..1142120724 100644
--- a/packages/@vuepress/plugin-test/enhanceApp.js
+++ b/packages/@vuepress/plugin-test/enhanceApp.js
@@ -1,3 +1,5 @@
+import BackToTop from './BackToTop'
+
 export default function ({ Vue }) {
-  console.warn('[vuepress-plugin-test] enhancing !!!')
+  Vue.component('BackToTop', BackToTop)
 }
diff --git a/packages/@vuepress/plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
index b6693c6d43..1ca6a808aa 100644
--- a/packages/@vuepress/plugin-test/index.js
+++ b/packages/@vuepress/plugin-test/index.js
@@ -11,6 +11,12 @@ class SimpleLogPlugin {
 module.exports = (options, context) => ({
   name: 'test',
 
+  // TODO
+  // globalComponents: ['BackTIoTop'],
+
+  // Usually used to construct a global UI, e.g. back to top.
+  globalUIComponents: ['BackToTop'],
+
   clientRootMixin: path.resolve(__dirname, 'mixin.js'),
 
   async ready () {
@@ -23,10 +29,13 @@ module.exports = (options, context) => ({
     }
   },
 
-  enhanceAppFiles: [{
-    name: 'dynamic-code',
-    content: `export default ({ Vue }) => { Vue.prototype.$sourceDir = () => '${context.sourceDir}' }`
-  }],
+  enhanceAppFiles: [
+    path.resolve(__dirname, 'enhanceApp.js'),
+    {
+      name: 'dynamic-code',
+      content: `export default ({ Vue }) => { Vue.prototype.$sourceDir = () => '${context.sourceDir}' }`
+    }
+  ],
 
   chainWebpack (config, isServer) {
     if (isServer) {
diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index f6af3fee3f..6d38944bd4 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -277,7 +277,6 @@ module.exports = {
 ```
 
 ``` js
-
 module.exports = {
   additionalPages () {
     return [
@@ -288,7 +287,35 @@ module.exports = {
     ]
   }
 }
-````
+```
+
+### globalUIComponents
+
+- Type: `Array|String`
+- Default: `undefined`
+
+You might want to inject some global UI fixed somewhere on the page, e.g. `back-to-top`, `popup`. In VuePress, **a global UI is a Vue component**, you can define the component's name(s) in the plugin, e.g.
+
+``` js
+module.exports = {
+  globalUIComponents: [
+    'Component-1',
+    'Component-2'
+  ]
+}
+```
+
+Then, VuePress will automatically inject these components behind the theme container:
+
+```html
+<div id="app">
+  <div class="theme-container"> ... </div>
+  <div class="global-ui">
+    <Component-1/>
+    <Component-2/>
+</div>
+</div>
+```
 
 ## Plugin Context
 

From b9fdf64fb0b66968a54b5408fd47ced7a7071183 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 17:38:24 +0800
Subject: [PATCH 057/242] feat: @vuepress/plugin-back-to-top

---
 .../@vuepress/core/lib/plugin-api/util.js     |  4 +-
 .../@vuepress/plugin-back-to-top/.npmignore   |  2 +
 .../plugin-back-to-top/BackToTop.vue          | 84 +++++++++++++++++++
 .../@vuepress/plugin-back-to-top/README.md    | 15 ++++
 .../@vuepress/plugin-back-to-top/client.js    |  5 ++
 .../@vuepress/plugin-back-to-top/index.js     |  9 ++
 .../@vuepress/plugin-back-to-top/package.json | 28 +++++++
 packages/@vuepress/plugin-test/BackToTop.vue  | 14 ----
 packages/@vuepress/plugin-test/enhanceApp.js  |  6 +-
 packages/docs/docs/.vuepress/config.js        |  1 +
 packages/docs/package.json                    |  3 +-
 11 files changed, 149 insertions(+), 22 deletions(-)
 create mode 100644 packages/@vuepress/plugin-back-to-top/.npmignore
 create mode 100644 packages/@vuepress/plugin-back-to-top/BackToTop.vue
 create mode 100644 packages/@vuepress/plugin-back-to-top/README.md
 create mode 100644 packages/@vuepress/plugin-back-to-top/client.js
 create mode 100644 packages/@vuepress/plugin-back-to-top/index.js
 create mode 100644 packages/@vuepress/plugin-back-to-top/package.json
 delete mode 100644 packages/@vuepress/plugin-test/BackToTop.vue

diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 0edf6d27ef..fa20dfedef 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -17,9 +17,9 @@ exports.resolvePlugin = function (pluginRaw) {
           ? pluginRaw
           : `@vuepress/plugin-${pluginRaw}`
         )
-      } catch (e) {
+      } catch (err2) {
         console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
-        throw new Error(err)
+        throw new Error(err2)
       }
     }
   }
diff --git a/packages/@vuepress/plugin-back-to-top/.npmignore b/packages/@vuepress/plugin-back-to-top/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-back-to-top/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-back-to-top/BackToTop.vue b/packages/@vuepress/plugin-back-to-top/BackToTop.vue
new file mode 100644
index 0000000000..3b701bb4b7
--- /dev/null
+++ b/packages/@vuepress/plugin-back-to-top/BackToTop.vue
@@ -0,0 +1,84 @@
+<template>
+  <transition name="fade">
+    <svg
+      v-if="show"
+      class="go-to-top"
+      @click="scrollToTop"
+      xmlns="http://www.w3.org/2000/svg" viewBox="0 0 49.484 28.284"
+    >
+      <g transform="translate(-229 -126.358)">
+        <rect fill="currentColor" width="35" height="5" rx="2" transform="translate(229 151.107) rotate(-45)"/>
+        <rect fill="currentColor" width="35" height="5" rx="2" transform="translate(274.949 154.642) rotate(-135)"/>
+      </g>
+    </svg>
+  </transition>
+</template>
+
+<script>
+import debounce from 'lodash.debounce'
+
+export default {
+  props: {
+    threshold: {
+      type: Number,
+      default: 300
+    }
+  },
+
+  data () {
+    return {
+      scrollTop: this.getScrollTop()
+    }
+  },
+
+  mounted () {
+    window.addEventListener('scroll', debounce(() => {
+      this.scrollTop = this.getScrollTop()
+    }, 100))
+  },
+
+  methods: {
+    getScrollTop () {
+      return window.pageYOffset ||
+        document.documentElement.scrollTop ||
+        document.body.scrollTop || 0
+    },
+
+    scrollToTop () {
+      window.scrollTo({ top: 0, behavior: 'smooth' })
+      this.scrollTop = 0
+    }
+  },
+
+  computed: {
+    show () {
+      return this.scrollTop > this.threshold
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+  // TODO use pure CSS so that it can be used not only in default theme.
+  $iconSize = 2rem
+  .go-to-top
+    cursor pointer
+    position fixed
+    bottom 2rem
+    right 2.5rem
+    width $iconSize
+    color lighten(#3eaf7c, 30%)
+    z-index 1
+    &:hover
+      color #3eaf7c
+
+  @media (max-width: 959px)
+    .go-to-top
+      display none
+
+  .fade-enter-active, .fade-leave-active
+    transition opacity 0.3s
+
+  .fade-enter, .fade-leave-to
+    opacity 0
+</style>
diff --git a/packages/@vuepress/plugin-back-to-top/README.md b/packages/@vuepress/plugin-back-to-top/README.md
new file mode 100644
index 0000000000..21dd4b00b5
--- /dev/null
+++ b/packages/@vuepress/plugin-back-to-top/README.md
@@ -0,0 +1,15 @@
+# @vuepress/plugin-back-to-top
+
+> back-to-top plugin for vuepress
+
+## Usage
+
+```javascript
+module.exports = {
+  plugins: ['back-to-top'] 
+}
+```
+
+## Plugin Options
+
+No options for now.
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-back-to-top/client.js b/packages/@vuepress/plugin-back-to-top/client.js
new file mode 100644
index 0000000000..2770de013f
--- /dev/null
+++ b/packages/@vuepress/plugin-back-to-top/client.js
@@ -0,0 +1,5 @@
+import BackToTop from './BackToTop.vue'
+
+export default ({ Vue }) => {
+  Vue.component('BackToTop', BackToTop)
+}
diff --git a/packages/@vuepress/plugin-back-to-top/index.js b/packages/@vuepress/plugin-back-to-top/index.js
new file mode 100644
index 0000000000..4ae5ff1d6b
--- /dev/null
+++ b/packages/@vuepress/plugin-back-to-top/index.js
@@ -0,0 +1,9 @@
+module.exports = (options, context) => ({
+  name: 'back-to-top',
+
+  enhanceAppFiles: [
+    context.resolve(__dirname, 'client.js')
+  ],
+
+  globalUIComponents: 'BackToTop'
+})
diff --git a/packages/@vuepress/plugin-back-to-top/package.json b/packages/@vuepress/plugin-back-to-top/package.json
new file mode 100644
index 0000000000..a402612ed1
--- /dev/null
+++ b/packages/@vuepress/plugin-back-to-top/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@vuepress/plugin-back-to-top",
+  "version": "1.0.0",
+  "description": "back-to-top plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/back-to-top#readme",
+  "dependencies": {
+    "lodash.debounce": "^4.0.8"
+  }
+}
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-test/BackToTop.vue b/packages/@vuepress/plugin-test/BackToTop.vue
deleted file mode 100644
index ace3e74772..0000000000
--- a/packages/@vuepress/plugin-test/BackToTop.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <h1 class="back-top">
-    ^
-  </h1>
-</template>
-
-<style>
-  .back-top {
-    position: fixed;
-    bottom: 20px;
-    right: 20px;
-  }
-</style>
-
diff --git a/packages/@vuepress/plugin-test/enhanceApp.js b/packages/@vuepress/plugin-test/enhanceApp.js
index 1142120724..b04259c755 100644
--- a/packages/@vuepress/plugin-test/enhanceApp.js
+++ b/packages/@vuepress/plugin-test/enhanceApp.js
@@ -1,5 +1 @@
-import BackToTop from './BackToTop'
-
-export default function ({ Vue }) {
-  Vue.component('BackToTop', BackToTop)
-}
+export default function ({ Vue }) {}
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index ee1ebb39d3..2a58e4c74f 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -24,6 +24,7 @@ module.exports = {
     ['meta', { name: 'msapplication-TileColor', content: '#000000' }]
   ],
   serviceWorker: true,
+  plugins: ['back-to-top'],
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 3b13a017a0..03528065f5 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -22,6 +22,7 @@
   },
   "homepage": "https://github.com/vuejs/vuepress#readme",
   "devDependencies": {
-    "vuepress": "^1.0.0"
+    "vuepress": "^1.0.0",
+    "@vuepress/back-to-top": "^1.0.0"
   }
 }

From 863a7b7fe69a1e122c7f5b490bdf9ca193d71046 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 20:51:18 +0800
Subject: [PATCH 058/242] docs(last-updated): transformer option

---
 .../@vuepress/plugin-last-updated/README.md   | 22 ++++++++++++++++++-
 .../@vuepress/plugin-last-updated/index.js    |  9 ++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/packages/@vuepress/plugin-last-updated/README.md b/packages/@vuepress/plugin-last-updated/README.md
index 00877feabf..0df339f0c4 100644
--- a/packages/@vuepress/plugin-last-updated/README.md
+++ b/packages/@vuepress/plugin-last-updated/README.md
@@ -2,4 +2,24 @@
 
 > last-updated plugin for vuepress
 
-Please do not use this plugin directly, this plugin has been included in the core.
\ No newline at end of file
+> Note that this plugin has been included in the core.
+
+## transformer
+
+- Type: `function`
+- Default: `undefined`
+
+By default, this plugin produces a 13-bit timestamp for each page, you can also pass in a transformer to convert it to any format that you want.
+
+``` javascript
+const timeago = require("timeago.js");
+
+module.exports = {
+  plugins: [
+    [ 
+      'last-updated',
+      { transformer: timeago.format }
+    ]
+  ]
+}
+```
diff --git a/packages/@vuepress/plugin-last-updated/index.js b/packages/@vuepress/plugin-last-updated/index.js
index aef6897524..d42fad5bfd 100644
--- a/packages/@vuepress/plugin-last-updated/index.js
+++ b/packages/@vuepress/plugin-last-updated/index.js
@@ -1,12 +1,13 @@
 const spawn = require('cross-spawn')
 
-module.exports = options => ({
+module.exports = (options = {}, context) => ({
   name: 'last-updated',
 
   extendPageData ({ filepath }) {
-    return {
-      lastUpdated: getGitLastUpdatedTimeStamp(filepath)
-    }
+    const { transformer } = options
+    const timestamp = getGitLastUpdatedTimeStamp(filepath)
+    const lastUpdated = typeof transformer === 'function' ? transformer(timestamp) : timestamp
+    return { lastUpdated }
   }
 })
 

From f6956a6984cefb651641c6193a5a0ad537f254d8 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 20:54:03 +0800
Subject: [PATCH 059/242] docs: tweaks

---
 packages/@vuepress/plugin-back-to-top/README.md      | 2 +-
 packages/@vuepress/plugin-google-analytics/README.md | 6 ++++++
 packages/@vuepress/plugin-last-updated/README.md     | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/plugin-back-to-top/README.md b/packages/@vuepress/plugin-back-to-top/README.md
index 21dd4b00b5..9e8260ae87 100644
--- a/packages/@vuepress/plugin-back-to-top/README.md
+++ b/packages/@vuepress/plugin-back-to-top/README.md
@@ -10,6 +10,6 @@ module.exports = {
 }
 ```
 
-## Plugin Options
+## Options
 
 No options for now.
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-google-analytics/README.md b/packages/@vuepress/plugin-google-analytics/README.md
index 90fa170113..be05a08e8b 100644
--- a/packages/@vuepress/plugin-google-analytics/README.md
+++ b/packages/@vuepress/plugin-google-analytics/README.md
@@ -4,3 +4,9 @@
 
 ## Options
 
+### ga
+
+- Type: `string`
+- Default: `/i18n/`
+
+Provide the Google Analytics ID to enable integration.
diff --git a/packages/@vuepress/plugin-last-updated/README.md b/packages/@vuepress/plugin-last-updated/README.md
index 0df339f0c4..e05d30bf6f 100644
--- a/packages/@vuepress/plugin-last-updated/README.md
+++ b/packages/@vuepress/plugin-last-updated/README.md
@@ -4,7 +4,9 @@
 
 > Note that this plugin has been included in the core.
 
-## transformer
+## Options
+
+### transformer
 
 - Type: `function`
 - Default: `undefined`

From 8397a976cf421f4169b498e3d33ffa612af57d39 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 12 Aug 2018 21:48:58 +0800
Subject: [PATCH 060/242] docs: refine "Using a plugin"

---
 packages/docs/docs/plugin/README.md | 91 ++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 7 deletions(-)

diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index 6d38944bd4..e885c687a6 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -37,7 +37,7 @@ A plugin module should use `CommonJS` instead of ES6's `export default` because
 
 ## Using a plugin
 
-You can use plugins by do some configuration at `.vuepress/config.js`:
+You can use plugins by doing some configuration at `.vuepress/config.js`:
 
 ``` js
 module.exports = {
@@ -47,7 +47,59 @@ module.exports = {
 }
 ```
 
-When you want to pass in some options to it:
+### Use plugins from a dependency
+
+A plugin can be published on npm in `CommonJS` format as `vuepress-plugin-xxx`. then you can use it:
+
+``` js
+module.exports = {
+  plugins: [ 'vuepress-plugin-xx' ]
+}
+```
+
+### Plugin Shorthand
+
+If you prefix the plugin with `vuepress-plugin-`, you can use a shorthand to leave out that prefix:
+
+``` js
+module.exports = {
+  plugins: [ 'xxx' ]
+}
+```
+
+Same with:
+
+``` js
+module.exports = {
+  plugins: [ 'vuepress-plugin-xxx' ]
+}
+```
+
+This also works with [Scoped Packages](https://docs.npmjs.com/misc/scope):
+
+``` js
+module.exports = {
+  plugins: [ '@org/plugin-xxx' ]
+}
+```
+
+Shorthand:
+
+``` js
+module.exports = {
+  plugins: [ '@org/xxx' ]
+}
+```
+
+::: warning Note
+The plugin whose name starts with `@vuepress/plugin-` is an officially maintained plugin.
+:::
+
+### Plugin options
+
+#### Babel Style
+
+Plugins can have options specified by wrapping the name and an options object in an array inside your config:
 
 ``` js
 module.exports = {
@@ -60,18 +112,43 @@ module.exports = {
 }
 ```
 
-### Use plugins from npm
+Since this style is consistent with [babel's Plugin/Preset Options](https://babeljs.io/docs/en/plugins#plugin-preset-options), we call it `Babel Style`.
 
-A plugin should be published on npm in `CommonJS` format as `vuepress-plugin-xxx` or `@vuepress/plugin-xxx`. Then you can use it like this:
+#### Object Style
+
+VuePress also provides a simpler way to use plugins from a dependency:
 
 ``` js
 module.exports = {
-  plugins: [ 'xxx' /* also can be full name. */ ]
+  plugins: {
+    'xxx': { /* options */ }    
+  }
+}
+```
+
+::: warning Note
+The plugin will be disabled when you explicitly pass a false.
+
+- babel style
+
+``` js
+module.exports = {
+  plugins: [ 
+    [ 'xxx', false ] // disabled.
+  ]
+}
+```
+
+- object style
+
+``` js
+module.exports = {
+  plugins: {
+    'xxx': false // disabled.
+  }
 }
 ```
 
-::: tip
-The plugin whose name starts with `@vuepress/plugin-` is the official plugin.
 :::
 
 ## Options

From 57f15ee86e32ae2fd84b2bc993f7d7895fc94862 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 13 Aug 2018 20:38:40 +0800
Subject: [PATCH 061/242] test: setup test

---
 package.json                                  |  5 +--
 .../core/__test__/plugin-api/Tapable.spec.js  |  3 ++
 packages/@vuepress/core/package.json          | 15 ---------
 {test => scripts}/jest.config.js              |  4 +++
 scripts/test.js                               | 32 +++++++++++++++++++
 yarn.lock                                     | 14 +++++++-
 6 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
 rename {test => scripts}/jest.config.js (87%)
 create mode 100644 scripts/test.js

diff --git a/package.json b/package.json
index b17ce0b52e..b2938d0101 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint --fix packages/**/*.js packages/**/*.vue packages/**/bin/*",
     "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
     "release": "/bin/bash scripts/release.sh",
-    "test": "node test/prepare.js && jest --config test/jest.config.js"
+    "test": "node scripts/test.js"
   },
   "repository": {
     "type": "git",
@@ -51,12 +51,13 @@
     "eslint": "^4.19.1",
     "eslint-plugin-jest": "^21.15.1",
     "eslint-plugin-vue-libs": "^3.0.0",
+    "execa": "^0.10.0",
     "jest": "^23.0.0",
     "jest-serializer-vue": "^1.0.0",
     "lerna": "^2.11.0",
     "lint-staged": "^7.0.4",
+    "minimist": "^1.2.0",
     "vue-jest": "^2.6.0",
-    "vuepress-theme-vue": "^1.1.0",
     "yorkie": "^1.0.3"
   },
   "engines": {
diff --git a/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js b/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
new file mode 100644
index 0000000000..8fde86f78c
--- /dev/null
+++ b/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
@@ -0,0 +1,3 @@
+test('two plus two is four', () => {
+  expect(2 + 2).toBe(4)
+})
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 26f2200d9b..06ed81e7dc 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -88,21 +88,6 @@
     "webpackbar": "^2.6.1",
     "workbox-build": "^3.1.0"
   },
-  "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.16",
-    "babel-core": "^7.0.0-0",
-    "babel-jest": "^23.0.0",
-    "conventional-changelog-cli": "^1.3.22",
-    "eslint": "^4.19.1",
-    "eslint-plugin-jest": "^21.15.1",
-    "eslint-plugin-vue-libs": "^3.0.0",
-    "jest": "^23.0.0",
-    "jest-serializer-vue": "^1.0.0",
-    "lint-staged": "^7.0.4",
-    "vue-jest": "^2.6.0",
-    "vuepress-theme-vue": "^1.1.0",
-    "yorkie": "^1.0.3"
-  },
   "engines": {
     "node": ">=8"
   },
diff --git a/test/jest.config.js b/scripts/jest.config.js
similarity index 87%
rename from test/jest.config.js
rename to scripts/jest.config.js
index f5980c93c7..5faf47d52a 100644
--- a/test/jest.config.js
+++ b/scripts/jest.config.js
@@ -11,6 +11,10 @@ module.exports = {
     'js',
     'vue'
   ],
+  testPathIgnorePatterns: [
+    'test.js',
+    path.resolve(__dirname, '../test')
+  ],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/lib/$1'
   },
diff --git a/scripts/test.js b/scripts/test.js
new file mode 100644
index 0000000000..b57e1aa689
--- /dev/null
+++ b/scripts/test.js
@@ -0,0 +1,32 @@
+const execa = require('execa')
+const minimist = require('minimist')
+
+const rawArgs = process.argv.slice(2)
+const args = minimist(rawArgs)
+
+let regex
+if (args.p) {
+  const packages = (args.p || args.package).split(',').join('|')
+  regex = `.*@vuepress/(${packages}|plugin-(${packages}))/.*\\.spec\\.js$`
+  const i = rawArgs.indexOf('-p')
+  rawArgs.splice(i, 2)
+}
+
+console.log(regex)
+
+;(async () => {
+  const jestArgs = [
+    '--env', 'node',
+    '--config', 'scripts/jest.config.js',
+    '--runInBand',
+    ...rawArgs,
+    ...(regex ? [regex] : [])
+  ]
+  console.log(`running jest with args: ${jestArgs.join(' ')}`)
+  await execa('jest', jestArgs, {
+    stdio: 'inherit'
+  })
+})().catch(err => {
+  err
+  process.exit(1)
+})
diff --git a/yarn.lock b/yarn.lock
index b9e4343b47..9e97ac0b46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2491,7 +2491,7 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
@@ -3251,6 +3251,18 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.2.0"
 
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"

From 9424df351051796b8481b5c5bdd48b9184b2974a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 14 Aug 2018 02:43:11 +0800
Subject: [PATCH 062/242] test: 'Tapable'

---
 package.json                                  |   6 +-
 .../core/__test__/plugin-api/Tapable.spec.js  |  70 ++-
 .../core/lib/plugin-api/core/Tapable.js       |   8 +-
 scripts/jest.config.js                        |  14 +-
 scripts/test.js                               |   2 -
 yarn.lock                                     | 521 +++++++++++++++++-
 6 files changed, 603 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index b2938d0101..49e3565ec3 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,6 @@
     "packages/docs"
   ],
   "description": "Minimalistic doc generator with Vue component based layout system",
-  "main": "lib/index.js",
-  "bin": {
-    "vuepress": "bin/vuepress.js"
-  },
   "scripts": {
     "boot": "node scripts/bootstrap.js",
     "dev": "lerna run --scope docs dev",
@@ -45,6 +41,8 @@
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.16",
+    "@babel/core": "^7.0.0-beta.47",
+    "@babel/preset-env": "^7.0.0-beta.47",
     "babel-core": "^7.0.0-0",
     "babel-jest": "^23.0.0",
     "conventional-changelog-cli": "^1.3.22",
diff --git a/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js b/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
index 8fde86f78c..af1b0404b8 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
@@ -1,3 +1,69 @@
-test('two plus two is four', () => {
-  expect(2 + 2).toBe(4)
+// TODO change to ES6 import
+// https://github.com/facebook/jest/issues/6835
+
+const Tapable = require('../../lib/plugin-api/core/Tapable')
+
+describe('Tapable', () => {
+  test('shoould tapable record the key', () => {
+    const tapable = new Tapable('option')
+    expect(tapable.key).toBe('option')
+  })
+
+  test('should \'tap\' work', () => {
+    const tapable = new Tapable('option')
+    tapable.tap('plugin-a', 'a')
+    tapable.tap('plugin-b', 'b')
+    expect(tapable.items).toEqual([
+      { value: 'a', name: 'plugin-a' },
+      { value: 'b', name: 'plugin-b' }
+    ])
+    expect(tapable.values).toEqual(['a', 'b'])
+  })
+
+  test('should \'tap\' resolve array value', () => {
+    const tapable = new Tapable('option')
+    tapable.tap('plugin-a', ['a-1', 'a-2'])
+    tapable.tap('plugin-b', 'b')
+    expect(tapable.items).toEqual([
+      { value: 'a-1', name: 'plugin-a' },
+      { value: 'a-2', name: 'plugin-a' },
+      { value: 'b', name: 'plugin-b' }
+    ])
+    expect(tapable.values).toEqual(['a-1', 'a-2', 'b'])
+  })
+
+  test('should \'run\' work', async () => {
+    const tapable = new Tapable('option')
+    const handler1 = jest.fn()
+    const handler2 = jest.fn()
+
+    tapable.tap('plugin-a', handler1)
+    tapable.tap('plugin-b', handler2)
+
+    await tapable.run(1, 2)
+    expect(handler1.mock.calls).toHaveLength(1)
+    expect(handler2.mock.calls).toHaveLength(1)
+    expect(handler1.mock.calls[0][0]).toBe(1)
+    expect(handler1.mock.calls[0][1]).toBe(2)
+    expect(handler2.mock.calls[0][0]).toBe(1)
+    expect(handler2.mock.calls[0][1]).toBe(2)
+  })
+
+  test('should \'parallelRun\' work', async () => {
+    const tapable = new Tapable('option')
+    const handler1 = jest.fn()
+    const handler2 = jest.fn()
+
+    tapable.tap('plugin-a', handler1)
+    tapable.tap('plugin-b', handler2)
+
+    await tapable.parallelRun(1, 2)
+    expect(handler1.mock.calls).toHaveLength(1)
+    expect(handler2.mock.calls).toHaveLength(1)
+    expect(handler1.mock.calls[0][0]).toBe(1)
+    expect(handler1.mock.calls[0][1]).toBe(2)
+    expect(handler2.mock.calls[0][0]).toBe(1)
+    expect(handler2.mock.calls[0][1]).toBe(2)
+  })
 })
+
diff --git a/packages/@vuepress/core/lib/plugin-api/core/Tapable.js b/packages/@vuepress/core/lib/plugin-api/core/Tapable.js
index 91f6da7884..5f21c61aa2 100644
--- a/packages/@vuepress/core/lib/plugin-api/core/Tapable.js
+++ b/packages/@vuepress/core/lib/plugin-api/core/Tapable.js
@@ -5,7 +5,7 @@ module.exports = class Tapable {
   }
 
   /**
-   * set value with name.
+   * Set value with name.
    * @param {string} name
    * @param {any} value
    */
@@ -17,7 +17,7 @@ module.exports = class Tapable {
   }
 
   /**
-   * get values.
+   * Get values.
    * @returns {Array<T>}
    */
   get values () {
@@ -25,7 +25,7 @@ module.exports = class Tapable {
   }
 
   /**
-   * execute in serial
+   * When T is function, eecute all functions in serial
    * @param args
    * @returns {Promise.<void>}
    */
@@ -36,7 +36,7 @@ module.exports = class Tapable {
   }
 
   /**
-   * execute in parallel
+   * When T is function, eecute all functions in parallel
    * @param args
    * @returns {Promise.<void>}
    */
diff --git a/scripts/jest.config.js b/scripts/jest.config.js
index 5faf47d52a..6ee7a818e0 100644
--- a/scripts/jest.config.js
+++ b/scripts/jest.config.js
@@ -15,8 +15,20 @@ module.exports = {
     'test.js',
     path.resolve(__dirname, '../test')
   ],
+  // projects: [
+  //   '<rootDir>/packages/@vuepress/*',
+  //   {
+  //     displayName: 'test',
+  //     verbose: true,
+  //     runner: 'jest',
+  //     testURL: 'http://localhost/',
+  //     testMatch: [
+  //       '<rootDir>/packages/@vuepress/*.js'
+  //     ]
+  //   }
+  // ],
   moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/lib/$1'
+    '^@/(.*)$': '<rootDir>/$1'
   },
   transform: {
     '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
diff --git a/scripts/test.js b/scripts/test.js
index b57e1aa689..bff2df2f54 100644
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -12,8 +12,6 @@ if (args.p) {
   rawArgs.splice(i, 2)
 }
 
-console.log(regex)
-
 ;(async () => {
   const jestArgs = [
     '--env', 'node',
diff --git a/yarn.lock b/yarn.lock
index 9e97ac0b46..6bff8e02a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,6 +14,12 @@
   dependencies:
     "@babel/highlight" "7.0.0-beta.47"
 
+"@babel/code-frame@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-rc.1.tgz#5c2154415d6c09959a71845ef519d11157e95d10"
+  dependencies:
+    "@babel/highlight" "7.0.0-rc.1"
+
 "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0-beta.54"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.54.tgz#0024f96fdf7028a21d68e273afd4e953214a1ead"
@@ -40,6 +46,25 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.0.0-beta.47":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-rc.1.tgz#53c84fd562e13325f123d5951184eec97b958204"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/generator" "7.0.0-rc.1"
+    "@babel/helpers" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
@@ -60,12 +85,28 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-rc.1.tgz#739c87d70b31aeed802bd6bc9fd51480065c45e8"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-annotate-as-pure@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.47.tgz#354fb596055d9db369211bf075f0d5e93904d6f6"
   dependencies:
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-annotate-as-pure@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-rc.1.tgz#4a9042a4a35f835d45c649f68f364cc7ed7dcb05"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.47.tgz#d5917c29ee3d68abc2c72f604bc043f6e056e907"
@@ -73,6 +114,13 @@
     "@babel/helper-explode-assignable-expression" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-rc.1.tgz#df64de2375585e23a0aaa5708ea137fb21157374"
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-call-delegate@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.47.tgz#96b7804397075f722a4030d3876f51ec19d8829b"
@@ -81,6 +129,14 @@
     "@babel/traverse" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-call-delegate@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-rc.1.tgz#7516f71b13c81560bb91fb6b1fae3a1e0345d37d"
+  dependencies:
+    "@babel/helper-hoist-variables" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-define-map@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.47.tgz#43a9def87c5166dc29630d51b3da9cc4320c131c"
@@ -89,6 +145,14 @@
     "@babel/types" "7.0.0-beta.47"
     lodash "^4.17.5"
 
+"@babel/helper-define-map@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-rc.1.tgz#a7f920b33651bc540253313b336864754926e75b"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/helper-explode-assignable-expression@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.47.tgz#56b688e282a698f4d1cf135453a11ae8af870a19"
@@ -96,6 +160,13 @@
     "@babel/traverse" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-explode-assignable-expression@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-rc.1.tgz#114359f835a2d97161a895444e45b80317c6d765"
+  dependencies:
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-function-name@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
@@ -112,6 +183,14 @@
     "@babel/template" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-function-name@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-rc.1.tgz#20b2cc836a53c669f297c8d309fc553385c5cdde"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-get-function-arity@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
@@ -124,18 +203,36 @@
   dependencies:
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-get-function-arity@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-rc.1.tgz#60185957f72ed73766ce74c836ac574921743c46"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-hoist-variables@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.47.tgz#ce295d1d723fe22b2820eaec748ed701aa5ae3d0"
   dependencies:
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-hoist-variables@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-rc.1.tgz#6d0ff35d599fc7dd9dadaac444e99b7976238aec"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-member-expression-to-functions@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.47.tgz#35bfcf1d16dce481ef3dec66d5a1ae6a7d80bb45"
   dependencies:
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-member-expression-to-functions@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-rc.1.tgz#03a3b200fc00f8100dbcef9a351b69cfc0234b4f"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-module-imports@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.47.tgz#5af072029ffcfbece6ffbaf5d9984c75580f3f04"
@@ -143,6 +240,13 @@
     "@babel/types" "7.0.0-beta.47"
     lodash "^4.17.5"
 
+"@babel/helper-module-imports@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-rc.1.tgz#c6269fa9dc451152895f185f0339d45f32c52e75"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/helper-module-transforms@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.47.tgz#7eff91fc96873bd7b8d816698f1a69bbc01f3c38"
@@ -154,22 +258,49 @@
     "@babel/types" "7.0.0-beta.47"
     lodash "^4.17.5"
 
+"@babel/helper-module-transforms@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-rc.1.tgz#15aa371352a37d527b233bd22d25f709ae5feaba"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-rc.1"
+    "@babel/helper-simple-access" "7.0.0-rc.1"
+    "@babel/helper-split-export-declaration" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/helper-optimise-call-expression@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.47.tgz#085d864d0613c5813c1b7c71b61bea36f195929e"
   dependencies:
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-optimise-call-expression@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-rc.1.tgz#482d8251870f61d88c9800fd3e58128e14ff8c98"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-plugin-utils@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.47.tgz#4f564117ec39f96cf60fafcde35c9ddce0e008fd"
 
+"@babel/helper-plugin-utils@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-rc.1.tgz#3e277eae59818e7d4caf4174f58a7a00d441336e"
+
 "@babel/helper-regex@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.47.tgz#b8e3b53132c4edbb04804242c02ffe4d60316971"
   dependencies:
     lodash "^4.17.5"
 
+"@babel/helper-regex@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-rc.1.tgz#591bf828846d91fea8c93d1bf3030bd99dbd94ce"
+  dependencies:
+    lodash "^4.17.10"
+
 "@babel/helper-remap-async-to-generator@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.47.tgz#444dc362f61470bd61a745ebb364431d9ca186c2"
@@ -180,6 +311,16 @@
     "@babel/traverse" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-remap-async-to-generator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-rc.1.tgz#cc32d270ca868245d0ac0a32d70dc83a6ce77db9"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-rc.1"
+    "@babel/helper-wrap-function" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-replace-supers@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.47.tgz#310b206a302868a792b659455ceba27db686cbb7"
@@ -189,6 +330,15 @@
     "@babel/traverse" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-replace-supers@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-rc.1.tgz#cab8d7a6c758e4561fb285f4725c850d68c1c3db"
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "7.0.0-rc.1"
+    "@babel/helper-optimise-call-expression" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-simple-access@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.47.tgz#234d754acbda9251a10db697ef50181eab125042"
@@ -197,6 +347,14 @@
     "@babel/types" "7.0.0-beta.47"
     lodash "^4.17.5"
 
+"@babel/helper-simple-access@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-rc.1.tgz#ab3b179b5f009a1e17207b227c37410ad8d73949"
+  dependencies:
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/helper-split-export-declaration@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
@@ -209,6 +367,12 @@
   dependencies:
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-split-export-declaration@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-rc.1.tgz#b00323834343fd0210f1f46c7a53521ad53efa5e"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-wrap-function@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.47.tgz#6528b44a3ccb4f3aeeb79add0a88192f7eb81161"
@@ -218,6 +382,15 @@
     "@babel/traverse" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helper-wrap-function@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-rc.1.tgz#168454fe350e9ead8d91cdc581597ea506e951ff"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helpers@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.47.tgz#f9b42ed2e4d5f75ec0fb2e792c173e451e8d40fd"
@@ -226,6 +399,14 @@
     "@babel/traverse" "7.0.0-beta.47"
     "@babel/types" "7.0.0-beta.47"
 
+"@babel/helpers@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-rc.1.tgz#e59092cdf4b28026b3fc9d272e27e0ef152b4bee"
+  dependencies:
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/highlight@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
@@ -250,6 +431,18 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/highlight@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-rc.1.tgz#e0ca4731fa4786f7b9500421d6ff5e5a7753e81e"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/parser@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-rc.1.tgz#d009a9bba8175d7b971e30cd03535b278c44082d"
+
 "@babel/plugin-proposal-async-generator-functions@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.47.tgz#571142284708c5ad4ec904d9aa705461a010be53"
@@ -258,6 +451,14 @@
     "@babel/helper-remap-async-to-generator" "7.0.0-beta.47"
     "@babel/plugin-syntax-async-generators" "7.0.0-beta.47"
 
+"@babel/plugin-proposal-async-generator-functions@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-rc.1.tgz#70d4ca787485487370a82e380c39c8c233bca639"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-remap-async-to-generator" "7.0.0-rc.1"
+    "@babel/plugin-syntax-async-generators" "7.0.0-rc.1"
+
 "@babel/plugin-proposal-class-properties@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.47.tgz#08c1a1dfc92d0f5c37b39096c6fb883e1ca4b0f5"
@@ -303,6 +504,13 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.47"
 
+"@babel/plugin-proposal-object-rest-spread@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-rc.1.tgz#bc7ce898a48831fd733b251fd5ae46f986c905d8"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/plugin-syntax-object-rest-spread" "7.0.0-rc.1"
+
 "@babel/plugin-proposal-optional-catch-binding@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-beta.47.tgz#8c6453919537517ea773bb8f3fceda4250795efa"
@@ -310,6 +518,13 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.47"
 
+"@babel/plugin-proposal-optional-catch-binding@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-rc.1.tgz#4ee80c9e4b6feb4c0c737bd996da3ee3fb9837d2"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/plugin-syntax-optional-catch-binding" "7.0.0-rc.1"
+
 "@babel/plugin-proposal-throw-expressions@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.0.0-beta.47.tgz#9a67f8b0852b4b0b255eff5d6d25fa436928424f"
@@ -325,12 +540,26 @@
     "@babel/helper-regex" "7.0.0-beta.47"
     regexpu-core "^4.1.4"
 
+"@babel/plugin-proposal-unicode-property-regex@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0-rc.1.tgz#02d0c33839eb52c93164907fb43b36c5a4afbc6c"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-regex" "7.0.0-rc.1"
+    regexpu-core "^4.2.0"
+
 "@babel/plugin-syntax-async-generators@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.47.tgz#8ab94852bf348badc866af85bd852221f0961256"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-syntax-async-generators@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-rc.1.tgz#71d016f1a241d5e735b120f6cb94b8c57d53d255"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-syntax-class-properties@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.47.tgz#de52bed12fd472c848e1562f57dd4a202fe27f11"
@@ -385,12 +614,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-syntax-object-rest-spread@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-rc.1.tgz#42032fd87fb3b18f5686a0ab957d7f6f0db26618"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-syntax-optional-catch-binding@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-beta.47.tgz#0b1c52b066aa36893c41450773a5adb904cd4024"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-syntax-optional-catch-binding@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-rc.1.tgz#c125fedf2fe59e4b510c202b1a912634d896fbb8"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-syntax-throw-expressions@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.0.0-beta.47.tgz#8ca197bab3534f443eecd7eb79da47e199dafaf7"
@@ -403,6 +644,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-arrow-functions@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-rc.1.tgz#95b369e6ded8425a00464609d29e1fd017b331b0"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-async-to-generator@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.47.tgz#5723816ea1e91fa313a84e6ee9cc12ff31d46610"
@@ -411,12 +658,26 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     "@babel/helper-remap-async-to-generator" "7.0.0-beta.47"
 
+"@babel/plugin-transform-async-to-generator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-rc.1.tgz#9e22abec137ded152e83c3aebb4d4fb1ad7cba59"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-remap-async-to-generator" "7.0.0-rc.1"
+
 "@babel/plugin-transform-block-scoped-functions@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.47.tgz#e422278e06c797b43c45f459d83c7af9d6237002"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-block-scoped-functions@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-rc.1.tgz#1b23adf0fb3a7395f6f0596a80039cfba6516750"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-block-scoping@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.47.tgz#b737cc58a81bea57efd5bda0baef9a43a25859ad"
@@ -424,6 +685,13 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     lodash "^4.17.5"
 
+"@babel/plugin-transform-block-scoping@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-rc.1.tgz#1a61565131ffd1022c04f9d3bcc4bdececf17859"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/plugin-transform-classes@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.47.tgz#7aff9cbe7b26fd94d7a9f97fa90135ef20c93fb6"
@@ -437,18 +705,43 @@
     "@babel/helper-split-export-declaration" "7.0.0-beta.47"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-rc.1.tgz#1d73cbceb4b4adca4cdad5f8f84a5c517fc0e06d"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-rc.1"
+    "@babel/helper-define-map" "7.0.0-rc.1"
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/helper-optimise-call-expression" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-replace-supers" "7.0.0-rc.1"
+    "@babel/helper-split-export-declaration" "7.0.0-rc.1"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.47.tgz#56ef2a021769a2b65e90a3e12fd10b791da9f3e0"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-computed-properties@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-rc.1.tgz#767c6e54e6928de6f1f4de341cee1ec58edce1cf"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-destructuring@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.47.tgz#452b607775fd1c4d10621997837189efc0a6d428"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-destructuring@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-rc.1.tgz#d72932088542ae1c11188cb36d58cd18ddd55aa8"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-dotall-regex@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-beta.47.tgz#d8da9b706d4bfc68dec9d565661f83e6e8036636"
@@ -457,12 +750,26 @@
     "@babel/helper-regex" "7.0.0-beta.47"
     regexpu-core "^4.1.3"
 
+"@babel/plugin-transform-dotall-regex@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-rc.1.tgz#3209d77c7905883482ff9d527c2f96d0db83df0a"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-regex" "7.0.0-rc.1"
+    regexpu-core "^4.1.3"
+
 "@babel/plugin-transform-duplicate-keys@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.47.tgz#4aabeda051ca3007e33a207db08f1a0cf9bd253b"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-duplicate-keys@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-rc.1.tgz#59d0c76877720446f83f1fbbad7c33670c5b19b9"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-exponentiation-operator@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.47.tgz#930e1abf5db9f4db5b63dbf97f3581ad0be1e907"
@@ -470,12 +777,25 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-exponentiation-operator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-rc.1.tgz#b8a7b7862a1e3b14510ad60e496ce5b54c2220d1"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-for-of@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.47.tgz#527d5dc24e4a4ad0fc1d0a3990d29968cb984e76"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-for-of@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-rc.1.tgz#1ad4f8986003f38db9251fb694c4f86657e9ec18"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-function-name@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.47.tgz#fb443c81cc77f3206a863b730b35c8c553ce5041"
@@ -483,12 +803,25 @@
     "@babel/helper-function-name" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-function-name@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-rc.1.tgz#e61149309db0d74df4ea3a566aac7b8794520e2d"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-literals@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.47.tgz#448fad196f062163684a38f10f14e83315892e9c"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-literals@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-rc.1.tgz#314e118e99574ab5292aea92136c26e3dc8c4abb"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-modules-amd@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.47.tgz#84564419b11c1be6b9fcd4c7b3a6737f2335aac4"
@@ -496,6 +829,13 @@
     "@babel/helper-module-transforms" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-modules-amd@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-rc.1.tgz#3f7d83c9ecf0bf5733748e119696cc50ae05987f"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-modules-commonjs@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.47.tgz#dfe5c6d867aa9614e55f7616736073edb3aab887"
@@ -504,6 +844,14 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     "@babel/helper-simple-access" "7.0.0-beta.47"
 
+"@babel/plugin-transform-modules-commonjs@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-rc.1.tgz#475bd3e6c3b86bb38307f715e0cbdb6cb2f431c2"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-simple-access" "7.0.0-rc.1"
+
 "@babel/plugin-transform-modules-systemjs@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.47.tgz#8514dbcdfca3345abd690059e7e8544e16ecbf05"
@@ -511,6 +859,13 @@
     "@babel/helper-hoist-variables" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-modules-systemjs@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-rc.1.tgz#6aca100a57c49e2622f29f177a3e088cc50ecd2e"
+  dependencies:
+    "@babel/helper-hoist-variables" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-modules-umd@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.47.tgz#6dcfb9661fdd131b20b721044746a7a309882918"
@@ -518,12 +873,25 @@
     "@babel/helper-module-transforms" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-modules-umd@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-rc.1.tgz#1a584cb37d252de63c90030f76c3d7d3d0ea1241"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-new-target@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-beta.47.tgz#4b5cb7ce30d7bffa105a1f43ed07d6ae206a4155"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-new-target@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-rc.1.tgz#e5839320686b3c97b82bd24157282565503ae569"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-object-super@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.47.tgz#ca8e5f326c5011c879f3a6ed749e58bd10fff05d"
@@ -531,6 +899,13 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     "@babel/helper-replace-supers" "7.0.0-beta.47"
 
+"@babel/plugin-transform-object-super@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-rc.1.tgz#03ffbcce806af7546fead73cecb43c0892b809f3"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-replace-supers" "7.0.0-rc.1"
+
 "@babel/plugin-transform-parameters@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.47.tgz#46a4236040a6552a5f165fb3ddd60368954b0ddd"
@@ -539,12 +914,26 @@
     "@babel/helper-get-function-arity" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-parameters@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-rc.1.tgz#c3f2f1fe179b58c968b3253cb412c8d83a3d5abc"
+  dependencies:
+    "@babel/helper-call-delegate" "7.0.0-rc.1"
+    "@babel/helper-get-function-arity" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-regenerator@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.47.tgz#86500e1c404055fb98fc82b73b09bd053cacb516"
   dependencies:
     regenerator-transform "^0.12.3"
 
+"@babel/plugin-transform-regenerator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-rc.1.tgz#8c5488ab75b7c9004d8bcf3f48a5814f946b5bb0"
+  dependencies:
+    regenerator-transform "^0.13.3"
+
 "@babel/plugin-transform-runtime@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.47.tgz#1700938fa8710909cbf28f7dd39f9b40688b09fd"
@@ -558,12 +947,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-shorthand-properties@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-rc.1.tgz#21724d2199d988ffad690de8dbdce8b834a7f313"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-spread@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.47.tgz#3feadb02292ed1e9b75090d651b9df88a7ab5c50"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-spread@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-rc.1.tgz#3ad6d96f42175ecf7c03d92313fa1f5c24a69637"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-sticky-regex@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.47.tgz#c0aa347d76b5dc87d3b37ac016ada3f950605131"
@@ -571,6 +972,13 @@
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
     "@babel/helper-regex" "7.0.0-beta.47"
 
+"@babel/plugin-transform-sticky-regex@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-rc.1.tgz#88079689a70d80c8e9b159572979a9c2b80f7c38"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-regex" "7.0.0-rc.1"
+
 "@babel/plugin-transform-template-literals@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.47.tgz#5f7b5badf64c4c5da79026aeab03001e62a6ee5f"
@@ -578,12 +986,25 @@
     "@babel/helper-annotate-as-pure" "7.0.0-beta.47"
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-template-literals@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-rc.1.tgz#c22533ce23554a0d596b208158b34b9975feb9e6"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-typeof-symbol@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.47.tgz#03c612ec09213eb386a81d5fa67c234ee4b2034c"
   dependencies:
     "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
+"@babel/plugin-transform-typeof-symbol@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-rc.1.tgz#51c628dfcd2a5b6c1792b90e4f2f24b7eb993389"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+
 "@babel/plugin-transform-unicode-regex@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.47.tgz#efed0b2f1dfbf28283502234a95b4be88f7fdcb6"
@@ -592,6 +1013,14 @@
     "@babel/helper-regex" "7.0.0-beta.47"
     regexpu-core "^4.1.3"
 
+"@babel/plugin-transform-unicode-regex@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-rc.1.tgz#b6c77bdb9a2823108210a174318ddd3c1ab6f3ce"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/helper-regex" "7.0.0-rc.1"
+    regexpu-core "^4.1.3"
+
 "@babel/preset-env@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.0.0-beta.47.tgz#a3dab3b5fac4de56e3510bdbcb528f1cbdedbe2d"
@@ -636,6 +1065,51 @@
     invariant "^2.2.2"
     semver "^5.3.0"
 
+"@babel/preset-env@^7.0.0-beta.47":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.0.0-rc.1.tgz#cb87a82fd3e44005219cd9f1cb3e9fdba907aae5"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-rc.1"
+    "@babel/helper-plugin-utils" "7.0.0-rc.1"
+    "@babel/plugin-proposal-async-generator-functions" "7.0.0-rc.1"
+    "@babel/plugin-proposal-object-rest-spread" "7.0.0-rc.1"
+    "@babel/plugin-proposal-optional-catch-binding" "7.0.0-rc.1"
+    "@babel/plugin-proposal-unicode-property-regex" "7.0.0-rc.1"
+    "@babel/plugin-syntax-async-generators" "7.0.0-rc.1"
+    "@babel/plugin-syntax-object-rest-spread" "7.0.0-rc.1"
+    "@babel/plugin-syntax-optional-catch-binding" "7.0.0-rc.1"
+    "@babel/plugin-transform-arrow-functions" "7.0.0-rc.1"
+    "@babel/plugin-transform-async-to-generator" "7.0.0-rc.1"
+    "@babel/plugin-transform-block-scoped-functions" "7.0.0-rc.1"
+    "@babel/plugin-transform-block-scoping" "7.0.0-rc.1"
+    "@babel/plugin-transform-classes" "7.0.0-rc.1"
+    "@babel/plugin-transform-computed-properties" "7.0.0-rc.1"
+    "@babel/plugin-transform-destructuring" "7.0.0-rc.1"
+    "@babel/plugin-transform-dotall-regex" "7.0.0-rc.1"
+    "@babel/plugin-transform-duplicate-keys" "7.0.0-rc.1"
+    "@babel/plugin-transform-exponentiation-operator" "7.0.0-rc.1"
+    "@babel/plugin-transform-for-of" "7.0.0-rc.1"
+    "@babel/plugin-transform-function-name" "7.0.0-rc.1"
+    "@babel/plugin-transform-literals" "7.0.0-rc.1"
+    "@babel/plugin-transform-modules-amd" "7.0.0-rc.1"
+    "@babel/plugin-transform-modules-commonjs" "7.0.0-rc.1"
+    "@babel/plugin-transform-modules-systemjs" "7.0.0-rc.1"
+    "@babel/plugin-transform-modules-umd" "7.0.0-rc.1"
+    "@babel/plugin-transform-new-target" "7.0.0-rc.1"
+    "@babel/plugin-transform-object-super" "7.0.0-rc.1"
+    "@babel/plugin-transform-parameters" "7.0.0-rc.1"
+    "@babel/plugin-transform-regenerator" "7.0.0-rc.1"
+    "@babel/plugin-transform-shorthand-properties" "7.0.0-rc.1"
+    "@babel/plugin-transform-spread" "7.0.0-rc.1"
+    "@babel/plugin-transform-sticky-regex" "7.0.0-rc.1"
+    "@babel/plugin-transform-template-literals" "7.0.0-rc.1"
+    "@babel/plugin-transform-typeof-symbol" "7.0.0-rc.1"
+    "@babel/plugin-transform-unicode-regex" "7.0.0-rc.1"
+    browserslist "^3.0.0"
+    invariant "^2.2.2"
+    js-levenshtein "^1.1.3"
+    semver "^5.3.0"
+
 "@babel/preset-stage-2@7.0.0-beta.47":
   version "7.0.0-beta.47"
   resolved "https://registry.yarnpkg.com/@babel/preset-stage-2/-/preset-stage-2-7.0.0-beta.47.tgz#deb930c44d7d6e519a33174bba121a2a630ed654"
@@ -686,6 +1160,15 @@
     babylon "7.0.0-beta.47"
     lodash "^4.17.5"
 
+"@babel/template@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-rc.1.tgz#5f9c0a481c9f22ecdb84697b3c3a34eadeeca23c"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/traverse@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
@@ -716,6 +1199,20 @@
     invariant "^2.2.0"
     lodash "^4.17.5"
 
+"@babel/traverse@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-rc.1.tgz#867b4b45ada2d51ae2d0076f1c1d5880f8557158"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/generator" "7.0.0-rc.1"
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/helper-split-export-declaration" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
 "@babel/types@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
@@ -732,6 +1229,14 @@
     lodash "^4.17.5"
     to-fast-properties "^2.0.0"
 
+"@babel/types@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-rc.1.tgz#6abf6d14ddd9fc022617e5b62e6b32f4fa6526ad"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -4923,6 +5428,10 @@ js-beautify@^1.6.12, js-beautify@^1.6.14:
     mkdirp "~0.5.0"
     nopt "~3.0.1"
 
+js-levenshtein@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.3.tgz#3ef627df48ec8cf24bacf05c0f184ff30ef413c5"
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -7128,6 +7637,12 @@ regenerator-transform@^0.12.3:
   dependencies:
     private "^0.1.6"
 
+regenerator-transform@^0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+  dependencies:
+    private "^0.1.6"
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -7153,7 +7668,7 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.1.3, regexpu-core@^4.1.4:
+regexpu-core@^4.1.3, regexpu-core@^4.1.4, regexpu-core@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
   dependencies:
@@ -8542,10 +9057,6 @@ vuepress-html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
-vuepress-theme-vue@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vuepress-theme-vue/-/vuepress-theme-vue-1.1.0.tgz#8b109e3db8cad7b18459f4d77076808110c2bcaa"
-
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"

From 8b0adcb97e70f4f58c5bb38488f7fdbecc4c7aee Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 14 Aug 2018 15:38:54 +0800
Subject: [PATCH 063/242] feat: refine 'resolvePlugin' and
 'resolveScopePackage' and update test

---
 __mocks__/@org/vuepress-plugin-a.js           |  1 +
 __mocks__/@org/vuepress-plugin-b.js           |  1 +
 __mocks__/vuepress-plugin-a.js                |  1 +
 __mocks__/vuepress-plugin-b.js                |  1 +
 .../core/__test__/plugin-api/Plugin.spec.js   | 42 +++++++++++++++++++
 .../@vuepress/core/lib/plugin-api/util.js     | 31 ++++++++++----
 6 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 __mocks__/@org/vuepress-plugin-a.js
 create mode 100644 __mocks__/@org/vuepress-plugin-b.js
 create mode 100644 __mocks__/vuepress-plugin-a.js
 create mode 100644 __mocks__/vuepress-plugin-b.js
 create mode 100644 packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js

diff --git a/__mocks__/@org/vuepress-plugin-a.js b/__mocks__/@org/vuepress-plugin-a.js
new file mode 100644
index 0000000000..02faf7f0fc
--- /dev/null
+++ b/__mocks__/@org/vuepress-plugin-a.js
@@ -0,0 +1 @@
+module.exports = '@org/vuepress-plugin-a'
diff --git a/__mocks__/@org/vuepress-plugin-b.js b/__mocks__/@org/vuepress-plugin-b.js
new file mode 100644
index 0000000000..582b4a9888
--- /dev/null
+++ b/__mocks__/@org/vuepress-plugin-b.js
@@ -0,0 +1 @@
+module.exports = '@org/vuepress-plugin-b'
diff --git a/__mocks__/vuepress-plugin-a.js b/__mocks__/vuepress-plugin-a.js
new file mode 100644
index 0000000000..99f4333018
--- /dev/null
+++ b/__mocks__/vuepress-plugin-a.js
@@ -0,0 +1 @@
+module.exports = 'vuepress-plugin-a'
diff --git a/__mocks__/vuepress-plugin-b.js b/__mocks__/vuepress-plugin-b.js
new file mode 100644
index 0000000000..9771336031
--- /dev/null
+++ b/__mocks__/vuepress-plugin-b.js
@@ -0,0 +1 @@
+module.exports = 'vuepress-plugin-b'
diff --git a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
new file mode 100644
index 0000000000..836681524a
--- /dev/null
+++ b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
@@ -0,0 +1,42 @@
+jest.mock('vuepress-plugin-a')
+jest.mock('@org/vuepress-plugin-a')
+
+const {
+  resolvePlugin,
+  resolveScopePackage
+} = require('../../lib/plugin-api/util')
+
+// const Plugin = require('../../lib/plugin-api/index')
+
+describe('resolvePlugin', () => {
+  test('should resolve scope packages correctly', () => {
+    const pkg1 = resolveScopePackage('@vuepress/plugin-a')
+    expect(pkg1.org).toBe('vuepress')
+    expect(pkg1.name).toBe('plugin-a')
+    const pkg2 = resolveScopePackage('vuepress/plugin-a')
+    expect(pkg2).toBe(null)
+    const pkg3 = resolveScopePackage('vuepress-plugin-a')
+    expect(pkg3).toBe(null)
+  })
+
+  test('shoould return raw when function or object is given', () => {
+    const plugin1 = () => {}
+    const plugin2 = {}
+    expect(resolvePlugin(plugin1)).toBe(plugin1)
+    expect(resolvePlugin(plugin2)).toBe(plugin2)
+  })
+
+  // https://jestjs.io/docs/en/manual-mocks#mocking-node-modules
+  test('shoould resolve fullname correctly', () => {
+    expect(resolvePlugin('vuepress-plugin-a')).toBe('vuepress-plugin-a')
+    expect(resolvePlugin('@org/vuepress-plugin-a')).toBe('@org/vuepress-plugin-a')
+  })
+
+  // https://jestjs.io/docs/en/manual-mocks#mocking-node-modules
+  test('shoould resolve shortcut correctly', () => {
+    expect(resolvePlugin('a')).toBe('vuepress-plugin-a')
+    expect(resolvePlugin('@org/a')).toBe('@org/vuepress-plugin-a')
+    // special shortcut for vuepress
+    expect(resolvePlugin('@vuepress/a')).toBe('@vuepress/plugin-a')
+  })
+})
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index fa20dfedef..079f2cdaf2 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -1,22 +1,37 @@
 const logger = require('../util/logger')
 const chalk = require('chalk')
 
+const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
+
+exports.resolveScopePackage = function (name) {
+  if (SCOPE_PACKAGE_RE.test(name)) {
+    return {
+      org: RegExp.$1,
+      name: RegExp.$2
+    }
+  }
+  return null
+}
+
 exports.resolvePlugin = function (pluginRaw) {
   if (typeof pluginRaw === 'function' || typeof pluginRaw === 'object') {
     return pluginRaw
   }
   if (typeof pluginRaw === 'string') {
     try {
-      return require(pluginRaw.startsWith('vuepress-plugin-')
-        ? pluginRaw
-        : `vuepress-plugin-${pluginRaw}`
-      )
+      return require(pluginRaw.startsWith('vuepress-plugin-') ? pluginRaw : `vuepress-plugin-${pluginRaw}`)
     } catch (err) {
+      const pkg = exports.resolveScopePackage(pluginRaw)
       try {
-        return require(pluginRaw.startsWith('@vuepress/plugin-')
-          ? pluginRaw
-          : `@vuepress/plugin-${pluginRaw}`
-        )
+        if (pkg) {
+          if (pkg.org === 'vuepress') {
+            return require(pkg.name.startsWith('plugin-') ? pluginRaw : `@vuepress/plugin-${pkg.name}`)
+          } else {
+            return require(pkg.name.startsWith('vuepress-plugin-') ? pluginRaw : `@${pkg.org}/vuepress-plugin-${pkg.name}`)
+          }
+        } else {
+          throw new Error(`[vuepress] Cannot resolve ${pluginRaw}.`)
+        }
       } catch (err2) {
         console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
         throw new Error(err2)

From 9a50862c26bb70a37a1d1e22f3229235ab80b5b4 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 22:34:08 +0800
Subject: [PATCH 064/242] feat: refine plugin API

---
 __mocks__/@org/vuepress-plugin-a.js           |   2 +-
 __mocks__/@org/vuepress-plugin-b.js           |   2 +-
 __mocks__/@vuepress/plugin-a.js               |   1 +
 __mocks__/vuepress-plugin-a.js                |   2 +-
 __mocks__/vuepress-plugin-b.js                |   2 +-
 .../{Tapable.spec.js => Options.spec.js}      |  46 +++----
 .../core/__test__/plugin-api/Plugin.spec.js   |  47 ++------
 .../__test__/plugin-api/PluginUtil.spec.js    | 105 ++++++++++++++++
 packages/@vuepress/core/lib/build.js          |   2 +-
 packages/@vuepress/core/lib/dev.js            |   2 +-
 .../plugin-api/{core/Tapable.js => Option.js} |   2 +-
 .../core/lib/plugin-api/constants.js          |  60 ++++------
 .../core/lib/plugin-api/core/Hook.js          |   3 -
 .../@vuepress/core/lib/plugin-api/index.js    | 112 +++++++-----------
 .../option/AdditionalPagesOption.js           |   4 +-
 .../option/ClientDynamicModulesOption.js      |   4 +-
 .../option/EnhanceAppFilesOption.js           |   4 +-
 .../plugin-api/option/ExtendPageDataOption.js |   4 +-
 .../option/GlobalUIComponentsOption.js        |   4 +-
 .../plugin-api/option/instantiateOption.js    |  16 +--
 .../@vuepress/core/lib/plugin-api/util.js     | 103 ++++++++++++----
 packages/@vuepress/core/lib/prepare/index.js  |  11 +-
 .../core/lib/prepare/resolvePlugin.js         |   6 +-
 packages/@vuepress/core/lib/util/logger.js    |   1 +
 packages/@vuepress/plugin-test/index.js       |   2 +-
 packages/@vuepress/theme-default/index.js     |   6 +-
 packages/docs/docs/.vuepress/config.js        |   2 +-
 packages/vuepress/vuepress.js                 |   4 +-
 28 files changed, 327 insertions(+), 232 deletions(-)
 create mode 100644 __mocks__/@vuepress/plugin-a.js
 rename packages/@vuepress/core/__test__/plugin-api/{Tapable.spec.js => Options.spec.js} (56%)
 create mode 100644 packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
 rename packages/@vuepress/core/lib/plugin-api/{core/Tapable.js => Option.js} (96%)
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/core/Hook.js

diff --git a/__mocks__/@org/vuepress-plugin-a.js b/__mocks__/@org/vuepress-plugin-a.js
index 02faf7f0fc..4ba52ba2c8 100644
--- a/__mocks__/@org/vuepress-plugin-a.js
+++ b/__mocks__/@org/vuepress-plugin-a.js
@@ -1 +1 @@
-module.exports = '@org/vuepress-plugin-a'
+module.exports = {}
diff --git a/__mocks__/@org/vuepress-plugin-b.js b/__mocks__/@org/vuepress-plugin-b.js
index 582b4a9888..4ba52ba2c8 100644
--- a/__mocks__/@org/vuepress-plugin-b.js
+++ b/__mocks__/@org/vuepress-plugin-b.js
@@ -1 +1 @@
-module.exports = '@org/vuepress-plugin-b'
+module.exports = {}
diff --git a/__mocks__/@vuepress/plugin-a.js b/__mocks__/@vuepress/plugin-a.js
new file mode 100644
index 0000000000..4ba52ba2c8
--- /dev/null
+++ b/__mocks__/@vuepress/plugin-a.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/__mocks__/vuepress-plugin-a.js b/__mocks__/vuepress-plugin-a.js
index 99f4333018..4ba52ba2c8 100644
--- a/__mocks__/vuepress-plugin-a.js
+++ b/__mocks__/vuepress-plugin-a.js
@@ -1 +1 @@
-module.exports = 'vuepress-plugin-a'
+module.exports = {}
diff --git a/__mocks__/vuepress-plugin-b.js b/__mocks__/vuepress-plugin-b.js
index 9771336031..4ba52ba2c8 100644
--- a/__mocks__/vuepress-plugin-b.js
+++ b/__mocks__/vuepress-plugin-b.js
@@ -1 +1 @@
-module.exports = 'vuepress-plugin-b'
+module.exports = {}
diff --git a/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js b/packages/@vuepress/core/__test__/plugin-api/Options.spec.js
similarity index 56%
rename from packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
rename to packages/@vuepress/core/__test__/plugin-api/Options.spec.js
index af1b0404b8..8ce3ca1f1b 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Tapable.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Options.spec.js
@@ -1,46 +1,46 @@
 // TODO change to ES6 import
 // https://github.com/facebook/jest/issues/6835
 
-const Tapable = require('../../lib/plugin-api/core/Tapable')
+const Option = require('../../lib/plugin-api/Option')
 
-describe('Tapable', () => {
-  test('shoould tapable record the key', () => {
-    const tapable = new Tapable('option')
-    expect(tapable.key).toBe('option')
+describe('Option', () => {
+  test('shoould option record the key', () => {
+    const option = new Option('option')
+    expect(option.key).toBe('option')
   })
 
   test('should \'tap\' work', () => {
-    const tapable = new Tapable('option')
-    tapable.tap('plugin-a', 'a')
-    tapable.tap('plugin-b', 'b')
-    expect(tapable.items).toEqual([
+    const option = new Option('option')
+    option.tap('plugin-a', 'a')
+    option.tap('plugin-b', 'b')
+    expect(option.items).toEqual([
       { value: 'a', name: 'plugin-a' },
       { value: 'b', name: 'plugin-b' }
     ])
-    expect(tapable.values).toEqual(['a', 'b'])
+    expect(option.values).toEqual(['a', 'b'])
   })
 
   test('should \'tap\' resolve array value', () => {
-    const tapable = new Tapable('option')
-    tapable.tap('plugin-a', ['a-1', 'a-2'])
-    tapable.tap('plugin-b', 'b')
-    expect(tapable.items).toEqual([
+    const option = new Option('option')
+    option.tap('plugin-a', ['a-1', 'a-2'])
+    option.tap('plugin-b', 'b')
+    expect(option.items).toEqual([
       { value: 'a-1', name: 'plugin-a' },
       { value: 'a-2', name: 'plugin-a' },
       { value: 'b', name: 'plugin-b' }
     ])
-    expect(tapable.values).toEqual(['a-1', 'a-2', 'b'])
+    expect(option.values).toEqual(['a-1', 'a-2', 'b'])
   })
 
   test('should \'run\' work', async () => {
-    const tapable = new Tapable('option')
+    const option = new Option('option')
     const handler1 = jest.fn()
     const handler2 = jest.fn()
 
-    tapable.tap('plugin-a', handler1)
-    tapable.tap('plugin-b', handler2)
+    option.tap('plugin-a', handler1)
+    option.tap('plugin-b', handler2)
 
-    await tapable.run(1, 2)
+    await option.run(1, 2)
     expect(handler1.mock.calls).toHaveLength(1)
     expect(handler2.mock.calls).toHaveLength(1)
     expect(handler1.mock.calls[0][0]).toBe(1)
@@ -50,14 +50,14 @@ describe('Tapable', () => {
   })
 
   test('should \'parallelRun\' work', async () => {
-    const tapable = new Tapable('option')
+    const option = new Option('option')
     const handler1 = jest.fn()
     const handler2 = jest.fn()
 
-    tapable.tap('plugin-a', handler1)
-    tapable.tap('plugin-b', handler2)
+    option.tap('plugin-a', handler1)
+    option.tap('plugin-b', handler2)
 
-    await tapable.parallelRun(1, 2)
+    await option.parallelRun(1, 2)
     expect(handler1.mock.calls).toHaveLength(1)
     expect(handler2.mock.calls).toHaveLength(1)
     expect(handler1.mock.calls[0][0]).toBe(1)
diff --git a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
index 836681524a..baa817ec49 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
@@ -1,42 +1,15 @@
 jest.mock('vuepress-plugin-a')
 jest.mock('@org/vuepress-plugin-a')
 
-const {
-  resolvePlugin,
-  resolveScopePackage
-} = require('../../lib/plugin-api/util')
-
-// const Plugin = require('../../lib/plugin-api/index')
-
-describe('resolvePlugin', () => {
-  test('should resolve scope packages correctly', () => {
-    const pkg1 = resolveScopePackage('@vuepress/plugin-a')
-    expect(pkg1.org).toBe('vuepress')
-    expect(pkg1.name).toBe('plugin-a')
-    const pkg2 = resolveScopePackage('vuepress/plugin-a')
-    expect(pkg2).toBe(null)
-    const pkg3 = resolveScopePackage('vuepress-plugin-a')
-    expect(pkg3).toBe(null)
-  })
-
-  test('shoould return raw when function or object is given', () => {
-    const plugin1 = () => {}
-    const plugin2 = {}
-    expect(resolvePlugin(plugin1)).toBe(plugin1)
-    expect(resolvePlugin(plugin2)).toBe(plugin2)
-  })
-
-  // https://jestjs.io/docs/en/manual-mocks#mocking-node-modules
-  test('shoould resolve fullname correctly', () => {
-    expect(resolvePlugin('vuepress-plugin-a')).toBe('vuepress-plugin-a')
-    expect(resolvePlugin('@org/vuepress-plugin-a')).toBe('@org/vuepress-plugin-a')
-  })
-
-  // https://jestjs.io/docs/en/manual-mocks#mocking-node-modules
-  test('shoould resolve shortcut correctly', () => {
-    expect(resolvePlugin('a')).toBe('vuepress-plugin-a')
-    expect(resolvePlugin('@org/a')).toBe('@org/vuepress-plugin-a')
-    // special shortcut for vuepress
-    expect(resolvePlugin('@vuepress/a')).toBe('@vuepress/plugin-a')
+const Plugin = require('../../lib/plugin-api/index')
+const { PLUGIN_OPTION_MAP } = require('../../lib/plugin-api/constants')
+
+describe('Plugin', () => {
+  test('should resolve scope packages correctly.', () => {
+    const plugin = new Plugin()
+    const readyHandler = () => {}
+    plugin.registerOption(PLUGIN_OPTION_MAP.READY.key, readyHandler)
+    expect(plugin.options.ready.values).toHaveLength(1)
+    expect(plugin.options.ready.values[0]).toBe(readyHandler)
   })
 })
diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
new file mode 100644
index 0000000000..0fe04f2332
--- /dev/null
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
@@ -0,0 +1,105 @@
+jest.mock('vuepress-plugin-a')
+jest.mock('@org/vuepress-plugin-a')
+
+const {
+  resolvePlugin,
+  hydratePlugin,
+  resolveScopePackage
+} = require('../../lib/plugin-api/util')
+
+function resolveMockModule (name) {
+  return require(`../../../../../__mocks__/${name}`)
+}
+
+// const Plugin = require('../../lib/plugin-api/index')
+
+describe('resolvePlugin', () => {
+  test('should resolve scope packages correctly.', () => {
+    const pkg1 = resolveScopePackage('@vuepress/plugin-a')
+    expect(pkg1.org).toBe('vuepress')
+    expect(pkg1.name).toBe('plugin-a')
+
+    const pkg2 = resolveScopePackage('vuepress/plugin-a')
+    expect(pkg2).toBe(null)
+
+    const pkg3 = resolveScopePackage('vuepress-plugin-a')
+    expect(pkg3).toBe(null)
+  })
+
+  test('shoould resolve local plugin as expected.', () => {
+    const plugin1 = () => {}
+    const plugin2 = {}
+    expect(resolvePlugin(plugin1)).toEqual({ name: 'plugin1', shortcut: 'plugin1', config: plugin1 })
+    expect(resolvePlugin(plugin2)).toEqual({ name: 'anonymous-1', shortcut: 'anonymous-1', config: plugin2 })
+  })
+
+  test('shoould resolve fullname usage correctly.', () => {
+    let plugin = resolvePlugin('vuepress-plugin-a')
+    expect(plugin.name).toBe('vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('a')
+    expect(plugin.config).toBe(resolveMockModule('vuepress-plugin-a'))
+
+    plugin = resolvePlugin('@org/vuepress-plugin-a')
+    expect(plugin.name).toBe('@org/vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('@org/a')
+    expect(plugin.config).toBe(resolveMockModule('@org/vuepress-plugin-a'))
+  })
+
+  test('shoould resolve shortcut usage correctly.', () => {
+    // normal package
+    let plugin = resolvePlugin('a')
+    expect(plugin.name).toBe('vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('a')
+    expect(plugin.config).toBe(resolveMockModule('vuepress-plugin-a'))
+
+    // scope packages
+    plugin = resolvePlugin('@org/a')
+    expect(plugin.name).toBe('@org/vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('@org/a')
+    expect(plugin.config).toBe(resolveMockModule('@org/vuepress-plugin-a'))
+
+    // special case for @vuepress package
+    plugin = resolvePlugin('@vuepress/a')
+    expect(plugin.name).toBe('@vuepress/plugin-a')
+    expect(plugin.shortcut).toBe('@vuepress/a')
+    expect(plugin.config).toBe(resolveMockModule('@vuepress/plugin-a'))
+  })
+
+  test('shoould return null when plugin cannot be resolved.', () => {
+    expect(resolvePlugin('c')).toEqual({ name: 'c', shortcut: 'c', config: null })
+  })
+})
+
+describe('hydratePlugin', () => {
+  test('shoould hydrate plugin correctly', () => {
+    const plugin = { name: 'a', shortcut: 'a', config: { enhanceAppFiles: 'file' }}
+    const hydratedPlugin = hydratePlugin(plugin, {}, {})
+    expect(hydratedPlugin.name).toBe('a')
+    expect(hydratedPlugin.shortcut).toBe('a')
+    expect(hydratedPlugin.enabled).toBe(true)
+    expect(hydratedPlugin.enhanceAppFiles).toBe('file')
+  })
+
+  test('shoould set \'enabled\' to false when \'pluginOptions\' is set to false.', () => {
+    const plugin = { name: 'a', shortcut: 'a', config: {}}
+    const hydratedPlugin = hydratePlugin(plugin, false, {})
+    expect(hydratedPlugin.name).toBe('a')
+    expect(hydratedPlugin.shortcut).toBe('a')
+    expect(hydratedPlugin.enabled).toBe(false)
+  })
+
+  test('shoould hydrate functional plugin correctly.', () => {
+    const config = jest.fn(() => ({ enhanceAppFiles: 'file' }))
+    const plugin = { name: 'a', shortcut: 'a', config }
+    const pluginOptions = {}
+    const pluginContext = {}
+    const hydratedPlugin = hydratePlugin(plugin, pluginOptions, pluginContext)
+    expect(hydratedPlugin.name).toBe('a')
+    expect(hydratedPlugin.shortcut).toBe('a')
+    expect(hydratedPlugin.enabled).toBe(true)
+    expect(hydratedPlugin.enhanceAppFiles).toBe('file')
+    expect(config.mock.calls).toHaveLength(1)
+    expect(config.mock.calls[0][0]).toBe(pluginOptions)
+    expect(Object.getPrototypeOf(config.mock.calls[0][1])).toBe(pluginContext)
+  })
+})
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 2097f371ed..edeb133206 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -94,7 +94,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     )
   }
 
-  await options.plugin.hooks.generated.run()
+  await options.plugin.options.generated.run()
 
   // DONE.
   const relativeDir = path.relative(process.cwd(), outDir)
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index a9e9f6a954..12b06d0f4f 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -24,7 +24,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
-    options.plugin.hooks.updated.run()
+    options.plugin.options.updated.run()
     prepare(sourceDir).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
diff --git a/packages/@vuepress/core/lib/plugin-api/core/Tapable.js b/packages/@vuepress/core/lib/plugin-api/Option.js
similarity index 96%
rename from packages/@vuepress/core/lib/plugin-api/core/Tapable.js
rename to packages/@vuepress/core/lib/plugin-api/Option.js
index 5f21c61aa2..6d2c6a53e2 100644
--- a/packages/@vuepress/core/lib/plugin-api/core/Tapable.js
+++ b/packages/@vuepress/core/lib/plugin-api/Option.js
@@ -1,4 +1,4 @@
-module.exports = class Tapable {
+module.exports = class Option {
   constructor (key) {
     this.key = key
     this.items = [] // Array<{ value: T, name: string }>
diff --git a/packages/@vuepress/core/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
index 4c0f09f91e..c6c9fa63e8 100644
--- a/packages/@vuepress/core/lib/plugin-api/constants.js
+++ b/packages/@vuepress/core/lib/plugin-api/constants.js
@@ -1,38 +1,28 @@
-const READY = 'ready'
-const COMPILED = 'compiled'
-const UPDATED = 'updated'
-const GENERATED = 'generated'
-
-const CHAIN_WEBPACK = 'chainWebpack'
-const ENHANCE_DEV_SERVER = 'enhanceDevServer'
-const ENHANCE_APP_FILES = 'enhanceAppFiles'
-const OUT_FILES = 'outFiles'
-const EXTEND_PAGE_DATA = 'extendPageData'
-const EXTEND_MARKDOWN = 'extendMarkdown'
-const CLIENT_DYNAMIC_MODULES = 'clientDynamicModules'
-const CLIENT_ROOT_MIXIN = 'clientRootMixin'
-const ADDITIONAL_PAGES = 'additionalPages'
-const GLOBAL_UI_COMPONENTS = 'globalUIComponents'
-
-const HOOK = {
-  READY,
-  COMPILED,
-  UPDATED,
-  GENERATED
+const PLUGIN_OPTION_META_MAP = {
+  // hooks
+  READY: { name: 'ready', types: [Function] },
+  COMPILED: { name: 'compiled', types: [Function] },
+  UPDATED: { name: 'updated', types: [Function] },
+  GENERATED: { name: 'generated', types: [Function] },
+  // options
+  CHAIN_WEBPACK: { name: 'chainWebpack', types: [Function] },
+  ENHANCE_DEV_SERVER: { name: 'enhanceDevServer', types: [Function] },
+  ENHANCE_APP_FILES: { name: 'enhanceAppFiles', types: [Array, Function] },
+  OUT_FILES: { name: 'outFiles', types: [Object] },
+  EXTEND_PAGE_DATA: { name: 'extendPageData', types: [Function] },
+  EXTEND_MARKDOWN: { name: 'extendMarkdown', types: [Function] },
+  CLIENT_DYNAMIC_MODULES: { name: 'clientDynamicModules', types: [Function] },
+  CLIENT_ROOT_MIXIN: { name: 'clientRootMixin', types: [String] },
+  ADDITIONAL_PAGES: { name: 'additionalPages', types: [Function, Array] },
+  GLOBAL_UI_COMPONENTS: { name: 'globalUIComponents', types: [String, Array] }
 }
 
-const OPTION = {
-  CHAIN_WEBPACK,
-  ENHANCE_DEV_SERVER,
-  ENHANCE_APP_FILES,
-  OUT_FILES,
-  EXTEND_PAGE_DATA,
-  EXTEND_MARKDOWN,
-  CLIENT_DYNAMIC_MODULES,
-  CLIENT_ROOT_MIXIN,
-  ADDITIONAL_PAGES,
-  GLOBAL_UI_COMPONENTS
-}
+const PLUGIN_OPTION_MAP = {}
+Object.keys(PLUGIN_OPTION_META_MAP).forEach(key => {
+  PLUGIN_OPTION_MAP[key] = Object.assign({ key }, PLUGIN_OPTION_META_MAP[key])
+})
+
+const OPTION_NAMES = Object.keys(PLUGIN_OPTION_META_MAP).map(key => PLUGIN_OPTION_META_MAP[key].name)
 
-exports.HOOK = HOOK
-exports.OPTION = OPTION
+exports.PLUGIN_OPTION_MAP = PLUGIN_OPTION_MAP
+exports.OPTION_NAMES = OPTION_NAMES
diff --git a/packages/@vuepress/core/lib/plugin-api/core/Hook.js b/packages/@vuepress/core/lib/plugin-api/core/Hook.js
deleted file mode 100644
index 3614637401..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/core/Hook.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const Tapable = require('./Tapable')
-
-module.exports = class Hook extends Tapable {}
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 6fe3f3c9c1..feaeea6188 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -1,33 +1,24 @@
 const chalk = require('chalk')
-const Hook = require('./core/Hook')
-const instantiateAPI = require('./option/instantiateOption')
 const logger = require('../util/logger')
-const { resolvePlugin, inferPluginName } = require('./util')
+const instantiateOption = require('./option/instantiateOption')
+const { resolvePlugin, hydratePlugin, normalizePluginsConfig } = require('./util')
 const { assertTypes } = require('../util/shared')
-const { HOOK, OPTION } = require('./constants')
+const { PLUGIN_OPTION_MAP } = require('./constants')
 
 module.exports = class Plugin {
   constructor (context) {
-    this.hooks = {}
     this.options = {}
     this._pluginContext = context
-    this.extendHooks(Object.values(HOOK))
-    this.extendOptions(Object.values(OPTION))
+    this.initializeOptions(PLUGIN_OPTION_MAP)
   }
 
-  use (pluginRaw, pluginOptions) {
+  use (pluginRaw, pluginOptions = {}) {
     let plugin = resolvePlugin(pluginRaw)
-    if (typeof plugin === 'function') {
-      // 'Object.create' here is to give each plugin a separate context,
-      // but also own the inheritance context.
-      plugin = plugin(pluginOptions, Object.create(this._pluginContext))
+    if (!plugin.config) {
+      console.warn(`[vuepress] cannot resolve plugin "${pluginRaw}"`)
+      return
     }
-
-    plugin = Object.assign({
-      enabled: true,
-      name: inferPluginName(pluginRaw, plugin)
-    }, plugin)
-
+    plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext)
     if (plugin.enabled) {
       this.applyPlugin(plugin)
     } else {
@@ -36,60 +27,39 @@ module.exports = class Plugin {
     return this
   }
 
-  useByConfigs (pluginConfigs) {
-    if (!Array.isArray(pluginConfigs)) {
-      pluginConfigs = []
-    }
-    pluginConfigs.forEach(pluginConfigs => {
-      pluginConfigs = Array.isArray(pluginConfigs)
-        ? pluginConfigs
-        : [pluginConfigs]
-      const [pluginRaw, pluginOptions] = pluginConfigs
+  useByPluginsConfig (pluginsConfig) {
+    pluginsConfig = normalizePluginsConfig(pluginsConfig)
+    pluginsConfig.forEach(([pluginRaw, pluginOptions]) => {
       this.use(pluginRaw, pluginOptions)
     })
     return this
   }
 
-  extendHooks (hooks) {
-    hooks.forEach(hook => {
-      this.hooks[hook] = new Hook(hook)
-    })
-  }
-
-  extendOptions (options) {
-    options.forEach(api => {
-      this.options[api] = instantiateAPI(api)
+  initializeOptions () {
+    Object.keys(PLUGIN_OPTION_MAP).forEach(key => {
+      const option = PLUGIN_OPTION_MAP[key]
+      this.options[option.name] = instantiateOption(option.name)
     })
   }
 
-  registerHook (name, hook, pluginName, types) {
-    const { valid, warnMsg } = assertTypes(hook, types)
-    if (valid) {
-      this.hooks[name].tap(pluginName, hook)
-    } else if (hook !== undefined) {
-      logger.warn(
-        `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
-        `Invalid value for "hook" ${chalk.cyan(name)}: ${warnMsg}`
-      )
-    }
-    return this
-  }
-
-  registerOption (name, api, pluginName, types) {
-    const { valid, warnMsg } = assertTypes(api, types)
+  registerOption (key, value, pluginName) {
+    const option = PLUGIN_OPTION_MAP[key]
+    const types = option.types
+    const { valid, warnMsg } = assertTypes(value, types)
     if (valid) {
-      this.options[name].tap(pluginName, api)
-    } else if (api !== undefined) {
+      this.options[option.name].tap(pluginName, value)
+    } else if (value !== undefined) {
       logger.warn(
         `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
-        `Invalid value for "option" ${chalk.cyan(name)}: ${warnMsg}`
+        `Invalid value for "option" ${chalk.cyan(option.name)}: ${warnMsg}`
       )
     }
     return this
   }
 
   applyPlugin ({
-    name,
+    name: pluginName,
+    shortcut,
     chainWebpack,
     enhanceDevServer,
     extendMarkdown,
@@ -105,24 +75,22 @@ module.exports = class Plugin {
     additionalPages,
     globalUIComponents
   }) {
-    logger.tip(`\nApply plugin ${chalk.gray(name)}...`)
-
-    this
-      .registerHook(HOOK.READY, ready, name, [Function])
-      .registerHook(HOOK.COMPILED, compiled, name, [Function])
-      .registerHook(HOOK.UPDATED, updated, name, [Function])
-      .registerHook(HOOK.GENERATED, generated, name, [Function])
+    logger.tip(`\nApply plugin ${chalk.gray(pluginName)}...`)
 
     this
-      .registerOption(OPTION.CHAIN_WEBPACK, chainWebpack, name, [Function])
-      .registerOption(OPTION.ENHANCE_DEV_SERVER, enhanceDevServer, name, [Function])
-      .registerOption(OPTION.EXTEND_MARKDOWN, extendMarkdown, name, [Function])
-      .registerOption(OPTION.EXTEND_PAGE_DATA, extendPageData, name, [Function])
-      .registerOption(OPTION.ENHANCE_APP_FILES, enhanceAppFiles, name, [Array, Function])
-      .registerOption(OPTION.OUT_FILES, outFiles, name, [Object])
-      .registerOption(OPTION.CLIENT_DYNAMIC_MODULES, clientDynamicModules, name, [Function])
-      .registerOption(OPTION.CLIENT_ROOT_MIXIN, clientRootMixin, name, [String])
-      .registerOption(OPTION.ADDITIONAL_PAGES, additionalPages, name, [Function, Array])
-      .registerOption(OPTION.GLOBAL_UI_COMPONENTS, globalUIComponents, name, [String, Array])
+      .registerOption(PLUGIN_OPTION_MAP.READY.key, ready, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.COMPILED.key, compiled, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.UPDATED.key, updated, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.GENERATED.key, generated, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.CHAIN_WEBPACK.key, chainWebpack, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.ENHANCE_DEV_SERVER.key, enhanceDevServer, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.EXTEND_MARKDOWN.key, extendMarkdown, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.EXTEND_PAGE_DATA.key, extendPageData, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.ENHANCE_APP_FILES.key, enhanceAppFiles, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.OUT_FILES.key, outFiles, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.CLIENT_DYNAMIC_MODULES.key, clientDynamicModules, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.CLIENT_ROOT_MIXIN.key, clientRootMixin, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.ADDITIONAL_PAGES.key, additionalPages, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.GLOBAL_UI_COMPONENTS.key, globalUIComponents, pluginName)
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js b/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
index 482b34e76c..920b76c58d 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
@@ -1,6 +1,6 @@
-const Tapable = require('../core/Tapable')
+const Option = require('../Option')
 
-module.exports = class AdditionalPagesOption extends Tapable {
+module.exports = class AdditionalPagesOption extends Option {
   tap (pluginName, value) {
     if (typeof value === 'function') {
       value = value()
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index 385bbc99c6..49c9b3f385 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -1,7 +1,7 @@
-const Tapable = require('../core/Tapable')
+const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
 
-module.exports = class ClientDynamicModulesOption extends Tapable {
+module.exports = class ClientDynamicModulesOption extends Option {
   async run () {
     for (const item of this.items) {
       const { value: fn, name: pluginName } = item
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 690fad1632..11a0da79ff 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -1,11 +1,11 @@
 const fs = require('fs-extra')
 const chalk = require('chalk')
-const Tapable = require('../core/Tapable')
+const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
 const { pathsToModuleCode } = require('../../prepare/codegen')
 const logger = require('../../util/logger')
 
-module.exports = class EnhanceAppFilesOption extends Tapable {
+module.exports = class EnhanceAppFilesOption extends Option {
   /**
    * In fact, we can quickly implement support for function parameters
    * by overriding 'tap', but 'tap' will be executed immediately
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
index c80081200a..b09471b59f 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
@@ -1,6 +1,6 @@
-const Tapable = require('../core/Tapable')
+const Option = require('../Option')
 
-module.exports = class ExtendPageDataOption extends Tapable {
+module.exports = class ExtendPageDataOption extends Option {
   async run (args) {
     const { data } = args
     for (const fn of this.values) {
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
index a6d7ccf698..58697ebe1c 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
@@ -1,7 +1,7 @@
-const Tapable = require('../core/Tapable')
+const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
 
-module.exports = class GlobalUIComponentsOption extends Tapable {
+module.exports = class GlobalUIComponentsOption extends Option {
   async run () {
     writeTemp(
       `dynamic-modules/global-ui.js`,
diff --git a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
index 7afcf74774..0ef86fa609 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
@@ -3,26 +3,26 @@ const ExtendPageDataOption = require('./ExtendPageDataOption')
 const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
 const AdditionalPagesOption = require('./AdditionalPagesOption')
 const GlobalUIComponentsOption = require('./GlobalUIComponentsOption')
-const Tapable = require('../core/Tapable')
-const { OPTION } = require('../constants')
+const Option = require('../Option')
+const { PLUGIN_OPTION_MAP } = require('../constants')
 
 module.exports = function instantiateOption (name) {
   switch (name) {
-  case OPTION.ENHANCE_APP_FILES:
+  case PLUGIN_OPTION_MAP.ENHANCE_APP_FILES.name:
     return new EnhanceAppFilesOption(name)
 
-  case OPTION.EXTEND_PAGE_DATA:
+  case PLUGIN_OPTION_MAP.EXTEND_PAGE_DATA.name:
     return new ExtendPageDataOption(name)
 
-  case OPTION.CLIENT_DYNAMIC_MODULES:
+  case PLUGIN_OPTION_MAP.CLIENT_DYNAMIC_MODULES.name:
     return new ClientDynamicModulesOption(name)
 
-  case OPTION.ADDITIONAL_PAGES:
+  case PLUGIN_OPTION_MAP.ADDITIONAL_PAGES.name:
     return new AdditionalPagesOption(name)
 
-  case OPTION.GLOBAL_UI_COMPONENTS:
+  case PLUGIN_OPTION_MAP.GLOBAL_UI_COMPONENTS.name:
     return new GlobalUIComponentsOption(name)
 
-  default: return new Tapable(name)
+  default: return new Option(name)
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 079f2cdaf2..1bfc9d03a1 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -1,7 +1,10 @@
-const logger = require('../util/logger')
 const chalk = require('chalk')
+const { isDebug } = require('../util/logger')
+const logger = require('../util/logger')
+const { assertTypes } = require('../util/shared')
 
 const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
+let anonymousPluginIdx = 0
 
 exports.resolveScopePackage = function (name) {
   if (SCOPE_PACKAGE_RE.test(name)) {
@@ -13,44 +16,102 @@ exports.resolveScopePackage = function (name) {
   return null
 }
 
+/**
+ * Resolve plugin config, name, and shortcut.
+ * @param pluginRaw
+ * @returns {{config: Function|Object, name: string, shortcut: string}}
+ */
 exports.resolvePlugin = function (pluginRaw) {
+  let name
+  let config
+  let shortcut
   if (typeof pluginRaw === 'function' || typeof pluginRaw === 'object') {
-    return pluginRaw
-  }
-  if (typeof pluginRaw === 'string') {
+    config = pluginRaw
+    name = shortcut = pluginRaw.name || `anonymous-${++anonymousPluginIdx}`
+  } else if (typeof pluginRaw === 'string') {
     try {
-      return require(pluginRaw.startsWith('vuepress-plugin-') ? pluginRaw : `vuepress-plugin-${pluginRaw}`)
+      shortcut = pluginRaw.startsWith('vuepress-plugin-') ? pluginRaw.slice(16) : pluginRaw
+      name = `vuepress-plugin-${shortcut}`
+      config = require(name)
     } catch (err) {
       const pkg = exports.resolveScopePackage(pluginRaw)
       try {
         if (pkg) {
           if (pkg.org === 'vuepress') {
-            return require(pkg.name.startsWith('plugin-') ? pluginRaw : `@vuepress/plugin-${pkg.name}`)
+            shortcut = pkg.name.startsWith('plugin-') ? pkg.name.slice(7) : pkg.name
+            name = `@vuepress/plugin-${shortcut}`
           } else {
-            return require(pkg.name.startsWith('vuepress-plugin-') ? pluginRaw : `@${pkg.org}/vuepress-plugin-${pkg.name}`)
+            shortcut = pkg.name.startsWith('vuepress-plugin-') ? pkg.name.slice(16) : pkg.name
+            name = `@${pkg.org}/vuepress-plugin-${shortcut}`
           }
+          shortcut = `@${pkg.org}/${shortcut}`
+          config = require(name)
         } else {
-          throw new Error(`[vuepress] Cannot resolve ${pluginRaw}.`)
+          throw new Error(`[vuepress] Invalid plugin usage ${pluginRaw}.`)
         }
       } catch (err2) {
-        console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
-        throw new Error(err2)
+        if (isDebug) {
+          console.error(err2)
+        }
+        name = shortcut = pluginRaw
+        config = null
       }
     }
   }
-  logger.warn(`\n[vuepress] Invalid plugin usage: ${chalk.yellow(pluginRaw)}\n`)
+  return { config, name, shortcut }
 }
 
-exports.inferPluginName = function (pluginRaw, pluginConfig) {
-  if (pluginConfig.name) {
-    return pluginConfig.name
+/**
+ * Hydrates your plugin config, options and context.
+ * @param {Function | Object} config
+ * @param {String} name
+ * @param {String} hortcut
+ * @param {Object} pluginOptions
+ * @param {Object} pluginContext
+ */
+exports.hydratePlugin = function ({ config, name, shortcut }, pluginOptions, pluginContext) {
+  const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
+  if (!valid) {
+    logger.warn(
+      `[${chalk.gray(shortcut)}] ` +
+      `Invalid value for "pluginOptions" ${chalk.cyan(name)}: ${warnMsg}`
+    )
+    pluginOptions = {}
   }
-  if (typeof pluginRaw === 'string') {
-    if (pluginRaw.startsWith('vuepress-plugin-')) {
-      return pluginRaw.slice(16)
-    }
-    return pluginRaw
+  let enabled = true
+  if (typeof pluginOptions === 'boolean') {
+    enabled = pluginOptions
+    pluginOptions = {}
+  }
+  if (typeof config === 'function') {
+    // 'Object.create' here is to give each plugin a separate context,
+    // but also own the inheritance context.
+    config = config(pluginOptions, Object.create(pluginContext))
+  }
+  return Object.assign(config, { name, shortcut, enabled })
+}
+
+/**
+ * Normalize plugins config in `.vuepress/config.js`
+ * @param pluginsConfig
+ */
+exports.normalizePluginsConfig = function (pluginsConfig) {
+  const { valid, warnMsg } = assertTypes(pluginsConfig, [Object, Array])
+  if (!valid) {
+    logger.warn(
+      `[${chalk.gray('config')}] ` +
+      `Invalid value for "plugin" value ${chalk.cyan(name)}: ${warnMsg}`
+    )
+    pluginsConfig = []
+  }
+  if (Array.isArray(pluginsConfig)) {
+    pluginsConfig = pluginsConfig.map(item => {
+      return Array.isArray(item) ? item : [item]
+    })
+  } else if (typeof pluginsConfig === 'object') {
+    pluginsConfig = Object.keys(pluginsConfig).map(item => {
+      return [item, pluginsConfig[item]]
+    })
   }
-  // ensure each plugin have a unique name.
-  return Date.now().toString(16)
+  return pluginsConfig
 }
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index bc031451bd..03cc5be7ce 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -21,6 +21,7 @@ module.exports = async function prepare ({
   // 2. resolve plugin
   const plugin = resolvePlugin(options)
   options.plugin = plugin
+  const pluginOptions = plugin.options
 
   // 3. resolve siteData
   // SiteData must be resolved after the plugin initialization
@@ -28,12 +29,12 @@ module.exports = async function prepare ({
   options.siteData = await resolveSiteData(options)
   Object.freeze(options)
 
-  await plugin.hooks.ready.run()
+  await pluginOptions.ready.run()
 
   // 4. apply plugin options to extend markdown.
-  plugin.options.extendMarkdown.run(markdown)
-  plugin.options.clientDynamicModules.run()
-  plugin.options.globalUIComponents.run()
+  pluginOptions.extendMarkdown.run(markdown)
+  pluginOptions.clientDynamicModules.run()
+  pluginOptions.globalUIComponents.run()
 
   // 5. generate routes code
   const routesCode = await genRoutesFile(options)
@@ -60,7 +61,7 @@ module.exports = async function prepare ({
     )
   }
 
-  await plugin.options.enhanceAppFiles.run()
+  await pluginOptions.enhanceAppFiles.run()
 
   return options
 }
diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
index 2481be0885..09d2ffcb1e 100644
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -13,9 +13,9 @@ module.exports = function (options) {
 
   plugin
     // user plugin
-    .useByConfigs(cliPlugins)
-    .useByConfigs(siteConfig.plugins)
-    .useByConfigs(themePlugins)
+    .useByPluginsConfig(cliPlugins)
+    .useByPluginsConfig(siteConfig.plugins)
+    .useByPluginsConfig(themePlugins)
     // built-in plugins
     .use(enhanceAppPlugin)
     .use(registerGlobalComponentsPlugin, {
diff --git a/packages/@vuepress/core/lib/util/logger.js b/packages/@vuepress/core/lib/util/logger.js
index 7824e2e003..919e27ee86 100644
--- a/packages/@vuepress/core/lib/util/logger.js
+++ b/packages/@vuepress/core/lib/util/logger.js
@@ -55,3 +55,4 @@ logger.debug = function (msg) {
 
 module.exports = logger
 module.exports.getLoggerFn = getLoggerFn
+module.exports.isDebug = isDebug
diff --git a/packages/@vuepress/plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
index 1ca6a808aa..ce98c86389 100644
--- a/packages/@vuepress/plugin-test/index.js
+++ b/packages/@vuepress/plugin-test/index.js
@@ -15,7 +15,7 @@ module.exports = (options, context) => ({
   // globalComponents: ['BackTIoTop'],
 
   // Usually used to construct a global UI, e.g. back to top.
-  globalUIComponents: ['BackToTop'],
+  // globalUIComponents: ['BackToTop'],
 
   clientRootMixin: path.resolve(__dirname, 'mixin.js'),
 
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 4e5e932d16..e8df30d4bd 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -1,7 +1,5 @@
 const path = require('path')
 const themePlugin = require('./plugin')
-const activeHeaderLinksPlugin = require('@vuepress/plugin-active-header-links')
-const googleAnalyticsPlugin = require('@vuepress/plugin-google-analytics')
 
 // Theme API.
 module.exports = {
@@ -9,7 +7,7 @@ module.exports = {
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: [
     themePlugin,
-    activeHeaderLinksPlugin,
-    googleAnalyticsPlugin
+    '@vuepress/active-header-links',
+    '@vuepress/google-analytics'
   ]
 }
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 2a58e4c74f..0f11efcc7a 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -24,7 +24,7 @@ module.exports = {
     ['meta', { name: 'msapplication-TileColor', content: '#000000' }]
   ],
   serviceWorker: true,
-  plugins: ['back-to-top'],
+  plugins: ['@vuepress/back-to-top'],
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
diff --git a/packages/vuepress/vuepress.js b/packages/vuepress/vuepress.js
index 84a9026531..df0b309158 100755
--- a/packages/vuepress/vuepress.js
+++ b/packages/vuepress/vuepress.js
@@ -3,7 +3,7 @@
 require('@vuepress/cli').bootstrap({
   theme: 'default',
   plugins: [
-    'test',
-    'i18n-ui'
+    '@vuepress/test',
+    '@vuepress/i18n-ui'
   ]
 })

From f346884639d6d92d20cf58cbbc0862607065242c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:06:50 +0800
Subject: [PATCH 065/242] feat: respect name in local plugin config

---
 packages/@vuepress/core/lib/plugin-api/index.js |  6 +++++-
 packages/@vuepress/core/lib/plugin-api/util.js  | 14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index feaeea6188..7f647660da 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -75,7 +75,11 @@ module.exports = class Plugin {
     additionalPages,
     globalUIComponents
   }) {
-    logger.tip(`\nApply plugin ${chalk.gray(pluginName)}...`)
+    if (shortcut) {
+      logger.tip(`\nApply plugin ${chalk.magenta(shortcut)} ${chalk.gray(`(i.e. "${pluginName}")`)} ...`)
+    } else {
+      logger.tip(`\nApply plugin ${chalk.magenta(pluginName)} ...`)
+    }
 
     this
       .registerOption(PLUGIN_OPTION_MAP.READY.key, ready, pluginName)
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 1bfc9d03a1..a33d0e034c 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -25,9 +25,11 @@ exports.resolvePlugin = function (pluginRaw) {
   let name
   let config
   let shortcut
+  let isLocal = false
   if (typeof pluginRaw === 'function' || typeof pluginRaw === 'object') {
     config = pluginRaw
     name = shortcut = pluginRaw.name || `anonymous-${++anonymousPluginIdx}`
+    isLocal = true
   } else if (typeof pluginRaw === 'string') {
     try {
       shortcut = pluginRaw.startsWith('vuepress-plugin-') ? pluginRaw.slice(16) : pluginRaw
@@ -58,7 +60,7 @@ exports.resolvePlugin = function (pluginRaw) {
       }
     }
   }
-  return { config, name, shortcut }
+  return { config, name, shortcut, isLocal }
 }
 
 /**
@@ -69,7 +71,7 @@ exports.resolvePlugin = function (pluginRaw) {
  * @param {Object} pluginOptions
  * @param {Object} pluginContext
  */
-exports.hydratePlugin = function ({ config, name, shortcut }, pluginOptions, pluginContext) {
+exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOptions, pluginContext) {
   const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
   if (!valid) {
     logger.warn(
@@ -88,7 +90,13 @@ exports.hydratePlugin = function ({ config, name, shortcut }, pluginOptions, plu
     // but also own the inheritance context.
     config = config(pluginOptions, Object.create(pluginContext))
   }
-  return Object.assign(config, { name, shortcut, enabled })
+  // respect name in local plugin config
+  name = isLocal && config.name || name
+  return Object.assign(config, {
+    name,
+    shortcut: isLocal ? null : shortcut,
+    enabled
+  })
 }
 
 /**

From 2236365d1f5a828709cbaa2bc0f5dac08b818d44 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:07:35 +0800
Subject: [PATCH 066/242] feat: using shortcut to resolve plugin

---
 packages/@vuepress/core/lib/prepare/resolvePlugin.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
index 09d2ffcb1e..db1b8d2007 100644
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
@@ -2,10 +2,6 @@ const path = require('path')
 const Plugin = require('../plugin-api/index')
 const PluginContext = require('../plugin-api/context')
 
-const lastUpdatedPlugin = require('@vuepress/plugin-last-updated')
-const enhanceAppPlugin = require('@vuepress/plugin-enhance-app')
-const registerGlobalComponentsPlugin = require('@vuepress/plugin-register-components')
-
 module.exports = function (options) {
   const { siteConfig, themeConfig, sourceDir, themePath, themePlugins, cliPlugins } = options
   const pluginContext = new PluginContext(options)
@@ -17,8 +13,8 @@ module.exports = function (options) {
     .useByPluginsConfig(siteConfig.plugins)
     .useByPluginsConfig(themePlugins)
     // built-in plugins
-    .use(enhanceAppPlugin)
-    .use(registerGlobalComponentsPlugin, {
+    .use('@vuepress/enhance-app')
+    .use('@vuepress/register-components', {
       componentsDir: [
         path.resolve(sourceDir, '.vuepress/components'),
         path.resolve(themePath, 'components')
@@ -32,7 +28,7 @@ module.exports = function (options) {
       .some(base => themeConfig.locales[base].lastUpdated)
   )
   if (shouldUseLastUpdated) {
-    plugin.use(lastUpdatedPlugin)
+    plugin.use('@vuepress/last-updated')
   }
 
   return plugin

From bd25781b8432e6827c0d584e6174129b571391db Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:28:03 +0800
Subject: [PATCH 067/242] fix: correct prepare usage

---
 packages/@vuepress/core/lib/dev.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index 12b06d0f4f..ff78815000 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -25,7 +25,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   // setup watchers to update options and dynamically generated files
   const update = () => {
     options.plugin.options.updated.run()
-    prepare(sourceDir).catch(err => {
+    prepare({ sourceDir, cliOptions, isProd: false }).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
   }

From 6c364fe5bd555f635193b5d04423a161409c1d62 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:28:27 +0800
Subject: [PATCH 068/242] refactor: enhance log output

---
 packages/@vuepress/core/lib/plugin-api/index.js                 | 2 +-
 .../core/lib/plugin-api/option/EnhanceAppFilesOption.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 7f647660da..ffc8c4db97 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -22,7 +22,7 @@ module.exports = class Plugin {
     if (plugin.enabled) {
       this.applyPlugin(plugin)
     } else {
-      logger.debug(`\n${chalk.gray(`[vuepress-plugin-${plugin.name}]`)} disabled.`)
+      logger.debug(`\n${chalk.gray(`[${plugin.name}]`)} disabled.`)
     }
     return this
   }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 11a0da79ff..217a4d59d2 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -58,7 +58,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
           )
         } else {
           logger.debug(
-            chalk.gray(`[vuepress-plugin-${pluginName}] `) +
+            chalk.gray(`[${pluginName}] `) +
             `${chalk.cyan(filepath)} Not Found.`
           )
         }

From 08cef09249f408800433bd0e69f23b3e820d5493 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:38:03 +0800
Subject: [PATCH 069/242] refactor(@vuepress/back-to-top): use pure css so this
 plugin can be used at not only stylus environm

---
 .../plugin-back-to-top/BackToTop.vue          | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/packages/@vuepress/plugin-back-to-top/BackToTop.vue b/packages/@vuepress/plugin-back-to-top/BackToTop.vue
index 3b701bb4b7..5268a1bd7d 100644
--- a/packages/@vuepress/plugin-back-to-top/BackToTop.vue
+++ b/packages/@vuepress/plugin-back-to-top/BackToTop.vue
@@ -58,27 +58,32 @@ export default {
 }
 </script>
 
-<style lang="stylus" scoped>
-  // TODO use pure CSS so that it can be used not only in default theme.
-  $iconSize = 2rem
-  .go-to-top
-    cursor pointer
-    position fixed
-    bottom 2rem
-    right 2.5rem
-    width $iconSize
-    color lighten(#3eaf7c, 30%)
-    z-index 1
-    &:hover
-      color #3eaf7c
+<style scoped>
+.go-to-top {
+  cursor: pointer;
+  position: fixed;
+  bottom: 2rem;
+  right: 2.5rem;
+  width: 2rem;
+  color: #72cda4;
+  z-index: 1;
+}
 
-  @media (max-width: 959px)
-    .go-to-top
-      display none
+.go-to-top:hover {
+  color: #3eaf7c;
+}
 
-  .fade-enter-active, .fade-leave-active
-    transition opacity 0.3s
+@media (max-width: 959px) {
+  .go-to-top {
+    display: none;
+  }
+}
 
-  .fade-enter, .fade-leave-to
-    opacity 0
+.fade-enter-active, .fade-leave-active {
+  transition: opacity 0.3s;
+}
+
+.fade-enter, .fade-leave-to {
+  opacity: 0;
+}
 </style>

From 28fdd900cb5dc7b03d473230517f3da6cf4803c2 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:45:50 +0800
Subject: [PATCH 070/242] chore: clean all "name" fields

---
 packages/@vuepress/plugin-active-header-links/index.js | 1 -
 packages/@vuepress/plugin-back-to-top/index.js         | 2 --
 packages/@vuepress/plugin-enhance-app/index.js         | 2 --
 packages/@vuepress/plugin-last-updated/index.js        | 2 --
 packages/@vuepress/plugin-register-components/index.js | 2 --
 packages/@vuepress/plugin-test/index.js                | 2 --
 packages/docs/docs/.vuepress/config.js                 | 4 +++-
 7 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/@vuepress/plugin-active-header-links/index.js b/packages/@vuepress/plugin-active-header-links/index.js
index a6c4763f3e..654654e1a4 100644
--- a/packages/@vuepress/plugin-active-header-links/index.js
+++ b/packages/@vuepress/plugin-active-header-links/index.js
@@ -1,7 +1,6 @@
 const path = require('path')
 
 module.exports = (options, context) => ({
-  name: 'active-header-links',
   enable: context.isDev,
   clientRootMixin: path.resolve(__dirname, 'mixin.js')
 })
diff --git a/packages/@vuepress/plugin-back-to-top/index.js b/packages/@vuepress/plugin-back-to-top/index.js
index 4ae5ff1d6b..900f0df1ab 100644
--- a/packages/@vuepress/plugin-back-to-top/index.js
+++ b/packages/@vuepress/plugin-back-to-top/index.js
@@ -1,6 +1,4 @@
 module.exports = (options, context) => ({
-  name: 'back-to-top',
-
   enhanceAppFiles: [
     context.resolve(__dirname, 'client.js')
   ],
diff --git a/packages/@vuepress/plugin-enhance-app/index.js b/packages/@vuepress/plugin-enhance-app/index.js
index 22c3fe5b75..cffea62e61 100644
--- a/packages/@vuepress/plugin-enhance-app/index.js
+++ b/packages/@vuepress/plugin-enhance-app/index.js
@@ -1,8 +1,6 @@
 const path = require('path')
 
 module.exports = (options, context) => ({
-  name: 'enhance-app',
-
   enhanceAppFiles: () => {
     const { sourceDir, themePath } = context
     const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
diff --git a/packages/@vuepress/plugin-last-updated/index.js b/packages/@vuepress/plugin-last-updated/index.js
index d42fad5bfd..33d904ec1b 100644
--- a/packages/@vuepress/plugin-last-updated/index.js
+++ b/packages/@vuepress/plugin-last-updated/index.js
@@ -1,8 +1,6 @@
 const spawn = require('cross-spawn')
 
 module.exports = (options = {}, context) => ({
-  name: 'last-updated',
-
   extendPageData ({ filepath }) {
     const { transformer } = options
     const timestamp = getGitLastUpdatedTimeStamp(filepath)
diff --git a/packages/@vuepress/plugin-register-components/index.js b/packages/@vuepress/plugin-register-components/index.js
index 33e0a86041..2e5d014981 100644
--- a/packages/@vuepress/plugin-register-components/index.js
+++ b/packages/@vuepress/plugin-register-components/index.js
@@ -16,8 +16,6 @@ async function resolveComponents (componentDir) {
 }
 
 module.exports = (options, context) => ({
-  name: 'register-global-components',
-
   async enhanceAppFiles () {
     const { componentsDir = [], components = [] } = options
     const baseDirs = Array.isArray(componentsDir) ? componentsDir : [componentsDir]
diff --git a/packages/@vuepress/plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
index ce98c86389..94788ad809 100644
--- a/packages/@vuepress/plugin-test/index.js
+++ b/packages/@vuepress/plugin-test/index.js
@@ -9,8 +9,6 @@ class SimpleLogPlugin {
 }
 
 module.exports = (options, context) => ({
-  name: 'test',
-
   // TODO
   // globalComponents: ['BackTIoTop'],
 
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 0f11efcc7a..d08da7809a 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -24,7 +24,6 @@ module.exports = {
     ['meta', { name: 'msapplication-TileColor', content: '#000000' }]
   ],
   serviceWorker: true,
-  plugins: ['@vuepress/back-to-top'],
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
@@ -110,6 +109,9 @@ module.exports = {
         }
       }
     }
+  },
+  plugins: {
+    '@vuepress/back-to-top': true
   }
 }
 

From 4ad784c9d5e802eccf0baf993e0c0341f4ba143f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:56:49 +0800
Subject: [PATCH 071/242] fix: cannot run "yarn dev" at the root project dir

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 49e3565ec3..8aa33b1dd1 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
   "description": "Minimalistic doc generator with Vue component based layout system",
   "scripts": {
     "boot": "node scripts/bootstrap.js",
-    "dev": "lerna run --scope docs dev",
-    "build": "lerna run --scope docs build",
+    "dev": "lerna exec --scope docs -- yarn dev",
+    "build": "lerna exec --scope docs -- yarn build",
     "lint": "eslint --fix packages/**/*.js packages/**/*.vue packages/**/bin/*",
     "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
     "release": "/bin/bash scripts/release.sh",

From 263da7a337161687d43754813754a1df989d5d2a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 15 Aug 2018 23:58:54 +0800
Subject: [PATCH 072/242] chore: tweaks plugin docs

---
 packages/docs/docs/plugin/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index e885c687a6..f41c5184b3 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -8,10 +8,10 @@ sidebar: auto
 
 Plugins usually add global-level functionality to VuePress. There is no strictly defined scope for a plugin - there are typically several types of plugins you can write:
 
-1. Extend the data generated at compile time. e.g. `the last updated time of each file`.
+1. Extend the data generated at compile time. e.g. [@vuepress/plugin-last-updated](https://github.com/vuejs/vuepress/tree/next/packages/@vuepress/plugin-last-updated).
 2. Generate extra files before or after compilation. e.g. `PWA support`.
-3. Add extra pages. e.g. [@vuepress/plugin-i18n-ui](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/plugin-i18n-ui)
-4. Inject global UI. e.g. `back to top`.
+3. Add extra pages. e.g. [@vuepress/plugin-i18n-ui](https://github.com/vuejs/vuepress/tree/next/packages/@vuepress/plugin-i18n-ui)
+4. Inject global UI. e.g. [@vuepress/plugin-back-to-top](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/plugin-back-to-top).
 
 A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with [plugin context](#plugin-context) which provides some compile-time context.
 
@@ -79,7 +79,7 @@ This also works with [Scoped Packages](https://docs.npmjs.com/misc/scope):
 
 ``` js
 module.exports = {
-  plugins: [ '@org/plugin-xxx' ]
+  plugins: [ '@org/vuepress-plugin-xxx', '@vuepress/plugin-xxx' ]
 }
 ```
 
@@ -87,7 +87,7 @@ Shorthand:
 
 ``` js
 module.exports = {
-  plugins: [ '@org/xxx' ]
+  plugins: [ '@org/xxx', '@vuepress/xxx' ]
 }
 ```
 

From ca7e02ba996c20a28bd60944bfbef0b3ec1bb227 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 02:11:40 +0800
Subject: [PATCH 073/242] chore: remove useless name field

---
 packages/@vuepress/plugin-google-analytics/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/@vuepress/plugin-google-analytics/index.js b/packages/@vuepress/plugin-google-analytics/index.js
index 286ab84279..714604f9e8 100644
--- a/packages/@vuepress/plugin-google-analytics/index.js
+++ b/packages/@vuepress/plugin-google-analytics/index.js
@@ -1,8 +1,6 @@
 const path = require('path')
 
 module.exports = (options = {}, context) => ({
-  name: 'google-analytics',
-
   ready () {
     const { siteConfig = {}} = context
     const ga = options.ga || siteConfig.ga

From cc03da9448bec63345e87cd1645f95405a8b9dc9 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 02:43:02 +0800
Subject: [PATCH 074/242] chore: rename Option spec

---
 .../core/__test__/plugin-api/{Options.spec.js => Option.spec.js}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/@vuepress/core/__test__/plugin-api/{Options.spec.js => Option.spec.js} (100%)

diff --git a/packages/@vuepress/core/__test__/plugin-api/Options.spec.js b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
similarity index 100%
rename from packages/@vuepress/core/__test__/plugin-api/Options.spec.js
rename to packages/@vuepress/core/__test__/plugin-api/Option.spec.js

From c64edbf210d2c5e29428caf0e3bea073f6282dd0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 02:52:00 +0800
Subject: [PATCH 075/242] test: improve test for hydratePlugin

---
 .../__test__/plugin-api/PluginUtil.spec.js    | 26 ++++++++++++++++---
 .../@vuepress/core/lib/plugin-api/context.js  |  4 +++
 .../@vuepress/core/lib/plugin-api/util.js     | 11 +++++---
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
index 0fe04f2332..f0fe55bf44 100644
--- a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
@@ -29,8 +29,18 @@ describe('resolvePlugin', () => {
   test('shoould resolve local plugin as expected.', () => {
     const plugin1 = () => {}
     const plugin2 = {}
-    expect(resolvePlugin(plugin1)).toEqual({ name: 'plugin1', shortcut: 'plugin1', config: plugin1 })
-    expect(resolvePlugin(plugin2)).toEqual({ name: 'anonymous-1', shortcut: 'anonymous-1', config: plugin2 })
+    expect(resolvePlugin(plugin1)).toEqual({
+      name: 'plugin1',
+      shortcut: 'plugin1',
+      config: plugin1,
+      isLocal: true
+    })
+    expect(resolvePlugin(plugin2)).toEqual({
+      name: 'anonymous-1',
+      shortcut: 'anonymous-1',
+      config: plugin2,
+      isLocal: true
+    })
   })
 
   test('shoould resolve fullname usage correctly.', () => {
@@ -66,7 +76,7 @@ describe('resolvePlugin', () => {
   })
 
   test('shoould return null when plugin cannot be resolved.', () => {
-    expect(resolvePlugin('c')).toEqual({ name: 'c', shortcut: 'c', config: null })
+    expect(resolvePlugin('c')).toEqual({ name: 'c', shortcut: 'c', config: null, isLocal: false })
   })
 })
 
@@ -102,4 +112,14 @@ describe('hydratePlugin', () => {
     expect(config.mock.calls[0][0]).toBe(pluginOptions)
     expect(Object.getPrototypeOf(config.mock.calls[0][1])).toBe(pluginContext)
   })
+
+  test('shoould hydrate functional plugin correctly - options defaults to \'{}\'.', () => {
+    const config = jest.fn(() => ({ enhanceAppFiles: 'file' }))
+    const plugin = { name: 'a', shortcut: 'a', config }
+    const pluginOptions = undefined
+    const pluginContext = {}
+    hydratePlugin(plugin, pluginOptions, pluginContext)
+    expect(config.mock.calls[0][0]).toEqual({})
+    expect(Object.getPrototypeOf(config.mock.calls[0][1])).toBe(pluginContext)
+  })
 })
diff --git a/packages/@vuepress/core/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
index 83d56b9598..f90cbd8b58 100644
--- a/packages/@vuepress/core/lib/plugin-api/context.js
+++ b/packages/@vuepress/core/lib/plugin-api/context.js
@@ -11,6 +11,10 @@ class PluginContext {
     })
   }
 
+  get base () {
+    return this._options.siteConfig.base
+  }
+
   get isProd () {
     return this._options.isProd
   }
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index a33d0e034c..ae48839366 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -72,12 +72,15 @@ exports.resolvePlugin = function (pluginRaw) {
  * @param {Object} pluginContext
  */
 exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOptions, pluginContext) {
+  console.log(pluginOptions)
   const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
   if (!valid) {
-    logger.warn(
-      `[${chalk.gray(shortcut)}] ` +
-      `Invalid value for "pluginOptions" ${chalk.cyan(name)}: ${warnMsg}`
-    )
+    if (pluginOptions !== undefined) {
+      logger.warn(
+        `[${chalk.gray(shortcut)}] ` +
+        `Invalid value for "pluginOptions" ${chalk.cyan(name)}: ${warnMsg}`
+      )
+    }
     pluginOptions = {}
   }
   let enabled = true

From f2064a7cbf32f58e7d5851303e3dfa010d9344a5 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 02:52:41 +0800
Subject: [PATCH 076/242] chore: remove console

---
 packages/@vuepress/core/lib/plugin-api/util.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index ae48839366..be5fe862ad 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -72,7 +72,6 @@ exports.resolvePlugin = function (pluginRaw) {
  * @param {Object} pluginContext
  */
 exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOptions, pluginContext) {
-  console.log(pluginOptions)
   const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
   if (!valid) {
     if (pluginOptions !== undefined) {

From d74615dc06254a5ed33fee3ec1a905299c771383 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 03:04:15 +0800
Subject: [PATCH 077/242] feat: init "@vuepress/plugin-pwa"

---
 .../@vuepress/core/lib/app/clientEntry.js     | 39 +-----------
 .../core/lib/webpack/createBaseConfig.js      |  2 -
 packages/@vuepress/core/package.json          |  1 -
 packages/@vuepress/plugin-pwa/.npmignore      |  2 +
 packages/@vuepress/plugin-pwa/README.md       | 63 +++++++++++++++++++
 .../lib/app => plugin-pwa}/SWUpdateEvent.js   |  0
 .../src => plugin-pwa}/SWUpdatePopup.vue      | 25 +++++---
 packages/@vuepress/plugin-pwa/event.js        |  3 +
 packages/@vuepress/plugin-pwa/index.js        | 26 ++++++++
 packages/@vuepress/plugin-pwa/inject.js       | 52 +++++++++++++++
 packages/@vuepress/plugin-pwa/package.json    | 28 +++++++++
 .../@vuepress/theme-default/src/Layout.vue    | 14 +----
 packages/docs/docs/.vuepress/config.js        | 29 ++++-----
 packages/docs/package.json                    |  3 +-
 14 files changed, 212 insertions(+), 75 deletions(-)
 create mode 100644 packages/@vuepress/plugin-pwa/.npmignore
 create mode 100644 packages/@vuepress/plugin-pwa/README.md
 rename packages/@vuepress/{core/lib/app => plugin-pwa}/SWUpdateEvent.js (100%)
 rename packages/@vuepress/{theme-default/src => plugin-pwa}/SWUpdatePopup.vue (79%)
 create mode 100644 packages/@vuepress/plugin-pwa/event.js
 create mode 100644 packages/@vuepress/plugin-pwa/index.js
 create mode 100644 packages/@vuepress/plugin-pwa/inject.js
 create mode 100644 packages/@vuepress/plugin-pwa/package.json

diff --git a/packages/@vuepress/core/lib/app/clientEntry.js b/packages/@vuepress/core/lib/app/clientEntry.js
index aa84ea6146..05915fd204 100644
--- a/packages/@vuepress/core/lib/app/clientEntry.js
+++ b/packages/@vuepress/core/lib/app/clientEntry.js
@@ -1,8 +1,6 @@
-/* global BASE_URL, GA_ID, ga, SW_ENABLED, VUEPRESS_VERSION, LAST_COMMIT_HASH*/
+/* global VUEPRESS_VERSION, LAST_COMMIT_HASH*/
 
 import { createApp } from './app'
-import SWUpdateEvent from './SWUpdateEvent'
-import { register } from 'register-service-worker'
 
 const { app, router } = createApp()
 
@@ -13,39 +11,4 @@ window.__VUEPRESS_VERSION__ = {
 
 router.onReady(() => {
   app.$mount('#app')
-
-  // TODO Separate it into a plugin ('vuepress-plugin-pwa')
-  // Register service worker
-  if (process.env.NODE_ENV === 'production' &&
-    SW_ENABLED &&
-    window.location.protocol === 'https:') {
-    register(`${BASE_URL}service-worker.js`, {
-      ready () {
-        console.log('[vuepress:sw] Service worker is active.')
-        app.$refs.layout.$emit('sw-ready')
-      },
-      cached (registration) {
-        console.log('[vuepress:sw] Content has been cached for offline use.')
-        app.$refs.layout.$emit('sw-cached', new SWUpdateEvent(registration))
-      },
-      updated (registration) {
-        console.log('[vuepress:sw] Content updated.')
-        app.$refs.layout.$emit('sw-updated', new SWUpdateEvent(registration))
-      },
-      offline () {
-        console.log('[vuepress:sw] No internet connection found. App is running in offline mode.')
-        app.$refs.layout.$emit('sw-offline')
-      },
-      error (err) {
-        console.error('[vuepress:sw] Error during service worker registration:', err)
-        app.$refs.layout.$emit('sw-error', err)
-        if (GA_ID) {
-          ga('send', 'exception', {
-            exDescription: err.message,
-            exFatal: false
-          })
-        }
-      }
-    })
-  }
 })
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index f77dce940d..b4873e6610 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -277,8 +277,6 @@ module.exports = function createBaseConfig ({
   config
     .plugin('injections')
     .use(require('webpack/lib/DefinePlugin'), [{
-      BASE_URL: JSON.stringify(siteConfig.base || '/'),
-      SW_ENABLED: !!siteConfig.serviceWorker,
       VUEPRESS_VERSION: JSON.stringify(require('../../package.json').version),
       LAST_COMMIT_HASH: JSON.stringify(getLastCommitHash())
     }])
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 06ed81e7dc..01b8ec3cb7 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -72,7 +72,6 @@
     "portfinder": "^1.0.13",
     "postcss-loader": "^2.1.5",
     "prismjs": "^1.13.0",
-    "register-service-worker": "^1.4.1",
     "toml": "^2.3.3",
     "url-loader": "^1.0.1",
     "vue": "^2.5.16",
diff --git a/packages/@vuepress/plugin-pwa/.npmignore b/packages/@vuepress/plugin-pwa/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-pwa/README.md b/packages/@vuepress/plugin-pwa/README.md
new file mode 100644
index 0000000000..827d95d3ba
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/README.md
@@ -0,0 +1,63 @@
+# @vuepress/plugin-active-header-links
+
+> active-header-links plugin for vuepress
+
+## Usage
+
+```javascript
+module.exports = {
+  plugins: ['@vuepress/pwa']
+}
+```
+
+Same with:
+
+```javascript
+module.exports = {
+  plugins: {
+    '@vuepress/pwa': {
+       serviceWorker: true
+     }
+  }
+}
+```
+
+SW-Update popup:
+
+```javascript
+module.exports = {
+  plugins: {
+    '@vuepress/pwa': {
+       serviceWorker: true,
+       updatePopup: {
+         message: "New content is available.",
+         buttonText: "Refresh"
+       }
+     }
+  }
+}
+```
+
+i18n Support:
+
+```javascript
+module.exports = {
+  plugins: {
+    '@vuepress/pwa': {
+      serviceWorker: true,
+      updatePopup: {
+        // It will don't depends on the VuePress i18n implementation
+        '/': {
+          message: "New content is available.",
+          buttonText: "Refresh"
+        },
+        '/zh/': {
+          message: "发现新内容可用",
+          buttonText: "刷新"
+        }
+      }
+    }
+  }
+}
+```
+    
\ No newline at end of file
diff --git a/packages/@vuepress/core/lib/app/SWUpdateEvent.js b/packages/@vuepress/plugin-pwa/SWUpdateEvent.js
similarity index 100%
rename from packages/@vuepress/core/lib/app/SWUpdateEvent.js
rename to packages/@vuepress/plugin-pwa/SWUpdateEvent.js
diff --git a/packages/@vuepress/theme-default/src/SWUpdatePopup.vue b/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
similarity index 79%
rename from packages/@vuepress/theme-default/src/SWUpdatePopup.vue
rename to packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
index b224db31ed..ce6f572465 100644
--- a/packages/@vuepress/theme-default/src/SWUpdatePopup.vue
+++ b/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
@@ -4,21 +4,28 @@
       v-if="enabled"
       class="sw-update-popup"
     >
-      {{message}}<br>
-      <button @click="reload">{{buttonText}}</button>
+      {{ message }}<br>
+      <button @click="reload">{{ buttonText }}</button>
     </div>
   </transition>
 </template>
 
 <script>
+/* global SW_UPDATE_POPUP */
+import event from './event'
+
 export default {
-  props: {
-    updateEvent: {
-      type: Object,
-      default: null
+  data () {
+    return {
+      config: SW_UPDATE_POPUP,
+      updateEvent: null
     }
   },
 
+  created () {
+    event.$on('sw-updated', this.onSWUpdated)
+  },
+
   computed: {
     popupConfig () {
       for (const config of [this.$themeLocaleConfig, this.$site.themeConfig]) {
@@ -46,6 +53,10 @@ export default {
   },
 
   methods: {
+    onSWUpdated (e) {
+      this.updateEvent = e
+    },
+
     reload () {
       if (this.updateEvent) {
         this.updateEvent.skipWaiting().then(() => {
@@ -59,7 +70,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../theme-default/src/styles/config.styl'
 
 .sw-update-popup
   position fixed
diff --git a/packages/@vuepress/plugin-pwa/event.js b/packages/@vuepress/plugin-pwa/event.js
new file mode 100644
index 0000000000..8853b4d295
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/event.js
@@ -0,0 +1,3 @@
+import Vue from 'vue'
+
+export default new Vue()
diff --git a/packages/@vuepress/plugin-pwa/index.js b/packages/@vuepress/plugin-pwa/index.js
new file mode 100644
index 0000000000..ce223a46f3
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/index.js
@@ -0,0 +1,26 @@
+const path = require('path')
+
+module.exports = (options, context) => ({
+  chainWebpack (config) {
+    options = Object.assign({
+      serviceWorker: true
+    }, options)
+
+    const { serviceWorker, updatePopup } = options
+    const base = context.base || '/'
+
+    config.plugin('injections').tap(([options]) => [
+      Object.assign(options, {
+        SW_BASE_URL: JSON.stringify(base),
+        SW_ENABLED: !!serviceWorker,
+        SW_UPDATE_POPUP: updatePopup ? JSON.stringify(updatePopup) : false
+      })
+    ])
+  },
+
+  globalUIComponents: 'SWUpdatePopup',
+
+  enhanceAppFiles: [
+    path.resolve(__dirname, 'inject.js')
+  ]
+})
diff --git a/packages/@vuepress/plugin-pwa/inject.js b/packages/@vuepress/plugin-pwa/inject.js
new file mode 100644
index 0000000000..7dc2fb158f
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/inject.js
@@ -0,0 +1,52 @@
+/* global SW_BASE_URL, SW_ENABLED, GA_ID, ga, SW_UPDATE_POPUP */
+
+import Vue from 'vue'
+import { register } from 'register-service-worker'
+import SWUpdateEvent from './SWUpdateEvent'
+import event from './event'
+
+if (SW_UPDATE_POPUP) {
+  Vue.component('SWUpdatePopup', () => import('./SWUpdatePopup.vue'))
+}
+
+export default ({ router }) => {
+  // Register service worker
+  router.onReady(() => {
+    if (process.env.NODE_ENV === 'production' &&
+      SW_ENABLED &&
+      window.location.protocol === 'https:') {
+      register(`${SW_BASE_URL}service-worker.js`, {
+        ready () {
+          console.log('[vuepress:sw] Service worker is active.')
+          event.$emit('sw-ready')
+        },
+
+        cached (registration) {
+          console.log('[vuepress:sw] Content has been cached for offline use.')
+          event.$emit('sw-cached', new SWUpdateEvent(registration))
+        },
+
+        updated (registration) {
+          console.log('[vuepress:sw] Content updated.')
+          event.$emit('sw-updated', new SWUpdateEvent(registration))
+        },
+
+        offline () {
+          console.log('[vuepress:sw] No internet connection found. App is running in offline mode.')
+          event.$emit('sw-offline')
+        },
+
+        error (err) {
+          console.error('[vuepress:sw] Error during service worker registration:', err)
+          event.$emit('sw-error', err)
+          if (GA_ID) {
+            ga('send', 'exception', {
+              exDescription: err.message,
+              exFatal: false
+            })
+          }
+        }
+      })
+    }
+  })
+}
diff --git a/packages/@vuepress/plugin-pwa/package.json b/packages/@vuepress/plugin-pwa/package.json
new file mode 100644
index 0000000000..9180cd1724
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@vuepress/plugin-pwa",
+  "version": "1.0.0",
+  "description": "pwa plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "register-service-worker": "^1.4.1"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-pwa#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/src/Layout.vue b/packages/@vuepress/theme-default/src/Layout.vue
index ee2e6abedb..43583738a0 100644
--- a/packages/@vuepress/theme-default/src/Layout.vue
+++ b/packages/@vuepress/theme-default/src/Layout.vue
@@ -51,8 +51,6 @@
         slot="bottom"
       />
     </Page>
-
-    <SWUpdatePopup :updateEvent="swUpdateEvent"/>
   </div>
 </template>
 
@@ -63,16 +61,14 @@ import Home from './Home.vue'
 import Navbar from './Navbar.vue'
 import Page from './Page.vue'
 import Sidebar from './Sidebar.vue'
-import SWUpdatePopup from './SWUpdatePopup.vue'
 import { resolveSidebarItems } from './util'
 
 export default {
-  components: { Home, Page, Sidebar, Navbar, SWUpdatePopup },
+  components: { Home, Page, Sidebar, Navbar },
 
   data () {
     return {
-      isSidebarOpen: false,
-      swUpdateEvent: null
+      isSidebarOpen: false
     }
   },
 
@@ -143,8 +139,6 @@ export default {
       nprogress.done()
       this.isSidebarOpen = false
     })
-
-    this.$on('sw-updated', this.onSWUpdated)
   },
 
   methods: {
@@ -170,10 +164,6 @@ export default {
           this.toggleSidebar(false)
         }
       }
-    },
-
-    onSWUpdated (e) {
-      this.swUpdateEvent = e
     }
   }
 }
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index d08da7809a..0f9b1e8ed1 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -23,7 +23,6 @@ module.exports = {
     ['meta', { name: 'msapplication-TileImage', content: '/icons/msapplication-icon-144x144.png' }],
     ['meta', { name: 'msapplication-TileColor', content: '#000000' }]
   ],
-  serviceWorker: true,
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
@@ -39,12 +38,6 @@ module.exports = {
         selectText: 'Languages',
         editLinkText: 'Edit this page on GitHub',
         lastUpdated: 'Last Updated',
-        serviceWorker: {
-          updatePopup: {
-            message: "New content is available.",
-            buttonText: "Refresh"
-          }
-        },
         nav: [
           {
             text: 'Guide',
@@ -80,12 +73,6 @@ module.exports = {
         selectText: '选择语言',
         editLinkText: '在 GitHub 上编辑此页',
         lastUpdated: '上次更新',
-        serviceWorker: {
-          updatePopup: {
-            message: "发现新内容可用",
-            buttonText: "刷新"
-          }
-        },
         nav: [
           {
             text: '指南',
@@ -111,7 +98,21 @@ module.exports = {
     }
   },
   plugins: {
-    '@vuepress/back-to-top': true
+    '@vuepress/back-to-top': true,
+    '@vuepress/pwa': {
+      serviceWorker: true,
+      updatePopup: {
+        // It will don't depends on the VuePress i18n implementation
+        '/': {
+          message: "New content is available.",
+          buttonText: "Refresh"
+        },
+        '/zh/': {
+          message: "发现新内容可用",
+          buttonText: "刷新"
+        }
+      }
+    }
   }
 }
 
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 03528065f5..6b7c36703e 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/vuejs/vuepress#readme",
   "devDependencies": {
     "vuepress": "^1.0.0",
-    "@vuepress/back-to-top": "^1.0.0"
+    "@vuepress/plugin-back-to-top": "^1.0.0",
+    "@vuepress/plugin-pwa": "^1.0.0"
   }
 }

From ac554a93c470d1b955a18891aa61c2d2672723bf Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 03:20:45 +0800
Subject: [PATCH 078/242] docs($pwa): enhance docs

---
 packages/@vuepress/plugin-pwa/README.md | 120 +++++++++++++++---------
 1 file changed, 76 insertions(+), 44 deletions(-)

diff --git a/packages/@vuepress/plugin-pwa/README.md b/packages/@vuepress/plugin-pwa/README.md
index 827d95d3ba..7fef9b5363 100644
--- a/packages/@vuepress/plugin-pwa/README.md
+++ b/packages/@vuepress/plugin-pwa/README.md
@@ -1,63 +1,95 @@
-# @vuepress/plugin-active-header-links
+# @vuepress/plugin-pwa
 
-> active-header-links plugin for vuepress
+> PWA plugin for vuepress
 
-## Usage
+## Options
 
-```javascript
-module.exports = {
-  plugins: ['@vuepress/pwa']
-}
-```
+### serviceWorker
+
+- Type: `boolean`
+- Default: `true`
+
+If set to `true`, VuePress will automatically generate and register a service worker that caches the content for offline use (only enabled in production).
+
+### updatePopup
 
-Same with:
+This option enables the popup to refresh contents. The popup will be shown when the site is updated (i.e. service worker is updated). It provides `refresh` button to allow users to refresh contents immediately.
 
-```javascript
+> If without the `refresh` button, the new service worker will be active after all [clients](https://developer.mozilla.org/en-US/docs/Web/API/Clients) are closed. This means that visitors cannot see new contents until they close all tabs of your site. But the `refresh` button activates the new service worker immediately.
+
+## Migration from 0.x.x
+
+Now that we have plugin API, all features' options that are in plugin's areas will become plugin options.
+
+### Service Worker
+
+``` diff
 module.exports = {
-  plugins: {
-    '@vuepress/pwa': {
-       serviceWorker: true
-     }
-  }
+- serviceWorker: true,
++ plugins: ['@vuepress/pwa']
 }
 ```
 
-SW-Update popup:
+### SW-Update Popup
 
-```javascript
+``` diff
 module.exports = {
-  plugins: {
-    '@vuepress/pwa': {
-       serviceWorker: true,
-       updatePopup: {
-         message: "New content is available.",
-         buttonText: "Refresh"
-       }
-     }
-  }
+  themeConfig: {
+-   serviceWorker: {
+-     updatePopup: { 
+-        message: "New content is available.", 
+-        buttonText: "Refresh" 
+-     }
+-   }
+  },
++  plugins: {
++   '@vuepress/pwa': {
++      serviceWorker: true,
++      updatePopup: {
++        message: "New content is available.",
++        buttonText: "Refresh"
++      }
++    }
++ }
 }
 ```
 
-i18n Support:
+For i18n user:
 
-```javascript
+``` diff
 module.exports = {
-  plugins: {
-    '@vuepress/pwa': {
-      serviceWorker: true,
-      updatePopup: {
-        // It will don't depends on the VuePress i18n implementation
-        '/': {
-          message: "New content is available.",
-          buttonText: "Refresh"
-        },
-        '/zh/': {
-          message: "发现新内容可用",
-          buttonText: "刷新"
-        }
-      }
+  themeConfig: {
+    '/': {
+-     serviceWorker: {
+-       updatePopup: {
+-         message: "New content is available.",
+-         buttonText: "Refresh"
+-       }
+-     }
+    },
+    '/zh/': {
+-     serviceWorker: {
+-       updatePopup: {
+-         message: "发现新内容可用",
+-         buttonText: "刷新"
+-       }
+-     }
     }
-  }
-}
+  },
++  plugins: {
++    '@vuepress/pwa': {
++      serviceWorker: true,
++      updatePopup: {
++        '/': {
++          message: "New content is available.",
++          buttonText: "Refresh"
++        },
++        '/zh/': {
++          message: "发现新内容可用",
++          buttonText: "刷新"
++        }
++      }
++    }
++  }
 ```
     
\ No newline at end of file

From 4c2cccb9ca9581c6190c8a4d7d45950fc8d50aa8 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 14:05:36 +0800
Subject: [PATCH 079/242] feat: utility "normalizeConfig"

---
 packages/@vuepress/core/lib/app/util.js | 43 +++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index c11172240e..bb32f3baed 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -17,3 +17,46 @@ export function findPageForPath (pages, path) {
     frontmatter: {}
   }
 }
+
+/**
+ * Normalize config.
+ * This utility is mainly for plugin developers. For some
+ * plugins that need internationalize the text. but it's
+ * not recommenbded to let plugin care about to the internal
+ * i18n implementation, so this utility was born.
+ *
+ *
+ * Usage:
+ *
+ * import { normalizeConfig } from '@app/util'
+ * export default {
+ *   data () {
+ *     return { config }
+ *   }
+ *   computed: {
+ *     normalizedConfig() {
+ *       return normalizeConfig(this, config)
+ *     }
+ *   }
+ * }
+ *
+ *
+ * e.g.
+ *
+ * Config: : 'Text'
+ * Normalized Config: 'Text'
+ *
+ * Config: : { '/': 'Text', '/zh/': '文本' }
+ * Normalized Config: 'Text' or '文本'
+ *
+ * @param {Vue} component
+ * @param {any} rawConfig
+ * @returns {any}
+ */
+export function normalizeConfig (component, rawConfig) {
+  const { $localePath } = component
+  if (typeof rawConfig === 'object' && rawConfig[$localePath]) {
+    return rawConfig[$localePath]
+  }
+  return rawConfig
+}

From 1fa57f6b4c80f9bd7c361b9bdfd3fb67ca5624d7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 16:34:49 +0800
Subject: [PATCH 080/242] feat: enhance plugin API - distinguish async and sync
 execution

---
 packages/@vuepress/core/lib/build.js          |  3 ++-
 packages/@vuepress/core/lib/dev.js            |  4 +--
 .../@vuepress/core/lib/plugin-api/Option.js   | 27 ++++++++++++++-----
 .../option/ClientDynamicModulesOption.js      |  2 +-
 .../option/EnhanceAppFilesOption.js           |  6 ++---
 .../plugin-api/option/ExtendPageDataOption.js |  2 +-
 .../option/GlobalUIComponentsOption.js        |  4 +--
 packages/@vuepress/core/lib/prepare/index.js  | 10 +++----
 .../core/lib/prepare/resolveSiteData.js       |  2 +-
 .../core/lib/webpack/createClientConfig.js    |  2 +-
 .../core/lib/webpack/createServerConfig.js    |  2 +-
 11 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index edeb133206..5d606a0f4f 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -29,6 +29,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
 
   let clientConfig = createClientConfig(options, cliOptions).toConfig()
   let serverConfig = createServerConfig(options, cliOptions).toConfig()
+  console.log('4')
 
   // apply user config...
   const userConfig = options.siteConfig.configureWebpack
@@ -94,7 +95,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     )
   }
 
-  await options.plugin.options.generated.run()
+  await options.plugin.options.generated.apply()
 
   // DONE.
   const relativeDir = path.relative(process.cwd(), outDir)
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index ff78815000..40637b791e 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -24,7 +24,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
-    options.plugin.options.updated.run()
+    options.plugin.options.updated.syncApply()
     prepare({ sourceDir, cliOptions, isProd: false }).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
@@ -111,7 +111,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
     add: app => {
       // apply plugin options to extend dev server.
       const { plugin } = options
-      plugin.options.enhanceDevServer.run(app)
+      plugin.options.enhanceDevServer.syncApply(app)
 
       const userPublic = path.resolve(sourceDir, '.vuepress/public')
 
diff --git a/packages/@vuepress/core/lib/plugin-api/Option.js b/packages/@vuepress/core/lib/plugin-api/Option.js
index 6d2c6a53e2..852d29fe7a 100644
--- a/packages/@vuepress/core/lib/plugin-api/Option.js
+++ b/packages/@vuepress/core/lib/plugin-api/Option.js
@@ -1,4 +1,4 @@
-module.exports = class Option {
+class Option {
   constructor (key) {
     this.key = key
     this.items = [] // Array<{ value: T, name: string }>
@@ -25,22 +25,35 @@ module.exports = class Option {
   }
 
   /**
-   * When T is function, eecute all functions in serial
+   * Synchronous running
+   * @param {Array<Function>} args
+   */
+  syncApply (...args) {
+    for (const fn of this.values) {
+      fn(...args)
+    }
+  }
+
+  /**
+   * Asynchronous serial running
    * @param args
-   * @returns {Promise.<void>}
+   * @param {Array<AsyncFunction>} args
    */
-  async run (...args) {
+  async asyncApply (...args) {
     for (const fn of this.values) {
       await fn(...args)
     }
   }
 
   /**
-   * When T is function, eecute all functions in parallel
+   * Asynchronous serial running
    * @param args
-   * @returns {Promise.<void>}
+   * @param {Array<AsyncFunction>} args
    */
-  async parallelRun (...args) {
+  async parallelApply (...args) {
     return await Promise.all(this.values.map(fn => fn(...args)))
   }
 }
+
+Option.prototype.apply = Option.prototype.asyncApply
+module.exports = Option
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index 49c9b3f385..841b9ca983 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -2,7 +2,7 @@ const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
 
 module.exports = class ClientDynamicModulesOption extends Option {
-  async run () {
+  async apply () {
     for (const item of this.items) {
       const { value: fn, name: pluginName } = item
       let modules = await fn()
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 217a4d59d2..46cbc80055 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -17,7 +17,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
    * the current plugin context, then return it with a function and
    * assign it to enhanceAppFiles.
    */
-  async beforeRun () {
+  async beforeApply () {
     const items = this.items
     this.items = []
     for (const { name, value } of items) {
@@ -30,8 +30,8 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
   }
 
-  async run (...args) {
-    await this.beforeRun()
+  async apply (...args) {
+    await this.beforeApply()
     const manifest = []
     let moduleId = 0
     let injectedCode = ''
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
index b09471b59f..161a606d99 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
@@ -1,7 +1,7 @@
 const Option = require('../Option')
 
 module.exports = class ExtendPageDataOption extends Option {
-  async run (args) {
+  async apply (args) {
     const { data } = args
     for (const fn of this.values) {
       const res = await fn(args)
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
index 58697ebe1c..ae072fff6e 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
@@ -2,8 +2,8 @@ const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
 
 module.exports = class GlobalUIComponentsOption extends Option {
-  async run () {
-    writeTemp(
+  async apply () {
+    await writeTemp(
       `dynamic-modules/global-ui.js`,
       `export default ${JSON.stringify(this.values, null, 2)}`
     )
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 03cc5be7ce..7c97a9b198 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -29,12 +29,12 @@ module.exports = async function prepare ({
   options.siteData = await resolveSiteData(options)
   Object.freeze(options)
 
-  await pluginOptions.ready.run()
+  await pluginOptions.ready.apply()
 
   // 4. apply plugin options to extend markdown.
-  pluginOptions.extendMarkdown.run(markdown)
-  pluginOptions.clientDynamicModules.run()
-  pluginOptions.globalUIComponents.run()
+  pluginOptions.extendMarkdown.syncApply(markdown)
+  await pluginOptions.clientDynamicModules.apply()
+  await pluginOptions.globalUIComponents.apply()
 
   // 5. generate routes code
   const routesCode = await genRoutesFile(options)
@@ -61,7 +61,7 @@ module.exports = async function prepare ({
     )
   }
 
-  await pluginOptions.enhanceAppFiles.run()
+  await pluginOptions.enhanceAppFiles.apply()
 
   return options
 }
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index a48065823b..25d7defc83 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -21,7 +21,7 @@ module.exports = async function ({
     const data = { key, path: routePath, filepath }
 
     const content = await fs.readFile(filepath, 'utf-8')
-    await plugin.options.extendPageData.run({ data, filepath, routePath, base, key, content })
+    await plugin.options.extendPageData.apply({ data, filepath, routePath, base, key, content })
 
     // extract yaml frontmatter
     const frontmatter = parseFrontmatter(content)
diff --git a/packages/@vuepress/core/lib/webpack/createClientConfig.js b/packages/@vuepress/core/lib/webpack/createClientConfig.js
index 6abe1d36d3..9163273c4a 100644
--- a/packages/@vuepress/core/lib/webpack/createClientConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createClientConfig.js
@@ -65,7 +65,7 @@ module.exports = function createClientConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, false /* isServer */)
   }
 
-  options.plugin.options.chainWebpack.run(config, false /* isServer */)
+  options.plugin.options.chainWebpack.syncApply(config, false /* isServer */)
 
   return config
 }
diff --git a/packages/@vuepress/core/lib/webpack/createServerConfig.js b/packages/@vuepress/core/lib/webpack/createServerConfig.js
index 44d25420a5..7043918529 100644
--- a/packages/@vuepress/core/lib/webpack/createServerConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createServerConfig.js
@@ -54,7 +54,7 @@ module.exports = function createServerConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, true /* isServer */)
   }
 
-  options.plugin.options.chainWebpack.run(config, true /* isServer */)
+  options.plugin.options.chainWebpack.syncApply(config, true /* isServer */)
 
   return config
 }

From 1b349dcda7e6f7fcb1f849a679a4c2fdd34186da Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 16:35:21 +0800
Subject: [PATCH 081/242] chore: update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9496595310..f4b33ee9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 *.log
 .temp
 TODOs.md
+packages/docs/vuepress/

From 6f5c2822f7eb76396002f4f51d21a6e42178e58d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 16:38:52 +0800
Subject: [PATCH 082/242] feat: expose isServer to enhanceApp files

---
 packages/@vuepress/core/lib/app/app.js         | 4 ++--
 packages/@vuepress/core/lib/app/clientEntry.js | 2 +-
 packages/@vuepress/core/lib/app/serverEntry.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 9e7b2be5e7..252e5fabee 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -47,7 +47,7 @@ Vue.prototype.$withBase = function (path) {
   }
 }
 
-export function createApp () {
+export function createApp (isServer) {
   const router = new Router({
     base: siteData.base,
     mode: 'history',
@@ -85,7 +85,7 @@ export function createApp () {
   try {
     appEnhancers.forEach(enhancer => {
       if (typeof enhancer === 'function') {
-        enhancer({ Vue, options, router, siteData })
+        enhancer({ Vue, options, router, siteData, isServer })
       }
     })
   } catch (e) {
diff --git a/packages/@vuepress/core/lib/app/clientEntry.js b/packages/@vuepress/core/lib/app/clientEntry.js
index 05915fd204..b7f795f613 100644
--- a/packages/@vuepress/core/lib/app/clientEntry.js
+++ b/packages/@vuepress/core/lib/app/clientEntry.js
@@ -2,7 +2,7 @@
 
 import { createApp } from './app'
 
-const { app, router } = createApp()
+const { app, router } = createApp(false /* isServer */)
 
 window.__VUEPRESS_VERSION__ = {
   version: VUEPRESS_VERSION,
diff --git a/packages/@vuepress/core/lib/app/serverEntry.js b/packages/@vuepress/core/lib/app/serverEntry.js
index 715fc95653..defcb9e66e 100644
--- a/packages/@vuepress/core/lib/app/serverEntry.js
+++ b/packages/@vuepress/core/lib/app/serverEntry.js
@@ -1,7 +1,7 @@
 import { createApp } from './app'
 
 export default context => new Promise((resolve, reject) => {
-  const { app, router } = createApp()
+  const { app, router } = createApp(true /* isServer */)
   const { url } = context
   const { fullPath } = router.resolve(url).route
 

From 7139532d588cb2d4229ba34777135cb04920816e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 19:49:14 +0800
Subject: [PATCH 083/242] fix: missing component registration code

---
 packages/@vuepress/plugin-register-components/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@vuepress/plugin-register-components/index.js b/packages/@vuepress/plugin-register-components/index.js
index 2e5d014981..da25922463 100644
--- a/packages/@vuepress/plugin-register-components/index.js
+++ b/packages/@vuepress/plugin-register-components/index.js
@@ -21,7 +21,7 @@ module.exports = (options, context) => ({
     const baseDirs = Array.isArray(componentsDir) ? componentsDir : [componentsDir]
 
     function importCode (name, absolutePath) {
-      `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
+      return `Vue.component(${JSON.stringify(name)}, () => import(${JSON.stringify(absolutePath)}))`
     }
 
     function genImport (baseDir, file) {
@@ -39,8 +39,8 @@ module.exports = (options, context) => ({
       code += files.map(file => genImport(baseDir, file)).join('\n') + '\n'
     }
 
-    // 2. Register named components.
-    code = components.map(({ name, path: absolutePath }) => importCode(name, absolutePath))
+    // 2. Register named componepackages/docs/docs/.vuepress/componentsnts.
+    code += components.map(({ name, path: absolutePath }) => importCode(name, absolutePath))
 
     code = `import Vue from 'vue'\n` + code + '\n'
 

From 92926605d08abea93acde0870fcafd281d99df44 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 16 Aug 2018 20:07:33 +0800
Subject: [PATCH 084/242] fix: unexpected error

---
 packages/@vuepress/core/lib/plugin-api/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index be5fe862ad..dfb71ec7bc 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -110,7 +110,7 @@ exports.normalizePluginsConfig = function (pluginsConfig) {
   if (!valid) {
     logger.warn(
       `[${chalk.gray('config')}] ` +
-      `Invalid value for "plugin" value ${chalk.cyan(name)}: ${warnMsg}`
+      `Invalid value for "plugin" field : ${warnMsg}`
     )
     pluginsConfig = []
   }

From 9dfd6fb5d6b5e205cba655d33e54ddfe8fbcb627 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 02:48:44 +0800
Subject: [PATCH 085/242] chore: remove log

---
 packages/@vuepress/core/lib/build.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 5d606a0f4f..3774ff17ef 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -29,7 +29,6 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
 
   let clientConfig = createClientConfig(options, cliOptions).toConfig()
   let serverConfig = createServerConfig(options, cliOptions).toConfig()
-  console.log('4')
 
   // apply user config...
   const userConfig = options.siteConfig.configureWebpack

From d3e2d09561f70dcc74bd837f9592bca643de12ad Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 03:02:38 +0800
Subject: [PATCH 086/242] fix: yarn buiild failed.

1. This is caused by asynchronous page components cannot be resolved during server side rendering. revert to register async components at router's "beforeEnter" hook instead.

  ref: https://ssr.vuejs.org/guide/structure.html#source-code-structure

2. Rename 'filepath' to 'filePath'.
---
 .../option/EnhanceAppFilesOption.js           | 12 +++++------
 .../@vuepress/core/lib/prepare/codegen.js     | 13 ++++++++----
 .../core/lib/prepare/resolveSiteData.js       | 20 +++++++++----------
 .../core/lib/webpack/createBaseConfig.js      |  8 ++++----
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 46cbc80055..1194a376bd 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -37,11 +37,11 @@ module.exports = class EnhanceAppFilesOption extends Option {
     let injectedCode = ''
 
     // 1. write enhance app files.
-    for (const { value: filepath, name: pluginName } of this.items) {
+    for (const { value: filePath, name: pluginName } of this.items) {
       let destPath
 
-      if (typeof filepath === 'object') {
-        const { name, content } = filepath
+      if (typeof filePath === 'object') {
+        const { name, content } = filePath
         if (content.includes('export default') || content.includes('module.exports')) {
           destPath = await writeTemp(`app-enhancers/${name}.js`, content)
         } else {
@@ -51,15 +51,15 @@ module.exports = class EnhanceAppFilesOption extends Option {
  */\n${content}\n\n`
         }
       } else {
-        if (fs.existsSync(filepath)) {
+        if (fs.existsSync(filePath)) {
           destPath = await writeTemp(
             `app-enhancers/enhancer-${moduleId++}.js`,
-            `export { default } from '${(filepath)}'`
+            `export { default } from '${(filePath)}'`
           )
         } else {
           logger.debug(
             chalk.gray(`[${pluginName}] `) +
-            `${chalk.cyan(filepath)} Not Found.`
+            `${chalk.cyan(filePath)} Not Found.`
           )
         }
       }
diff --git a/packages/@vuepress/core/lib/prepare/codegen.js b/packages/@vuepress/core/lib/prepare/codegen.js
index c496d5ca33..de7717b229 100644
--- a/packages/@vuepress/core/lib/prepare/codegen.js
+++ b/packages/@vuepress/core/lib/prepare/codegen.js
@@ -6,7 +6,7 @@ exports.pathsToModuleCode = function (files) {
   let code = ''
 
   code += files
-    .map(filepath => `import m${index++} from ${JSON.stringify(filepath)}`)
+    .map(filePath => `import m${index++} from ${JSON.stringify(filePath)}`)
     .join('\n')
 
   code += '\n\nexport default [\n'
@@ -25,12 +25,18 @@ exports.genRoutesFile = async function ({
   siteData: { pages },
   plugin
 }) {
-  function genRoute ({ path: pagePath, key: componentName }, index) {
+  function genRoute ({ path: pagePath, filePath, key: componentName }) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
-    component: ThemeLayout
+    component: ThemeLayout,
+    beforeEnter: (to, from, next) => {
+      import(${JSON.stringify(filePath)}).then(comp => {
+        Vue.component(${JSON.stringify(componentName)}, comp.default)
+        next()
+      })
+    }
   }`
 
     const dncodedPath = decodeURIComponent(pagePath)
@@ -77,7 +83,6 @@ exports.genRoutesFile = async function ({
     `import rootMixins from '@temp/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +
-    `${pages.map(({ filepath, key }) => `Vue.component('${key}', () => import('${filepath}'))`).join('\n')}\n\n` +
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
   )
 }
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index 25d7defc83..7682213f8d 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -16,12 +16,12 @@ module.exports = async function ({
   themeConfig,
   publicPath
 }) {
-  async function getPageData ({ filepath, routePath, base }) {
+  async function getPageData ({ filePath, routePath, base }) {
     const key = 'v-' + Math.random().toString(16).slice(2)
-    const data = { key, path: routePath, filepath }
+    const data = { key, path: routePath, filePath }
 
-    const content = await fs.readFile(filepath, 'utf-8')
-    await plugin.options.extendPageData.apply({ data, filepath, routePath, base, key, content })
+    const content = await fs.readFile(filePath, 'utf-8')
+    await plugin.options.extendPageData.apply({ data, filePath, routePath, base, key, content })
 
     // extract yaml frontmatter
     const frontmatter = parseFrontmatter(content)
@@ -50,18 +50,18 @@ module.exports = async function ({
 
   // resolve pagesData
   const pagesData = await Promise.all(pageFiles.map(async (base) => {
-    const filepath = path.resolve(sourceDir, base)
+    const filePath = path.resolve(sourceDir, base)
     const routePath = encodePath(fileToPath(base))
-    return getPageData({ filepath, routePath, base })
+    return getPageData({ filePath, routePath, base })
   }))
 
   // resolve additional pagesData
   const additionalPagesData = await Promise.all(
-    plugin.options.additionalPages.values.map(async ({ route: routePath, path: filepath }) => {
-      if (!fs.existsSync(filepath)) {
-        throw new Error(`[vuepress] Cannot resolve additional page: ${filepath}`)
+    plugin.options.additionalPages.values.map(async ({ route: routePath, path: filePath }) => {
+      if (!fs.existsSync(filePath)) {
+        throw new Error(`[vuepress] Cannot resolve additional page: ${filePath}`)
       }
-      return getPageData({ filepath, routePath })
+      return getPageData({ filePath, routePath })
     })
   )
 
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index b4873e6610..c74db6605c 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -129,17 +129,17 @@ module.exports = function createBaseConfig ({
     config.module
       .rule('js')
         .test(/\.js$/)
-        .exclude.add(filepath => {
+        .exclude.add(filePath => {
           // Always transpile lib directory
-          if (filepath.startsWith(libDir)) {
+          if (filePath.startsWith(libDir)) {
             return false
           }
           // always transpile js in vue files
-          if (/\.vue\.js$/.test(filepath)) {
+          if (/\.vue\.js$/.test(filePath)) {
             return false
           }
           // Don't transpile node_modules
-          return /node_modules/.test(filepath)
+          return /node_modules/.test(filePath)
         }).end()
         .use('cache-loader')
           .loader('cache-loader')

From c97a5319076dc806287d80f315228c41bc4c98fe Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 03:04:23 +0800
Subject: [PATCH 087/242] fix: ssr failed - move window accessing to mounted
 hook

---
 packages/@vuepress/plugin-back-to-top/BackToTop.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-back-to-top/BackToTop.vue b/packages/@vuepress/plugin-back-to-top/BackToTop.vue
index 5268a1bd7d..35877254a0 100644
--- a/packages/@vuepress/plugin-back-to-top/BackToTop.vue
+++ b/packages/@vuepress/plugin-back-to-top/BackToTop.vue
@@ -27,11 +27,12 @@ export default {
 
   data () {
     return {
-      scrollTop: this.getScrollTop()
+      scrollTop: null
     }
   },
 
   mounted () {
+    this.scrollTop = this.getScrollTop()
     window.addEventListener('scroll', debounce(() => {
       this.scrollTop = this.getScrollTop()
     }, 100))

From 841e03e1ccf8284e85b49438aa1ec6b57002b32a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 03:05:00 +0800
Subject: [PATCH 088/242] feat: plugin context - publicDir

---
 packages/@vuepress/core/lib/plugin-api/context.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/@vuepress/core/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
index f90cbd8b58..acb66c19b8 100644
--- a/packages/@vuepress/core/lib/plugin-api/context.js
+++ b/packages/@vuepress/core/lib/plugin-api/context.js
@@ -23,6 +23,10 @@ class PluginContext {
     return this._options.sourceDir
   }
 
+  get publicDir () {
+    path.resolve(this.sourceDir, '.vuepress/public')
+  }
+
   get outDir () {
     return this._options.outDir
   }

From 1c70be60c97361b987e6a925aa3a486c423bdc33 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 03:05:40 +0800
Subject: [PATCH 089/242] chore: tweaks naming

---
 packages/@vuepress/plugin-last-updated/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/plugin-last-updated/index.js b/packages/@vuepress/plugin-last-updated/index.js
index 33d904ec1b..864c600b30 100644
--- a/packages/@vuepress/plugin-last-updated/index.js
+++ b/packages/@vuepress/plugin-last-updated/index.js
@@ -1,14 +1,14 @@
 const spawn = require('cross-spawn')
 
 module.exports = (options = {}, context) => ({
-  extendPageData ({ filepath }) {
+  extendPageData ({ filePath }) {
     const { transformer } = options
-    const timestamp = getGitLastUpdatedTimeStamp(filepath)
+    const timestamp = getGitLastUpdatedTimeStamp(filePath)
     const lastUpdated = typeof transformer === 'function' ? transformer(timestamp) : timestamp
     return { lastUpdated }
   }
 })
 
-function getGitLastUpdatedTimeStamp (filepath) {
-  return parseInt(spawn.sync('git', ['log', '-1', '--format=%ct', filepath]).stdout.toString('utf-8')) * 1000
+function getGitLastUpdatedTimeStamp (filePath) {
+  return parseInt(spawn.sync('git', ['log', '-1', '--format=%ct', filePath]).stdout.toString('utf-8')) * 1000
 }

From ae6b3e924d6842e1db0618081519c95bda286223 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 03:37:57 +0800
Subject: [PATCH 090/242] feat: init @vuepress/shared-utils

Move common utilities to @vuepress/shared-utils
---
 packages/@vuepress/cli/index.js               |  2 +-
 packages/@vuepress/core/lib/build.js          |  4 +--
 packages/@vuepress/core/lib/dev.js            |  4 +--
 packages/@vuepress/core/lib/eject.js          |  4 +--
 .../@vuepress/core/lib/markdown/highlight.js  |  3 +-
 .../@vuepress/core/lib/plugin-api/index.js    |  3 +-
 .../option/EnhanceAppFilesOption.js           |  4 +--
 .../@vuepress/core/lib/plugin-api/util.js     |  6 ++--
 packages/@vuepress/core/lib/prepare/index.js  |  4 +--
 .../@vuepress/core/lib/prepare/loadConfig.js  |  2 +-
 .../core/lib/prepare/resolveOptions.js        |  5 +---
 .../core/lib/prepare/resolveSiteData.js       |  2 +-
 packages/@vuepress/core/lib/prepare/util.js   |  2 +-
 .../core/lib/webpack/DevLogPlugin.js          |  3 +-
 packages/@vuepress/core/package.json          |  9 +++---
 .../plugin-register-components/index.js       |  3 +-
 .../plugin-register-components/package.json   |  3 +-
 packages/@vuepress/shared-utils/.npmignore    |  2 ++
 packages/@vuepress/shared-utils/README.md     |  3 ++
 packages/@vuepress/shared-utils/index.js      |  5 ++++
 packages/@vuepress/shared-utils/lib/env.js    |  3 ++
 .../lib/util => shared-utils/lib}/logger.js   |  5 ++--
 packages/@vuepress/shared-utils/package.json  | 30 +++++++++++++++++++
 23 files changed, 66 insertions(+), 45 deletions(-)
 create mode 100644 packages/@vuepress/shared-utils/.npmignore
 create mode 100644 packages/@vuepress/shared-utils/README.md
 create mode 100644 packages/@vuepress/shared-utils/index.js
 create mode 100644 packages/@vuepress/shared-utils/lib/env.js
 rename packages/@vuepress/{core/lib/util => shared-utils/lib}/logger.js (86%)
 create mode 100644 packages/@vuepress/shared-utils/package.json

diff --git a/packages/@vuepress/cli/index.js b/packages/@vuepress/cli/index.js
index 49d452b23e..a1d8d56492 100644
--- a/packages/@vuepress/cli/index.js
+++ b/packages/@vuepress/cli/index.js
@@ -1,4 +1,4 @@
-const chalk = require('chalk')
+const { chalk } = require('@vuepress/shared-utils')
 const semver = require('semver')
 
 try {
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 3774ff17ef..159356c41c 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -1,14 +1,12 @@
 module.exports = async function build (sourceDir, cliOptions = {}) {
   process.env.NODE_ENV = 'production'
 
-  const fs = require('fs-extra')
   const path = require('path')
-  const chalk = require('chalk')
   const webpack = require('webpack')
   const readline = require('readline')
   const escape = require('escape-html')
 
-  const logger = require('./util/logger')
+  const { chalk, fs, logger } = require('@vuepress/shared-utils')
   const prepare = require('./prepare/index')
   const createClientConfig = require('./webpack/createClientConfig')
   const createServerConfig = require('./webpack/createServerConfig')
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index 40637b791e..be32c59b8d 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -1,7 +1,5 @@
 module.exports = async function dev (sourceDir, cliOptions = {}) {
-  const fs = require('fs')
   const path = require('path')
-  const chalk = require('chalk')
   const webpack = require('webpack')
   const chokidar = require('chokidar')
   const serve = require('webpack-serve')
@@ -12,7 +10,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const history = require('connect-history-api-fallback')
 
   const prepare = require('./prepare/index')
-  const logger = require('./util/logger')
+  const { chalk, fs, logger } = require('@vuepress/shared-utils')
   const HeadPlugin = require('./webpack/HeadPlugin')
   const DevLogPlugin = require('./webpack/DevLogPlugin')
   const createClientConfig = require('./webpack/createClientConfig')
diff --git a/packages/@vuepress/core/lib/eject.js b/packages/@vuepress/core/lib/eject.js
index e96b00fd84..e4b62c8dae 100644
--- a/packages/@vuepress/core/lib/eject.js
+++ b/packages/@vuepress/core/lib/eject.js
@@ -1,7 +1,5 @@
-const fs = require('fs-extra')
 const path = require('path')
-const chalk = require('chalk')
-const logger = require('./util/logger')
+const { chalk, fs, logger } = require('@vuepress/shared-utils')
 
 module.exports = async (dir) => {
   const source = path.resolve(__dirname, 'default-theme')
diff --git a/packages/@vuepress/core/lib/markdown/highlight.js b/packages/@vuepress/core/lib/markdown/highlight.js
index 02d5e3ff55..39a019ba94 100644
--- a/packages/@vuepress/core/lib/markdown/highlight.js
+++ b/packages/@vuepress/core/lib/markdown/highlight.js
@@ -1,8 +1,7 @@
-const chalk = require('chalk')
 const prism = require('prismjs')
 const loadLanguages = require('prismjs/components/index')
 const escapeHtml = require('escape-html')
-const logger = require('../util/logger')
+const { logger, chalk } = require('@vuepress/shared-utils')
 
 // required to make embedded highlighting work...
 loadLanguages(['markup', 'css', 'javascript'])
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index ffc8c4db97..52c63092cf 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -1,5 +1,4 @@
-const chalk = require('chalk')
-const logger = require('../util/logger')
+const { logger, chalk } = require('@vuepress/shared-utils')
 const instantiateOption = require('./option/instantiateOption')
 const { resolvePlugin, hydratePlugin, normalizePluginsConfig } = require('./util')
 const { assertTypes } = require('../util/shared')
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 1194a376bd..361c4fc2db 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -1,9 +1,7 @@
-const fs = require('fs-extra')
-const chalk = require('chalk')
 const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
 const { pathsToModuleCode } = require('../../prepare/codegen')
-const logger = require('../../util/logger')
+const { fs, chalk, logger } = require('@vuepress/shared-utils')
 
 module.exports = class EnhanceAppFilesOption extends Option {
   /**
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index dfb71ec7bc..84a5ea5a98 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -1,6 +1,4 @@
-const chalk = require('chalk')
-const { isDebug } = require('../util/logger')
-const logger = require('../util/logger')
+const { logger, chalk, env } = require('@vuepress/shared-utils')
 const { assertTypes } = require('../util/shared')
 
 const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
@@ -52,7 +50,7 @@ exports.resolvePlugin = function (pluginRaw) {
           throw new Error(`[vuepress] Invalid plugin usage ${pluginRaw}.`)
         }
       } catch (err2) {
-        if (isDebug) {
+        if (env.isDebug) {
           console.error(err2)
         }
         name = shortcut = pluginRaw
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 7c97a9b198..227bda7729 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,12 +1,10 @@
 const path = require('path')
-const fs = require('fs-extra')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
 const resolvePlugin = require('./resolvePlugin')
 const { genRoutesFile } = require('./codegen')
 const { writeTemp } = require('./util')
-const logger = require('../util/logger')
-const chalk = require('chalk')
+const { fs, chalk, logger } = require('@vuepress/shared-utils')
 
 module.exports = async function prepare ({
   sourceDir,
diff --git a/packages/@vuepress/core/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
index aa913ba013..949e4c6efa 100644
--- a/packages/@vuepress/core/lib/prepare/loadConfig.js
+++ b/packages/@vuepress/core/lib/prepare/loadConfig.js
@@ -1,4 +1,4 @@
-const fs = require('fs-extra')
+const { fs } = require('@vuepress/shared-utils')
 const path = require('path')
 const yamlParser = require('js-yaml')
 const tomlParser = require('toml')
diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
index 1c0e2ced65..3f63c411c7 100644
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ b/packages/@vuepress/core/lib/prepare/resolveOptions.js
@@ -1,11 +1,8 @@
 const path = require('path')
-const chalk = require('chalk')
-const fs = require('fs-extra')
-const globby = require('globby')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
 const { sort } = require('./util')
-const logger = require('../util/logger')
+const { chalk, fs, logger, globby } = require('@vuepress/shared-utils')
 
 module.exports = async function resolveOptions (sourceDir, cliOptions) {
   function requireResolve (target) {
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index 7682213f8d..0982276b44 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -1,4 +1,4 @@
-const fs = require('fs-extra')
+const { fs } = require('@vuepress/shared-utils')
 const path = require('path')
 const { encodePath, fileToPath } = require('./util')
 const {
diff --git a/packages/@vuepress/core/lib/prepare/util.js b/packages/@vuepress/core/lib/prepare/util.js
index 38b01f75cc..5d96cca703 100644
--- a/packages/@vuepress/core/lib/prepare/util.js
+++ b/packages/@vuepress/core/lib/prepare/util.js
@@ -1,5 +1,5 @@
 const path = require('path')
-const fs = require('fs-extra')
+const { fs } = require('@vuepress/shared-utils')
 
 const tempPath = path.resolve(__dirname, '../app/.temp')
 fs.ensureDirSync(tempPath)
diff --git a/packages/@vuepress/core/lib/webpack/DevLogPlugin.js b/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
index 8fd18d4a0a..79dd5e0086 100644
--- a/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
+++ b/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
@@ -1,5 +1,4 @@
-const chalk = require('chalk')
-const logger = require('../util/logger')
+const { chalk, logger } = require('@vuepress/shared-utils')
 
 module.exports = class DevLogPlugin {
   constructor (options) {
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 01b8ec3cb7..9033a6828e 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -36,13 +36,13 @@
   "dependencies": {
     "@babel/core": "7.0.0-beta.47",
     "@vue/babel-preset-app": "3.0.0-beta.11",
-    "@vuepress/plugin-last-updated": "1.0.0",
-    "@vuepress/plugin-enhance-app": "1.0.0",
-    "@vuepress/plugin-register-components": "1.0.0",
+    "@vuepress/shared-utils": "^1.0.0",
+    "@vuepress/plugin-last-updated": "^1.0.0",
+    "@vuepress/plugin-enhance-app": "^1.0.0",
+    "@vuepress/plugin-register-components": "^1.0.0",
     "autoprefixer": "^8.2.0",
     "babel-loader": "8.0.0-beta.3",
     "cache-loader": "^1.2.2",
-    "chalk": "^2.3.2",
     "chokidar": "^2.0.3",
     "commander": "^2.15.1",
     "connect-history-api-fallback": "^1.5.0",
@@ -52,7 +52,6 @@
     "diacritics": "^1.3.0",
     "escape-html": "^1.0.3",
     "file-loader": "^1.1.11",
-    "fs-extra": "^5.0.0",
     "globby": "^8.0.1",
     "gray-matter": "^4.0.1",
     "js-yaml": "^3.11.0",
diff --git a/packages/@vuepress/plugin-register-components/index.js b/packages/@vuepress/plugin-register-components/index.js
index da25922463..42c46fa60c 100644
--- a/packages/@vuepress/plugin-register-components/index.js
+++ b/packages/@vuepress/plugin-register-components/index.js
@@ -1,6 +1,5 @@
-const fs = require('fs-extra')
+const { fs, globby } = require('@vuepress/shared-utils')
 const path = require('path')
-const globby = require('globby')
 
 function fileToComponentName (file) {
   return file
diff --git a/packages/@vuepress/plugin-register-components/package.json b/packages/@vuepress/plugin-register-components/package.json
index a83fd80569..766a22a6f8 100644
--- a/packages/@vuepress/plugin-register-components/package.json
+++ b/packages/@vuepress/plugin-register-components/package.json
@@ -23,7 +23,6 @@
   },
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-components#readme",
   "dependencies": {
-    "fs-extra": "^5.0.0",
-    "globby": "^8.0.1"
+    "@vuepress/shared-utils": "^1.0.0"
   }
 }
\ No newline at end of file
diff --git a/packages/@vuepress/shared-utils/.npmignore b/packages/@vuepress/shared-utils/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/shared-utils/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/shared-utils/README.md b/packages/@vuepress/shared-utils/README.md
new file mode 100644
index 0000000000..37e62efcc0
--- /dev/null
+++ b/packages/@vuepress/shared-utils/README.md
@@ -0,0 +1,3 @@
+# @vuepress/shard-utils
+
+> shard-utils for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
new file mode 100644
index 0000000000..4baa3e99e9
--- /dev/null
+++ b/packages/@vuepress/shared-utils/index.js
@@ -0,0 +1,5 @@
+exports.logger = require('./lib/logger')
+exports.env = require('./lib/env')
+exports.chalk = require('chalk')
+exports.fs = require('fs-extra')
+exports.globby = require('globby')
diff --git a/packages/@vuepress/shared-utils/lib/env.js b/packages/@vuepress/shared-utils/lib/env.js
new file mode 100644
index 0000000000..5a0742dbfa
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/env.js
@@ -0,0 +1,3 @@
+const isDebug = process.argv.indexOf('--debug') !== -1
+
+exports.isDebug = isDebug
diff --git a/packages/@vuepress/core/lib/util/logger.js b/packages/@vuepress/shared-utils/lib/logger.js
similarity index 86%
rename from packages/@vuepress/core/lib/util/logger.js
rename to packages/@vuepress/shared-utils/lib/logger.js
index 919e27ee86..c876be8c68 100644
--- a/packages/@vuepress/core/lib/util/logger.js
+++ b/packages/@vuepress/shared-utils/lib/logger.js
@@ -1,4 +1,5 @@
 const chalk = require('chalk')
+const env = require('./env')
 
 const logger = {}
 
@@ -45,14 +46,12 @@ for (const type in logTypes) {
 }
 
 const debugFn = getLoggerFn('magenta', 'DEBUG')
-const isDebug = process.argv.indexOf('--debug') !== -1 || process.argv.indexOf('--verbose') !== -1
 
 logger.debug = function (msg) {
-  if (isDebug) {
+  if (env.isDebug) {
     debugFn(msg)
   }
 }
 
 module.exports = logger
 module.exports.getLoggerFn = getLoggerFn
-module.exports.isDebug = isDebug
diff --git a/packages/@vuepress/shared-utils/package.json b/packages/@vuepress/shared-utils/package.json
new file mode 100644
index 0000000000..598b11367f
--- /dev/null
+++ b/packages/@vuepress/shared-utils/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "@vuepress/shared-utils",
+  "version": "1.0.0",
+  "description": "shared-utils for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "chalk": "^2.3.2",
+    "fs-extra": "^5.0.0",
+    "globby": "^8.0.1"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/shared-utils#readme"
+}
\ No newline at end of file

From 07f386dcef445d0dda88a7812796838c6b7d7f2d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 03:53:19 +0800
Subject: [PATCH 091/242] chore: disable algolia for now.

---
 packages/docs/docs/.vuepress/config.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 0f9b1e8ed1..6ef9811d16 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -28,10 +28,10 @@ module.exports = {
     editLinks: true,
     docsDir: 'docs',
     // #697 Provided by the official algolia team.
-    algolia: {
-      apiKey: '3a539aab83105f01761a137c61004d85',
-      indexName: 'vuepress'
-    },
+    // algolia: {
+    //   apiKey: '3a539aab83105f01761a137c61004d85',
+    //   indexName: 'vuepress'
+    // },
     locales: {
       '/': {
         label: 'English',

From 4282d3bebca5a88cf71bcc033f1d1bee68107721 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 05:47:23 +0800
Subject: [PATCH 092/242] refactor: using plugin API to rewrite code generation
 of 'routes'

1. 'registerComponent' in '@app/util'
2. Split 'routes.js', 'root-mixins', 'async-compoents' into different modules (decouple)
---
 packages/@vuepress/core/lib/app/app.js        |  2 +-
 packages/@vuepress/core/lib/app/util.js       | 11 ++++++
 .../@vuepress/core/lib/plugin-api/context.js  |  8 +++++
 .../@vuepress/core/lib/plugin-api/index.js    |  4 +--
 .../option/EnhanceAppFilesOption.js           |  2 +-
 .../@vuepress/core/lib/plugin-api/util.js     |  4 +--
 .../{prepare => plugins/routes}/codegen.js    | 36 +++++++------------
 .../core/lib/plugins/routes/index.js          | 27 ++++++++++++++
 packages/@vuepress/core/lib/prepare/index.js  |  6 +---
 9 files changed, 65 insertions(+), 35 deletions(-)
 rename packages/@vuepress/core/lib/{prepare => plugins/routes}/codegen.js (64%)
 create mode 100644 packages/@vuepress/core/lib/plugins/routes/index.js

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 252e5fabee..7b0667966b 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import dataMixin from './dataMixin'
-import { routes } from '@temp/routes'
+import { routes } from '@dynamic/routes'
 import { siteData } from '@temp/siteData'
 import appEnhancers from '@temp/app-enhancers.js'
 import globalUIComponents from '@dynamic/global-ui.js'
diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index bb32f3baed..a526e1553f 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -1,3 +1,6 @@
+import Vue from 'vue'
+import { loadComponent } from '@dynamic/async-component'
+
 export function injectMixins (options, mixins) {
   if (!options.mixins) {
     options.mixins = []
@@ -18,6 +21,14 @@ export function findPageForPath (pages, path) {
   }
 }
 
+export function registerComponent (key) {
+  return loadComponent(key).then(comp => {
+    console.log(comp.default)
+    Vue.component(key, comp.default)
+    return comp.default
+  })
+}
+
 /**
  * Normalize config.
  * This utility is mainly for plugin developers. For some
diff --git a/packages/@vuepress/core/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
index acb66c19b8..d7f59f7a34 100644
--- a/packages/@vuepress/core/lib/plugin-api/context.js
+++ b/packages/@vuepress/core/lib/plugin-api/context.js
@@ -46,6 +46,14 @@ class PluginContext {
   get siteConfig () {
     return this._options.siteConfig
   }
+
+  get siteData () {
+    return this._options.siteData
+  }
+
+  get self () {
+    return this._options.self
+  }
 }
 
 Object.assign(PluginContext.prototype, {
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 52c63092cf..b9508a6c7a 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -15,9 +15,9 @@ module.exports = class Plugin {
     let plugin = resolvePlugin(pluginRaw)
     if (!plugin.config) {
       console.warn(`[vuepress] cannot resolve plugin "${pluginRaw}"`)
-      return
+      return this
     }
-    plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext)
+    plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext, this)
     if (plugin.enabled) {
       this.applyPlugin(plugin)
     } else {
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 361c4fc2db..51bfcb3a95 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -1,6 +1,6 @@
 const Option = require('../Option')
 const { writeTemp } = require('../../prepare/util')
-const { pathsToModuleCode } = require('../../prepare/codegen')
+const { pathsToModuleCode } = require('../../plugins/routes/codegen')
 const { fs, chalk, logger } = require('@vuepress/shared-utils')
 
 module.exports = class EnhanceAppFilesOption extends Option {
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 84a5ea5a98..205cdb6c76 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -69,7 +69,7 @@ exports.resolvePlugin = function (pluginRaw) {
  * @param {Object} pluginOptions
  * @param {Object} pluginContext
  */
-exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOptions, pluginContext) {
+exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOptions, pluginContext, self) {
   const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
   if (!valid) {
     if (pluginOptions !== undefined) {
@@ -88,7 +88,7 @@ exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOpt
   if (typeof config === 'function') {
     // 'Object.create' here is to give each plugin a separate context,
     // but also own the inheritance context.
-    config = config(pluginOptions, Object.create(pluginContext))
+    config = config(pluginOptions, Object.create(pluginContext), self)
   }
   // respect name in local plugin config
   name = isLocal && config.name || name
diff --git a/packages/@vuepress/core/lib/prepare/codegen.js b/packages/@vuepress/core/lib/plugins/routes/codegen.js
similarity index 64%
rename from packages/@vuepress/core/lib/prepare/codegen.js
rename to packages/@vuepress/core/lib/plugins/routes/codegen.js
index de7717b229..95ff5a22dd 100644
--- a/packages/@vuepress/core/lib/prepare/codegen.js
+++ b/packages/@vuepress/core/lib/plugins/routes/codegen.js
@@ -1,6 +1,3 @@
-const path = require('path')
-const { writeTemp } = require('./util')
-
 exports.pathsToModuleCode = function (files) {
   let index = 0
   let code = ''
@@ -21,10 +18,7 @@ exports.pathsToModuleCode = function (files) {
   return code
 }
 
-exports.genRoutesFile = async function ({
-  siteData: { pages },
-  plugin
-}) {
+exports.genRoutesFile = async function (pages) {
   function genRoute ({ path: pagePath, filePath, key: componentName }) {
     let code = `
   {
@@ -32,10 +26,7 @@ exports.genRoutesFile = async function ({
     path: ${JSON.stringify(pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
-      import(${JSON.stringify(filePath)}).then(comp => {
-        Vue.component(${JSON.stringify(componentName)}, comp.default)
-        next()
-      })
+      registerComponent(${JSON.stringify(componentName)}).then(() => next())
     }
   }`
 
@@ -65,24 +56,21 @@ exports.genRoutesFile = async function ({
     component: ThemeNotFound
   }`
 
-  // TODO move it to a single file?
-  const builtInRootMixins = [
-    path.resolve(__dirname, '../app/root-mixins/updateMeta.js')
-  ]
-  const rootMixins = [
-    ...builtInRootMixins,
-    ...plugin.options.clientRootMixin.values
-  ]
-  await writeTemp('root-mixins.js', exports.pathsToModuleCode(rootMixins))
-
   return (
-    `import Vue from 'vue'\n` +
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
-    `import { injectMixins, loadComponent } from '@app/util'\n` +
-    `import rootMixins from '@temp/root-mixins'\n\n` +
+    `import { injectMixins, registerComponent } from '@app/util'\n` +
+    `import rootMixins from '@dynamic/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
   )
 }
+
+exports.genImportAsyncComponentFile = function (pages) {
+  return `export function loadComponent (key) {
+  switch (key) {
+${pages.map(({ key, filePath }) => `    case "${key}": return import("${filePath}");`).join('\n')}
+  }
+}`
+}
diff --git a/packages/@vuepress/core/lib/plugins/routes/index.js b/packages/@vuepress/core/lib/plugins/routes/index.js
new file mode 100644
index 0000000000..138922bf9a
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugins/routes/index.js
@@ -0,0 +1,27 @@
+const path = require('path')
+const { genRoutesFile, pathsToModuleCode, genImportAsyncComponentFile } = require('./codegen')
+
+module.exports = (options, context, self) => ({
+  name: '@vuepress/internal-routes',
+
+  async clientDynamicModules () {
+    const builtInRootMixins = [
+      path.resolve(__dirname, '../../app/root-mixins/updateMeta.js')
+    ]
+
+    const rootMixins = [
+      ...builtInRootMixins,
+      ...self.options.clientRootMixin.values
+    ]
+
+    const routesCode = await genRoutesFile(context.siteData.pages)
+    const rootMixinsCode = pathsToModuleCode(rootMixins)
+    const importAsyncComponentCode = genImportAsyncComponentFile(context.siteData.pages)
+
+    return [
+      { name: 'routes.js', content: routesCode },
+      { name: 'root-mixins.js', content: rootMixinsCode },
+      { name: 'async-component.js', content: importAsyncComponentCode }
+    ]
+  }
+})
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 227bda7729..cb20f3d0a9 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -2,7 +2,6 @@ const path = require('path')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
 const resolvePlugin = require('./resolvePlugin')
-const { genRoutesFile } = require('./codegen')
 const { writeTemp } = require('./util')
 const { fs, chalk, logger } = require('@vuepress/shared-utils')
 
@@ -18,6 +17,7 @@ module.exports = async function prepare ({
 
   // 2. resolve plugin
   const plugin = resolvePlugin(options)
+  plugin.use(require('../plugins/routes'))
   options.plugin = plugin
   const pluginOptions = plugin.options
 
@@ -34,10 +34,6 @@ module.exports = async function prepare ({
   await pluginOptions.clientDynamicModules.apply()
   await pluginOptions.globalUIComponents.apply()
 
-  // 5. generate routes code
-  const routesCode = await genRoutesFile(options)
-  await writeTemp('routes.js', routesCode)
-
   // 6. generate siteData
   const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
   await writeTemp('siteData.js', dataCode)

From 065224277038bced62e7b4af84d2056ef506fbb6 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 05:58:59 +0800
Subject: [PATCH 093/242] feat: Completely make '@vuepress/plugin-pwa' a
 standalone plugin

---
 packages/@vuepress/core/lib/app/util.js       |  1 -
 packages/@vuepress/core/lib/build.js          | 15 --------
 packages/@vuepress/plugin-i18n-ui/index.vue   | 35 ++++++++++++++++---
 packages/@vuepress/plugin-pwa/README.md       | 16 +++++++++
 .../@vuepress/plugin-pwa/SWUpdatePopup.vue    | 11 ++----
 packages/@vuepress/plugin-pwa/index.js        | 28 ++++++++++++---
 packages/@vuepress/plugin-pwa/inject.js       |  6 ++--
 packages/@vuepress/plugin-pwa/package.json    |  3 +-
 .../skip-waiting.js                           |  0
 packages/@vuepress/plugin-test/index.js       |  9 ++---
 packages/@vuepress/theme-default/plugin.js    |  9 +++--
 yarn.lock                                     |  6 ++--
 12 files changed, 91 insertions(+), 48 deletions(-)
 rename packages/@vuepress/{core/lib/service-worker => plugin-pwa}/skip-waiting.js (100%)

diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index a526e1553f..3ef7fd9d1f 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -23,7 +23,6 @@ export function findPageForPath (pages, path) {
 
 export function registerComponent (key) {
   return loadComponent(key).then(comp => {
-    console.log(comp.default)
     Vue.component(key, comp.default)
     return comp.default
   })
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 159356c41c..13052a710e 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -77,21 +77,6 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   readline.clearLine(process.stdout, 0)
   readline.cursorTo(process.stdout, 0)
 
-  if (options.siteConfig.serviceWorker) {
-    logger.wait('\nGenerating service worker...')
-    const wbb = require('workbox-build')
-    await wbb.generateSW({
-      swDest: path.resolve(outDir, 'service-worker.js'),
-      globDirectory: outDir,
-      globPatterns: ['**\/*.{js,css,html,png,jpg,jpeg,gif,svg,woff,woff2,eot,ttf,otf}']
-    })
-    await fs.writeFile(
-      path.resolve(outDir, 'service-worker.js'),
-      await fs.readFile(path.resolve(__dirname, 'service-worker/skip-waiting.js'), 'utf8'),
-      { flag: 'a' }
-    )
-  }
-
   await options.plugin.options.generated.apply()
 
   // DONE.
diff --git a/packages/@vuepress/plugin-i18n-ui/index.vue b/packages/@vuepress/plugin-i18n-ui/index.vue
index 86a4c29a03..95008844f3 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.vue
+++ b/packages/@vuepress/plugin-i18n-ui/index.vue
@@ -17,12 +17,18 @@
     <div class="helper-content">
       <div id="left">
         <transition name="slide-left">
-          <Content :page-key="key"/>
+          <Content
+            v-if="currentPageComponent"
+            :page-key="key"
+          />
         </transition>
       </div>
       <div id="right">
         <transition name="slide-left">
-          <Content :page-key="rightKey"/>
+          <Content
+            v-if="rightPageComponent"
+            :page-key="rightKey"
+          />
         </transition>
       </div>
     </div>
@@ -30,17 +36,21 @@
 </template>
 
 <script>
-import { findPageForPath } from '@app/util'
+import { findPageForPath, registerComponent } from '@app/util'
 
 export default {
   data () {
     return {
-      currentPagePath: '/'
+      currentPagePath: '/',
+      currentPageComponent: null,
+      rightPageComponent: null
     }
   },
 
   mounted () {
     syncScroll()
+    this.loadComponent(this.key, 'currentPageComponent')
+    this.loadComponent(this.rightKey, 'rightPageComponent')
   },
 
   computed: {
@@ -85,6 +95,23 @@ export default {
   methods: {
     handlePageChange (e) {
       this.currentPagePath = e.target.value
+    },
+
+    loadComponent (key, flag) {
+      this[flag] = null
+      registerComponent(key).then(() => {
+        this[flag] = true
+      })
+    }
+  },
+
+  watch: {
+    key (newValue) {
+      this.loadComponent(newValue, 'currentPageComponent')
+    },
+
+    rightKey (newValue) {
+      this.loadComponent(newValue, 'rightPageComponent')
     }
   }
 }
diff --git a/packages/@vuepress/plugin-pwa/README.md b/packages/@vuepress/plugin-pwa/README.md
index 7fef9b5363..c30d9a2ca4 100644
--- a/packages/@vuepress/plugin-pwa/README.md
+++ b/packages/@vuepress/plugin-pwa/README.md
@@ -13,6 +13,22 @@ If set to `true`, VuePress will automatically generate and register a service wo
 
 ### updatePopup
 
+- Type: `boolean|popupConfig`
+- Default: `undefined`
+
+```typescript
+interface normalPopupConfig {
+	message: string; // defaults to 'New content is available.'
+	buttonText: string; // defaults to 'Refresh'
+}
+
+interface localedPopupConfig {
+  [localePath: string]: normalPopupConfig
+}
+
+type popupConfig = normalPopupConfig | localedPopupConfig
+```
+
 This option enables the popup to refresh contents. The popup will be shown when the site is updated (i.e. service worker is updated). It provides `refresh` button to allow users to refresh contents immediately.
 
 > If without the `refresh` button, the new service worker will be active after all [clients](https://developer.mozilla.org/en-US/docs/Web/API/Clients) are closed. This means that visitors cannot see new contents until they close all tabs of your site. But the `refresh` button activates the new service worker immediately.
diff --git a/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue b/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
index ce6f572465..d15d50c7cb 100644
--- a/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
+++ b/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
@@ -13,11 +13,12 @@
 <script>
 /* global SW_UPDATE_POPUP */
 import event from './event'
+import { normalizeConfig } from '@app/util'
 
 export default {
   data () {
     return {
-      config: SW_UPDATE_POPUP,
+      rawPopupConfig: SW_UPDATE_POPUP,
       updateEvent: null
     }
   },
@@ -28,13 +29,7 @@ export default {
 
   computed: {
     popupConfig () {
-      for (const config of [this.$themeLocaleConfig, this.$site.themeConfig]) {
-        const sw = config.serviceWorker
-        if (sw && sw.updatePopup) {
-          return typeof sw.updatePopup === 'object' ? sw.updatePopup : {}
-        }
-      }
-      return null
+      return normalizeConfig(this, this.rawPopupConfig)
     },
 
     enabled () {
diff --git a/packages/@vuepress/plugin-pwa/index.js b/packages/@vuepress/plugin-pwa/index.js
index ce223a46f3..4f43ac540f 100644
--- a/packages/@vuepress/plugin-pwa/index.js
+++ b/packages/@vuepress/plugin-pwa/index.js
@@ -1,11 +1,14 @@
 const path = require('path')
+const { logger, fs } = require('@vuepress/shared-utils')
 
 module.exports = (options, context) => ({
-  chainWebpack (config) {
+  ready () {
     options = Object.assign({
       serviceWorker: true
     }, options)
+  },
 
+  chainWebpack (config) {
     const { serviceWorker, updatePopup } = options
     const base = context.base || '/'
 
@@ -20,7 +23,24 @@ module.exports = (options, context) => ({
 
   globalUIComponents: 'SWUpdatePopup',
 
-  enhanceAppFiles: [
-    path.resolve(__dirname, 'inject.js')
-  ]
+  enhanceAppFiles: [path.resolve(__dirname, 'inject.js')],
+
+  async generated () {
+    const { serviceWorker } = options
+    const { outDir } = context
+    if (serviceWorker) {
+      logger.wait('\nGenerating service worker...')
+      const wbb = require('workbox-build')
+      await wbb.generateSW({
+        swDest: path.resolve(outDir, 'service-worker.js'),
+        globDirectory: outDir,
+        globPatterns: ['**\/*.{js,css,html,png,jpg,jpeg,gif,svg,woff,woff2,eot,ttf,otf}']
+      })
+      await fs.writeFile(
+        path.resolve(outDir, 'service-worker.js'),
+        await fs.readFile(path.resolve(__dirname, 'skip-waiting.js'), 'utf8'),
+        { flag: 'a' }
+      )
+    }
+  }
 })
diff --git a/packages/@vuepress/plugin-pwa/inject.js b/packages/@vuepress/plugin-pwa/inject.js
index 7dc2fb158f..44e0f98f0f 100644
--- a/packages/@vuepress/plugin-pwa/inject.js
+++ b/packages/@vuepress/plugin-pwa/inject.js
@@ -9,12 +9,12 @@ if (SW_UPDATE_POPUP) {
   Vue.component('SWUpdatePopup', () => import('./SWUpdatePopup.vue'))
 }
 
-export default ({ router }) => {
+export default ({ router, isServer }) => {
   // Register service worker
   router.onReady(() => {
     if (process.env.NODE_ENV === 'production' &&
-      SW_ENABLED &&
-      window.location.protocol === 'https:') {
+      !isServer &&
+      SW_ENABLED) {
       register(`${SW_BASE_URL}service-worker.js`, {
         ready () {
           console.log('[vuepress:sw] Service worker is active.')
diff --git a/packages/@vuepress/plugin-pwa/package.json b/packages/@vuepress/plugin-pwa/package.json
index 9180cd1724..4f57924844 100644
--- a/packages/@vuepress/plugin-pwa/package.json
+++ b/packages/@vuepress/plugin-pwa/package.json
@@ -17,7 +17,8 @@
     "generator"
   ],
   "dependencies": {
-    "register-service-worker": "^1.4.1"
+    "register-service-worker": "^1.5.2",
+    "@vuepress/shared-utils": "^1.0.0"
   },
   "author": "Evan You",
   "license": "MIT",
diff --git a/packages/@vuepress/core/lib/service-worker/skip-waiting.js b/packages/@vuepress/plugin-pwa/skip-waiting.js
similarity index 100%
rename from packages/@vuepress/core/lib/service-worker/skip-waiting.js
rename to packages/@vuepress/plugin-pwa/skip-waiting.js
diff --git a/packages/@vuepress/plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
index 94788ad809..f723a37a16 100644
--- a/packages/@vuepress/plugin-test/index.js
+++ b/packages/@vuepress/plugin-test/index.js
@@ -36,15 +36,16 @@ module.exports = (options, context) => ({
   ],
 
   chainWebpack (config, isServer) {
-    if (isServer) {
+    const { publicDir } = context
+    if (isServer && publicDir) {
       config
         .plugin('copy')
-        .tap(args => {
-          args[0].push({
+        .tap(([options]) => {
+          options.push({
             from: path.resolve(context.sourceDir, '.vuepress/images'),
             to: path.resolve(context.outDir, 'images')
           })
-          return args
+          return options
         })
     }
     config
diff --git a/packages/@vuepress/theme-default/plugin.js b/packages/@vuepress/theme-default/plugin.js
index 9fbf8c13e2..1aee3b5bbf 100644
--- a/packages/@vuepress/theme-default/plugin.js
+++ b/packages/@vuepress/theme-default/plugin.js
@@ -15,10 +15,9 @@ module.exports = (options, context) => ({
 
     config.resolve
       .alias
-      .set('@default-theme', path.resolve('.'))
-      .set('@AlgoliaSearchBox', isAlgoliaSearch
-        ? path.resolve(__dirname, './src/AlgoliaSearchBox.vue')
-        : path.resolve(__dirname, './noopModule.js'))
-      .end()
+        .set('@default-theme', path.resolve('.'))
+        .set('@AlgoliaSearchBox', isAlgoliaSearch
+          ? path.resolve(__dirname, 'src/AlgoliaSearchBox.vue')
+          : path.resolve(__dirname, 'noopModule.js'))
   }
 })
diff --git a/yarn.lock b/yarn.lock
index 6bff8e02a0..652f2da55c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7679,9 +7679,9 @@ regexpu-core@^4.1.3, regexpu-core@^4.1.4, regexpu-core@^4.2.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.0.2"
 
-register-service-worker@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.4.1.tgz#4b4c9b4200fc697942c6ae7d611349587b992b2f"
+register-service-worker@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.5.2.tgz#a4631896c38d6ec5597358f44988cc46a911912d"
 
 registry-auth-token@^3.0.1:
   version "3.3.2"

From 9b108a573df328aaed33772966e6f503e57ccf58 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 12:52:33 +0800
Subject: [PATCH 094/242] chore: correct dependency

---
 packages/@vuepress/core/package.json       | 3 +--
 packages/@vuepress/plugin-pwa/package.json | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 9033a6828e..cfffdc2184 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -83,8 +83,7 @@
     "webpack-chain": "^4.6.0",
     "webpack-merge": "^4.1.2",
     "webpack-serve": "^1.0.2",
-    "webpackbar": "^2.6.1",
-    "workbox-build": "^3.1.0"
+    "webpackbar": "^2.6.1"
   },
   "engines": {
     "node": ">=8"
diff --git a/packages/@vuepress/plugin-pwa/package.json b/packages/@vuepress/plugin-pwa/package.json
index 4f57924844..c78734afad 100644
--- a/packages/@vuepress/plugin-pwa/package.json
+++ b/packages/@vuepress/plugin-pwa/package.json
@@ -18,7 +18,8 @@
   ],
   "dependencies": {
     "register-service-worker": "^1.5.2",
-    "@vuepress/shared-utils": "^1.0.0"
+    "@vuepress/shared-utils": "^1.0.0",
+    "workbox-build": "^3.1.0"
   },
   "author": "Evan You",
   "license": "MIT",

From 86c8dbf4a5a4eaf4ce4c5aaa7673b70e84d89ecc Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 17:43:25 +0800
Subject: [PATCH 095/242] feat: move 'writeTemp' to shared utility and support
 config temp path

---
 .../@vuepress/core/lib/plugin-api/context.js  |  2 +-
 .../option/ClientDynamicModulesOption.js      |  4 +--
 .../option/EnhanceAppFilesOption.js           |  3 +-
 .../option/GlobalUIComponentsOption.js        |  4 +--
 packages/@vuepress/core/lib/prepare/index.js  |  3 +-
 packages/@vuepress/core/lib/prepare/util.js   | 28 -----------------
 .../core/lib/webpack/createBaseConfig.js      |  4 +--
 packages/@vuepress/shared-utils/index.js      |  1 +
 .../@vuepress/shared-utils/lib/writeTemp.js   | 31 +++++++++++++++++++
 9 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 packages/@vuepress/shared-utils/lib/writeTemp.js

diff --git a/packages/@vuepress/core/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
index d7f59f7a34..f697ea5615 100644
--- a/packages/@vuepress/core/lib/plugin-api/context.js
+++ b/packages/@vuepress/core/lib/plugin-api/context.js
@@ -1,5 +1,5 @@
 const path = require('path')
-const { writeTemp } = require('../prepare/util')
+const { writeTemp } = require('@vuepress/shared-utils')
 
 class PluginContext {
   constructor (options) {
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index 841b9ca983..ccf204dc60 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -1,5 +1,5 @@
 const Option = require('../Option')
-const { writeTemp } = require('../../prepare/util')
+const { writeTemp } = require('@vuepress/shared-utils')
 
 module.exports = class ClientDynamicModulesOption extends Option {
   async apply () {
@@ -11,7 +11,7 @@ module.exports = class ClientDynamicModulesOption extends Option {
       }
       for (const { name, content } of modules) {
         await writeTemp(
-          `dynamic-modules/${name}`,
+          `dynamic/${name}`,
           `
 /**
  * Generated by [vuepress-plugin-${pluginName}]"
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 51bfcb3a95..e1be10e161 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -1,7 +1,6 @@
 const Option = require('../Option')
-const { writeTemp } = require('../../prepare/util')
 const { pathsToModuleCode } = require('../../plugins/routes/codegen')
-const { fs, chalk, logger } = require('@vuepress/shared-utils')
+const { fs, chalk, logger, writeTemp } = require('@vuepress/shared-utils')
 
 module.exports = class EnhanceAppFilesOption extends Option {
   /**
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
index ae072fff6e..dafd0372b1 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
@@ -1,10 +1,10 @@
 const Option = require('../Option')
-const { writeTemp } = require('../../prepare/util')
+const { writeTemp } = require('@vuepress/shared-utils')
 
 module.exports = class GlobalUIComponentsOption extends Option {
   async apply () {
     await writeTemp(
-      `dynamic-modules/global-ui.js`,
+      `dynamic/global-ui.js`,
       `export default ${JSON.stringify(this.values, null, 2)}`
     )
   }
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index cb20f3d0a9..2aa330486a 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -2,8 +2,7 @@ const path = require('path')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
 const resolvePlugin = require('./resolvePlugin')
-const { writeTemp } = require('./util')
-const { fs, chalk, logger } = require('@vuepress/shared-utils')
+const { fs, chalk, logger, writeTemp } = require('@vuepress/shared-utils')
 
 module.exports = async function prepare ({
   sourceDir,
diff --git a/packages/@vuepress/core/lib/prepare/util.js b/packages/@vuepress/core/lib/prepare/util.js
index 5d96cca703..22ad69fa1c 100644
--- a/packages/@vuepress/core/lib/prepare/util.js
+++ b/packages/@vuepress/core/lib/prepare/util.js
@@ -1,31 +1,3 @@
-const path = require('path')
-const { fs } = require('@vuepress/shared-utils')
-
-const tempPath = path.resolve(__dirname, '../app/.temp')
-fs.ensureDirSync(tempPath)
-
-const tempCache = new Map()
-exports.writeTemp = async function (file, content) {
-  const destPath = path.join(tempPath, file)
-  await fs.ensureDir(path.parse(destPath).dir)
-  // cache write to avoid hitting the dist if it didn't change
-  const cached = tempCache.get(file)
-  if (cached !== content) {
-    await fs.writeFile(destPath, content)
-    tempCache.set(file, content)
-  }
-  return destPath
-}
-
-exports.writeEnhanceTemp = async function (destName, srcPath) {
-  await exports.writeTemp(
-    destName,
-    fs.existsSync(srcPath)
-      ? `export { default } from ${JSON.stringify(srcPath)}`
-      : `export default function () {}`
-  )
-}
-
 const indexRE = /(^|.*\/)(index|readme)\.md$/i
 const extRE = /\.(vue|md)$/
 
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index c74db6605c..d03cad8f9d 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -42,8 +42,8 @@ module.exports = function createBaseConfig ({
       .set('@themeNotFound', themeNotFoundPath)
       .set('@source', sourceDir)
       .set('@app', path.resolve(__dirname, '../app'))
-      .set('@temp', path.resolve(__dirname, '../app/.temp'))
-      .set('@dynamic', path.resolve(__dirname, '../app/.temp/dynamic-modules'))
+      .set('@temp', process.env.VUEPRESS_TEMP_PATH)
+      .set('@dynamic', path.resolve(process.env.VUEPRESS_TEMP_PATH, 'dynamic'))
       .end()
     .extensions
       .merge(['.js', '.jsx', '.vue', '.json', '.styl'])
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 4baa3e99e9..02132e6bc7 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -1,5 +1,6 @@
 exports.logger = require('./lib/logger')
 exports.env = require('./lib/env')
+exports.writeTemp = require('./lib/writeTemp')
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
 exports.globby = require('globby')
diff --git a/packages/@vuepress/shared-utils/lib/writeTemp.js b/packages/@vuepress/shared-utils/lib/writeTemp.js
new file mode 100644
index 0000000000..d75f6f3dd7
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/writeTemp.js
@@ -0,0 +1,31 @@
+const path = require('path')
+const fs = require('fs-extra')
+
+if (!process.env.VUEPRESS_TEMP_PATH) {
+  process.env.VUEPRESS_TEMP_PATH = path.resolve(__dirname, '../.temp')
+}
+
+const tempPath = process.env.VUEPRESS_TEMP_PATH
+fs.ensureDirSync(tempPath)
+
+const tempCache = new Map()
+
+/**
+ * A low-level temporary file processing utility
+ * @param fileA
+ * @param content
+ * @returns {Promise<*|string>}
+ */
+async function writeTemp (file, content) {
+  const destPath = path.join(tempPath, file)
+  await fs.ensureDir(path.parse(destPath).dir)
+  // cache write to avoid hitting the dist if it didn't change
+  const cached = tempCache.get(file)
+  if (cached !== content) {
+    await fs.writeFile(destPath, content)
+    tempCache.set(file, content)
+  }
+  return destPath
+}
+
+module.exports = writeTemp

From 7239daf1e8857dbea44d3ce9f33be8740b852f05 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 18:06:34 +0800
Subject: [PATCH 096/242] fix: dev server hot relead failed - correct siteDate
 path

---
 packages/@vuepress/core/lib/app/app.js                  | 3 ++-
 packages/@vuepress/core/lib/app/dataMixin.js            | 4 +++-
 packages/@vuepress/core/lib/webpack/createBaseConfig.js | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 7b0667966b..0fadfd6381 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -1,3 +1,4 @@
+/* global VUEPRESS_TEMP_PATH */
 import Vue from 'vue'
 import Router from 'vue-router'
 import dataMixin from './dataMixin'
@@ -17,7 +18,7 @@ import ClientOnly from './components/ClientOnly'
 // suggest dev server restart on base change
 if (module.hot) {
   const prevBase = siteData.base
-  module.hot.accept('./.temp/siteData', () => {
+  module.hot.accept(VUEPRESS_TEMP_PATH + '/siteData.js', () => {
     if (siteData.base !== prevBase) {
       window.alert(
         `[vuepress] Site base has changed. ` +
diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index ab4b51039d..1979790fdd 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -1,3 +1,5 @@
+/* global VUEPRESS_TEMP_PATH */
+
 import Vue from 'vue'
 import { findPageForPath } from './util'
 
@@ -12,7 +14,7 @@ export default function dataMixin (siteData) {
   Vue.$store = store
 
   if (module.hot) {
-    module.hot.accept('./.temp/siteData', () => {
+    module.hot.accept(VUEPRESS_TEMP_PATH + '/siteData.js', () => {
       prepare(siteData)
       store.siteData = siteData
     })
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index d03cad8f9d..632f280a7e 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -278,6 +278,7 @@ module.exports = function createBaseConfig ({
     .plugin('injections')
     .use(require('webpack/lib/DefinePlugin'), [{
       VUEPRESS_VERSION: JSON.stringify(require('../../package.json').version),
+      VUEPRESS_TEMP_PATH: JSON.stringify(process.env.VUEPRESS_TEMP_PATH),
       LAST_COMMIT_HASH: JSON.stringify(getLastCommitHash())
     }])
 

From 216b8d5b775007f39974a423171b5677c4f4ef03 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 18:20:45 +0800
Subject: [PATCH 097/242] feat($pwa): support popupComponent and update docs

---
 packages/@vuepress/plugin-pwa/README.md       | 75 ++++++++++++++++++-
 packages/@vuepress/plugin-pwa/index.js        | 16 ++--
 .../plugin-pwa/{ => lib}/SWUpdateEvent.js     |  0
 .../plugin-pwa/{ => lib}/SWUpdatePopup.vue    | 63 +++++++++-------
 .../@vuepress/plugin-pwa/{ => lib}/event.js   |  0
 .../@vuepress/plugin-pwa/{ => lib}/inject.js  |  0
 .../plugin-pwa/{ => lib}/skip-waiting.js      |  0
 .../plugin-register-components/index.js       |  2 +-
 8 files changed, 122 insertions(+), 34 deletions(-)
 rename packages/@vuepress/plugin-pwa/{ => lib}/SWUpdateEvent.js (100%)
 rename packages/@vuepress/plugin-pwa/{ => lib}/SWUpdatePopup.vue (56%)
 rename packages/@vuepress/plugin-pwa/{ => lib}/event.js (100%)
 rename packages/@vuepress/plugin-pwa/{ => lib}/inject.js (100%)
 rename packages/@vuepress/plugin-pwa/{ => lib}/skip-waiting.js (100%)

diff --git a/packages/@vuepress/plugin-pwa/README.md b/packages/@vuepress/plugin-pwa/README.md
index c30d9a2ca4..8f10a3f6a8 100644
--- a/packages/@vuepress/plugin-pwa/README.md
+++ b/packages/@vuepress/plugin-pwa/README.md
@@ -33,6 +33,17 @@ This option enables the popup to refresh contents. The popup will be shown when
 
 > If without the `refresh` button, the new service worker will be active after all [clients](https://developer.mozilla.org/en-US/docs/Web/API/Clients) are closed. This means that visitors cannot see new contents until they close all tabs of your site. But the `refresh` button activates the new service worker immediately.
 
+### popupComponent
+
+- Type: `string`
+- Default: `undefined`
+
+A custom component to replace the default popup component. 
+
+**Also see:** 
+
+- [Customize the SW-Update Popup UI](#customize-the-sw-update-popup-ui)
+
 ## Migration from 0.x.x
 
 Now that we have plugin API, all features' options that are in plugin's areas will become plugin options.
@@ -108,4 +119,66 @@ module.exports = {
 +    }
 +  }
 ```
-    
\ No newline at end of file
+    
+## Customize the SW-Update Popup UI
+
+The default sw-update popup component provides a default slot which gives you the ability to fully control the appearence of the popup.
+
+First, you need to create a global component (e.g. `MySWUpdatePopup`) at `.vuepress/components`. A simple component created based on the default component is as follows:
+
+```vue
+<template>
+  <SWUpdatePopup>
+    <div
+      slot-scope="{ enabled, reload, message, buttonText }"
+      class="my-sw-update-popup">
+      {{ message }}<br>
+      <button @click="reload">{{ buttonText }}</button>
+    </div>
+  </SWUpdatePopup>
+</template>
+
+<script>
+import SWUpdatePopup from '@vuepress/plugin-pwa/lib/SWUpdatePopup.vue'
+
+export default {
+  components: { SWUpdatePopup }
+}
+</script>
+
+<style>
+.my-sw-update-popup {
+  text-align: right;
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  background-color: #fff;
+  font-size: 20px;
+  padding: 10px;
+  border: 5px solid #3eaf7c;
+}
+
+.my-sw-update-popup button {
+  border: 1px solid #fefefe;
+}
+</style>
+```
+
+Then, update your plugin:
+
+``` diff
+module.exports = {
+   plugins: {
+    '@vuepress/pwa': {
+       serviceWorker: true,
++      popupComponent: 'MySWUpdatePopup',
+       updatePopup: true
+     }
+  }
+}
+``` 
+
+**Also see:** 
+
+- [VuePress > Using Components](https://vuepress.vuejs.org/guide/using-vue.html#using-components)
+- [Vue > Scoped Slots](https://vuejs.org/v2/guide/components-slots.html#Scoped-Slots)
diff --git a/packages/@vuepress/plugin-pwa/index.js b/packages/@vuepress/plugin-pwa/index.js
index 4f43ac540f..1eb8394daa 100644
--- a/packages/@vuepress/plugin-pwa/index.js
+++ b/packages/@vuepress/plugin-pwa/index.js
@@ -21,24 +21,30 @@ module.exports = (options, context) => ({
     ])
   },
 
-  globalUIComponents: 'SWUpdatePopup',
+  // TODO support components option
+  // components: [
+  //   { name: 'SWUpdatePopup', path: path.resolve(__dirname, 'lib/SWUpdatePopup.vue') }
+  // ],
 
-  enhanceAppFiles: [path.resolve(__dirname, 'inject.js')],
+  globalUIComponents: options.popupComponent || 'SWUpdatePopup',
+
+  enhanceAppFiles: [path.resolve(__dirname, 'lib/inject.js')],
 
   async generated () {
     const { serviceWorker } = options
     const { outDir } = context
+    const swFilePath = path.resolve(outDir, 'service-worker.js')
     if (serviceWorker) {
       logger.wait('\nGenerating service worker...')
       const wbb = require('workbox-build')
       await wbb.generateSW({
-        swDest: path.resolve(outDir, 'service-worker.js'),
+        swDest: swFilePath,
         globDirectory: outDir,
         globPatterns: ['**\/*.{js,css,html,png,jpg,jpeg,gif,svg,woff,woff2,eot,ttf,otf}']
       })
       await fs.writeFile(
-        path.resolve(outDir, 'service-worker.js'),
-        await fs.readFile(path.resolve(__dirname, 'skip-waiting.js'), 'utf8'),
+        swFilePath,
+        await fs.readFile(path.resolve(__dirname, 'lib/skip-waiting.js'), 'utf8'),
         { flag: 'a' }
       )
     }
diff --git a/packages/@vuepress/plugin-pwa/SWUpdateEvent.js b/packages/@vuepress/plugin-pwa/lib/SWUpdateEvent.js
similarity index 100%
rename from packages/@vuepress/plugin-pwa/SWUpdateEvent.js
rename to packages/@vuepress/plugin-pwa/lib/SWUpdateEvent.js
diff --git a/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue b/packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue
similarity index 56%
rename from packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
rename to packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue
index d15d50c7cb..6181d2b4d6 100644
--- a/packages/@vuepress/plugin-pwa/SWUpdatePopup.vue
+++ b/packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue
@@ -1,12 +1,19 @@
 <template>
   <transition name="sw-update-popup">
-    <div
-      v-if="enabled"
-      class="sw-update-popup"
+    <slot
+      :reload="reload"
+      :enabled="enabled"
+      :message="message"
+      :buttonText="buttonText"
     >
-      {{ message }}<br>
-      <button @click="reload">{{ buttonText }}</button>
-    </div>
+      <div
+        v-if="enabled"
+        class="sw-update-popup"
+      >
+        {{ message }}<br>
+        <button @click="reload">{{ buttonText }}</button>
+      </div>
+    </slot>
   </transition>
 </template>
 
@@ -64,28 +71,30 @@ export default {
 }
 </script>
 
-<style lang="stylus">
-@import '../theme-default/src/styles/config.styl'
-
-.sw-update-popup
-  position fixed
-  right 1em
-  bottom 1em
-  padding 1em
-  border 1px solid $accentColor
-  border-radius 3px
-  background #fff
-  box-shadow 0 4px 16px rgba(0, 0, 0, 0.5)
-  text-align center
+<style scoped>
+.sw-update-popup {
+  position: fixed;
+  right: 1em;
+  bottom: 1em;
+  padding: 1em;
+  border: 1px solid #3eaf7c;
+  border-radius: 3px;
+  background: #fff;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.5);
+  text-align: center;
+}
 
-  button
-    margin-top 0.5em
-    padding 0.25em 2em
+.sw-update-popup > button {
+  margin-top: 0.5em;
+  padding: 0.25em 2em;
+}
 
-.sw-update-popup-enter-active, .sw-update-popup-leave-active
-  transition opacity 0.3s, transform 0.3s
+.sw-update-popup-enter-active, .sw-update-popup-leave-active {
+  transition: opacity 0.3s, transform 0.3s;
+}
 
-.sw-update-popup-enter, .sw-update-popup-leave-to
-  opacity 0
-  transform translate(0, 50%) scale(0.5)
+.sw-update-popup-enter, .sw-update-popup-leave-to {
+  opacit: 0;
+  transform: translate(0, 50%) scale(0.5);
+}
 </style>
diff --git a/packages/@vuepress/plugin-pwa/event.js b/packages/@vuepress/plugin-pwa/lib/event.js
similarity index 100%
rename from packages/@vuepress/plugin-pwa/event.js
rename to packages/@vuepress/plugin-pwa/lib/event.js
diff --git a/packages/@vuepress/plugin-pwa/inject.js b/packages/@vuepress/plugin-pwa/lib/inject.js
similarity index 100%
rename from packages/@vuepress/plugin-pwa/inject.js
rename to packages/@vuepress/plugin-pwa/lib/inject.js
diff --git a/packages/@vuepress/plugin-pwa/skip-waiting.js b/packages/@vuepress/plugin-pwa/lib/skip-waiting.js
similarity index 100%
rename from packages/@vuepress/plugin-pwa/skip-waiting.js
rename to packages/@vuepress/plugin-pwa/lib/skip-waiting.js
diff --git a/packages/@vuepress/plugin-register-components/index.js b/packages/@vuepress/plugin-register-components/index.js
index 42c46fa60c..328ff40fef 100644
--- a/packages/@vuepress/plugin-register-components/index.js
+++ b/packages/@vuepress/plugin-register-components/index.js
@@ -38,7 +38,7 @@ module.exports = (options, context) => ({
       code += files.map(file => genImport(baseDir, file)).join('\n') + '\n'
     }
 
-    // 2. Register named componepackages/docs/docs/.vuepress/componentsnts.
+    // 2. Register named components.
     code += components.map(({ name, path: absolutePath }) => importCode(name, absolutePath))
 
     code = `import Vue from 'vue'\n` + code + '\n'

From fa63b67d24cf6b4bcea9ab2cd746f9d4d834ffbb Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 18:37:16 +0800
Subject: [PATCH 098/242] feat($pwa): built-in i18n support, support
 "updatePopup: true" shortcut

---
 packages/@vuepress/plugin-pwa/README.md       | 19 +++++++++++++++++--
 .../plugin-pwa/lib/SWUpdatePopup.vue          |  8 ++++++--
 packages/@vuepress/plugin-pwa/lib/i18n.js     | 10 ++++++++++
 packages/docs/docs/.vuepress/config.js        | 12 +-----------
 4 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 packages/@vuepress/plugin-pwa/lib/i18n.js

diff --git a/packages/@vuepress/plugin-pwa/README.md b/packages/@vuepress/plugin-pwa/README.md
index 8f10a3f6a8..9939adfad4 100644
--- a/packages/@vuepress/plugin-pwa/README.md
+++ b/packages/@vuepress/plugin-pwa/README.md
@@ -18,8 +18,8 @@ If set to `true`, VuePress will automatically generate and register a service wo
 
 ```typescript
 interface normalPopupConfig {
-	message: string; // defaults to 'New content is available.'
-	buttonText: string; // defaults to 'Refresh'
+  message: string; // defaults to 'New content is available.'
+  buttonText: string; // defaults to 'Refresh'
 }
 
 interface localedPopupConfig {
@@ -119,6 +119,21 @@ module.exports = {
 +    }
 +  }
 ```
+
+It's worth mentioning that the PWA plugin has above i18n built in, so if you want to use the default i18n directly, you can abbreviate the above configuration as:
+
+```js
+module.exports = {
+  plugins: {
+    '@vuepress/pwa': {
+      serviceWorker: true,
+      updatePopup: true
+    }
+  }
+}
+```
+
+Feel free to submit PRs to improve the default [i18n configuration](https://github.com/vuejs/vuepress/blob/next/packages/%40vuepress/plugin-pwa/lib/i18n.js).
     
 ## Customize the SW-Update Popup UI
 
diff --git a/packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue b/packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue
index 6181d2b4d6..f7d04aa716 100644
--- a/packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue
+++ b/packages/@vuepress/plugin-pwa/lib/SWUpdatePopup.vue
@@ -21,6 +21,7 @@
 /* global SW_UPDATE_POPUP */
 import event from './event'
 import { normalizeConfig } from '@app/util'
+import { popupConfig as defaultPopupConfig } from './i18n'
 
 export default {
   data () {
@@ -32,6 +33,9 @@ export default {
 
   created () {
     event.$on('sw-updated', this.onSWUpdated)
+    if (SW_UPDATE_POPUP === true) {
+      this.rawPopupConfig = defaultPopupConfig
+    }
   },
 
   computed: {
@@ -45,12 +49,12 @@ export default {
 
     message () {
       const c = this.popupConfig
-      return (c && c.message) || 'New content is available.'
+      return (c && c.message) || defaultPopupConfig['/'].message
     },
 
     buttonText () {
       const c = this.popupConfig
-      return (c && c.buttonText) || 'Refresh'
+      return (c && c.buttonText) || defaultPopupConfig['/'].buttonText
     }
   },
 
diff --git a/packages/@vuepress/plugin-pwa/lib/i18n.js b/packages/@vuepress/plugin-pwa/lib/i18n.js
new file mode 100644
index 0000000000..adc33bbc8e
--- /dev/null
+++ b/packages/@vuepress/plugin-pwa/lib/i18n.js
@@ -0,0 +1,10 @@
+export const popupConfig = {
+  '/': {
+    message: 'New content is available.',
+    buttonText: 'Refresh'
+  },
+  '/zh/': {
+    message: '发现新内容可用',
+    buttonText: '刷新'
+  }
+}
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 6ef9811d16..aaf05a036a 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -101,17 +101,7 @@ module.exports = {
     '@vuepress/back-to-top': true,
     '@vuepress/pwa': {
       serviceWorker: true,
-      updatePopup: {
-        // It will don't depends on the VuePress i18n implementation
-        '/': {
-          message: "New content is available.",
-          buttonText: "Refresh"
-        },
-        '/zh/': {
-          message: "发现新内容可用",
-          buttonText: "刷新"
-        }
-      }
+      updatePopup: true
     }
   }
 }

From a406bef30b5a6a52d1804f999c4e963cdac5f8dc Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 19:18:40 +0800
Subject: [PATCH 099/242] test: fix Option test failed

---
 .../@vuepress/core/__test__/plugin-api/Option.spec.js     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/__test__/plugin-api/Option.spec.js b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
index 8ce3ca1f1b..a80b3db3e6 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
@@ -32,7 +32,7 @@ describe('Option', () => {
     expect(option.values).toEqual(['a-1', 'a-2', 'b'])
   })
 
-  test('should \'run\' work', async () => {
+  test('should \'apply\' work', async () => {
     const option = new Option('option')
     const handler1 = jest.fn()
     const handler2 = jest.fn()
@@ -40,7 +40,7 @@ describe('Option', () => {
     option.tap('plugin-a', handler1)
     option.tap('plugin-b', handler2)
 
-    await option.run(1, 2)
+    await option.apply(1, 2)
     expect(handler1.mock.calls).toHaveLength(1)
     expect(handler2.mock.calls).toHaveLength(1)
     expect(handler1.mock.calls[0][0]).toBe(1)
@@ -49,7 +49,7 @@ describe('Option', () => {
     expect(handler2.mock.calls[0][1]).toBe(2)
   })
 
-  test('should \'parallelRun\' work', async () => {
+  test('should \'parallelApply\' work', async () => {
     const option = new Option('option')
     const handler1 = jest.fn()
     const handler2 = jest.fn()
@@ -57,7 +57,7 @@ describe('Option', () => {
     option.tap('plugin-a', handler1)
     option.tap('plugin-b', handler2)
 
-    await option.parallelRun(1, 2)
+    await option.parallelApply(1, 2)
     expect(handler1.mock.calls).toHaveLength(1)
     expect(handler2.mock.calls).toHaveLength(1)
     expect(handler1.mock.calls[0][0]).toBe(1)

From 07f32968245bcd05cee87eca72cdfe0ce8bedb71 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 19:59:15 +0800
Subject: [PATCH 100/242] chore: update TODOs in README

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9defcb69ae..9b131a4eb4 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,11 @@ Websites built with VuePress:
 
 VuePress is still a work in progress. There are a few things that it currently does not support but are planned:
 
-- Plugin support
-- Blogging support
+- Migrate the old test.
+- `@vuepress/plugin-test-utils`.
+- `once` option for plugin options, which allows the same plugin only to be applied only once.
+- `theme` name shortcut.
+- `@vuepress/theme-blog`
 
 Contributions are welcome!
 

From 7dfee461c28e34195d57758b42ab0c0d805cc8d4 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 20:00:18 +0800
Subject: [PATCH 101/242] feat: delay apply plugin and create more APIs for
 test

---
 .../@vuepress/core/lib/plugin-api/index.js    | 26 ++++++++++---
 .../@vuepress/core/lib/plugin-api/util.js     |  3 +-
 packages/@vuepress/core/lib/prepare/index.js  | 37 ++++++++++++++++---
 .../core/lib/prepare/resolvePlugin.js         | 35 ------------------
 4 files changed, 55 insertions(+), 46 deletions(-)
 delete mode 100644 packages/@vuepress/core/lib/prepare/resolvePlugin.js

diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index b9508a6c7a..490ef4bf6e 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -8,9 +8,28 @@ module.exports = class Plugin {
   constructor (context) {
     this.options = {}
     this._pluginContext = context
+    this._pluginQuene = []
     this.initializeOptions(PLUGIN_OPTION_MAP)
   }
 
+  get enabledPlugins () {
+    return this._pluginQuene.filter(({ enabled }) => enabled)
+  }
+
+  get disabledPlugins () {
+    return this._pluginQuene.filter(({ enabled }) => !enabled)
+  }
+
+  apply () {
+    this._pluginQuene.forEach(plugin => {
+      if (plugin.enabled) {
+        this.applyPlugin(plugin)
+      } else {
+        logger.debug(`\n${chalk.gray(`[${plugin.name}]`)} disabled.`)
+      }
+    })
+  }
+
   use (pluginRaw, pluginOptions = {}) {
     let plugin = resolvePlugin(pluginRaw)
     if (!plugin.config) {
@@ -18,11 +37,8 @@ module.exports = class Plugin {
       return this
     }
     plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext, this)
-    if (plugin.enabled) {
-      this.applyPlugin(plugin)
-    } else {
-      logger.debug(`\n${chalk.gray(`[${plugin.name}]`)} disabled.`)
-    }
+    this._pluginQuene.push(plugin)
+
     return this
   }
 
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 205cdb6c76..5fd0a0bfc6 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -95,7 +95,8 @@ exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOpt
   return Object.assign(config, {
     name,
     shortcut: isLocal ? null : shortcut,
-    enabled
+    enabled,
+    $$options: pluginOptions /* used for test */
   })
 }
 
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 2aa330486a..9fe8e8eb63 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,8 +1,9 @@
 const path = require('path')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
-const resolvePlugin = require('./resolvePlugin')
 const { fs, chalk, logger, writeTemp } = require('@vuepress/shared-utils')
+const Plugin = require('../plugin-api/index')
+const PluginContext = require('../plugin-api/context')
 
 module.exports = async function prepare ({
   sourceDir,
@@ -12,11 +13,37 @@ module.exports = async function prepare ({
   // 1. load options
   const options = await resolveOptions(sourceDir, cliOptions)
   options.isProd = isProd
-  const { markdown } = options
 
-  // 2. resolve plugin
-  const plugin = resolvePlugin(options)
-  plugin.use(require('../plugins/routes'))
+  // 2. apply plugins
+  const { siteConfig, themeConfig, themePath, themePlugins, cliPlugins, markdown } = options
+  const pluginContext = new PluginContext(options)
+  const plugin = new Plugin(pluginContext)
+
+  const shouldUseLastUpdated = (
+    themeConfig.lastUpdated ||
+    Object.keys(siteConfig.locales && themeConfig.locales || {})
+      .some(base => themeConfig.locales[base].lastUpdated)
+  )
+
+  plugin
+    // internl core plugins
+    .use(require('../plugins/routes'))
+    // user plugin
+    .useByPluginsConfig(cliPlugins)
+    .useByPluginsConfig(siteConfig.plugins)
+    .useByPluginsConfig(themePlugins)
+    // built-in plugins
+    .use('@vuepress/enhance-app')
+    .use('@vuepress/last-updated', shouldUseLastUpdated)
+    .use('@vuepress/register-components', {
+      componentsDir: [
+        path.resolve(sourceDir, '.vuepress/components'),
+        path.resolve(themePath, 'components')
+      ]
+    })
+
+  plugin.apply()
+
   options.plugin = plugin
   const pluginOptions = plugin.options
 
diff --git a/packages/@vuepress/core/lib/prepare/resolvePlugin.js b/packages/@vuepress/core/lib/prepare/resolvePlugin.js
deleted file mode 100644
index db1b8d2007..0000000000
--- a/packages/@vuepress/core/lib/prepare/resolvePlugin.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const path = require('path')
-const Plugin = require('../plugin-api/index')
-const PluginContext = require('../plugin-api/context')
-
-module.exports = function (options) {
-  const { siteConfig, themeConfig, sourceDir, themePath, themePlugins, cliPlugins } = options
-  const pluginContext = new PluginContext(options)
-  const plugin = new Plugin(pluginContext)
-
-  plugin
-    // user plugin
-    .useByPluginsConfig(cliPlugins)
-    .useByPluginsConfig(siteConfig.plugins)
-    .useByPluginsConfig(themePlugins)
-    // built-in plugins
-    .use('@vuepress/enhance-app')
-    .use('@vuepress/register-components', {
-      componentsDir: [
-        path.resolve(sourceDir, '.vuepress/components'),
-        path.resolve(themePath, 'components')
-      ]
-    })
-
-  // whether to use last updated
-  const shouldUseLastUpdated = (
-    themeConfig.lastUpdated ||
-    Object.keys(siteConfig.locales && themeConfig.locales || {})
-      .some(base => themeConfig.locales[base].lastUpdated)
-  )
-  if (shouldUseLastUpdated) {
-    plugin.use('@vuepress/last-updated')
-  }
-
-  return plugin
-}

From 5350e364b0abd3bdb8aefcd4bff1f5c070ca9631 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 20:00:38 +0800
Subject: [PATCH 102/242] test: improve test for plugin

---
 .../core/__test__/plugin-api/Plugin.spec.js   | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
index baa817ec49..0ae166d83b 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
@@ -5,11 +5,51 @@ const Plugin = require('../../lib/plugin-api/index')
 const { PLUGIN_OPTION_MAP } = require('../../lib/plugin-api/constants')
 
 describe('Plugin', () => {
-  test('should resolve scope packages correctly.', () => {
+  test('should \'registerOption\' work.', () => {
     const plugin = new Plugin()
     const readyHandler = () => {}
     plugin.registerOption(PLUGIN_OPTION_MAP.READY.key, readyHandler)
     expect(plugin.options.ready.values).toHaveLength(1)
     expect(plugin.options.ready.values[0]).toBe(readyHandler)
   })
+
+  test('should \'useByPluginsConfig\' work.', () => {
+    [
+      ['a'],
+      [['a']],
+      [['a', true]],
+      { a: true }
+    ].forEach(pluginsConfig => {
+      const plugin = new Plugin()
+      plugin.useByPluginsConfig(pluginsConfig)
+      expect(plugin.enabledPlugins).toHaveLength(1)
+      expect(plugin.enabledPlugins[0].name).toBe('vuepress-plugin-a')
+      expect(plugin.disabledPlugins).toHaveLength(0)
+    })
+  })
+
+  test('should \'useByPluginsConfig\' work. - disable plugin', () => {
+    [
+      [['a', false]],
+      { a: false }
+    ].forEach(pluginsConfig => {
+      const plugin = new Plugin()
+      plugin.useByPluginsConfig(pluginsConfig)
+      expect(plugin.enabledPlugins).toHaveLength(0)
+      expect(plugin.disabledPlugins).toHaveLength(1)
+      expect(plugin.disabledPlugins[0].name).toBe('vuepress-plugin-a')
+    })
+  })
+
+  test('should \'useByPluginsConfig\' work. - get options', () => {
+    const pluginOptions = {};
+    [
+      [['a', pluginOptions]],
+      { a: pluginOptions }
+    ].forEach(pluginsConfig => {
+      const plugin = new Plugin()
+      plugin.useByPluginsConfig(pluginsConfig)
+      expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions)
+    })
+  })
 })

From 268eaedce3b86ea741d2230c79657d2e0fc17a9a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 17 Aug 2018 20:00:55 +0800
Subject: [PATCH 103/242] docs: tweaks path

---
 packages/@vuepress/plugin-register-components/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-register-components/README.md b/packages/@vuepress/plugin-register-components/README.md
index 930a70ea57..a89d595a27 100644
--- a/packages/@vuepress/plugin-register-components/README.md
+++ b/packages/@vuepress/plugin-register-components/README.md
@@ -44,7 +44,7 @@ module.exports = {
         components: [
           {
             name: 'V-Card',
-            path: 'somepath/components/card.vue'
+            path: 'path/to/card.vue'
           }
         ]
       }

From 2d65bf2085a9d6ae41a5c2b317df130d9b362ac4 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:18:15 +0800
Subject: [PATCH 104/242] feat($shared-utils): codegen util

---
 .../routes/codegen.js                         | 20 -------------------
 .../routes/index.js                           |  3 ++-
 .../option/EnhanceAppFilesOption.js           |  9 +++++++--
 packages/@vuepress/core/lib/prepare/index.js  |  2 +-
 packages/@vuepress/shared-utils/index.js      |  1 +
 .../@vuepress/shared-utils/lib/codegen.js     | 19 ++++++++++++++++++
 6 files changed, 30 insertions(+), 24 deletions(-)
 rename packages/@vuepress/core/lib/{plugins => internal-plugins}/routes/codegen.js (80%)
 rename packages/@vuepress/core/lib/{plugins => internal-plugins}/routes/index.js (83%)
 create mode 100644 packages/@vuepress/shared-utils/lib/codegen.js

diff --git a/packages/@vuepress/core/lib/plugins/routes/codegen.js b/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
similarity index 80%
rename from packages/@vuepress/core/lib/plugins/routes/codegen.js
rename to packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
index 95ff5a22dd..47c37dccae 100644
--- a/packages/@vuepress/core/lib/plugins/routes/codegen.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
@@ -1,23 +1,3 @@
-exports.pathsToModuleCode = function (files) {
-  let index = 0
-  let code = ''
-
-  code += files
-    .map(filePath => `import m${index++} from ${JSON.stringify(filePath)}`)
-    .join('\n')
-
-  code += '\n\nexport default [\n'
-
-  for (let i = 0; i < index; i++) {
-    code += `  m${i}`
-    code += i === index - 1 ? '\n' : ',\n'
-  }
-
-  code += ']\n'
-
-  return code
-}
-
 exports.genRoutesFile = async function (pages) {
   function genRoute ({ path: pagePath, filePath, key: componentName }) {
     let code = `
diff --git a/packages/@vuepress/core/lib/plugins/routes/index.js b/packages/@vuepress/core/lib/internal-plugins/routes/index.js
similarity index 83%
rename from packages/@vuepress/core/lib/plugins/routes/index.js
rename to packages/@vuepress/core/lib/internal-plugins/routes/index.js
index 138922bf9a..953ff5a647 100644
--- a/packages/@vuepress/core/lib/plugins/routes/index.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes/index.js
@@ -1,5 +1,6 @@
 const path = require('path')
-const { genRoutesFile, pathsToModuleCode, genImportAsyncComponentFile } = require('./codegen')
+const { codegen: { pathsToModuleCode }} = require('@vuepress/shared-utils')
+const { genRoutesFile, genImportAsyncComponentFile } = require('./codegen')
 
 module.exports = (options, context, self) => ({
   name: '@vuepress/internal-routes',
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index e1be10e161..759c815056 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -1,6 +1,11 @@
 const Option = require('../Option')
-const { pathsToModuleCode } = require('../../plugins/routes/codegen')
-const { fs, chalk, logger, writeTemp } = require('@vuepress/shared-utils')
+const {
+  fs,
+  chalk,
+  logger,
+  writeTemp,
+  codegen: { pathsToModuleCode }
+} = require('@vuepress/shared-utils')
 
 module.exports = class EnhanceAppFilesOption extends Option {
   /**
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 9fe8e8eb63..4ecf0fd032 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -27,7 +27,7 @@ module.exports = async function prepare ({
 
   plugin
     // internl core plugins
-    .use(require('../plugins/routes'))
+    .use(require('../internal-plugins/routes'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 02132e6bc7..78b8b5a4e5 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -1,6 +1,7 @@
 exports.logger = require('./lib/logger')
 exports.env = require('./lib/env')
 exports.writeTemp = require('./lib/writeTemp')
+exports.codegen = require('./lib/codegen')
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
 exports.globby = require('globby')
diff --git a/packages/@vuepress/shared-utils/lib/codegen.js b/packages/@vuepress/shared-utils/lib/codegen.js
new file mode 100644
index 0000000000..97ede18817
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/codegen.js
@@ -0,0 +1,19 @@
+exports.pathsToModuleCode = function (files) {
+  let index = 0
+  let code = ''
+
+  code += files
+    .map(filePath => `import m${index++} from ${JSON.stringify(filePath)}`)
+    .join('\n')
+
+  code += '\n\nexport default [\n'
+
+  for (let i = 0; i < index; i++) {
+    code += `  m${i}`
+    code += i === index - 1 ? '\n' : ',\n'
+  }
+
+  code += ']\n'
+
+  return code
+}

From 675833d5a32a2b98e53df3af4a6455c6b1f21412 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:24:35 +0800
Subject: [PATCH 105/242] refactor($core): extract internal plugin root-mixins

---
 .../lib/internal-plugins/root-mixins/index.js | 22 +++++++++++++++++++
 .../core/lib/internal-plugins/routes/index.js | 13 -----------
 packages/@vuepress/core/lib/prepare/index.js  |  1 +
 3 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js

diff --git a/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js b/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
new file mode 100644
index 0000000000..8304670e62
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
@@ -0,0 +1,22 @@
+const path = require('path')
+const { codegen: { pathsToModuleCode }} = require('@vuepress/shared-utils')
+
+module.exports = (options, context, self) => ({
+  name: '@vuepress/internal-root-mixins',
+
+  async clientDynamicModules () {
+    const builtInRootMixins = [
+      path.resolve(__dirname, '../../app/root-mixins/updateMeta.js')
+    ]
+
+    const rootMixins = [
+      ...builtInRootMixins,
+      ...self.options.clientRootMixin.values
+    ]
+
+    const rootMixinsCode = pathsToModuleCode(rootMixins)
+    return [
+      { name: 'root-mixins.js', content: rootMixinsCode }
+    ]
+  }
+})
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes/index.js b/packages/@vuepress/core/lib/internal-plugins/routes/index.js
index 953ff5a647..79e08d8a3a 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes/index.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes/index.js
@@ -1,27 +1,14 @@
-const path = require('path')
-const { codegen: { pathsToModuleCode }} = require('@vuepress/shared-utils')
 const { genRoutesFile, genImportAsyncComponentFile } = require('./codegen')
 
 module.exports = (options, context, self) => ({
   name: '@vuepress/internal-routes',
 
   async clientDynamicModules () {
-    const builtInRootMixins = [
-      path.resolve(__dirname, '../../app/root-mixins/updateMeta.js')
-    ]
-
-    const rootMixins = [
-      ...builtInRootMixins,
-      ...self.options.clientRootMixin.values
-    ]
-
     const routesCode = await genRoutesFile(context.siteData.pages)
-    const rootMixinsCode = pathsToModuleCode(rootMixins)
     const importAsyncComponentCode = genImportAsyncComponentFile(context.siteData.pages)
 
     return [
       { name: 'routes.js', content: routesCode },
-      { name: 'root-mixins.js', content: rootMixinsCode },
       { name: 'async-component.js', content: importAsyncComponentCode }
     ]
   }
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 4ecf0fd032..4fbfc2b7dd 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -28,6 +28,7 @@ module.exports = async function prepare ({
   plugin
     // internl core plugins
     .use(require('../internal-plugins/routes'))
+    .use(require('../internal-plugins/root-mixins'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)

From 4af0a025d5ee881ba04b9e1614883c5ffc3e17d7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:30:09 +0800
Subject: [PATCH 106/242] refactor($core): extract internal plugin
 import-async-component

---
 .../import-async-component/index.js           | 19 ++++++
 .../lib/internal-plugins/root-mixins/index.js |  1 +
 .../lib/internal-plugins/routes/codegen.js    | 57 +---------------
 .../core/lib/internal-plugins/routes/index.js | 65 +++++++++++++++++--
 4 files changed, 79 insertions(+), 63 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/import-async-component/index.js

diff --git a/packages/@vuepress/core/lib/internal-plugins/import-async-component/index.js b/packages/@vuepress/core/lib/internal-plugins/import-async-component/index.js
new file mode 100644
index 0000000000..26407d0612
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/import-async-component/index.js
@@ -0,0 +1,19 @@
+function genImportAsyncComponentFile (pages) {
+  return `export function loadComponent (key) {
+  switch (key) {
+${pages.map(({ key, filePath }) => `    case "${key}": return import("${filePath}");`).join('\n')}
+  }
+}`
+}
+
+module.exports = (options, context) => ({
+  name: '@vuepress/internal-import-async-component',
+
+  // @dynamic/async-component
+  async clientDynamicModules () {
+    const importAsyncComponentCode = genImportAsyncComponentFile(context.siteData.pages)
+    return [
+      { name: 'async-component.js', content: importAsyncComponentCode }
+    ]
+  }
+})
diff --git a/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js b/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
index 8304670e62..faa7342a93 100644
--- a/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
+++ b/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
@@ -4,6 +4,7 @@ const { codegen: { pathsToModuleCode }} = require('@vuepress/shared-utils')
 module.exports = (options, context, self) => ({
   name: '@vuepress/internal-root-mixins',
 
+  // @dynamic/root-mixins
   async clientDynamicModules () {
     const builtInRootMixins = [
       path.resolve(__dirname, '../../app/root-mixins/updateMeta.js')
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js b/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
index 47c37dccae..cf637de588 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
@@ -1,56 +1 @@
-exports.genRoutesFile = async function (pages) {
-  function genRoute ({ path: pagePath, filePath, key: componentName }) {
-    let code = `
-  {
-    name: ${JSON.stringify(componentName)},
-    path: ${JSON.stringify(pagePath)},
-    component: ThemeLayout,
-    beforeEnter: (to, from, next) => {
-      registerComponent(${JSON.stringify(componentName)}).then(() => next())
-    }
-  }`
-
-    const dncodedPath = decodeURIComponent(pagePath)
-    if (dncodedPath !== pagePath) {
-      code += `,
-  {
-    path: ${JSON.stringify(dncodedPath)},
-    redirect: ${JSON.stringify(pagePath)}
-  }`
-    }
-
-    if (/\/$/.test(pagePath)) {
-      code += `,
-  {
-    path: ${JSON.stringify(pagePath + 'index.html')},
-    redirect: ${JSON.stringify(pagePath)}
-  }`
-    }
-
-    return code
-  }
-
-  const notFoundRoute = `,
-  {
-    path: '*',
-    component: ThemeNotFound
-  }`
-
-  return (
-    `import ThemeLayout from '@themeLayout'\n` +
-    `import ThemeNotFound from '@themeNotFound'\n` +
-    `import { injectMixins, registerComponent } from '@app/util'\n` +
-    `import rootMixins from '@dynamic/root-mixins'\n\n` +
-    `injectMixins(ThemeLayout, rootMixins)\n` +
-    `injectMixins(ThemeNotFound, rootMixins)\n\n` +
-    `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
-  )
-}
-
-exports.genImportAsyncComponentFile = function (pages) {
-  return `export function loadComponent (key) {
-  switch (key) {
-${pages.map(({ key, filePath }) => `    case "${key}": return import("${filePath}");`).join('\n')}
-  }
-}`
-}
+``
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes/index.js b/packages/@vuepress/core/lib/internal-plugins/routes/index.js
index 79e08d8a3a..178f7dbc65 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes/index.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes/index.js
@@ -1,15 +1,66 @@
-const { genRoutesFile, genImportAsyncComponentFile } = require('./codegen')
-
-module.exports = (options, context, self) => ({
+module.exports = (options, context) => ({
   name: '@vuepress/internal-routes',
 
+  // @dynamic/routes
   async clientDynamicModules () {
     const routesCode = await genRoutesFile(context.siteData.pages)
-    const importAsyncComponentCode = genImportAsyncComponentFile(context.siteData.pages)
-
     return [
-      { name: 'routes.js', content: routesCode },
-      { name: 'async-component.js', content: importAsyncComponentCode }
+      { name: 'routes.js', content: routesCode }
     ]
   }
 })
+
+/**
+ * Generate routes meta data file.
+ * @param pages
+ * @returns {Promise<string>}
+ */
+async function genRoutesFile (pages) {
+  function genRoute ({ path: pagePath, filePath, key: componentName }) {
+    let code = `
+  {
+    name: ${JSON.stringify(componentName)},
+    path: ${JSON.stringify(pagePath)},
+    component: ThemeLayout,
+    beforeEnter: (to, from, next) => {
+      registerComponent(${JSON.stringify(componentName)}).then(() => next())
+    }
+  }`
+
+    const dncodedPath = decodeURIComponent(pagePath)
+    if (dncodedPath !== pagePath) {
+      code += `,
+  {
+    path: ${JSON.stringify(dncodedPath)},
+    redirect: ${JSON.stringify(pagePath)}
+  }`
+    }
+
+    if (/\/$/.test(pagePath)) {
+      code += `,
+  {
+    path: ${JSON.stringify(pagePath + 'index.html')},
+    redirect: ${JSON.stringify(pagePath)}
+  }`
+    }
+
+    return code
+  }
+
+  const notFoundRoute = `,
+  {
+    path: '*',
+    component: ThemeNotFound
+  }`
+
+  return (
+    `import ThemeLayout from '@themeLayout'\n` +
+    `import ThemeNotFound from '@themeNotFound'\n` +
+    `import { injectMixins, registerComponent } from '@app/util'\n` +
+    `import rootMixins from '@dynamic/root-mixins'\n\n` +
+    `injectMixins(ThemeLayout, rootMixins)\n` +
+    `injectMixins(ThemeNotFound, rootMixins)\n\n` +
+    `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
+  )
+}
+

From c05768a172c63455ac8f5a9e74c1dd8edb4cb857 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:35:02 +0800
Subject: [PATCH 107/242] chore($core): flattern internal plugins directory
 structure

---
 .../index.js => import-async-component.js}                      | 0
 .../internal-plugins/{root-mixins/index.js => root-mixins.js}   | 2 +-
 .../core/lib/internal-plugins/{routes/index.js => routes.js}    | 0
 packages/@vuepress/core/lib/internal-plugins/routes/codegen.js  | 1 -
 packages/@vuepress/core/lib/prepare/index.js                    | 1 +
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/@vuepress/core/lib/internal-plugins/{import-async-component/index.js => import-async-component.js} (100%)
 rename packages/@vuepress/core/lib/internal-plugins/{root-mixins/index.js => root-mixins.js} (88%)
 rename packages/@vuepress/core/lib/internal-plugins/{routes/index.js => routes.js} (100%)
 delete mode 100644 packages/@vuepress/core/lib/internal-plugins/routes/codegen.js

diff --git a/packages/@vuepress/core/lib/internal-plugins/import-async-component/index.js b/packages/@vuepress/core/lib/internal-plugins/import-async-component.js
similarity index 100%
rename from packages/@vuepress/core/lib/internal-plugins/import-async-component/index.js
rename to packages/@vuepress/core/lib/internal-plugins/import-async-component.js
diff --git a/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js b/packages/@vuepress/core/lib/internal-plugins/root-mixins.js
similarity index 88%
rename from packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
rename to packages/@vuepress/core/lib/internal-plugins/root-mixins.js
index faa7342a93..095a7a5b0f 100644
--- a/packages/@vuepress/core/lib/internal-plugins/root-mixins/index.js
+++ b/packages/@vuepress/core/lib/internal-plugins/root-mixins.js
@@ -7,7 +7,7 @@ module.exports = (options, context, self) => ({
   // @dynamic/root-mixins
   async clientDynamicModules () {
     const builtInRootMixins = [
-      path.resolve(__dirname, '../../app/root-mixins/updateMeta.js')
+      path.resolve(__dirname, '../app/root-mixins/updateMeta.js')
     ]
 
     const rootMixins = [
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes/index.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
similarity index 100%
rename from packages/@vuepress/core/lib/internal-plugins/routes/index.js
rename to packages/@vuepress/core/lib/internal-plugins/routes.js
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js b/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
deleted file mode 100644
index cf637de588..0000000000
--- a/packages/@vuepress/core/lib/internal-plugins/routes/codegen.js
+++ /dev/null
@@ -1 +0,0 @@
-``
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 4fbfc2b7dd..5fbd337788 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -29,6 +29,7 @@ module.exports = async function prepare ({
     // internl core plugins
     .use(require('../internal-plugins/routes'))
     .use(require('../internal-plugins/root-mixins'))
+    .use(require('../internal-plugins/import-async-component'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)

From dfd86abc399b1f2bb5ba8066f983394172a0e072 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:40:11 +0800
Subject: [PATCH 108/242] refactor($core): remove @vuepress/plugin-enhance-app
 and move it to core `

---
 .../lib/internal-plugins/enhance-app.js}      |  4 ++-
 packages/@vuepress/core/lib/prepare/index.js  |  2 +-
 packages/@vuepress/core/package.json          |  1 -
 .../@vuepress/plugin-enhance-app/.npmignore   |  2 --
 .../@vuepress/plugin-enhance-app/README.md    |  3 ---
 .../@vuepress/plugin-enhance-app/package.json | 25 -------------------
 6 files changed, 4 insertions(+), 33 deletions(-)
 rename packages/@vuepress/{plugin-enhance-app/index.js => core/lib/internal-plugins/enhance-app.js} (83%)
 delete mode 100644 packages/@vuepress/plugin-enhance-app/.npmignore
 delete mode 100644 packages/@vuepress/plugin-enhance-app/README.md
 delete mode 100644 packages/@vuepress/plugin-enhance-app/package.json

diff --git a/packages/@vuepress/plugin-enhance-app/index.js b/packages/@vuepress/core/lib/internal-plugins/enhance-app.js
similarity index 83%
rename from packages/@vuepress/plugin-enhance-app/index.js
rename to packages/@vuepress/core/lib/internal-plugins/enhance-app.js
index cffea62e61..1163d3187b 100644
--- a/packages/@vuepress/plugin-enhance-app/index.js
+++ b/packages/@vuepress/core/lib/internal-plugins/enhance-app.js
@@ -1,7 +1,9 @@
 const path = require('path')
 
 module.exports = (options, context) => ({
-  enhanceAppFiles: () => {
+  name: '@vuepress/internal-enhance-app',
+
+  enhanceAppFiles () {
     const { sourceDir, themePath } = context
     const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
     const themeEnhanceAppPath = path.resolve(themePath, 'enhanceApp.js')
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 5fbd337788..c0ff0bec01 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -30,12 +30,12 @@ module.exports = async function prepare ({
     .use(require('../internal-plugins/routes'))
     .use(require('../internal-plugins/root-mixins'))
     .use(require('../internal-plugins/import-async-component'))
+    .use(require('../internal-plugins/enhance-app'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)
     .useByPluginsConfig(themePlugins)
     // built-in plugins
-    .use('@vuepress/enhance-app')
     .use('@vuepress/last-updated', shouldUseLastUpdated)
     .use('@vuepress/register-components', {
       componentsDir: [
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index cfffdc2184..e11c9e5299 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -38,7 +38,6 @@
     "@vue/babel-preset-app": "3.0.0-beta.11",
     "@vuepress/shared-utils": "^1.0.0",
     "@vuepress/plugin-last-updated": "^1.0.0",
-    "@vuepress/plugin-enhance-app": "^1.0.0",
     "@vuepress/plugin-register-components": "^1.0.0",
     "autoprefixer": "^8.2.0",
     "babel-loader": "8.0.0-beta.3",
diff --git a/packages/@vuepress/plugin-enhance-app/.npmignore b/packages/@vuepress/plugin-enhance-app/.npmignore
deleted file mode 100644
index 18f0a334a4..0000000000
--- a/packages/@vuepress/plugin-enhance-app/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__tests__
-__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-enhance-app/README.md b/packages/@vuepress/plugin-enhance-app/README.md
deleted file mode 100644
index 8e7f87363b..0000000000
--- a/packages/@vuepress/plugin-enhance-app/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-enhance-app
-
-> enhance-app plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-enhance-app/package.json b/packages/@vuepress/plugin-enhance-app/package.json
deleted file mode 100644
index ee5a2e43f9..0000000000
--- a/packages/@vuepress/plugin-enhance-app/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "@vuepress/plugin-enhance-app",
-  "version": "1.0.0",
-  "description": "enhance-app plugin for vuepress",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuepress.git"
-  },
-  "keywords": [
-    "documentation",
-    "vue",
-    "vuepress",
-    "generator"
-  ],
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vuepress/issues"
-  },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-enhance-app#readme"
-}
\ No newline at end of file

From 10966638c2431e726afc09a566b365d460c62360 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:46:08 +0800
Subject: [PATCH 109/242] chore($core): update core's README and remove
 exported util

---
 packages/@vuepress/core/README.md    | 11 ++++++-----
 packages/@vuepress/core/lib/index.js |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/@vuepress/core/README.md b/packages/@vuepress/core/README.md
index 8b45650aa4..fbf3f0f13c 100644
--- a/packages/@vuepress/core/README.md
+++ b/packages/@vuepress/core/README.md
@@ -1,8 +1,9 @@
 # @vuepress/core
 
-> core for vuepress
+## APIs
 
-``` bash
-cd packages/@vuepress/core
-yarn link
-```
\ No newline at end of file
+### core.dev
+
+### core.build
+
+### core.eject
diff --git a/packages/@vuepress/core/lib/index.js b/packages/@vuepress/core/lib/index.js
index edaa3ed54c..77b22e74fd 100644
--- a/packages/@vuepress/core/lib/index.js
+++ b/packages/@vuepress/core/lib/index.js
@@ -1,4 +1,3 @@
 exports.dev = require('./dev')
 exports.build = require('./build')
 exports.eject = require('./eject')
-Object.assign(exports, require('./util/index'))

From e9b109f70934e2e03835c5c16ce4f2ad6b42f20c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:54:10 +0800
Subject: [PATCH 110/242] refactor($core): refine eject

---
 packages/@vuepress/core/README.md    | 6 +++---
 packages/@vuepress/core/lib/eject.js | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/README.md b/packages/@vuepress/core/README.md
index fbf3f0f13c..7829eb5850 100644
--- a/packages/@vuepress/core/README.md
+++ b/packages/@vuepress/core/README.md
@@ -2,8 +2,8 @@
 
 ## APIs
 
-### core.dev
+### dev(sourceDir, options)
 
-### core.build
+### build(sourceDir, options)
 
-### core.eject
+### eject(targetDir)
diff --git a/packages/@vuepress/core/lib/eject.js b/packages/@vuepress/core/lib/eject.js
index e4b62c8dae..f365df354f 100644
--- a/packages/@vuepress/core/lib/eject.js
+++ b/packages/@vuepress/core/lib/eject.js
@@ -2,7 +2,13 @@ const path = require('path')
 const { chalk, fs, logger } = require('@vuepress/shared-utils')
 
 module.exports = async (dir) => {
-  const source = path.resolve(__dirname, 'default-theme')
+  try {
+    require.resolve('@vuepress/theme-default')
+  } catch (err) {
+    console.log(chalk.red(`\n[vuepress] cannot find '@vuepress/theme-default'\n`))
+    process.exit(1)
+  }
+  const source = require.resolve('@vuepress/theme-default')
   const target = path.resolve(dir, '.vuepress/theme')
   await fs.copy(source, target)
   // remove the import to default theme override

From 49d8be8d1f8a92b878fb10e97fc2febba7dd0bad Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 03:58:37 +0800
Subject: [PATCH 111/242] docs($cli): documentation

---
 packages/@vuepress/cli/README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/cli/README.md b/packages/@vuepress/cli/README.md
index aea4c4ff7c..e2524b698b 100644
--- a/packages/@vuepress/cli/README.md
+++ b/packages/@vuepress/cli/README.md
@@ -1,3 +1,18 @@
 # @vuepress/cli
 
-> cli for vuepress
\ No newline at end of file
+> cli for vuepress
+
+## APIs
+
+### program
+
+Current instance of [commander.js](https://github.com/tj/commander.js)
+
+### bootstrap(options)
+
+Launch the cli.
+
+#### options.plugins
+
+#### options.theme
+         
\ No newline at end of file

From a379708ac5bcb5b39d591358d47a579958526a58 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 04:03:10 +0800
Subject: [PATCH 112/242] chore: clean @vuepress/plugin-test

---
 packages/@vuepress/plugin-test/.npmignore    |  2 -
 packages/@vuepress/plugin-test/README.md     |  3 -
 packages/@vuepress/plugin-test/enhanceApp.js |  1 -
 packages/@vuepress/plugin-test/index.js      | 91 --------------------
 packages/@vuepress/plugin-test/mixin.js      |  8 --
 packages/@vuepress/plugin-test/package.json  | 26 ------
 packages/vuepress/package.json               |  1 -
 packages/vuepress/vuepress.js                |  1 -
 8 files changed, 133 deletions(-)
 delete mode 100644 packages/@vuepress/plugin-test/.npmignore
 delete mode 100644 packages/@vuepress/plugin-test/README.md
 delete mode 100644 packages/@vuepress/plugin-test/enhanceApp.js
 delete mode 100644 packages/@vuepress/plugin-test/index.js
 delete mode 100644 packages/@vuepress/plugin-test/mixin.js
 delete mode 100644 packages/@vuepress/plugin-test/package.json

diff --git a/packages/@vuepress/plugin-test/.npmignore b/packages/@vuepress/plugin-test/.npmignore
deleted file mode 100644
index 18f0a334a4..0000000000
--- a/packages/@vuepress/plugin-test/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__tests__
-__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-test/README.md b/packages/@vuepress/plugin-test/README.md
deleted file mode 100644
index fc9725b8b3..0000000000
--- a/packages/@vuepress/plugin-test/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-test
-
-> test plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-test/enhanceApp.js b/packages/@vuepress/plugin-test/enhanceApp.js
deleted file mode 100644
index b04259c755..0000000000
--- a/packages/@vuepress/plugin-test/enhanceApp.js
+++ /dev/null
@@ -1 +0,0 @@
-export default function ({ Vue }) {}
diff --git a/packages/@vuepress/plugin-test/index.js b/packages/@vuepress/plugin-test/index.js
deleted file mode 100644
index f723a37a16..0000000000
--- a/packages/@vuepress/plugin-test/index.js
+++ /dev/null
@@ -1,91 +0,0 @@
-const path = require('path')
-
-class SimpleLogPlugin {
-  apply (compiler) {
-    compiler.hooks.done.tap('simple-log', function () {
-      console.log('\n\nDone!')
-    })
-  }
-}
-
-module.exports = (options, context) => ({
-  // TODO
-  // globalComponents: ['BackTIoTop'],
-
-  // Usually used to construct a global UI, e.g. back to top.
-  // globalUIComponents: ['BackToTop'],
-
-  clientRootMixin: path.resolve(__dirname, 'mixin.js'),
-
-  async ready () {
-    context.writeTemp('my-temp', 'A temp file generated by vuepress-plugin-test.')
-  },
-
-  extendPageData ({ content }) {
-    return {
-      size: (content.length / 1024).toFixed(2) + 'kb'
-    }
-  },
-
-  enhanceAppFiles: [
-    path.resolve(__dirname, 'enhanceApp.js'),
-    {
-      name: 'dynamic-code',
-      content: `export default ({ Vue }) => { Vue.prototype.$sourceDir = () => '${context.sourceDir}' }`
-    }
-  ],
-
-  chainWebpack (config, isServer) {
-    const { publicDir } = context
-    if (isServer && publicDir) {
-      config
-        .plugin('copy')
-        .tap(([options]) => {
-          options.push({
-            from: path.resolve(context.sourceDir, '.vuepress/images'),
-            to: path.resolve(context.outDir, 'images')
-          })
-          return options
-        })
-    }
-    config
-      .plugin('simple-log')
-      .use(SimpleLogPlugin)
-  },
-
-  extendMarkdown (md) {
-    // md.use()
-  },
-
-  enhanceDevServer (app) {
-    const path = require('path')
-    const mount = require('koa-mount')
-    const serveStatic = require('koa-static')
-    const imagePublicPath = path.resolve(context.sourceDir, '.vuepress/images')
-    app.use(mount(path.join(context.publicPath, 'images'), serveStatic(imagePublicPath)))
-  },
-
-  async generated () {
-    console.log('generated')
-  },
-
-  updated () {
-    console.log('updated')
-  },
-
-  additionalPages () {
-    return [
-      {
-        route: '/readme/',
-        path: path.resolve(__dirname, '../../../README.md')
-      }
-    ]
-  },
-
-  clientDynamicModules () {
-    return {
-      name: 'constans.js',
-      content: `export const SOURCE_DIR = '${context.sourceDir}'`
-    }
-  }
-})
diff --git a/packages/@vuepress/plugin-test/mixin.js b/packages/@vuepress/plugin-test/mixin.js
deleted file mode 100644
index 5a36f0efd5..0000000000
--- a/packages/@vuepress/plugin-test/mixin.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  created () {
-    console.log('created')
-  },
-  mounted () {
-    console.log('mounted')
-  }
-}
diff --git a/packages/@vuepress/plugin-test/package.json b/packages/@vuepress/plugin-test/package.json
deleted file mode 100644
index 75450ef59e..0000000000
--- a/packages/@vuepress/plugin-test/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "private": true,
-  "name": "@vuepress/plugin-test",
-  "version": "1.0.0",
-  "description": "test plugin for vuepress",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuepress.git"
-  },
-  "keywords": [
-    "documentation",
-    "vue",
-    "vuepress",
-    "generator"
-  ],
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vuepress/issues"
-  },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-test#readme"
-}
\ No newline at end of file
diff --git a/packages/vuepress/package.json b/packages/vuepress/package.json
index 67184e481d..8b98bc70b1 100644
--- a/packages/vuepress/package.json
+++ b/packages/vuepress/package.json
@@ -25,7 +25,6 @@
     "@vuepress/core": "^1.0.0",
     "@vuepress/cli": "^1.0.0",
     "@vuepress/theme-default": "^1.0.0",
-    "@vuepress/plugin-test": "^1.0.0",
     "@vuepress/plugin-i18n-ui": "^1.0.0"
   }
 }
diff --git a/packages/vuepress/vuepress.js b/packages/vuepress/vuepress.js
index df0b309158..77af8d5871 100755
--- a/packages/vuepress/vuepress.js
+++ b/packages/vuepress/vuepress.js
@@ -3,7 +3,6 @@
 require('@vuepress/cli').bootstrap({
   theme: 'default',
   plugins: [
-    '@vuepress/test',
     '@vuepress/i18n-ui'
   ]
 })

From e02a91986d2b7f40b7805b01ba13c290be3500db Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 04:06:10 +0800
Subject: [PATCH 113/242] chore($vuepress): remove '@vuepress/i18n-ui' preset.

---
 packages/docs/docs/.vuepress/config.js | 1 +
 packages/docs/package.json             | 3 ++-
 packages/vuepress/package.json         | 3 +--
 packages/vuepress/vuepress.js          | 7 +------
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index aaf05a036a..e150af86a0 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -98,6 +98,7 @@ module.exports = {
     }
   },
   plugins: {
+    '@vuepress/i18n-ui': true,
     '@vuepress/back-to-top': true,
     '@vuepress/pwa': {
       serviceWorker: true,
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 6b7c36703e..00642f6aed 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -24,6 +24,7 @@
   "devDependencies": {
     "vuepress": "^1.0.0",
     "@vuepress/plugin-back-to-top": "^1.0.0",
-    "@vuepress/plugin-pwa": "^1.0.0"
+    "@vuepress/plugin-pwa": "^1.0.0",
+    "@vuepress/plugin-i18n-ui": "^1.0.0"
   }
 }
diff --git a/packages/vuepress/package.json b/packages/vuepress/package.json
index 8b98bc70b1..eb1fcb7ba4 100644
--- a/packages/vuepress/package.json
+++ b/packages/vuepress/package.json
@@ -24,7 +24,6 @@
   "dependencies": {
     "@vuepress/core": "^1.0.0",
     "@vuepress/cli": "^1.0.0",
-    "@vuepress/theme-default": "^1.0.0",
-    "@vuepress/plugin-i18n-ui": "^1.0.0"
+    "@vuepress/theme-default": "^1.0.0"
   }
 }
diff --git a/packages/vuepress/vuepress.js b/packages/vuepress/vuepress.js
index 77af8d5871..7e34722a12 100755
--- a/packages/vuepress/vuepress.js
+++ b/packages/vuepress/vuepress.js
@@ -1,8 +1,3 @@
 #!/usr/bin/env node
 
-require('@vuepress/cli').bootstrap({
-  theme: 'default',
-  plugins: [
-    '@vuepress/i18n-ui'
-  ]
-})
+require('@vuepress/cli').bootstrap({ theme: 'default' })

From 6a97de101cd0add99e78e10feff8bf96de8a257f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 04:09:13 +0800
Subject: [PATCH 114/242] chore($theme-default): remove
 '@vuepress/google-analytics' preset.

---
 packages/@vuepress/theme-default/index.js     | 3 +--
 packages/@vuepress/theme-default/package.json | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index e8df30d4bd..59582b2928 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -7,7 +7,6 @@ module.exports = {
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: [
     themePlugin,
-    '@vuepress/active-header-links',
-    '@vuepress/google-analytics'
+    '@vuepress/active-header-links'
   ]
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index a29b79eb3a..fe43290022 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -24,7 +24,6 @@
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme",
   "dependencies": {
     "@vuepress/plugin-active-header-links": "1.0.0",
-    "@vuepress/plugin-google-analytics": "1.0.0",
     "docsearch.js": "^2.5.2",
     "nprogress": "^0.2.0",
     "stylus": "^0.54.5",

From b90e009b036ab4565ac32374eb32c6ec638c9a87 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 18 Aug 2018 04:16:08 +0800
Subject: [PATCH 115/242] feat($shared-utils) env.isProd

---
 packages/@vuepress/shared-utils/lib/env.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@vuepress/shared-utils/lib/env.js b/packages/@vuepress/shared-utils/lib/env.js
index 5a0742dbfa..49be4cc8b8 100644
--- a/packages/@vuepress/shared-utils/lib/env.js
+++ b/packages/@vuepress/shared-utils/lib/env.js
@@ -1,3 +1,5 @@
 const isDebug = process.argv.indexOf('--debug') !== -1
+const isProd = process.env.NODE_ENV === 'production'
 
 exports.isDebug = isDebug
+exports.isProd = isProd

From 8f89eef61b90834d0a037da3df2633468c1f8e64 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 20 Aug 2018 23:23:09 +0800
Subject: [PATCH 116/242] refacotr($core): separate createCSSRule from core to
 shared-utils

---
 .../core/lib/webpack/createBaseConfig.js      | 90 ++++++++++---------
 packages/@vuepress/shared-utils/index.js      |  1 +
 .../@vuepress/shared-utils/lib/webpack.js     | 57 ++++++++++++
 3 files changed, 104 insertions(+), 44 deletions(-)
 create mode 100644 packages/@vuepress/shared-utils/lib/webpack.js

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 632f280a7e..3413ad6c48 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -200,51 +200,53 @@ module.exports = function createBaseConfig ({
           name: `assets/fonts/[name].[hash:8].[ext]`
         })
 
-  function createCSSRule (lang, test, loader, options) {
-    const baseRule = config.module.rule(lang).test(test)
-    const modulesRule = baseRule.oneOf('modules').resourceQuery(/module/)
-    const normalRule = baseRule.oneOf('normal')
+  const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
+  const postcssOptions = siteConfig.postcss
 
-    applyLoaders(modulesRule, true)
-    applyLoaders(normalRule, false)
-
-    function applyLoaders (rule, modules) {
-      if (!isServer) {
-        if (isProd) {
-          rule.use('extract-css-loader').loader(CSSExtractPlugin.loader)
-        } else {
-          rule.use('vue-style-loader').loader('vue-style-loader')
-        }
-      }
-
-      rule.use('css-loader')
-        .loader(isServer ? 'css-loader/locals' : 'css-loader')
-        .options({
-          modules,
-          localIdentName: `[local]_[hash:base64:8]`,
-          importLoaders: 1,
-          sourceMap: !isProd
-        })
-
-      rule.use('postcss-loader').loader('postcss-loader').options(Object.assign({
-        plugins: [require('autoprefixer')],
-        sourceMap: !isProd
-      }, siteConfig.postcss))
-
-      if (loader) {
-        rule.use(loader).loader(loader).options(options)
-      }
-    }
-  }
-
-  createCSSRule('css', /\.css$/)
-  createCSSRule('postcss', /\.p(ost)?css$/)
-  createCSSRule('scss', /\.scss$/, 'sass-loader', siteConfig.scss)
-  createCSSRule('sass', /\.sass$/, 'sass-loader', Object.assign({ indentedSyntax: true }, siteConfig.sass))
-  createCSSRule('less', /\.less$/, 'less-loader', siteConfig.less)
-  createCSSRule('stylus', /\.styl(us)?$/, 'stylus-loader', Object.assign({
-    preferPathResolver: 'webpack'
-  }, siteConfig.stylus))
+  createCSSRule({ lang: 'css', test: /\.css$/, config, isProd, isServer, postcssOptions })
+  createCSSRule({ lang: 'postcss', test: /\.p(ost)?css$/, config, isProd, isServer, postcssOptions })
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'scss',
+    test: /\.scss$/,
+    loader: 'sass-loader',
+    options: siteConfig.scss
+  })
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'sass',
+    test: /\.sass/,
+    loader: 'sass-loader',
+    options: Object.assign({ indentedSyntax: true }, siteConfig.sass)
+  })
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'less',
+    test: /\.less/,
+    loader: 'less-loader',
+    options: siteConfig.less
+  })
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'stylus',
+    test: /\.styl(us)?$/,
+    loader: 'stylus-loader',
+    options: Object.assign({
+      preferPathResolver: 'webpack'
+    }, siteConfig.stylus)
+  })
 
   config
     .plugin('vue-loader')
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 78b8b5a4e5..274c4246fd 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -2,6 +2,7 @@ exports.logger = require('./lib/logger')
 exports.env = require('./lib/env')
 exports.writeTemp = require('./lib/writeTemp')
 exports.codegen = require('./lib/codegen')
+exports.webpack = require('./lib/webpack')
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
 exports.globby = require('globby')
diff --git a/packages/@vuepress/shared-utils/lib/webpack.js b/packages/@vuepress/shared-utils/lib/webpack.js
new file mode 100644
index 0000000000..09cdbbc60c
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/webpack.js
@@ -0,0 +1,57 @@
+/**
+ * Create CSS processing pipeline
+ * @param {object} config instance of webpack-chain
+ * @param {boolean} isServer
+ * @param {boolean} isProd
+ * @param {string} lang
+ * @param {regexp} test
+ * @param {string} loader loaders' name
+ * @param {object} options loaders' options
+ * @param {object} postcssOptions
+ */
+exports.createCSSRule = function ({
+  config,
+  isServer,
+  isProd,
+  lang,
+  test,
+  loader,
+  options,
+  postcssOptions
+}) {
+  const CSSExtractPlugin = require('mini-css-extract-plugin')
+  const baseRule = config.module.rule(lang).test(test)
+  const modulesRule = baseRule.oneOf('modules').resourceQuery(/module/)
+  const normalRule = baseRule.oneOf('normal')
+
+  applyLoaders(modulesRule, true)
+  applyLoaders(normalRule, false)
+
+  function applyLoaders (rule, modules) {
+    if (!isServer) {
+      if (isProd) {
+        rule.use('extract-css-loader').loader(CSSExtractPlugin.loader)
+      } else {
+        rule.use('vue-style-loader').loader('vue-style-loader')
+      }
+    }
+
+    rule.use('css-loader')
+      .loader(isServer ? 'css-loader/locals' : 'css-loader')
+      .options({
+        modules,
+        localIdentName: `[local]_[hash:base64:8]`,
+        importLoaders: 1,
+        sourceMap: !isProd
+      })
+
+    rule.use('postcss-loader').loader('postcss-loader').options(Object.assign({
+      plugins: [require('autoprefixer')],
+      sourceMap: !isProd
+    }, postcssOptions))
+
+    if (loader) {
+      rule.use(loader).loader(loader).options(options)
+    }
+  }
+}

From 8a7463ac52a6990d9a365d7065060a082a3d1ecd Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 20 Aug 2018 23:30:38 +0800
Subject: [PATCH 117/242] chore($env): change isProd to function

---
 packages/@vuepress/shared-utils/lib/env.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/shared-utils/lib/env.js b/packages/@vuepress/shared-utils/lib/env.js
index 49be4cc8b8..09177f1b29 100644
--- a/packages/@vuepress/shared-utils/lib/env.js
+++ b/packages/@vuepress/shared-utils/lib/env.js
@@ -1,5 +1,5 @@
 const isDebug = process.argv.indexOf('--debug') !== -1
-const isProd = process.env.NODE_ENV === 'production'
+const isProduction = () => process.env.NODE_ENV === 'production'
 
 exports.isDebug = isDebug
-exports.isProd = isProd
+exports.isProduction = isProduction

From 17cd87d2b71176d5f11e4c1c34e6f2eeac8958d1 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 20 Aug 2018 23:39:45 +0800
Subject: [PATCH 118/242] feat: set up @vuepress/plugin-stylus

---
 .../core/lib/webpack/createBaseConfig.js      | 12 -------
 packages/@vuepress/plugin-stylus/.npmignore   |  2 ++
 packages/@vuepress/plugin-stylus/README.md    |  3 ++
 packages/@vuepress/plugin-stylus/index.js     | 21 ++++++++++++
 packages/@vuepress/plugin-stylus/package.json | 33 +++++++++++++++++++
 packages/@vuepress/theme-default/index.js     |  3 +-
 packages/@vuepress/theme-default/package.json |  3 +-
 7 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 packages/@vuepress/plugin-stylus/.npmignore
 create mode 100644 packages/@vuepress/plugin-stylus/README.md
 create mode 100644 packages/@vuepress/plugin-stylus/index.js
 create mode 100644 packages/@vuepress/plugin-stylus/package.json

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 3413ad6c48..93c98504c3 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -235,18 +235,6 @@ module.exports = function createBaseConfig ({
     loader: 'less-loader',
     options: siteConfig.less
   })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'stylus',
-    test: /\.styl(us)?$/,
-    loader: 'stylus-loader',
-    options: Object.assign({
-      preferPathResolver: 'webpack'
-    }, siteConfig.stylus)
-  })
 
   config
     .plugin('vue-loader')
diff --git a/packages/@vuepress/plugin-stylus/.npmignore b/packages/@vuepress/plugin-stylus/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-stylus/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-stylus/README.md b/packages/@vuepress/plugin-stylus/README.md
new file mode 100644
index 0000000000..60f224e7a0
--- /dev/null
+++ b/packages/@vuepress/plugin-stylus/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-stylus
+
+> stylus plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-stylus/index.js b/packages/@vuepress/plugin-stylus/index.js
new file mode 100644
index 0000000000..4aa8b88ea6
--- /dev/null
+++ b/packages/@vuepress/plugin-stylus/index.js
@@ -0,0 +1,21 @@
+const { env: { isProduction }} = require('@vuepress/shared-utils')
+const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
+
+module.exports = (options, context) => ({
+  chainWebpack (config, isServer) {
+    const isProd = isProduction()
+    const { postcss, stylus } = context.siteConfig
+    createCSSRule({
+      config,
+      isProd,
+      isServer,
+      postcss,
+      lang: 'stylus',
+      test: /\.styl(us)?$/,
+      loader: 'stylus-loader',
+      options: Object.assign({
+        preferPathResolver: 'webpack'
+      }, stylus)
+    })
+  }
+})
diff --git a/packages/@vuepress/plugin-stylus/package.json b/packages/@vuepress/plugin-stylus/package.json
new file mode 100644
index 0000000000..c18b97d7c1
--- /dev/null
+++ b/packages/@vuepress/plugin-stylus/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "@vuepress/plugin-stylus",
+  "version": "1.0.0",
+  "description": "stylus plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "@vuepress/shared-utils": "^1.0.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2",
+    "postcss-loader": "^2.1.5",
+    "mini-css-extract-plugin": "^0.4.1",
+    "autoprefixer": "^8.2.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-stylus#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 59582b2928..91059ea1c9 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -7,6 +7,7 @@ module.exports = {
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: [
     themePlugin,
-    '@vuepress/active-header-links'
+    '@vuepress/active-header-links',
+    '@vuepress/stylus'
   ]
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index fe43290022..c74e6f6360 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -26,7 +26,6 @@
     "@vuepress/plugin-active-header-links": "1.0.0",
     "docsearch.js": "^2.5.2",
     "nprogress": "^0.2.0",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2"
+    "@vuepress/plugin-stylus": "^1.0.0"
   }
 }
\ No newline at end of file

From 5e46295030f5bb32226a0084543d3f6afa25a96a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 00:19:18 +0800
Subject: [PATCH 119/242] feat: set up @vuepress/plugin-sass

Note that it would be better to transform  @vuepress/plugin-sass as a 3rd plugin so we don't need to install deps at our repo.
---
 .../core/lib/webpack/createBaseConfig.js      |  21 +-
 packages/@vuepress/plugin-sass/.npmignore     |   2 +
 packages/@vuepress/plugin-sass/README.md      |   3 +
 packages/@vuepress/plugin-sass/index.js       |  31 ++
 packages/@vuepress/plugin-sass/package.json   |  33 +++
 yarn.lock                                     | 278 ++++++++++++++++--
 6 files changed, 326 insertions(+), 42 deletions(-)
 create mode 100644 packages/@vuepress/plugin-sass/.npmignore
 create mode 100644 packages/@vuepress/plugin-sass/README.md
 create mode 100644 packages/@vuepress/plugin-sass/index.js
 create mode 100644 packages/@vuepress/plugin-sass/package.json

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 93c98504c3..5d62ad4f49 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -205,26 +205,7 @@ module.exports = function createBaseConfig ({
 
   createCSSRule({ lang: 'css', test: /\.css$/, config, isProd, isServer, postcssOptions })
   createCSSRule({ lang: 'postcss', test: /\.p(ost)?css$/, config, isProd, isServer, postcssOptions })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'scss',
-    test: /\.scss$/,
-    loader: 'sass-loader',
-    options: siteConfig.scss
-  })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'sass',
-    test: /\.sass/,
-    loader: 'sass-loader',
-    options: Object.assign({ indentedSyntax: true }, siteConfig.sass)
-  })
+
   createCSSRule({
     config,
     isProd,
diff --git a/packages/@vuepress/plugin-sass/.npmignore b/packages/@vuepress/plugin-sass/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-sass/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-sass/README.md b/packages/@vuepress/plugin-sass/README.md
new file mode 100644
index 0000000000..2dcb9dd443
--- /dev/null
+++ b/packages/@vuepress/plugin-sass/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-sass
+
+> sass plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-sass/index.js b/packages/@vuepress/plugin-sass/index.js
new file mode 100644
index 0000000000..6c93314250
--- /dev/null
+++ b/packages/@vuepress/plugin-sass/index.js
@@ -0,0 +1,31 @@
+const { env: { isProduction }} = require('@vuepress/shared-utils')
+const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
+
+module.exports = (options, context) => ({
+  chainWebpack (config, isServer) {
+    const isProd = isProduction()
+    const { postcss, scss, sass } = context.siteConfig
+
+    createCSSRule({
+      config,
+      isProd,
+      isServer,
+      postcssOptions: postcss,
+      lang: 'scss',
+      test: /\.scss$/,
+      loader: 'sass-loader',
+      options: scss
+    })
+
+    createCSSRule({
+      config,
+      isProd,
+      isServer,
+      postcssOptions: postcss,
+      lang: 'sass',
+      test: /\.sass/,
+      loader: 'sass-loader',
+      options: Object.assign({ indentedSyntax: true }, sass)
+    })
+  }
+})
diff --git a/packages/@vuepress/plugin-sass/package.json b/packages/@vuepress/plugin-sass/package.json
new file mode 100644
index 0000000000..91ce8e17e2
--- /dev/null
+++ b/packages/@vuepress/plugin-sass/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "@vuepress/plugin-sass",
+  "version": "1.0.0",
+  "description": "sass plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "@vuepress/shared-utils": "^1.0.0",
+    "node-sass": "^4.9.3",
+    "sass-loader": "^7.1.0",
+    "postcss-loader": "^2.1.5",
+    "mini-css-extract-plugin": "^0.4.1",
+    "autoprefixer": "^8.2.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-sass#readme"
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 652f2da55c..4c6a1bd99d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1766,6 +1766,10 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
@@ -2075,6 +2079,12 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
 bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -2333,6 +2343,10 @@ camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2532,6 +2546,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+clone-deep@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.0"
+    shallow-clone "^1.0.0"
+
 clone@2.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
@@ -2988,6 +3011,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+cross-spawn@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -4051,6 +4081,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4061,6 +4095,12 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  dependencies:
+    for-in "^1.0.1"
+
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -4136,6 +4176,15 @@ fsevents@^1.2.2, fsevents@^1.2.3:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
+fstream@^1.0.0, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4157,6 +4206,12 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+gaze@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  dependencies:
+    globule "^1.0.0"
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -4262,7 +4317,17 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -4338,6 +4403,14 @@ globby@^8.0.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
+globule@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.10"
+    minimatch "~3.0.2"
+
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -4637,6 +4710,10 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
+in-publish@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -4662,7 +4739,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -5415,6 +5492,10 @@ joi@^11.1.1:
     isemail "3.x.x"
     topo "2.x.x"
 
+js-base64@^2.1.8:
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.8.tgz#57a9b130888f956834aa40c5b165ba59c758f033"
+
 js-base64@^2.1.9:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92"
@@ -5881,7 +5962,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -5900,11 +5981,15 @@ lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
-lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
@@ -5916,10 +6001,18 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
+lodash.mergewith@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
+lodash.tail@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+
 lodash.template@^4.0.2, lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
@@ -5941,7 +6034,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@4.x, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+lodash@4.x, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -6121,7 +6214,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0:
+meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
@@ -6283,7 +6376,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -6347,11 +6440,18 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
 mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
 
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -6392,7 +6492,7 @@ mz@^2.6.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.9.2:
+nan@^2.10.0, nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -6481,6 +6581,23 @@ node-cache@^4.1.1:
     clone "2.x"
     lodash "4.x"
 
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -6537,12 +6654,42 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
+node-sass@^4.9.3:
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.10.0"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "2.87.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
 nopt@1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
   dependencies:
     abbrev "1"
 
+"nopt@2 || 3", nopt@~3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -6550,12 +6697,6 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-nopt@~3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -6619,7 +6760,7 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npmlog@^4.0.2, npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6783,6 +6924,12 @@ os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -6795,7 +6942,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.4:
+osenv@0, osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
@@ -7766,7 +7913,7 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@^2.87.0:
+request@2.87.0, request@^2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
@@ -7869,7 +8016,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -7943,6 +8090,26 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.2.3"
 
+sass-graph@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  dependencies:
+    glob "^7.0.0"
+    lodash "^4.0.0"
+    scss-tokenizer "^0.2.3"
+    yargs "^7.0.0"
+
+sass-loader@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
+  dependencies:
+    clone-deep "^2.0.1"
+    loader-utils "^1.0.1"
+    lodash.tail "^4.1.1"
+    neo-async "^2.5.0"
+    pify "^3.0.0"
+    semver "^5.5.0"
+
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
@@ -7958,6 +8125,13 @@ schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
+scss-tokenizer@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  dependencies:
+    js-base64 "^2.1.8"
+    source-map "^0.4.2"
+
 section-matter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -7983,6 +8157,10 @@ semver-diff@^2.0.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
 serialize-javascript@^1.3.0, serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -8028,6 +8206,14 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shallow-clone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^5.0.0"
+    mixin-object "^2.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -8152,7 +8338,7 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, sourc
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.4.4:
+source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -8252,6 +8438,12 @@ std-env@^1.1.0, std-env@^1.3.0:
   dependencies:
     is-ci "^1.1.0"
 
+stdout-stream@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+  dependencies:
+    readable-stream "^2.0.1"
+
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -8303,7 +8495,7 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1:
+string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
@@ -8471,6 +8663,14 @@ tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
 
+tar@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
 tar@^4:
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
@@ -8671,6 +8871,12 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+"true-case-path@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
+  dependencies:
+    glob "^6.0.4"
+
 tsconfig@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
@@ -9246,11 +9452,15 @@ whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0:
+which@1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
@@ -9489,6 +9699,12 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  dependencies:
+    camelcase "^3.0.0"
+
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -9518,6 +9734,24 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.0"
+
 yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"

From 44641856354485ad1b6ddcedc9f23c42e556d87c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 00:27:26 +0800
Subject: [PATCH 120/242] feat: set up @vuepress/plugin-less

Note that it would be better to transform  @vuepress/plugin-less as a 3rd plugin so we don't need to install deps at our repo.
---
 .../core/lib/webpack/createBaseConfig.js      | 11 -------
 packages/@vuepress/plugin-less/.npmignore     |  2 ++
 packages/@vuepress/plugin-less/README.md      |  3 ++
 packages/@vuepress/plugin-less/index.js       | 20 ++++++++++++
 packages/@vuepress/plugin-less/package.json   | 32 +++++++++++++++++++
 yarn.lock                                     | 12 +++++++
 6 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 packages/@vuepress/plugin-less/.npmignore
 create mode 100644 packages/@vuepress/plugin-less/README.md
 create mode 100644 packages/@vuepress/plugin-less/index.js
 create mode 100644 packages/@vuepress/plugin-less/package.json

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 5d62ad4f49..9806ce0f05 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -206,17 +206,6 @@ module.exports = function createBaseConfig ({
   createCSSRule({ lang: 'css', test: /\.css$/, config, isProd, isServer, postcssOptions })
   createCSSRule({ lang: 'postcss', test: /\.p(ost)?css$/, config, isProd, isServer, postcssOptions })
 
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'less',
-    test: /\.less/,
-    loader: 'less-loader',
-    options: siteConfig.less
-  })
-
   config
     .plugin('vue-loader')
     .use(VueLoaderPlugin)
diff --git a/packages/@vuepress/plugin-less/.npmignore b/packages/@vuepress/plugin-less/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-less/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-less/README.md b/packages/@vuepress/plugin-less/README.md
new file mode 100644
index 0000000000..e5830e32f9
--- /dev/null
+++ b/packages/@vuepress/plugin-less/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-less
+
+> less plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-less/index.js b/packages/@vuepress/plugin-less/index.js
new file mode 100644
index 0000000000..185e6420fe
--- /dev/null
+++ b/packages/@vuepress/plugin-less/index.js
@@ -0,0 +1,20 @@
+const { env: { isProduction }} = require('@vuepress/shared-utils')
+const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
+
+module.exports = (options, context) => ({
+  chainWebpack (config, isServer) {
+    const isProd = isProduction()
+    const { postcss, less } = context.siteConfig
+
+    createCSSRule({
+      config,
+      isProd,
+      isServer,
+      postcssOptions: postcss,
+      lang: 'less',
+      test: /\.less/,
+      loader: 'less-loader',
+      options: less
+    })
+  }
+})
diff --git a/packages/@vuepress/plugin-less/package.json b/packages/@vuepress/plugin-less/package.json
new file mode 100644
index 0000000000..a410da3415
--- /dev/null
+++ b/packages/@vuepress/plugin-less/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@vuepress/plugin-less",
+  "version": "1.0.0",
+  "description": "less plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "@vuepress/shared-utils": "^1.0.0",
+    "less-loader": "^4.1.0",
+    "postcss-loader": "^2.1.5",
+    "mini-css-extract-plugin": "^0.4.1",
+    "autoprefixer": "^8.2.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-less#readme"
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 4c6a1bd99d..7d63cb0127 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2563,6 +2563,10 @@ clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
+clone@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+
 cmd-shim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
@@ -5825,6 +5829,14 @@ lerna@^2.11.0:
     write-pkg "^3.1.0"
     yargs "^8.0.2"
 
+less-loader@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^3.0.0"
+
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"

From 8780c2c4baab6913f9983321f5a51a168c7edb55 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 00:37:00 +0800
Subject: [PATCH 121/242] refactor($core): using camel cases at file name

---
 .../lib/internal-plugins/{enhance-app.js => enhanceApp.js}  | 0
 .../{import-async-component.js => importAsyncComponent.js}  | 0
 .../lib/internal-plugins/{root-mixins.js => rootMixins.js}  | 0
 packages/@vuepress/core/lib/prepare/index.js                | 6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/@vuepress/core/lib/internal-plugins/{enhance-app.js => enhanceApp.js} (100%)
 rename packages/@vuepress/core/lib/internal-plugins/{import-async-component.js => importAsyncComponent.js} (100%)
 rename packages/@vuepress/core/lib/internal-plugins/{root-mixins.js => rootMixins.js} (100%)

diff --git a/packages/@vuepress/core/lib/internal-plugins/enhance-app.js b/packages/@vuepress/core/lib/internal-plugins/enhanceApp.js
similarity index 100%
rename from packages/@vuepress/core/lib/internal-plugins/enhance-app.js
rename to packages/@vuepress/core/lib/internal-plugins/enhanceApp.js
diff --git a/packages/@vuepress/core/lib/internal-plugins/import-async-component.js b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
similarity index 100%
rename from packages/@vuepress/core/lib/internal-plugins/import-async-component.js
rename to packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
diff --git a/packages/@vuepress/core/lib/internal-plugins/root-mixins.js b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
similarity index 100%
rename from packages/@vuepress/core/lib/internal-plugins/root-mixins.js
rename to packages/@vuepress/core/lib/internal-plugins/rootMixins.js
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index c0ff0bec01..cb7a384644 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -28,9 +28,9 @@ module.exports = async function prepare ({
   plugin
     // internl core plugins
     .use(require('../internal-plugins/routes'))
-    .use(require('../internal-plugins/root-mixins'))
-    .use(require('../internal-plugins/import-async-component'))
-    .use(require('../internal-plugins/enhance-app'))
+    .use(require('../internal-plugins/rootMixins'))
+    .use(require('../internal-plugins/importAsyncComponent'))
+    .use(require('../internal-plugins/enhanceApp'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)

From ee32e852b182f9c94e81ec570c741bc984361fed Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 00:42:00 +0800
Subject: [PATCH 122/242] feat($core): support 'dirname' field for
 'clientDynamicModules' That allow user to define the directory of generated
 dynamic module.

---
 .../core/lib/plugin-api/option/ClientDynamicModulesOption.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index ccf204dc60..535ba19424 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -9,9 +9,9 @@ module.exports = class ClientDynamicModulesOption extends Option {
       if (!Array.isArray(modules)) {
         modules = [modules]
       }
-      for (const { name, content } of modules) {
+      for (const { name, content, dirname } of modules) {
         await writeTemp(
-          `dynamic/${name}`,
+          `${dirname || 'dynamic'}/${name}`,
           `
 /**
  * Generated by [vuepress-plugin-${pluginName}]"

From fe61f994eef33cbb780304aaeaf89d241843952c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 00:51:38 +0800
Subject: [PATCH 123/242] refactor($core): extract internal plugin 'site-data'

---
 packages/@vuepress/core/lib/app/app.js                   | 4 ++--
 packages/@vuepress/core/lib/app/dataMixin.js             | 2 +-
 packages/@vuepress/core/lib/internal-plugins/siteData.js | 9 +++++++++
 packages/@vuepress/core/lib/prepare/index.js             | 5 +----
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/siteData.js

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 0fadfd6381..1ad87edc78 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -3,7 +3,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import dataMixin from './dataMixin'
 import { routes } from '@dynamic/routes'
-import { siteData } from '@temp/siteData'
+import { siteData } from '@dynamic/siteData'
 import appEnhancers from '@temp/app-enhancers.js'
 import globalUIComponents from '@dynamic/global-ui.js'
 
@@ -18,7 +18,7 @@ import ClientOnly from './components/ClientOnly'
 // suggest dev server restart on base change
 if (module.hot) {
   const prevBase = siteData.base
-  module.hot.accept(VUEPRESS_TEMP_PATH + '/siteData.js', () => {
+  module.hot.accept(VUEPRESS_TEMP_PATH + '/dynamic/siteData.js', () => {
     if (siteData.base !== prevBase) {
       window.alert(
         `[vuepress] Site base has changed. ` +
diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index 1979790fdd..5330d0ebc6 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -14,7 +14,7 @@ export default function dataMixin (siteData) {
   Vue.$store = store
 
   if (module.hot) {
-    module.hot.accept(VUEPRESS_TEMP_PATH + '/siteData.js', () => {
+    module.hot.accept(VUEPRESS_TEMP_PATH + '/dynamic/siteData.js', () => {
       prepare(siteData)
       store.siteData = siteData
     })
diff --git a/packages/@vuepress/core/lib/internal-plugins/siteData.js b/packages/@vuepress/core/lib/internal-plugins/siteData.js
new file mode 100644
index 0000000000..346faf99ff
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/siteData.js
@@ -0,0 +1,9 @@
+module.exports = (options, context) => ({
+  name: '@vuepress/internal-site-data',
+
+  // @internal/siteData
+  async clientDynamicModules () {
+    const code = `export const siteData = ${JSON.stringify(context.siteData, null, 2)}`
+    return [{ name: 'siteData.js', content: code }]
+  }
+})
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index cb7a384644..6cd055df67 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -31,6 +31,7 @@ module.exports = async function prepare ({
     .use(require('../internal-plugins/rootMixins'))
     .use(require('../internal-plugins/importAsyncComponent'))
     .use(require('../internal-plugins/enhanceApp'))
+    .use(require('../internal-plugins/siteData'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)
@@ -62,10 +63,6 @@ module.exports = async function prepare ({
   await pluginOptions.clientDynamicModules.apply()
   await pluginOptions.globalUIComponents.apply()
 
-  // 6. generate siteData
-  const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
-  await writeTemp('siteData.js', dataCode)
-
   // 7. handle user override
   const overridePath = path.resolve(sourceDir, '.vuepress/override.styl').replace(/[\\]+/g, '/')
   const hasUserOverride = fs.existsSync(overridePath)

From 5fe91bfcc0aaf5bd3acd4a2c856c766fa2ec94ce Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 00:59:18 +0800
Subject: [PATCH 124/242] refactor($core): extract internal plugin
 'override-css'

---
 .../core/lib/internal-plugins/overrideCSS.js  | 26 +++++++++++++++++++
 packages/@vuepress/core/lib/prepare/index.js  | 19 +-------------
 packages/docs/docs/.vuepress/override.styl    |  0
 3 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
 create mode 100644 packages/docs/docs/.vuepress/override.styl

diff --git a/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js b/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
new file mode 100644
index 0000000000..ad54c1106b
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
@@ -0,0 +1,26 @@
+const path = require('path')
+const { writeTemp, fs, logger, chalk } = require('@vuepress/shared-utils')
+
+module.exports = (options, context) => ({
+  name: '@vuepress/internal-override-css',
+
+  async ready () {
+    const { sourceDir } = context
+
+    const overridePath = path.resolve(sourceDir, '.vuepress/override.styl').replace(/[\\]+/g, '/')
+    const hasUserOverride = fs.existsSync(overridePath)
+    await writeTemp('override.styl', hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
+
+    const stylePath = path.resolve(sourceDir, '.vuepress/style.styl').replace(/[\\]+/g, '/')
+    const hasUserStyle = fs.existsSync(stylePath)
+    await writeTemp('style.styl', hasUserStyle ? `@import(${JSON.stringify(stylePath)})` : ``)
+
+    // Temporary tip, will be removed at next release.
+    if (hasUserOverride && !hasUserStyle) {
+      logger.tip(
+        `${chalk.magenta('override.styl')} has been split into 2 APIs, we recommend you upgrade to continue.\n` +
+        `      See: ${chalk.magenta('https://vuepress.vuejs.org/default-theme-config/#simple-css-override')}`
+      )
+    }
+  }
+})
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 6cd055df67..875cf5bc28 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,7 +1,6 @@
 const path = require('path')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
-const { fs, chalk, logger, writeTemp } = require('@vuepress/shared-utils')
 const Plugin = require('../plugin-api/index')
 const PluginContext = require('../plugin-api/context')
 
@@ -32,6 +31,7 @@ module.exports = async function prepare ({
     .use(require('../internal-plugins/importAsyncComponent'))
     .use(require('../internal-plugins/enhanceApp'))
     .use(require('../internal-plugins/siteData'))
+    .use(require('../internal-plugins/overrideCSS'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)
@@ -63,23 +63,6 @@ module.exports = async function prepare ({
   await pluginOptions.clientDynamicModules.apply()
   await pluginOptions.globalUIComponents.apply()
 
-  // 7. handle user override
-  const overridePath = path.resolve(sourceDir, '.vuepress/override.styl').replace(/[\\]+/g, '/')
-  const hasUserOverride = fs.existsSync(overridePath)
-  await writeTemp('override.styl', hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
-
-  const stylePath = path.resolve(sourceDir, '.vuepress/style.styl').replace(/[\\]+/g, '/')
-  const hasUserStyle = fs.existsSync(stylePath)
-  await writeTemp('style.styl', hasUserStyle ? `@import(${JSON.stringify(stylePath)})` : ``)
-
-  // Temporary tip, will be removed at next release.
-  if (hasUserOverride && !hasUserStyle) {
-    logger.tip(
-      `${chalk.magenta('override.styl')} has been split into 2 APIs, we recommend you upgrade to continue.\n` +
-      `      See: ${chalk.magenta('https://vuepress.vuejs.org/default-theme-config/#simple-css-override')}`
-    )
-  }
-
   await pluginOptions.enhanceAppFiles.apply()
 
   return options
diff --git a/packages/docs/docs/.vuepress/override.styl b/packages/docs/docs/.vuepress/override.styl
new file mode 100644
index 0000000000..e69de29bb2

From afe0e32c334424b13c9ace453cb4bc0f59bebbdd Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 01:14:36 +0800
Subject: [PATCH 125/242] chore: tweak prepare index file.

---
 packages/@vuepress/core/lib/prepare/index.js | 13 +++++--------
 packages/docs/docs/.vuepress/override.styl   |  0
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 packages/docs/docs/.vuepress/override.styl

diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 875cf5bc28..db8f80d0bb 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -17,6 +17,8 @@ module.exports = async function prepare ({
   const { siteConfig, themeConfig, themePath, themePlugins, cliPlugins, markdown } = options
   const pluginContext = new PluginContext(options)
   const plugin = new Plugin(pluginContext)
+  options.plugin = plugin
+  const pluginOptions = plugin.options
 
   const shouldUseLastUpdated = (
     themeConfig.lastUpdated ||
@@ -44,25 +46,20 @@ module.exports = async function prepare ({
         path.resolve(themePath, 'components')
       ]
     })
-
-  plugin.apply()
-
-  options.plugin = plugin
-  const pluginOptions = plugin.options
+    .apply()
 
   // 3. resolve siteData
   // SiteData must be resolved after the plugin initialization
   // because plugins can be able to extend the sitedata.
   options.siteData = await resolveSiteData(options)
-  Object.freeze(options)
 
+  // 4. ready hook, user can do some options transformation here.
   await pluginOptions.ready.apply()
 
-  // 4. apply plugin options to extend markdown.
+  // 5. apply plugin options
   pluginOptions.extendMarkdown.syncApply(markdown)
   await pluginOptions.clientDynamicModules.apply()
   await pluginOptions.globalUIComponents.apply()
-
   await pluginOptions.enhanceAppFiles.apply()
 
   return options
diff --git a/packages/docs/docs/.vuepress/override.styl b/packages/docs/docs/.vuepress/override.styl
deleted file mode 100644
index e69de29bb2..0000000000

From 721f5038444e0105c35fc5abea80c4f8c3d82e32 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 01:45:59 +0800
Subject: [PATCH 126/242] feat: make sure the namesake plugin is only executed
 once.

---
 .../core/__test__/plugin-api/Plugin.spec.js      | 16 ++++++++++++++++
 packages/@vuepress/core/lib/plugin-api/index.js  |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
index 0ae166d83b..0a5519c542 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
@@ -52,4 +52,20 @@ describe('Plugin', () => {
       expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions)
     })
   })
+
+  test('make sure the namesake plugin is only executed once.', () => {
+    const pluginOptions1 = {}
+    const pluginOptions2 = {}
+    const pluginOptions3 = {}
+    const pluginsConfig = [
+      ['a', pluginOptions1],
+      ['a', pluginOptions2],
+      ['a', pluginOptions3]
+    ]
+    const plugin = new Plugin()
+    plugin.useByPluginsConfig(pluginsConfig)
+    expect(plugin.enabledPlugins).toHaveLength(1)
+    // using the last one
+    expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions3)
+  })
 })
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 490ef4bf6e..738f19b019 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -37,6 +37,10 @@ module.exports = class Plugin {
       return this
     }
     plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext, this)
+    const duplicateIndex = this._pluginQuene.findIndex(({ name }) => name === plugin.name)
+    if (duplicateIndex !== -1) {
+      this._pluginQuene.splice(duplicateIndex, 1)
+    }
     this._pluginQuene.push(plugin)
 
     return this

From 8d1fa5cfb91adca245195dd84ef14156f2aba90d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 01:51:56 +0800
Subject: [PATCH 127/242] chore: update plugin generation comment

---
 packages/@vuepress/core/lib/plugin-api/index.js                 | 2 +-
 .../core/lib/plugin-api/option/ClientDynamicModulesOption.js    | 2 +-
 .../core/lib/plugin-api/option/EnhanceAppFilesOption.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 738f19b019..e49fdbda00 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -69,7 +69,7 @@ module.exports = class Plugin {
       this.options[option.name].tap(pluginName, value)
     } else if (value !== undefined) {
       logger.warn(
-        `${chalk.gray(`[vuepress-plugin-${pluginName}]`)} ` +
+        `${chalk.gray(pluginName)} ` +
         `Invalid value for "option" ${chalk.cyan(option.name)}: ${warnMsg}`
       )
     }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index 535ba19424..4df740be8e 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -14,7 +14,7 @@ module.exports = class ClientDynamicModulesOption extends Option {
           `${dirname || 'dynamic'}/${name}`,
           `
 /**
- * Generated by [vuepress-plugin-${pluginName}]"
+ * Generated by "${pluginName}"
  */
 ${content}\n\n
         `.trim())
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 759c815056..e5af1f2894 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -48,7 +48,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
           destPath = await writeTemp(`app-enhancers/${name}.js`, content)
         } else {
           injectedCode += `/*
- * injected by vuepress-plugin-${pluginName} 
+ * injected by "${pluginName}"
  * file name: ${name}
  */\n${content}\n\n`
         }

From dd9bea3a9f68718fe824c6191ac4b55cc1cb8079 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 13:21:41 +0800
Subject: [PATCH 128/242] fix($core): do not pollute raw config

---
 packages/@vuepress/core/lib/plugin-api/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 5fd0a0bfc6..234deab888 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -92,7 +92,7 @@ exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOpt
   }
   // respect name in local plugin config
   name = isLocal && config.name || name
-  return Object.assign(config, {
+  return Object.assign({}, config, {
     name,
     shortcut: isLocal ? null : shortcut,
     enabled,

From 1747da1f2ac4619498abd039fb7d87a91b44cbdf Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 13:25:47 +0800
Subject: [PATCH 129/242] feat: support multiple option for plugin API.

Since the namesake plugin can only be executed once by default, if your plugin does need to be executed multiple times, you need to set 'multiple' to true explicitly.
---
 __mocks__/vuepress-plugin-b.js                   |  4 +++-
 .../core/__test__/plugin-api/Plugin.spec.js      | 16 ++++++++++++++++
 packages/@vuepress/core/lib/plugin-api/index.js  |  9 +++++----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/__mocks__/vuepress-plugin-b.js b/__mocks__/vuepress-plugin-b.js
index 4ba52ba2c8..0b52ba9543 100644
--- a/__mocks__/vuepress-plugin-b.js
+++ b/__mocks__/vuepress-plugin-b.js
@@ -1 +1,3 @@
-module.exports = {}
+module.exports = {
+  multiple: true
+}
diff --git a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
index 0a5519c542..8189730f58 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
@@ -1,4 +1,5 @@
 jest.mock('vuepress-plugin-a')
+jest.mock('vuepress-plugin-b')
 jest.mock('@org/vuepress-plugin-a')
 
 const Plugin = require('../../lib/plugin-api/index')
@@ -68,4 +69,19 @@ describe('Plugin', () => {
     // using the last one
     expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions3)
   })
+
+  test('a "multuple" plugin can be applied multuple times.', () => {
+    const pluginOptions1 = { a: 1 }
+    const pluginOptions2 = { b: 1 }
+    const pluginsConfig = [
+      ['b', pluginOptions1],
+      ['b', pluginOptions2]
+    ]
+    const plugin = new Plugin()
+    plugin.useByPluginsConfig(pluginsConfig)
+    expect(plugin.enabledPlugins).toHaveLength(2)
+    // using the last one
+    expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions1)
+    expect(plugin.enabledPlugins[1].$$options).toBe(pluginOptions2)
+  })
 })
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index e49fdbda00..571fb4bbec 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -37,12 +37,13 @@ module.exports = class Plugin {
       return this
     }
     plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext, this)
-    const duplicateIndex = this._pluginQuene.findIndex(({ name }) => name === plugin.name)
-    if (duplicateIndex !== -1) {
-      this._pluginQuene.splice(duplicateIndex, 1)
+    if (plugin.multiple !== true) {
+      const duplicateIndex = this._pluginQuene.findIndex(({ name }) => name === plugin.name)
+      if (duplicateIndex !== -1) {
+        this._pluginQuene.splice(duplicateIndex, 1)
+      }
     }
     this._pluginQuene.push(plugin)
-
     return this
   }
 

From ac55f92d939e4ce2c099412594c2353619296c72 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 21 Aug 2018 19:32:02 +0800
Subject: [PATCH 130/242] feat($core): write all enhanceApp files to separate
 file.

In the old implementation, the enhanceApp fi`le that doesn't have `default export` will be written to the same file "inject.js", but it will cause conflict if two files contains the same import definition.
---
 .../plugin-api/option/EnhanceAppFilesOption.js   | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index e5af1f2894..5e99c09354 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -32,11 +32,10 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
   }
 
-  async apply (...args) {
+  async apply () {
     await this.beforeApply()
     const manifest = []
     let moduleId = 0
-    let injectedCode = ''
 
     // 1. write enhance app files.
     for (const { value: filePath, name: pluginName } of this.items) {
@@ -45,12 +44,9 @@ module.exports = class EnhanceAppFilesOption extends Option {
       if (typeof filePath === 'object') {
         const { name, content } = filePath
         if (content.includes('export default') || content.includes('module.exports')) {
-          destPath = await writeTemp(`app-enhancers/${name}.js`, content)
+          destPath = await writeTemp(`app-enhancers/${name}`, content)
         } else {
-          injectedCode += `/*
- * injected by "${pluginName}"
- * file name: ${name}
- */\n${content}\n\n`
+          destPath = await writeTemp(`app-enhancers/${name}`, content + '\nexport default {}')
         }
       } else {
         if (fs.existsSync(filePath)) {
@@ -70,12 +66,6 @@ module.exports = class EnhanceAppFilesOption extends Option {
       }
     }
 
-    const injectedCodeDestPath = await writeTemp(
-      `app-enhancers/inject.js`,
-      injectedCode + 'export default {}\n'
-    )
-    manifest.push(injectedCodeDestPath)
-
     // 2. write entry file.
     await writeTemp('app-enhancers.js', pathsToModuleCode(manifest))
   }

From 1be40abd708a3b8118a149493ad1585337201900 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 00:53:58 +0800
Subject: [PATCH 131/242] fix($register-components): avoid file overwritten.

---
 packages/@vuepress/plugin-register-components/index.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-register-components/index.js b/packages/@vuepress/plugin-register-components/index.js
index 328ff40fef..3496d86a4d 100644
--- a/packages/@vuepress/plugin-register-components/index.js
+++ b/packages/@vuepress/plugin-register-components/index.js
@@ -14,7 +14,14 @@ async function resolveComponents (componentDir) {
   return (await globby(['**/*.vue'], { cwd: componentDir }))
 }
 
+// Since this plugin can ben used by multiple times, we need to
+// give each generated files a uid or the previous file would be
+// overwritten.
+let moduleId = 0
+
 module.exports = (options, context) => ({
+  multiple: true,
+
   async enhanceAppFiles () {
     const { componentsDir = [], components = [] } = options
     const baseDirs = Array.isArray(componentsDir) ? componentsDir : [componentsDir]
@@ -45,7 +52,7 @@ module.exports = (options, context) => ({
 
     return [
       {
-        name: 'global-components.js',
+        name: `global-components-${++moduleId}.js`,
         content: code
       }
     ]

From b30fa4fad37d33be1a7a9af6bbb22d29678197da Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 00:55:53 +0800
Subject: [PATCH 132/242] refactor($core): rename 'Plugin' to 'PluginAPI'

---
 .../{Plugin.spec.js => PluginAPI.spec.js}     | 54 +++++++++----------
 packages/@vuepress/core/lib/build.js          |  2 +-
 packages/@vuepress/core/lib/dev.js            |  6 +--
 .../@vuepress/core/lib/plugin-api/index.js    |  2 +-
 packages/@vuepress/core/lib/prepare/index.js  | 19 ++++---
 .../core/lib/prepare/resolveSiteData.js       |  6 +--
 .../core/lib/webpack/createClientConfig.js    |  2 +-
 .../core/lib/webpack/createServerConfig.js    |  2 +-
 8 files changed, 46 insertions(+), 47 deletions(-)
 rename packages/@vuepress/core/__test__/plugin-api/{Plugin.spec.js => PluginAPI.spec.js} (50%)

diff --git a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
similarity index 50%
rename from packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
rename to packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
index 8189730f58..32895dd6bb 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
@@ -2,16 +2,16 @@ jest.mock('vuepress-plugin-a')
 jest.mock('vuepress-plugin-b')
 jest.mock('@org/vuepress-plugin-a')
 
-const Plugin = require('../../lib/plugin-api/index')
+const PluginAPI = require('../../lib/plugin-api/index')
 const { PLUGIN_OPTION_MAP } = require('../../lib/plugin-api/constants')
 
 describe('Plugin', () => {
   test('should \'registerOption\' work.', () => {
-    const plugin = new Plugin()
+    const api = new PluginAPI()
     const readyHandler = () => {}
-    plugin.registerOption(PLUGIN_OPTION_MAP.READY.key, readyHandler)
-    expect(plugin.options.ready.values).toHaveLength(1)
-    expect(plugin.options.ready.values[0]).toBe(readyHandler)
+    api.registerOption(PLUGIN_OPTION_MAP.READY.key, readyHandler)
+    expect(api.options.ready.values).toHaveLength(1)
+    expect(api.options.ready.values[0]).toBe(readyHandler)
   })
 
   test('should \'useByPluginsConfig\' work.', () => {
@@ -21,11 +21,11 @@ describe('Plugin', () => {
       [['a', true]],
       { a: true }
     ].forEach(pluginsConfig => {
-      const plugin = new Plugin()
-      plugin.useByPluginsConfig(pluginsConfig)
-      expect(plugin.enabledPlugins).toHaveLength(1)
-      expect(plugin.enabledPlugins[0].name).toBe('vuepress-plugin-a')
-      expect(plugin.disabledPlugins).toHaveLength(0)
+      const api = new PluginAPI()
+      api.useByPluginsConfig(pluginsConfig)
+      expect(api.enabledPlugins).toHaveLength(1)
+      expect(api.enabledPlugins[0].name).toBe('vuepress-plugin-a')
+      expect(api.disabledPlugins).toHaveLength(0)
     })
   })
 
@@ -34,11 +34,11 @@ describe('Plugin', () => {
       [['a', false]],
       { a: false }
     ].forEach(pluginsConfig => {
-      const plugin = new Plugin()
-      plugin.useByPluginsConfig(pluginsConfig)
-      expect(plugin.enabledPlugins).toHaveLength(0)
-      expect(plugin.disabledPlugins).toHaveLength(1)
-      expect(plugin.disabledPlugins[0].name).toBe('vuepress-plugin-a')
+      const api = new PluginAPI()
+      api.useByPluginsConfig(pluginsConfig)
+      expect(api.enabledPlugins).toHaveLength(0)
+      expect(api.disabledPlugins).toHaveLength(1)
+      expect(api.disabledPlugins[0].name).toBe('vuepress-plugin-a')
     })
   })
 
@@ -48,9 +48,9 @@ describe('Plugin', () => {
       [['a', pluginOptions]],
       { a: pluginOptions }
     ].forEach(pluginsConfig => {
-      const plugin = new Plugin()
-      plugin.useByPluginsConfig(pluginsConfig)
-      expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions)
+      const api = new PluginAPI()
+      api.useByPluginsConfig(pluginsConfig)
+      expect(api.enabledPlugins[0].$$options).toBe(pluginOptions)
     })
   })
 
@@ -63,11 +63,11 @@ describe('Plugin', () => {
       ['a', pluginOptions2],
       ['a', pluginOptions3]
     ]
-    const plugin = new Plugin()
-    plugin.useByPluginsConfig(pluginsConfig)
-    expect(plugin.enabledPlugins).toHaveLength(1)
+    const api = new PluginAPI()
+    api.useByPluginsConfig(pluginsConfig)
+    expect(api.enabledPlugins).toHaveLength(1)
     // using the last one
-    expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions3)
+    expect(api.enabledPlugins[0].$$options).toBe(pluginOptions3)
   })
 
   test('a "multuple" plugin can be applied multuple times.', () => {
@@ -77,11 +77,11 @@ describe('Plugin', () => {
       ['b', pluginOptions1],
       ['b', pluginOptions2]
     ]
-    const plugin = new Plugin()
-    plugin.useByPluginsConfig(pluginsConfig)
-    expect(plugin.enabledPlugins).toHaveLength(2)
+    const api = new PluginAPI()
+    api.useByPluginsConfig(pluginsConfig)
+    expect(api.enabledPlugins).toHaveLength(2)
     // using the last one
-    expect(plugin.enabledPlugins[0].$$options).toBe(pluginOptions1)
-    expect(plugin.enabledPlugins[1].$$options).toBe(pluginOptions2)
+    expect(api.enabledPlugins[0].$$options).toBe(pluginOptions1)
+    expect(api.enabledPlugins[1].$$options).toBe(pluginOptions2)
   })
 })
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 13052a710e..cee72ad6f4 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -77,7 +77,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   readline.clearLine(process.stdout, 0)
   readline.cursorTo(process.stdout, 0)
 
-  await options.plugin.options.generated.apply()
+  await options.pluginAPI.options.generated.apply()
 
   // DONE.
   const relativeDir = path.relative(process.cwd(), outDir)
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index be32c59b8d..e1c7494434 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -22,7 +22,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
-    options.plugin.options.updated.syncApply()
+    options.pluginAPI.options.updated.syncApply()
     prepare({ sourceDir, cliOptions, isProd: false }).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
@@ -108,8 +108,8 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
     port,
     add: app => {
       // apply plugin options to extend dev server.
-      const { plugin } = options
-      plugin.options.enhanceDevServer.syncApply(app)
+      const { pluginAPI } = options
+      pluginAPI.options.enhanceDevServer.syncApply(app)
 
       const userPublic = path.resolve(sourceDir, '.vuepress/public')
 
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 571fb4bbec..ef4582177c 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -4,7 +4,7 @@ const { resolvePlugin, hydratePlugin, normalizePluginsConfig } = require('./util
 const { assertTypes } = require('../util/shared')
 const { PLUGIN_OPTION_MAP } = require('./constants')
 
-module.exports = class Plugin {
+module.exports = class PluginAPI {
   constructor (context) {
     this.options = {}
     this._pluginContext = context
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index db8f80d0bb..c46630d60f 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const resolveOptions = require('./resolveOptions')
 const resolveSiteData = require('./resolveSiteData')
-const Plugin = require('../plugin-api/index')
+const PluginAPI = require('../plugin-api/index')
 const PluginContext = require('../plugin-api/context')
 
 module.exports = async function prepare ({
@@ -16,9 +16,8 @@ module.exports = async function prepare ({
   // 2. apply plugins
   const { siteConfig, themeConfig, themePath, themePlugins, cliPlugins, markdown } = options
   const pluginContext = new PluginContext(options)
-  const plugin = new Plugin(pluginContext)
-  options.plugin = plugin
-  const pluginOptions = plugin.options
+  const pluginAPI = new PluginAPI(pluginContext)
+  options.pluginAPI = pluginAPI
 
   const shouldUseLastUpdated = (
     themeConfig.lastUpdated ||
@@ -26,7 +25,7 @@ module.exports = async function prepare ({
       .some(base => themeConfig.locales[base].lastUpdated)
   )
 
-  plugin
+  pluginAPI
     // internl core plugins
     .use(require('../internal-plugins/routes'))
     .use(require('../internal-plugins/rootMixins'))
@@ -54,13 +53,13 @@ module.exports = async function prepare ({
   options.siteData = await resolveSiteData(options)
 
   // 4. ready hook, user can do some options transformation here.
-  await pluginOptions.ready.apply()
+  await pluginAPI.options.ready.apply()
 
   // 5. apply plugin options
-  pluginOptions.extendMarkdown.syncApply(markdown)
-  await pluginOptions.clientDynamicModules.apply()
-  await pluginOptions.globalUIComponents.apply()
-  await pluginOptions.enhanceAppFiles.apply()
+  pluginAPI.options.extendMarkdown.syncApply(markdown)
+  await pluginAPI.options.clientDynamicModules.apply()
+  await pluginAPI.options.globalUIComponents.apply()
+  await pluginAPI.options.enhanceAppFiles.apply()
 
   return options
 }
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index 0982276b44..da67951d4e 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -10,7 +10,7 @@ const {
 module.exports = async function ({
   sourceDir,
   pageFiles,
-  plugin,
+  pluginAPI,
   markdown,
   siteConfig,
   themeConfig,
@@ -21,7 +21,7 @@ module.exports = async function ({
     const data = { key, path: routePath, filePath }
 
     const content = await fs.readFile(filePath, 'utf-8')
-    await plugin.options.extendPageData.apply({ data, filePath, routePath, base, key, content })
+    await pluginAPI.options.extendPageData.apply({ data, filePath, routePath, base, key, content })
 
     // extract yaml frontmatter
     const frontmatter = parseFrontmatter(content)
@@ -57,7 +57,7 @@ module.exports = async function ({
 
   // resolve additional pagesData
   const additionalPagesData = await Promise.all(
-    plugin.options.additionalPages.values.map(async ({ route: routePath, path: filePath }) => {
+    pluginAPI.options.additionalPages.values.map(async ({ route: routePath, path: filePath }) => {
       if (!fs.existsSync(filePath)) {
         throw new Error(`[vuepress] Cannot resolve additional page: ${filePath}`)
       }
diff --git a/packages/@vuepress/core/lib/webpack/createClientConfig.js b/packages/@vuepress/core/lib/webpack/createClientConfig.js
index 9163273c4a..40eafc0ec2 100644
--- a/packages/@vuepress/core/lib/webpack/createClientConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createClientConfig.js
@@ -65,7 +65,7 @@ module.exports = function createClientConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, false /* isServer */)
   }
 
-  options.plugin.options.chainWebpack.syncApply(config, false /* isServer */)
+  options.pluginAPI.options.chainWebpack.syncApply(config, false /* isServer */)
 
   return config
 }
diff --git a/packages/@vuepress/core/lib/webpack/createServerConfig.js b/packages/@vuepress/core/lib/webpack/createServerConfig.js
index 7043918529..058c79720c 100644
--- a/packages/@vuepress/core/lib/webpack/createServerConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createServerConfig.js
@@ -54,7 +54,7 @@ module.exports = function createServerConfig (options, cliOptions) {
     options.siteConfig.chainWebpack(config, true /* isServer */)
   }
 
-  options.plugin.options.chainWebpack.syncApply(config, true /* isServer */)
+  options.pluginAPI.options.chainWebpack.syncApply(config, true /* isServer */)
 
   return config
 }

From 1553cebe8d228017777f142095cca76a4af7a02c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 01:19:28 +0800
Subject: [PATCH 133/242] chore($core): move internal dynamic modules to
 'internal' dir.

---
 packages/@vuepress/core/lib/app/app.js                 | 10 +++++-----
 packages/@vuepress/core/lib/app/dataMixin.js           |  2 +-
 packages/@vuepress/core/lib/app/util.js                |  2 +-
 .../core/lib/internal-plugins/importAsyncComponent.js  | 10 ++++++----
 .../@vuepress/core/lib/internal-plugins/rootMixins.js  |  4 +---
 packages/@vuepress/core/lib/internal-plugins/routes.js |  6 ++----
 .../@vuepress/core/lib/internal-plugins/siteData.js    |  2 +-
 .../lib/plugin-api/option/EnhanceAppFilesOption.js     |  2 +-
 .../lib/plugin-api/option/GlobalUIComponentsOption.js  |  2 +-
 .../@vuepress/core/lib/webpack/createBaseConfig.js     |  1 +
 10 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 1ad87edc78..f2ea2b02e6 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -2,10 +2,10 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import dataMixin from './dataMixin'
-import { routes } from '@dynamic/routes'
-import { siteData } from '@dynamic/siteData'
-import appEnhancers from '@temp/app-enhancers.js'
-import globalUIComponents from '@dynamic/global-ui.js'
+import { routes } from '@internal/routes'
+import { siteData } from '@internal/siteData'
+import appEnhancers from '@internal/app-enhancers'
+import globalUIComponents from '@internal/global-ui'
 
 // generated from user config
 import('@temp/style.styl')
@@ -18,7 +18,7 @@ import ClientOnly from './components/ClientOnly'
 // suggest dev server restart on base change
 if (module.hot) {
   const prevBase = siteData.base
-  module.hot.accept(VUEPRESS_TEMP_PATH + '/dynamic/siteData.js', () => {
+  module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
     if (siteData.base !== prevBase) {
       window.alert(
         `[vuepress] Site base has changed. ` +
diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index 5330d0ebc6..eef95dd4b5 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -14,7 +14,7 @@ export default function dataMixin (siteData) {
   Vue.$store = store
 
   if (module.hot) {
-    module.hot.accept(VUEPRESS_TEMP_PATH + '/dynamic/siteData.js', () => {
+    module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
       prepare(siteData)
       store.siteData = siteData
     })
diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index 3ef7fd9d1f..0228b7e298 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { loadComponent } from '@dynamic/async-component'
+import { loadComponent } from '@internal/async-component'
 
 export function injectMixins (options, mixins) {
   if (!options.mixins) {
diff --git a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
index 26407d0612..bf0bc652fd 100644
--- a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
+++ b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
@@ -9,11 +9,13 @@ ${pages.map(({ key, filePath }) => `    case "${key}": return import("${filePath
 module.exports = (options, context) => ({
   name: '@vuepress/internal-import-async-component',
 
-  // @dynamic/async-component
+  // @internal/async-component
   async clientDynamicModules () {
     const importAsyncComponentCode = genImportAsyncComponentFile(context.siteData.pages)
-    return [
-      { name: 'async-component.js', content: importAsyncComponentCode }
-    ]
+    return {
+      name: 'async-component.js',
+      content: importAsyncComponentCode,
+      dirname: 'internal'
+    }
   }
 })
diff --git a/packages/@vuepress/core/lib/internal-plugins/rootMixins.js b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
index 095a7a5b0f..e24fce1216 100644
--- a/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
+++ b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
@@ -16,8 +16,6 @@ module.exports = (options, context, self) => ({
     ]
 
     const rootMixinsCode = pathsToModuleCode(rootMixins)
-    return [
-      { name: 'root-mixins.js', content: rootMixinsCode }
-    ]
+    return { name: 'root-mixins.js', content: rootMixinsCode, dirname: 'internal' }
   }
 })
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index 178f7dbc65..d7a1234077 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -4,9 +4,7 @@ module.exports = (options, context) => ({
   // @dynamic/routes
   async clientDynamicModules () {
     const routesCode = await genRoutesFile(context.siteData.pages)
-    return [
-      { name: 'routes.js', content: routesCode }
-    ]
+    return { name: 'routes.js', content: routesCode, dirname: 'internal' }
   }
 })
 
@@ -57,7 +55,7 @@ async function genRoutesFile (pages) {
     `import ThemeLayout from '@themeLayout'\n` +
     `import ThemeNotFound from '@themeNotFound'\n` +
     `import { injectMixins, registerComponent } from '@app/util'\n` +
-    `import rootMixins from '@dynamic/root-mixins'\n\n` +
+    `import rootMixins from '@internal/root-mixins'\n\n` +
     `injectMixins(ThemeLayout, rootMixins)\n` +
     `injectMixins(ThemeNotFound, rootMixins)\n\n` +
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
diff --git a/packages/@vuepress/core/lib/internal-plugins/siteData.js b/packages/@vuepress/core/lib/internal-plugins/siteData.js
index 346faf99ff..0fdfcb88c5 100644
--- a/packages/@vuepress/core/lib/internal-plugins/siteData.js
+++ b/packages/@vuepress/core/lib/internal-plugins/siteData.js
@@ -4,6 +4,6 @@ module.exports = (options, context) => ({
   // @internal/siteData
   async clientDynamicModules () {
     const code = `export const siteData = ${JSON.stringify(context.siteData, null, 2)}`
-    return [{ name: 'siteData.js', content: code }]
+    return { name: 'siteData.js', content: code, dirname: 'internal' }
   }
 })
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 5e99c09354..b1c2b66739 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -67,6 +67,6 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
 
     // 2. write entry file.
-    await writeTemp('app-enhancers.js', pathsToModuleCode(manifest))
+    await writeTemp('internal/app-enhancers.js', pathsToModuleCode(manifest))
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
index dafd0372b1..accc9f4969 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
@@ -4,7 +4,7 @@ const { writeTemp } = require('@vuepress/shared-utils')
 module.exports = class GlobalUIComponentsOption extends Option {
   async apply () {
     await writeTemp(
-      `dynamic/global-ui.js`,
+      `internal/global-ui.js`,
       `export default ${JSON.stringify(this.values, null, 2)}`
     )
   }
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 9806ce0f05..fdbf3664a8 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -44,6 +44,7 @@ module.exports = function createBaseConfig ({
       .set('@app', path.resolve(__dirname, '../app'))
       .set('@temp', process.env.VUEPRESS_TEMP_PATH)
       .set('@dynamic', path.resolve(process.env.VUEPRESS_TEMP_PATH, 'dynamic'))
+      .set('@internal', path.resolve(process.env.VUEPRESS_TEMP_PATH, 'internal'))
       .end()
     .extensions
       .merge(['.js', '.jsx', '.vue', '.json', '.styl'])

From 1d24fa8285ad1b6e1431da79437f7524b8797a84 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 01:30:42 +0800
Subject: [PATCH 134/242] Revert "feat: set up @vuepress/plugin-less"

This reverts commit 44641856354485ad1b6ddcedc9f23c42e556d87c.
---
 .../core/lib/webpack/createBaseConfig.js      | 11 +++++++
 packages/@vuepress/plugin-less/.npmignore     |  2 --
 packages/@vuepress/plugin-less/README.md      |  3 --
 packages/@vuepress/plugin-less/index.js       | 20 ------------
 packages/@vuepress/plugin-less/package.json   | 32 -------------------
 yarn.lock                                     | 12 -------
 6 files changed, 11 insertions(+), 69 deletions(-)
 delete mode 100644 packages/@vuepress/plugin-less/.npmignore
 delete mode 100644 packages/@vuepress/plugin-less/README.md
 delete mode 100644 packages/@vuepress/plugin-less/index.js
 delete mode 100644 packages/@vuepress/plugin-less/package.json

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index fdbf3664a8..1478cae56c 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -207,6 +207,17 @@ module.exports = function createBaseConfig ({
   createCSSRule({ lang: 'css', test: /\.css$/, config, isProd, isServer, postcssOptions })
   createCSSRule({ lang: 'postcss', test: /\.p(ost)?css$/, config, isProd, isServer, postcssOptions })
 
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'less',
+    test: /\.less/,
+    loader: 'less-loader',
+    options: siteConfig.less
+  })
+
   config
     .plugin('vue-loader')
     .use(VueLoaderPlugin)
diff --git a/packages/@vuepress/plugin-less/.npmignore b/packages/@vuepress/plugin-less/.npmignore
deleted file mode 100644
index 18f0a334a4..0000000000
--- a/packages/@vuepress/plugin-less/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__tests__
-__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-less/README.md b/packages/@vuepress/plugin-less/README.md
deleted file mode 100644
index e5830e32f9..0000000000
--- a/packages/@vuepress/plugin-less/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-less
-
-> less plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-less/index.js b/packages/@vuepress/plugin-less/index.js
deleted file mode 100644
index 185e6420fe..0000000000
--- a/packages/@vuepress/plugin-less/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const { env: { isProduction }} = require('@vuepress/shared-utils')
-const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
-
-module.exports = (options, context) => ({
-  chainWebpack (config, isServer) {
-    const isProd = isProduction()
-    const { postcss, less } = context.siteConfig
-
-    createCSSRule({
-      config,
-      isProd,
-      isServer,
-      postcssOptions: postcss,
-      lang: 'less',
-      test: /\.less/,
-      loader: 'less-loader',
-      options: less
-    })
-  }
-})
diff --git a/packages/@vuepress/plugin-less/package.json b/packages/@vuepress/plugin-less/package.json
deleted file mode 100644
index a410da3415..0000000000
--- a/packages/@vuepress/plugin-less/package.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "@vuepress/plugin-less",
-  "version": "1.0.0",
-  "description": "less plugin for vuepress",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuepress.git"
-  },
-  "keywords": [
-    "documentation",
-    "vue",
-    "vuepress",
-    "generator"
-  ],
-  "dependencies": {
-    "@vuepress/shared-utils": "^1.0.0",
-    "less-loader": "^4.1.0",
-    "postcss-loader": "^2.1.5",
-    "mini-css-extract-plugin": "^0.4.1",
-    "autoprefixer": "^8.2.0"
-  },
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vuepress/issues"
-  },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-less#readme"
-}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 7d63cb0127..4c6a1bd99d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2563,10 +2563,6 @@ clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
-clone@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-
 cmd-shim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
@@ -5829,14 +5825,6 @@ lerna@^2.11.0:
     write-pkg "^3.1.0"
     yargs "^8.0.2"
 
-less-loader@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
-  dependencies:
-    clone "^2.1.1"
-    loader-utils "^1.1.0"
-    pify "^3.0.0"
-
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"

From 9358387937415222b36497e70a0745d86e9a0713 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 01:31:13 +0800
Subject: [PATCH 135/242] Revert "feat: set up @vuepress/plugin-sass"

This reverts commit 5e46295030f5bb32226a0084543d3f6afa25a96a.
---
 .../core/lib/webpack/createBaseConfig.js      |  21 +-
 packages/@vuepress/plugin-sass/.npmignore     |   2 -
 packages/@vuepress/plugin-sass/README.md      |   3 -
 packages/@vuepress/plugin-sass/index.js       |  31 --
 packages/@vuepress/plugin-sass/package.json   |  33 ---
 yarn.lock                                     | 278 ++----------------
 6 files changed, 42 insertions(+), 326 deletions(-)
 delete mode 100644 packages/@vuepress/plugin-sass/.npmignore
 delete mode 100644 packages/@vuepress/plugin-sass/README.md
 delete mode 100644 packages/@vuepress/plugin-sass/index.js
 delete mode 100644 packages/@vuepress/plugin-sass/package.json

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 1478cae56c..a132169c6b 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -206,7 +206,26 @@ module.exports = function createBaseConfig ({
 
   createCSSRule({ lang: 'css', test: /\.css$/, config, isProd, isServer, postcssOptions })
   createCSSRule({ lang: 'postcss', test: /\.p(ost)?css$/, config, isProd, isServer, postcssOptions })
-
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'scss',
+    test: /\.scss$/,
+    loader: 'sass-loader',
+    options: siteConfig.scss
+  })
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'sass',
+    test: /\.sass/,
+    loader: 'sass-loader',
+    options: Object.assign({ indentedSyntax: true }, siteConfig.sass)
+  })
   createCSSRule({
     config,
     isProd,
diff --git a/packages/@vuepress/plugin-sass/.npmignore b/packages/@vuepress/plugin-sass/.npmignore
deleted file mode 100644
index 18f0a334a4..0000000000
--- a/packages/@vuepress/plugin-sass/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__tests__
-__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-sass/README.md b/packages/@vuepress/plugin-sass/README.md
deleted file mode 100644
index 2dcb9dd443..0000000000
--- a/packages/@vuepress/plugin-sass/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-sass
-
-> sass plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-sass/index.js b/packages/@vuepress/plugin-sass/index.js
deleted file mode 100644
index 6c93314250..0000000000
--- a/packages/@vuepress/plugin-sass/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const { env: { isProduction }} = require('@vuepress/shared-utils')
-const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
-
-module.exports = (options, context) => ({
-  chainWebpack (config, isServer) {
-    const isProd = isProduction()
-    const { postcss, scss, sass } = context.siteConfig
-
-    createCSSRule({
-      config,
-      isProd,
-      isServer,
-      postcssOptions: postcss,
-      lang: 'scss',
-      test: /\.scss$/,
-      loader: 'sass-loader',
-      options: scss
-    })
-
-    createCSSRule({
-      config,
-      isProd,
-      isServer,
-      postcssOptions: postcss,
-      lang: 'sass',
-      test: /\.sass/,
-      loader: 'sass-loader',
-      options: Object.assign({ indentedSyntax: true }, sass)
-    })
-  }
-})
diff --git a/packages/@vuepress/plugin-sass/package.json b/packages/@vuepress/plugin-sass/package.json
deleted file mode 100644
index 91ce8e17e2..0000000000
--- a/packages/@vuepress/plugin-sass/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@vuepress/plugin-sass",
-  "version": "1.0.0",
-  "description": "sass plugin for vuepress",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuepress.git"
-  },
-  "keywords": [
-    "documentation",
-    "vue",
-    "vuepress",
-    "generator"
-  ],
-  "dependencies": {
-    "@vuepress/shared-utils": "^1.0.0",
-    "node-sass": "^4.9.3",
-    "sass-loader": "^7.1.0",
-    "postcss-loader": "^2.1.5",
-    "mini-css-extract-plugin": "^0.4.1",
-    "autoprefixer": "^8.2.0"
-  },
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vuepress/issues"
-  },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-sass#readme"
-}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 4c6a1bd99d..652f2da55c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1766,10 +1766,6 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
@@ -2079,12 +2075,6 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -2343,10 +2333,6 @@ camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2546,15 +2532,6 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
-clone-deep@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.0"
-    shallow-clone "^1.0.0"
-
 clone@2.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
@@ -3011,13 +2988,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -4081,10 +4051,6 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4095,12 +4061,6 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  dependencies:
-    for-in "^1.0.1"
-
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -4176,15 +4136,6 @@ fsevents@^1.2.2, fsevents@^1.2.3:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4206,12 +4157,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  dependencies:
-    globule "^1.0.0"
-
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -4317,17 +4262,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -4403,14 +4338,6 @@ globby@^8.0.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globule@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -4710,10 +4637,6 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -4739,7 +4662,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -5492,10 +5415,6 @@ joi@^11.1.1:
     isemail "3.x.x"
     topo "2.x.x"
 
-js-base64@^2.1.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.8.tgz#57a9b130888f956834aa40c5b165ba59c758f033"
-
 js-base64@^2.1.9:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92"
@@ -5962,7 +5881,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -5981,15 +5900,11 @@ lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
@@ -6001,18 +5916,10 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.tail@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-
 lodash.template@^4.0.2, lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
@@ -6034,7 +5941,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@4.x, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
+lodash@4.x, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -6214,7 +6121,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
@@ -6376,7 +6283,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -6440,18 +6347,11 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
 mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -6492,7 +6392,7 @@ mz@^2.6.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.10.0, nan@^2.9.2:
+nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -6581,23 +6481,6 @@ node-cache@^4.1.1:
     clone "2.x"
     lodash "4.x"
 
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -6654,42 +6537,12 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-sass@^4.9.3:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "2.87.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
 nopt@1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
   dependencies:
     abbrev "1"
 
-"nopt@2 || 3", nopt@~3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -6697,6 +6550,12 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
+nopt@~3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -6760,7 +6619,7 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6924,12 +6783,6 @@ os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -6942,7 +6795,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
@@ -7913,7 +7766,7 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2.87.0, request@^2.87.0:
+request@^2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
@@ -8016,7 +7869,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -8090,26 +7943,6 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.2.3"
 
-sass-graph@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
-
-sass-loader@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
-  dependencies:
-    clone-deep "^2.0.1"
-    loader-utils "^1.0.1"
-    lodash.tail "^4.1.1"
-    neo-async "^2.5.0"
-    pify "^3.0.0"
-    semver "^5.5.0"
-
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
@@ -8125,13 +7958,6 @@ schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
 section-matter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -8157,10 +7983,6 @@ semver-diff@^2.0.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
 serialize-javascript@^1.3.0, serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -8206,14 +8028,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^5.0.0"
-    mixin-object "^2.0.1"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -8338,7 +8152,7 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, sourc
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.4.2, source-map@^0.4.4:
+source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -8438,12 +8252,6 @@ std-env@^1.1.0, std-env@^1.3.0:
   dependencies:
     is-ci "^1.1.0"
 
-stdout-stream@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
-  dependencies:
-    readable-stream "^2.0.1"
-
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -8495,7 +8303,7 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
@@ -8663,14 +8471,6 @@ tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
 
-tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 tar@^4:
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
@@ -8871,12 +8671,6 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
-"true-case-path@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
-  dependencies:
-    glob "^6.0.4"
-
 tsconfig@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
@@ -9452,15 +9246,11 @@ whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0:
+which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
@@ -9699,12 +9489,6 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  dependencies:
-    camelcase "^3.0.0"
-
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -9734,24 +9518,6 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.0"
-
 yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"

From c1cf4b131b0451e7d765b12d123e6ef3ae759d0f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 01:31:25 +0800
Subject: [PATCH 136/242] Revert "feat: set up @vuepress/plugin-stylus"

This reverts commit 17cd87d2b71176d5f11e4c1c34e6f2eeac8958d1.
---
 .../core/lib/webpack/createBaseConfig.js      | 12 +++++++
 packages/@vuepress/plugin-stylus/.npmignore   |  2 --
 packages/@vuepress/plugin-stylus/README.md    |  3 --
 packages/@vuepress/plugin-stylus/index.js     | 21 ------------
 packages/@vuepress/plugin-stylus/package.json | 33 -------------------
 packages/@vuepress/theme-default/index.js     |  3 +-
 packages/@vuepress/theme-default/package.json |  3 +-
 7 files changed, 15 insertions(+), 62 deletions(-)
 delete mode 100644 packages/@vuepress/plugin-stylus/.npmignore
 delete mode 100644 packages/@vuepress/plugin-stylus/README.md
 delete mode 100644 packages/@vuepress/plugin-stylus/index.js
 delete mode 100644 packages/@vuepress/plugin-stylus/package.json

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index a132169c6b..9c3ef41605 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -236,6 +236,18 @@ module.exports = function createBaseConfig ({
     loader: 'less-loader',
     options: siteConfig.less
   })
+  createCSSRule({
+    config,
+    isProd,
+    isServer,
+    postcssOptions,
+    lang: 'stylus',
+    test: /\.styl(us)?$/,
+    loader: 'stylus-loader',
+    options: Object.assign({
+      preferPathResolver: 'webpack'
+    }, siteConfig.stylus)
+  })
 
   config
     .plugin('vue-loader')
diff --git a/packages/@vuepress/plugin-stylus/.npmignore b/packages/@vuepress/plugin-stylus/.npmignore
deleted file mode 100644
index 18f0a334a4..0000000000
--- a/packages/@vuepress/plugin-stylus/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__tests__
-__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-stylus/README.md b/packages/@vuepress/plugin-stylus/README.md
deleted file mode 100644
index 60f224e7a0..0000000000
--- a/packages/@vuepress/plugin-stylus/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @vuepress/plugin-stylus
-
-> stylus plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-stylus/index.js b/packages/@vuepress/plugin-stylus/index.js
deleted file mode 100644
index 4aa8b88ea6..0000000000
--- a/packages/@vuepress/plugin-stylus/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const { env: { isProduction }} = require('@vuepress/shared-utils')
-const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
-
-module.exports = (options, context) => ({
-  chainWebpack (config, isServer) {
-    const isProd = isProduction()
-    const { postcss, stylus } = context.siteConfig
-    createCSSRule({
-      config,
-      isProd,
-      isServer,
-      postcss,
-      lang: 'stylus',
-      test: /\.styl(us)?$/,
-      loader: 'stylus-loader',
-      options: Object.assign({
-        preferPathResolver: 'webpack'
-      }, stylus)
-    })
-  }
-})
diff --git a/packages/@vuepress/plugin-stylus/package.json b/packages/@vuepress/plugin-stylus/package.json
deleted file mode 100644
index c18b97d7c1..0000000000
--- a/packages/@vuepress/plugin-stylus/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@vuepress/plugin-stylus",
-  "version": "1.0.0",
-  "description": "stylus plugin for vuepress",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuepress.git"
-  },
-  "keywords": [
-    "documentation",
-    "vue",
-    "vuepress",
-    "generator"
-  ],
-  "dependencies": {
-    "@vuepress/shared-utils": "^1.0.0",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
-    "postcss-loader": "^2.1.5",
-    "mini-css-extract-plugin": "^0.4.1",
-    "autoprefixer": "^8.2.0"
-  },
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vuepress/issues"
-  },
-  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-stylus#readme"
-}
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 91059ea1c9..59582b2928 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -7,7 +7,6 @@ module.exports = {
   notFound: path.resolve(__dirname, 'src/NotFound.vue'),
   plugins: [
     themePlugin,
-    '@vuepress/active-header-links',
-    '@vuepress/stylus'
+    '@vuepress/active-header-links'
   ]
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index c74e6f6360..fe43290022 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -26,6 +26,7 @@
     "@vuepress/plugin-active-header-links": "1.0.0",
     "docsearch.js": "^2.5.2",
     "nprogress": "^0.2.0",
-    "@vuepress/plugin-stylus": "^1.0.0"
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2"
   }
 }
\ No newline at end of file

From 639e5d4ab07f863d4c6d9a84b22bb876c025e643 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 22 Aug 2018 01:34:14 +0800
Subject: [PATCH 137/242] Revert "refacotr($core): separate createCSSRule from
 core to shared-utils"

This reverts commit 8f89eef61b90834d0a037da3df2633468c1f8e64.
---
 .../core/lib/webpack/createBaseConfig.js      | 90 +++++++++----------
 packages/@vuepress/shared-utils/index.js      |  1 -
 .../@vuepress/shared-utils/lib/webpack.js     | 57 ------------
 3 files changed, 44 insertions(+), 104 deletions(-)
 delete mode 100644 packages/@vuepress/shared-utils/lib/webpack.js

diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 9c3ef41605..832cc0cda5 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -201,53 +201,51 @@ module.exports = function createBaseConfig ({
           name: `assets/fonts/[name].[hash:8].[ext]`
         })
 
-  const { webpack: { createCSSRule }} = require('@vuepress/shared-utils')
-  const postcssOptions = siteConfig.postcss
+  function createCSSRule (lang, test, loader, options) {
+    const baseRule = config.module.rule(lang).test(test)
+    const modulesRule = baseRule.oneOf('modules').resourceQuery(/module/)
+    const normalRule = baseRule.oneOf('normal')
 
-  createCSSRule({ lang: 'css', test: /\.css$/, config, isProd, isServer, postcssOptions })
-  createCSSRule({ lang: 'postcss', test: /\.p(ost)?css$/, config, isProd, isServer, postcssOptions })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'scss',
-    test: /\.scss$/,
-    loader: 'sass-loader',
-    options: siteConfig.scss
-  })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'sass',
-    test: /\.sass/,
-    loader: 'sass-loader',
-    options: Object.assign({ indentedSyntax: true }, siteConfig.sass)
-  })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'less',
-    test: /\.less/,
-    loader: 'less-loader',
-    options: siteConfig.less
-  })
-  createCSSRule({
-    config,
-    isProd,
-    isServer,
-    postcssOptions,
-    lang: 'stylus',
-    test: /\.styl(us)?$/,
-    loader: 'stylus-loader',
-    options: Object.assign({
-      preferPathResolver: 'webpack'
-    }, siteConfig.stylus)
-  })
+    applyLoaders(modulesRule, true)
+    applyLoaders(normalRule, false)
+
+    function applyLoaders (rule, modules) {
+      if (!isServer) {
+        if (isProd) {
+          rule.use('extract-css-loader').loader(CSSExtractPlugin.loader)
+        } else {
+          rule.use('vue-style-loader').loader('vue-style-loader')
+        }
+      }
+
+      rule.use('css-loader')
+        .loader(isServer ? 'css-loader/locals' : 'css-loader')
+        .options({
+          modules,
+          localIdentName: `[local]_[hash:base64:8]`,
+          importLoaders: 1,
+          sourceMap: !isProd
+        })
+
+      rule.use('postcss-loader').loader('postcss-loader').options(Object.assign({
+        plugins: [require('autoprefixer')],
+        sourceMap: !isProd
+      }, siteConfig.postcss))
+
+      if (loader) {
+        rule.use(loader).loader(loader).options(options)
+      }
+    }
+  }
+
+  createCSSRule('css', /\.css$/)
+  createCSSRule('postcss', /\.p(ost)?css$/)
+  createCSSRule('scss', /\.scss$/, 'sass-loader', siteConfig.scss)
+  createCSSRule('sass', /\.sass$/, 'sass-loader', Object.assign({ indentedSyntax: true }, siteConfig.sass))
+  createCSSRule('less', /\.less$/, 'less-loader', siteConfig.less)
+  createCSSRule('stylus', /\.styl(us)?$/, 'stylus-loader', Object.assign({
+    preferPathResolver: 'webpack'
+  }, siteConfig.stylus))
 
   config
     .plugin('vue-loader')
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 274c4246fd..78b8b5a4e5 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -2,7 +2,6 @@ exports.logger = require('./lib/logger')
 exports.env = require('./lib/env')
 exports.writeTemp = require('./lib/writeTemp')
 exports.codegen = require('./lib/codegen')
-exports.webpack = require('./lib/webpack')
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
 exports.globby = require('globby')
diff --git a/packages/@vuepress/shared-utils/lib/webpack.js b/packages/@vuepress/shared-utils/lib/webpack.js
deleted file mode 100644
index 09cdbbc60c..0000000000
--- a/packages/@vuepress/shared-utils/lib/webpack.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Create CSS processing pipeline
- * @param {object} config instance of webpack-chain
- * @param {boolean} isServer
- * @param {boolean} isProd
- * @param {string} lang
- * @param {regexp} test
- * @param {string} loader loaders' name
- * @param {object} options loaders' options
- * @param {object} postcssOptions
- */
-exports.createCSSRule = function ({
-  config,
-  isServer,
-  isProd,
-  lang,
-  test,
-  loader,
-  options,
-  postcssOptions
-}) {
-  const CSSExtractPlugin = require('mini-css-extract-plugin')
-  const baseRule = config.module.rule(lang).test(test)
-  const modulesRule = baseRule.oneOf('modules').resourceQuery(/module/)
-  const normalRule = baseRule.oneOf('normal')
-
-  applyLoaders(modulesRule, true)
-  applyLoaders(normalRule, false)
-
-  function applyLoaders (rule, modules) {
-    if (!isServer) {
-      if (isProd) {
-        rule.use('extract-css-loader').loader(CSSExtractPlugin.loader)
-      } else {
-        rule.use('vue-style-loader').loader('vue-style-loader')
-      }
-    }
-
-    rule.use('css-loader')
-      .loader(isServer ? 'css-loader/locals' : 'css-loader')
-      .options({
-        modules,
-        localIdentName: `[local]_[hash:base64:8]`,
-        importLoaders: 1,
-        sourceMap: !isProd
-      })
-
-    rule.use('postcss-loader').loader('postcss-loader').options(Object.assign({
-      plugins: [require('autoprefixer')],
-      sourceMap: !isProd
-    }, postcssOptions))
-
-    if (loader) {
-      rule.use(loader).loader(loader).options(options)
-    }
-  }
-}

From ad574cef441e40f1c7d41051b534c3ac01f1eeb3 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 23 Aug 2018 16:21:23 +0800
Subject: [PATCH 138/242] refactor($core): 'frontmatter' defaults to {} at
 build time

---
 packages/@vuepress/core/lib/app/dataMixin.js           | 5 -----
 packages/@vuepress/core/lib/prepare/resolveSiteData.js | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index eef95dd4b5..3a109e1cf4 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -82,11 +82,6 @@ export default function dataMixin (siteData) {
 }
 
 function prepare (siteData) {
-  siteData.pages.forEach(page => {
-    if (!page.frontmatter) {
-      page.frontmatter = {}
-    }
-  })
   if (siteData.locales) {
     Object.keys(siteData.locales).forEach(path => {
       siteData.locales[path].path = path
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index da67951d4e..d7eb1f6dee 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -38,9 +38,9 @@ module.exports = async function ({
     if (headers.length) {
       data.headers = headers
     }
-    if (Object.keys(frontmatter.data).length) {
-      data.frontmatter = frontmatter.data
-    }
+
+    data.frontmatter = frontmatter.data
+
     if (frontmatter.excerpt) {
       const { html } = markdown.render(frontmatter.excerpt)
       data.excerpt = html

From 68518ffe5acbead9cf633729e2c46526a525a45f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 23 Aug 2018 16:24:24 +0800
Subject: [PATCH 139/242] chore: naming: self => api

---
 packages/@vuepress/core/lib/internal-plugins/rootMixins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/internal-plugins/rootMixins.js b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
index e24fce1216..ef08bed7e1 100644
--- a/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
+++ b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const { codegen: { pathsToModuleCode }} = require('@vuepress/shared-utils')
 
-module.exports = (options, context, self) => ({
+module.exports = (options, context, api) => ({
   name: '@vuepress/internal-root-mixins',
 
   // @dynamic/root-mixins
@@ -12,7 +12,7 @@ module.exports = (options, context, self) => ({
 
     const rootMixins = [
       ...builtInRootMixins,
-      ...self.options.clientRootMixin.values
+      ...api.options.clientRootMixin.values
     ]
 
     const rootMixinsCode = pathsToModuleCode(rootMixins)

From c9e0385db5eacc590a5941186120b171815e0505 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 23 Aug 2018 16:34:52 +0800
Subject: [PATCH 140/242] chore($core): simplify ExtendPageDataOption

---
 .../core/lib/plugin-api/option/ExtendPageDataOption.js       | 5 ++---
 packages/@vuepress/core/lib/prepare/resolveSiteData.js       | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
index 161a606d99..e9a78fc593 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
@@ -1,10 +1,9 @@
 const Option = require('../Option')
 
 module.exports = class ExtendPageDataOption extends Option {
-  async apply (args) {
-    const { data } = args
+  async apply (data) {
     for (const fn of this.values) {
-      const res = await fn(args)
+      const res = await fn(data)
       if (typeof res === 'object') {
         Object.assign(data, res)
       }
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
index d7eb1f6dee..9ce28b4ea6 100644
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
@@ -21,7 +21,6 @@ module.exports = async function ({
     const data = { key, path: routePath, filePath }
 
     const content = await fs.readFile(filePath, 'utf-8')
-    await pluginAPI.options.extendPageData.apply({ data, filePath, routePath, base, key, content })
 
     // extract yaml frontmatter
     const frontmatter = parseFrontmatter(content)
@@ -45,6 +44,8 @@ module.exports = async function ({
       const { html } = markdown.render(frontmatter.excerpt)
       data.excerpt = html
     }
+
+    await pluginAPI.options.extendPageData.apply(data)
     return data
   }
 

From 6d19b58347463b4dcfc5ed3845e861d1f52fed2d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 23 Aug 2018 18:06:02 +0800
Subject: [PATCH 141/242] chore: fix typo

---
 packages/@vuepress/core/lib/internal-plugins/rootMixins.js | 2 +-
 packages/@vuepress/core/lib/internal-plugins/routes.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/internal-plugins/rootMixins.js b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
index ef08bed7e1..38edf4c52a 100644
--- a/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
+++ b/packages/@vuepress/core/lib/internal-plugins/rootMixins.js
@@ -4,7 +4,7 @@ const { codegen: { pathsToModuleCode }} = require('@vuepress/shared-utils')
 module.exports = (options, context, api) => ({
   name: '@vuepress/internal-root-mixins',
 
-  // @dynamic/root-mixins
+  // @internal/root-mixins
   async clientDynamicModules () {
     const builtInRootMixins = [
       path.resolve(__dirname, '../app/root-mixins/updateMeta.js')
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index d7a1234077..5fdd9dd7c5 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -1,7 +1,7 @@
 module.exports = (options, context) => ({
   name: '@vuepress/internal-routes',
 
-  // @dynamic/routes
+  // @internal/routes
   async clientDynamicModules () {
     const routesCode = await genRoutesFile(context.siteData.pages)
     return { name: 'routes.js', content: routesCode, dirname: 'internal' }

From 45252a9fd410aaa225eb662e7ea0ebcd7443f072 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 23 Aug 2018 18:35:39 +0800
Subject: [PATCH 142/242] refactor($core): extract dataMixin, try to reuse it
 at build time

---
 packages/@vuepress/core/lib/app/app.js        |  2 +-
 .../{app/dataMixin.js => data-mixins/base.js} | 50 ++++++++-----------
 .../@vuepress/core/lib/data-mixins/client.js  | 33 ++++++++++++
 .../core/lib/internal-plugins/data-mixins.js  | 18 +++++++
 packages/@vuepress/core/lib/prepare/index.js  |  1 +
 5 files changed, 75 insertions(+), 29 deletions(-)
 rename packages/@vuepress/core/lib/{app/dataMixin.js => data-mixins/base.js} (72%)
 create mode 100644 packages/@vuepress/core/lib/data-mixins/client.js
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/data-mixins.js

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index f2ea2b02e6..ebe0359116 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -1,7 +1,7 @@
 /* global VUEPRESS_TEMP_PATH */
 import Vue from 'vue'
 import Router from 'vue-router'
-import dataMixin from './dataMixin'
+import dataMixin from '../data-mixins/client'
 import { routes } from '@internal/routes'
 import { siteData } from '@internal/siteData'
 import appEnhancers from '@internal/app-enhancers'
diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/data-mixins/base.js
similarity index 72%
rename from packages/@vuepress/core/lib/app/dataMixin.js
rename to packages/@vuepress/core/lib/data-mixins/base.js
index 3a109e1cf4..35f5405929 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/data-mixins/base.js
@@ -1,30 +1,25 @@
-/* global VUEPRESS_TEMP_PATH */
+// This file would be used at both client and server side.
 
-import Vue from 'vue'
-import { findPageForPath } from './util'
-
-export default function dataMixin (siteData) {
-  prepare(siteData)
-  const store = new Vue({
-    data: {
-      siteData,
-      disableScrollBehavior: false
+function findPageForPath (pages, path) {
+  for (let i = 0; i < pages.length; i++) {
+    const page = pages[i]
+    if (page.path === path) {
+      return page
     }
-  })
-  Vue.$store = store
-
-  if (module.hot) {
-    module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
-      prepare(siteData)
-      store.siteData = siteData
-    })
   }
+  return {
+    path: '',
+    frontmatter: {}
+  }
+}
 
+module.exports = function dataMixin (siteData, route) {
   return {
     computed: {
       $site () {
-        return store.siteData
+        return siteData
       },
+
       $localeConfig () {
         const { locales = {}} = this.$site
         let targetLang
@@ -38,9 +33,11 @@ export default function dataMixin (siteData) {
         }
         return targetLang || defaultLang || {}
       },
+
       $siteTitle () {
         return this.$localeConfig.title || this.$site.title || ''
       },
+
       $title () {
         const page = this.$page
         const siteTitle = this.$siteTitle
@@ -54,6 +51,7 @@ export default function dataMixin (siteData) {
             : siteTitle
           : selfTitle || 'VuePress'
       },
+
       $description () {
         // #565 hoist description from meta
         if (this.$page.frontmatter.meta) {
@@ -62,30 +60,26 @@ export default function dataMixin (siteData) {
         }
         return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''
       },
+
       $lang () {
         return this.$page.frontmatter.lang || this.$localeConfig.lang || 'en-US'
       },
+
       $localePath () {
         return this.$localeConfig.path || '/'
       },
+
       $themeLocaleConfig () {
         return (this.$site.themeConfig.locales || {})[this.$localePath] || {}
       },
+
       $page () {
         return findPageForPath(
           this.$site.pages,
-          this.$route.path
+          route && route.path || this.$route.path
         )
       }
     }
   }
 }
 
-function prepare (siteData) {
-  if (siteData.locales) {
-    Object.keys(siteData.locales).forEach(path => {
-      siteData.locales[path].path = path
-    })
-  }
-  Object.freeze(siteData)
-}
diff --git a/packages/@vuepress/core/lib/data-mixins/client.js b/packages/@vuepress/core/lib/data-mixins/client.js
new file mode 100644
index 0000000000..14cd81d787
--- /dev/null
+++ b/packages/@vuepress/core/lib/data-mixins/client.js
@@ -0,0 +1,33 @@
+/* global VUEPRESS_TEMP_PATH */
+
+import Vue from 'vue'
+import dataMixin from '@internal/data-mixins'
+
+export default function (siteData) {
+  prepare(siteData)
+  const store = new Vue({
+    data: {
+      siteData,
+      disableScrollBehavior: false
+    }
+  })
+  Vue.$store = store
+
+  if (module.hot) {
+    module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
+      prepare(siteData)
+      store.siteData = siteData
+    })
+  }
+
+  return dataMixin(siteData)
+}
+
+function prepare (siteData) {
+  if (siteData.locales) {
+    Object.keys(siteData.locales).forEach(path => {
+      siteData.locales[path].path = path
+    })
+  }
+  Object.freeze(siteData)
+}
diff --git a/packages/@vuepress/core/lib/internal-plugins/data-mixins.js b/packages/@vuepress/core/lib/internal-plugins/data-mixins.js
new file mode 100644
index 0000000000..5090aa9db2
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/data-mixins.js
@@ -0,0 +1,18 @@
+const path = require('path')
+const { fs } = require('@vuepress/shared-utils')
+
+// This plugin generate a mirror es module of '/core/lib/data-mixins/base.js'
+// Since for now Webpack cannot allow 'ES6 import' to import a a commonjs
+// module.
+//
+// Ref: https://github.com/webpack/webpack/issues/4039
+module.exports = (options, context) => ({
+  name: '@vuepress/internal-enhance-app',
+
+  // @internal/data-mixins
+  async clientDynamicModules () {
+    const dataMixinsCommonjsModule = await fs.readFile(path.resolve(__dirname, '../data-mixins/base.js'), 'utf-8')
+    const dataMixinsEsModule = dataMixinsCommonjsModule.replace('module.exports =', 'export default')
+    return { name: 'data-mixins.js', content: dataMixinsEsModule, dirname: 'internal' }
+  }
+})
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index c46630d60f..19cd487ec7 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -33,6 +33,7 @@ module.exports = async function prepare ({
     .use(require('../internal-plugins/enhanceApp'))
     .use(require('../internal-plugins/siteData'))
     .use(require('../internal-plugins/overrideCSS'))
+    .use(require('../internal-plugins/data-mixins'))
     // user plugin
     .useByPluginsConfig(cliPlugins)
     .useByPluginsConfig(siteConfig.plugins)

From afa71b582bedbb47ae8066893d5e3dd92e7bca6f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 24 Aug 2018 00:02:33 +0800
Subject: [PATCH 143/242] refactor: refine core implementation (#762)

---
 packages/@vuepress/core/lib/build.js          |   4 +-
 packages/@vuepress/core/lib/dev.js            |   4 +-
 .../internal-plugins/importAsyncComponent.js  |   4 +-
 .../core/lib/internal-plugins/routes.js       |  10 +-
 .../core/lib/internal-plugins/siteData.js     |   2 +-
 .../@vuepress/core/lib/plugin-api/context.js  |  64 -----
 .../@vuepress/core/lib/plugin-api/util.js     |  11 +-
 .../@vuepress/core/lib/prepare/AppContext.js  | 249 ++++++++++++++++++
 packages/@vuepress/core/lib/prepare/Page.js   |  72 +++++
 packages/@vuepress/core/lib/prepare/index.js  |  68 +----
 .../core/lib/prepare/resolveOptions.js        | 129 ---------
 .../core/lib/prepare/resolveSiteData.js       |  82 ------
 .../core/lib/webpack/createBaseConfig.js      |   4 +-
 .../@vuepress/plugin-back-to-top/index.js     |   4 +-
 packages/@vuepress/plugin-i18n-ui/index.js    |   8 +-
 .../@vuepress/plugin-last-updated/index.js    |   4 +-
 16 files changed, 361 insertions(+), 358 deletions(-)
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/context.js
 create mode 100644 packages/@vuepress/core/lib/prepare/AppContext.js
 create mode 100644 packages/@vuepress/core/lib/prepare/Page.js
 delete mode 100644 packages/@vuepress/core/lib/prepare/resolveOptions.js
 delete mode 100644 packages/@vuepress/core/lib/prepare/resolveSiteData.js

diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index cee72ad6f4..7d291d17b4 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -65,12 +65,12 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
 
   // render pages
   logger.wait('Rendering static HTML...')
-  for (const page of options.siteData.pages) {
+  for (const page of options.pages) {
     await renderPage(page)
   }
 
   // if the user does not have a custom 404.md, generate the theme's default
-  if (!options.siteData.pages.some(p => p.path === '/404.html')) {
+  if (!options.pages.some(p => p.path === '/404.html')) {
     await renderPage({ path: '/404.html' })
   }
 
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index e1c7494434..a2cfd0a192 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -81,7 +81,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   .use(DevLogPlugin, [{
     port,
     displayHost,
-    publicPath: options.publicPath
+    publicPath: options.base
   }])
 
   config = config.toConfig()
@@ -118,7 +118,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
 
       // respect base when serving static files...
       if (fs.existsSync(userPublic)) {
-        app.use(mount(options.publicPath, serveStatic(userPublic)))
+        app.use(mount(options.base, serveStatic(userPublic)))
       }
 
       app.use(convert(history({
diff --git a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
index bf0bc652fd..33bfb42316 100644
--- a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
+++ b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
@@ -1,7 +1,7 @@
 function genImportAsyncComponentFile (pages) {
   return `export function loadComponent (key) {
   switch (key) {
-${pages.map(({ key, filePath }) => `    case "${key}": return import("${filePath}");`).join('\n')}
+${pages.map(({ key, _filePath }) => `    case "${key}": return import("${_filePath}");`).join('\n')}
   }
 }`
 }
@@ -11,7 +11,7 @@ module.exports = (options, context) => ({
 
   // @internal/async-component
   async clientDynamicModules () {
-    const importAsyncComponentCode = genImportAsyncComponentFile(context.siteData.pages)
+    const importAsyncComponentCode = genImportAsyncComponentFile(context.pages)
     return {
       name: 'async-component.js',
       content: importAsyncComponentCode,
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index 5fdd9dd7c5..aa8328829e 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -3,7 +3,7 @@ module.exports = (options, context) => ({
 
   // @internal/routes
   async clientDynamicModules () {
-    const routesCode = await genRoutesFile(context.siteData.pages)
+    const routesCode = await genRoutesFile(context.pages)
     return { name: 'routes.js', content: routesCode, dirname: 'internal' }
   }
 })
@@ -14,11 +14,15 @@ module.exports = (options, context) => ({
  * @returns {Promise<string>}
  */
 async function genRoutesFile (pages) {
-  function genRoute ({ path: pagePath, filePath, key: componentName }) {
+  function genRoute ({
+    path: pagePath,
+    key: componentName,
+    frontmatter = {}
+  }) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
-    path: ${JSON.stringify(pagePath)},
+    path: ${JSON.stringify(frontmatter.permalink || pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
       registerComponent(${JSON.stringify(componentName)}).then(() => next())
diff --git a/packages/@vuepress/core/lib/internal-plugins/siteData.js b/packages/@vuepress/core/lib/internal-plugins/siteData.js
index 0fdfcb88c5..91a99baf4f 100644
--- a/packages/@vuepress/core/lib/internal-plugins/siteData.js
+++ b/packages/@vuepress/core/lib/internal-plugins/siteData.js
@@ -3,7 +3,7 @@ module.exports = (options, context) => ({
 
   // @internal/siteData
   async clientDynamicModules () {
-    const code = `export const siteData = ${JSON.stringify(context.siteData, null, 2)}`
+    const code = `export const siteData = ${JSON.stringify(context.getSiteData(), null, 2)}`
     return { name: 'siteData.js', content: code, dirname: 'internal' }
   }
 })
diff --git a/packages/@vuepress/core/lib/plugin-api/context.js b/packages/@vuepress/core/lib/plugin-api/context.js
deleted file mode 100644
index f697ea5615..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/context.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const path = require('path')
-const { writeTemp } = require('@vuepress/shared-utils')
-
-class PluginContext {
-  constructor (options) {
-    Object.defineProperty(this, '_options', {
-      enumerable: false,
-      configurable: false,
-      writable: false,
-      value: options
-    })
-  }
-
-  get base () {
-    return this._options.siteConfig.base
-  }
-
-  get isProd () {
-    return this._options.isProd
-  }
-
-  get sourceDir () {
-    return this._options.sourceDir
-  }
-
-  get publicDir () {
-    path.resolve(this.sourceDir, '.vuepress/public')
-  }
-
-  get outDir () {
-    return this._options.outDir
-  }
-
-  get themePath () {
-    return this._options.themePath
-  }
-
-  get publicPath () {
-    return this._options.publicPath
-  }
-
-  get themeConfig () {
-    return this._options.themeConfig
-  }
-
-  get siteConfig () {
-    return this._options.siteConfig
-  }
-
-  get siteData () {
-    return this._options.siteData
-  }
-
-  get self () {
-    return this._options.self
-  }
-}
-
-Object.assign(PluginContext.prototype, {
-  resolve: path.resolve,
-  writeTemp
-})
-
-module.exports = PluginContext
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 234deab888..84ef93418e 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -107,11 +107,14 @@ exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOpt
 exports.normalizePluginsConfig = function (pluginsConfig) {
   const { valid, warnMsg } = assertTypes(pluginsConfig, [Object, Array])
   if (!valid) {
-    logger.warn(
-      `[${chalk.gray('config')}] ` +
-      `Invalid value for "plugin" field : ${warnMsg}`
-    )
+    if (pluginsConfig !== undefined) {
+      logger.warn(
+        `[${chalk.gray('config')}] ` +
+        `Invalid value for "plugin" field : ${warnMsg}`
+      )
+    }
     pluginsConfig = []
+    return pluginsConfig
   }
   if (Array.isArray(pluginsConfig)) {
     pluginsConfig = pluginsConfig.map(item => {
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
new file mode 100644
index 0000000000..1c8ab1916c
--- /dev/null
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -0,0 +1,249 @@
+const path = require('path')
+const createMarkdown = require('../markdown/index')
+const loadConfig = require('./loadConfig')
+const { globby } = require('@vuepress/shared-utils')
+const { sort } = require('./util')
+const { fs, logger, chalk } = require('@vuepress/shared-utils')
+
+const Page = require('./Page')
+const PluginAPI = require('../plugin-api/index')
+
+module.exports = class AppContext {
+  /**
+   * Instantiate the app context with a new API
+   * @param { string } sourceDir
+   * @param {{
+   *  isProd: boolean,
+   *  plugins: pluginsConfig,
+   *  theme: themeNameConfig
+   * }} options
+   */
+  constructor (sourceDir, options) {
+    this.sourceDir = sourceDir
+    this._options = options
+    this.isProd = options.isProd
+    this.vuepressDir = path.resolve(sourceDir, '.vuepress')
+    this.siteConfig = loadConfig(this.vuepressDir)
+    this.base = this.siteConfig.base || '/'
+    this.themeConfig = this.siteConfig.themeConfig || {}
+    this.outDir = this.siteConfig.dest
+      ? path.resolve(this.siteConfig.dest)
+      : path.resolve(sourceDir, '.vuepress/dist')
+
+    this.markdown = createMarkdown(this.siteConfig)
+    this.pluginAPI = new PluginAPI(this)
+    this.pages = [] // Array<Page>
+  }
+
+  /**
+   * Load pages, load plugins, apply plugins / plugin options, etc.
+   * @returns {Promise<void>}
+   */
+  async process () {
+    this.normalizeHeadTagUrls()
+    await this.resolveTheme()
+    this.resolvePlugins()
+
+    await this.resolvePages()
+    await this.pluginAPI.options.additionalPages.values.map(async ({ path, permalink }) => {
+      await this.addPage(path, { permalink })
+    })
+
+    await this.pluginAPI.options.ready.apply()
+    this.pluginAPI.options.extendMarkdown.syncApply(this.markdown)
+    await this.pluginAPI.options.clientDynamicModules.apply()
+    await this.pluginAPI.options.globalUIComponents.apply()
+    await this.pluginAPI.options.enhanceAppFiles.apply()
+  }
+
+  /**
+   * Apply internal and user plugins
+   */
+  resolvePlugins () {
+    const themeConfig = this.themeConfig
+    const siteConfig = this.siteConfig
+
+    const shouldUseLastUpdated = (
+      themeConfig.lastUpdated ||
+      Object.keys(siteConfig.locales && themeConfig.locales || {})
+        .some(base => themeConfig.locales[base].lastUpdated)
+    )
+
+    this.pluginAPI
+      // internl core plugins
+      .use(require('../internal-plugins/siteData'))
+      .use(require('../internal-plugins/routes'))
+      .use(require('../internal-plugins/rootMixins'))
+      .use(require('../internal-plugins/importAsyncComponent'))
+      .use(require('../internal-plugins/enhanceApp'))
+      .use(require('../internal-plugins/overrideCSS'))
+      .use(require('../internal-plugins/data-mixins'))
+      // user plugin
+      .useByPluginsConfig(this._options.plugins)
+      .useByPluginsConfig(this.siteConfig.plugins)
+      .useByPluginsConfig(this.themeplugins)
+      // built-in plugins
+      .use('@vuepress/last-updated', shouldUseLastUpdated)
+      .use('@vuepress/register-components', {
+        componentsDir: [
+          path.resolve(this.sourceDir, '.vuepress/components'),
+          path.resolve(this.themePath, 'components')
+        ]
+      })
+      .apply()
+  }
+
+  /**
+   * normalize head tag urls for base
+   */
+  normalizeHeadTagUrls () {
+    if (this.base !== '/' && this.siteConfig.head) {
+      this.siteConfig.head.forEach(tag => {
+        const attrs = tag[1]
+        if (attrs) {
+          for (const name in attrs) {
+            if (name === 'src' || name === 'href') {
+              const value = attrs[name]
+              if (value.charAt(0) === '/') {
+                attrs[name] = this.base + value.slice(1)
+              }
+            }
+          }
+        }
+      })
+    }
+  }
+
+  /**
+   * Find all page source files located in sourceDir
+   * @returns {Promise<void>}
+   */
+  async resolvePages () {
+    // resolve pageFiles
+    const patterns = ['**/*.md', '!.vuepress', '!node_modules']
+    if (this.siteConfig.dest) {
+      // #654 exclude dest folder when dest dir was set in
+      // sourceDir but not in '.vuepress'
+      const outDirRelative = path.relative(this.sourceDir, this.outDir)
+      if (!outDirRelative.includes('..')) {
+        patterns.push('!' + outDirRelative)
+      }
+    }
+    const pageFiles = sort(await globby(patterns, { cwd: this.sourceDir }))
+
+    await Promise.all(pageFiles.map(async (relative) => {
+      const filePath = path.resolve(this.sourceDir, relative)
+      await this.addPage(filePath, { relative })
+    }))
+  }
+
+  /**
+   * Add a page
+   * @param { string } filePath
+   * @param { string } relative relative path of source markdown file.
+   * @param { string } permalink the URL (excluding the domain name)
+   *                   for your pages, posts.
+   * @returns { Promise<void> }
+   */
+  async addPage (filePath, { relative, permalink }) {
+    const page = new Page(filePath, { relative, permalink })
+    await page.process(this.markdown)
+    await this.pluginAPI.options.extendPageData.apply(page)
+    this.pages.push(page)
+  }
+
+  /**
+   * Resolve theme
+   * @returns { Promise<void> }
+   */
+  async resolveTheme () {
+    const theme = this.siteConfig.theme || this._options.theme
+    const requireResolve = (target) => {
+      return require.resolve(target, {
+        paths: [
+          path.resolve(__dirname, '../../node_modules'),
+          path.resolve(this.sourceDir)
+        ]
+      })
+    }
+
+    // resolve theme
+    const localThemePath = path.resolve(this.vuepressDir, 'theme')
+    const useLocalTheme = await fs.exists(localThemePath)
+
+    let themePath = null
+    let themeLayoutPath = null
+    let themeNotFoundPath = null
+    let themeIndexFile = null
+    let themePlugins = []
+
+    if (useLocalTheme) {
+      logger.tip(`\nApply theme located at ${localThemePath}...`)
+
+      // use local custom theme
+      themePath = localThemePath
+      themeLayoutPath = path.resolve(localThemePath, 'Layout.vue')
+      themeNotFoundPath = path.resolve(localThemePath, 'NotFound.vue')
+      if (!fs.existsSync(themeLayoutPath)) {
+        throw new Error(`[vuepress] Cannot resolve Layout.vue file in .vuepress/theme.`)
+      }
+      if (!fs.existsSync(themeNotFoundPath)) {
+        throw new Error(`[vuepress] Cannot resolve NotFound.vue file in .vuepress/theme.`)
+      }
+    } else if (theme) {
+      // use external theme
+      try {
+        // backward-compatible 0.x.x.
+        themeLayoutPath = requireResolve(`vuepress-theme-${theme}/Layout.vue`)
+        themePath = path.dirname(themeLayoutPath)
+        themeNotFoundPath = path.resolve(themeLayoutPath, 'NotFound.vue')
+      } catch (e) {
+        try {
+          themeIndexFile = requireResolve(`vuepress-theme-${theme}/index.js`)
+        } catch (e) {
+          try {
+            themeIndexFile = requireResolve(`@vuepress/theme-${theme}`)
+            themePath = path.dirname(themeIndexFile)
+            themeIndexFile = require(themeIndexFile)
+            themeLayoutPath = themeIndexFile.layout
+            themeNotFoundPath = themeIndexFile.notFound
+            themePlugins = themeIndexFile.plugins
+          } catch (e) {
+            throw new Error(`[vuepress] Failed to load custom theme "${theme}". File vuepress-theme-${theme}/Layout.vue does not exist.`)
+          }
+        }
+      }
+      logger.tip(`\nApply theme ${chalk.gray(theme)}`)
+    } else {
+      throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
+    }
+
+    this.themePath = themePath
+    this.themeLayoutPath = themeLayoutPath
+    this.themeNotFoundPath = themeNotFoundPath
+    this.themeplugins = themePlugins
+  }
+
+  /**
+   * Get the data to be delivered to the client.
+   * @returns {{
+   *  title: string,
+   *  description: string,
+   *  base: string,
+   *  pages: Page[],
+   *  themeConfig: ThemeConfig,
+   *  locales: Locales
+   * }}
+   */
+  getSiteData () {
+    return {
+      title: this.siteConfig.title || '',
+      description: this.siteConfig.description || '',
+      base: this.base,
+      pages: this.pages.map(page => page.toJson()),
+      themeConfig: this.siteConfig.themeConfig || {},
+      locales: this.siteConfig.locales
+    }
+  }
+}
+
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
new file mode 100644
index 0000000000..4e48e6d017
--- /dev/null
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -0,0 +1,72 @@
+const path = require('path')
+const slugify = require('../markdown/slugify')
+const { fs } = require('@vuepress/shared-utils')
+const { encodePath, fileToPath } = require('./util')
+const {
+  inferTitle,
+  extractHeaders,
+  parseFrontmatter
+} = require('../util/index')
+
+module.exports = class Page {
+  constructor (filePath, {
+    relative,
+    routePath
+  }) {
+    this._filePath = filePath
+    if (relative) {
+      this._routePath = encodePath(fileToPath(relative))
+    } else {
+      this._routePath = routePath
+    }
+    this.path = this._routePath
+  }
+
+  async process (markdown) {
+    this.key = 'v-' + Math.random().toString(16).slice(2)
+    this.content = await fs.readFile(this._filePath, 'utf-8')
+    const frontmatter = parseFrontmatter(this.content)
+
+    // infer title
+    const title = inferTitle(frontmatter)
+    if (title) {
+      this.title = title
+    }
+
+    // headers
+    const headers = extractHeaders(
+      frontmatter.content,
+      ['h2', 'h3'],
+      markdown
+    )
+    if (headers.length) {
+      this.headers = headers
+    }
+
+    this.frontmatter = frontmatter.data
+
+    if (frontmatter.excerpt) {
+      const { html } = markdown.render(frontmatter.excerpt)
+      this.excerpt = html
+    }
+  }
+
+  get filename () {
+    return path.parse(this._filePath).name
+  }
+
+  get slug () {
+    return slugify(this.filename)
+  }
+
+  toJson () {
+    const json = {}
+    Object.keys(this).reduce((json, key) => {
+      if (!key.startsWith('_')) {
+        json[key] = this[key]
+      }
+      return json
+    }, json)
+    return json
+  }
+}
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 19cd487ec7..68c0998068 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,66 +1,14 @@
-const path = require('path')
-const resolveOptions = require('./resolveOptions')
-const resolveSiteData = require('./resolveSiteData')
-const PluginAPI = require('../plugin-api/index')
-const PluginContext = require('../plugin-api/context')
+const AppContext = require('./AppContext')
 
 module.exports = async function prepare ({
   sourceDir,
   isProd,
-  cliOptions
+  cliOptions: {
+    plugins,
+    theme
+  }
 }) {
-  // 1. load options
-  const options = await resolveOptions(sourceDir, cliOptions)
-  options.isProd = isProd
-
-  // 2. apply plugins
-  const { siteConfig, themeConfig, themePath, themePlugins, cliPlugins, markdown } = options
-  const pluginContext = new PluginContext(options)
-  const pluginAPI = new PluginAPI(pluginContext)
-  options.pluginAPI = pluginAPI
-
-  const shouldUseLastUpdated = (
-    themeConfig.lastUpdated ||
-    Object.keys(siteConfig.locales && themeConfig.locales || {})
-      .some(base => themeConfig.locales[base].lastUpdated)
-  )
-
-  pluginAPI
-    // internl core plugins
-    .use(require('../internal-plugins/routes'))
-    .use(require('../internal-plugins/rootMixins'))
-    .use(require('../internal-plugins/importAsyncComponent'))
-    .use(require('../internal-plugins/enhanceApp'))
-    .use(require('../internal-plugins/siteData'))
-    .use(require('../internal-plugins/overrideCSS'))
-    .use(require('../internal-plugins/data-mixins'))
-    // user plugin
-    .useByPluginsConfig(cliPlugins)
-    .useByPluginsConfig(siteConfig.plugins)
-    .useByPluginsConfig(themePlugins)
-    // built-in plugins
-    .use('@vuepress/last-updated', shouldUseLastUpdated)
-    .use('@vuepress/register-components', {
-      componentsDir: [
-        path.resolve(sourceDir, '.vuepress/components'),
-        path.resolve(themePath, 'components')
-      ]
-    })
-    .apply()
-
-  // 3. resolve siteData
-  // SiteData must be resolved after the plugin initialization
-  // because plugins can be able to extend the sitedata.
-  options.siteData = await resolveSiteData(options)
-
-  // 4. ready hook, user can do some options transformation here.
-  await pluginAPI.options.ready.apply()
-
-  // 5. apply plugin options
-  pluginAPI.options.extendMarkdown.syncApply(markdown)
-  await pluginAPI.options.clientDynamicModules.apply()
-  await pluginAPI.options.globalUIComponents.apply()
-  await pluginAPI.options.enhanceAppFiles.apply()
-
-  return options
+  const appContext = new AppContext(sourceDir, { plugins, theme, isProd })
+  await appContext.process()
+  return appContext
 }
diff --git a/packages/@vuepress/core/lib/prepare/resolveOptions.js b/packages/@vuepress/core/lib/prepare/resolveOptions.js
deleted file mode 100644
index 3f63c411c7..0000000000
--- a/packages/@vuepress/core/lib/prepare/resolveOptions.js
+++ /dev/null
@@ -1,129 +0,0 @@
-const path = require('path')
-const createMarkdown = require('../markdown/index')
-const loadConfig = require('./loadConfig')
-const { sort } = require('./util')
-const { chalk, fs, logger, globby } = require('@vuepress/shared-utils')
-
-module.exports = async function resolveOptions (sourceDir, cliOptions) {
-  function requireResolve (target) {
-    return require.resolve(target, {
-      paths: [
-        path.resolve(__dirname, '../../node_modules'),
-        path.resolve(sourceDir)
-      ]
-    })
-  }
-
-  const vuepressDir = path.resolve(sourceDir, '.vuepress')
-  const siteConfig = loadConfig(vuepressDir)
-
-  // normalize head tag urls for base
-  const base = siteConfig.base || '/'
-  if (base !== '/' && siteConfig.head) {
-    siteConfig.head.forEach(tag => {
-      const attrs = tag[1]
-      if (attrs) {
-        for (const name in attrs) {
-          if (name === 'src' || name === 'href') {
-            const value = attrs[name]
-            if (value.charAt(0) === '/') {
-              attrs[name] = base + value.slice(1)
-            }
-          }
-        }
-      }
-    })
-  }
-
-  // resolve outDir
-  const outDir = siteConfig.dest
-    ? path.resolve(siteConfig.dest)
-    : path.resolve(sourceDir, '.vuepress/dist')
-
-  // resolve theme
-  const localThemePath = path.resolve(vuepressDir, 'theme')
-  const useLocalTheme = fs.existsSync(localThemePath)
-  const theme = siteConfig.theme || cliOptions.theme
-
-  let themePath = null
-  let themeLayoutPath = null
-  let themeNotFoundPath = null
-  let themeIndexFile = null
-  let themePlugins = []
-
-  if (useLocalTheme) {
-    logger.tip(`\nApply theme located at ${localThemePath}...`)
-
-    // use local custom theme
-    themePath = localThemePath
-    themeLayoutPath = path.resolve(localThemePath, 'Layout.vue')
-    themeNotFoundPath = path.resolve(localThemePath, 'NotFound.vue')
-    if (!fs.existsSync(themeLayoutPath)) {
-      throw new Error(`[vuepress] Cannot resolve Layout.vue file in .vuepress/theme.`)
-    }
-    if (!fs.existsSync(themeNotFoundPath)) {
-      throw new Error(`[vuepress] Cannot resolve NotFound.vue file in .vuepress/theme.`)
-    }
-  } else if (theme) {
-    // use external theme
-    try {
-      // backward-compatible 0.x.x.
-      themeLayoutPath = requireResolve(`vuepress-theme-${theme}/Layout.vue`)
-      themePath = path.dirname(themeLayoutPath)
-      themeNotFoundPath = path.resolve(themeLayoutPath, 'NotFound.vue')
-    } catch (e) {
-      try {
-        themeIndexFile = requireResolve(`vuepress-theme-${theme}/index.js`)
-      } catch (e) {
-        try {
-          themeIndexFile = requireResolve(`@vuepress/theme-${theme}`)
-          themePath = path.dirname(themeIndexFile)
-          themeIndexFile = require(themeIndexFile)
-          themeLayoutPath = themeIndexFile.layout
-          themeNotFoundPath = themeIndexFile.notFound
-          themePlugins = themeIndexFile.plugins
-        } catch (e) {
-          throw new Error(`[vuepress] Failed to load custom theme "${theme}". File vuepress-theme-${theme}/Layout.vue does not exist.`)
-        }
-      }
-    }
-    logger.tip(`\nApply theme ${chalk.gray(theme)}`)
-  } else {
-    throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
-  }
-
-  // resolve theme config
-  const themeConfig = siteConfig.themeConfig || {}
-
-  // resolve markdown
-  const markdown = createMarkdown(siteConfig)
-
-  // resolve pageFiles
-  const patterns = ['**/*.md', '!.vuepress', '!node_modules']
-  if (siteConfig.dest) {
-    // #654 exclude dest folder when dest dir was set in
-    // sourceDir but not in '.vuepress'
-    const outDirRelative = path.relative(sourceDir, outDir)
-    if (!outDirRelative.includes('..')) {
-      patterns.push('!' + outDirRelative)
-    }
-  }
-  const pageFiles = sort(await globby(patterns, { cwd: sourceDir }))
-
-  const options = {
-    siteConfig,
-    themeConfig,
-    sourceDir,
-    outDir,
-    publicPath: base,
-    pageFiles,
-    themePath,
-    themeLayoutPath,
-    themeNotFoundPath,
-    themePlugins,
-    cliPlugins: cliOptions.plugins || [],
-    markdown
-  }
-
-  return options
-}
diff --git a/packages/@vuepress/core/lib/prepare/resolveSiteData.js b/packages/@vuepress/core/lib/prepare/resolveSiteData.js
deleted file mode 100644
index 9ce28b4ea6..0000000000
--- a/packages/@vuepress/core/lib/prepare/resolveSiteData.js
+++ /dev/null
@@ -1,82 +0,0 @@
-const { fs } = require('@vuepress/shared-utils')
-const path = require('path')
-const { encodePath, fileToPath } = require('./util')
-const {
-  inferTitle,
-  extractHeaders,
-  parseFrontmatter
-} = require('../util/index')
-
-module.exports = async function ({
-  sourceDir,
-  pageFiles,
-  pluginAPI,
-  markdown,
-  siteConfig,
-  themeConfig,
-  publicPath
-}) {
-  async function getPageData ({ filePath, routePath, base }) {
-    const key = 'v-' + Math.random().toString(16).slice(2)
-    const data = { key, path: routePath, filePath }
-
-    const content = await fs.readFile(filePath, 'utf-8')
-
-    // extract yaml frontmatter
-    const frontmatter = parseFrontmatter(content)
-    // infer title
-    const title = inferTitle(frontmatter)
-    if (title) {
-      data.title = title
-    }
-    const headers = extractHeaders(
-      frontmatter.content,
-      ['h2', 'h3'],
-      markdown
-    )
-    if (headers.length) {
-      data.headers = headers
-    }
-
-    data.frontmatter = frontmatter.data
-
-    if (frontmatter.excerpt) {
-      const { html } = markdown.render(frontmatter.excerpt)
-      data.excerpt = html
-    }
-
-    await pluginAPI.options.extendPageData.apply(data)
-    return data
-  }
-
-  // resolve pagesData
-  const pagesData = await Promise.all(pageFiles.map(async (base) => {
-    const filePath = path.resolve(sourceDir, base)
-    const routePath = encodePath(fileToPath(base))
-    return getPageData({ filePath, routePath, base })
-  }))
-
-  // resolve additional pagesData
-  const additionalPagesData = await Promise.all(
-    pluginAPI.options.additionalPages.values.map(async ({ route: routePath, path: filePath }) => {
-      if (!fs.existsSync(filePath)) {
-        throw new Error(`[vuepress] Cannot resolve additional page: ${filePath}`)
-      }
-      return getPageData({ filePath, routePath })
-    })
-  )
-
-  const siteData = {
-    title: siteConfig.title || '',
-    description: siteConfig.description || '',
-    base: publicPath,
-    pages: [
-      ...pagesData,
-      ...additionalPagesData
-    ],
-    themeConfig,
-    locales: siteConfig.locales
-  }
-
-  return siteData
-}
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 832cc0cda5..43ddf42553 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -2,14 +2,12 @@ const path = require('path')
 
 module.exports = function createBaseConfig ({
   siteConfig,
-  siteData,
   sourceDir,
   outDir,
-  publicPath,
+  base: publicPath,
   themePath,
   themeLayoutPath,
   themeNotFoundPath,
-  isAlgoliaSearch,
   markdown
 }, { debug } = {}, isServer) {
   const Config = require('webpack-chain')
diff --git a/packages/@vuepress/plugin-back-to-top/index.js b/packages/@vuepress/plugin-back-to-top/index.js
index 900f0df1ab..ecfc0b64cf 100644
--- a/packages/@vuepress/plugin-back-to-top/index.js
+++ b/packages/@vuepress/plugin-back-to-top/index.js
@@ -1,6 +1,8 @@
+const path = require('path')
+
 module.exports = (options, context) => ({
   enhanceAppFiles: [
-    context.resolve(__dirname, 'client.js')
+    path.resolve(__dirname, 'client.js')
   ],
 
   globalUIComponents: 'BackToTop'
diff --git a/packages/@vuepress/plugin-i18n-ui/index.js b/packages/@vuepress/plugin-i18n-ui/index.js
index ad57388657..34f15e6442 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.js
+++ b/packages/@vuepress/plugin-i18n-ui/index.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 module.exports = (pluginOptions = {}, context) => ({
   name: 'i18n-ui',
 
@@ -5,14 +7,14 @@ module.exports = (pluginOptions = {}, context) => ({
   enabled: !context.isProd,
 
   enhanceAppFiles: [
-    context.resolve(__dirname, 'client.js')
+    path.resolve(__dirname, 'client.js')
   ],
 
   additionalPages: [
     {
       override: false,
-      route: pluginOptions.route || '/i18n/',
-      path: context.resolve(__dirname, 'index.md')
+      permalink: pluginOptions.route || '/i18n/',
+      path: path.resolve(__dirname, 'index.md')
     }
   ]
 })
diff --git a/packages/@vuepress/plugin-last-updated/index.js b/packages/@vuepress/plugin-last-updated/index.js
index 864c600b30..2324244f30 100644
--- a/packages/@vuepress/plugin-last-updated/index.js
+++ b/packages/@vuepress/plugin-last-updated/index.js
@@ -1,9 +1,9 @@
 const spawn = require('cross-spawn')
 
 module.exports = (options = {}, context) => ({
-  extendPageData ({ filePath }) {
+  extendPageData ({ _filePath }) {
     const { transformer } = options
-    const timestamp = getGitLastUpdatedTimeStamp(filePath)
+    const timestamp = getGitLastUpdatedTimeStamp(_filePath)
     const lastUpdated = typeof transformer === 'function' ? transformer(timestamp) : timestamp
     return { lastUpdated }
   }

From abc1d01d04109c1c2952256cc2b434857d891e5a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 24 Aug 2018 00:10:06 +0800
Subject: [PATCH 144/242] fix: regression - avoid deliver 'content' to client
 side

---
 packages/@vuepress/core/lib/prepare/Page.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 4e48e6d017..2404fb6c43 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -24,8 +24,8 @@ module.exports = class Page {
 
   async process (markdown) {
     this.key = 'v-' + Math.random().toString(16).slice(2)
-    this.content = await fs.readFile(this._filePath, 'utf-8')
-    const frontmatter = parseFrontmatter(this.content)
+    this._content = await fs.readFile(this._filePath, 'utf-8')
+    const frontmatter = parseFrontmatter(this._content)
 
     // infer title
     const title = inferTitle(frontmatter)

From 6a4592d7a02f1b311376510b5b69081aa1e73475 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 24 Aug 2018 00:13:58 +0800
Subject: [PATCH 145/242] chore: simplify encode url

---
 packages/@vuepress/core/lib/prepare/Page.js | 6 +++---
 packages/@vuepress/core/lib/prepare/util.js | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 2404fb6c43..f8a1927ab1 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const slugify = require('../markdown/slugify')
 const { fs } = require('@vuepress/shared-utils')
-const { encodePath, fileToPath } = require('./util')
+const { fileToPath } = require('./util')
 const {
   inferTitle,
   extractHeaders,
@@ -15,9 +15,9 @@ module.exports = class Page {
   }) {
     this._filePath = filePath
     if (relative) {
-      this._routePath = encodePath(fileToPath(relative))
+      this._routePath = encodeURI(fileToPath(relative))
     } else {
-      this._routePath = routePath
+      this._routePath = encodeURI(routePath)
     }
     this.path = this._routePath
   }
diff --git a/packages/@vuepress/core/lib/prepare/util.js b/packages/@vuepress/core/lib/prepare/util.js
index 22ad69fa1c..4bb3213fd8 100644
--- a/packages/@vuepress/core/lib/prepare/util.js
+++ b/packages/@vuepress/core/lib/prepare/util.js
@@ -24,7 +24,3 @@ exports.sort = function (arr) {
     return 0
   })
 }
-
-exports.encodePath = function (userpath) {
-  return userpath.split('/').map(item => encodeURIComponent(item)).join('/')
-}

From 06941fda334d7cc7e238363d7e60cb9268e8fa82 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 24 Aug 2018 00:25:17 +0800
Subject: [PATCH 146/242] Revert "refactor($core): extract dataMixin, try to
 reuse it at build time"

This reverts commit 45252a9fd410aaa225eb662e7ea0ebcd7443f072.
---
 packages/@vuepress/core/lib/app/app.js        |  2 +-
 .../{data-mixins/base.js => app/dataMixin.js} | 50 +++++++++++--------
 .../@vuepress/core/lib/data-mixins/client.js  | 33 ------------
 .../core/lib/internal-plugins/data-mixins.js  | 18 -------
 4 files changed, 29 insertions(+), 74 deletions(-)
 rename packages/@vuepress/core/lib/{data-mixins/base.js => app/dataMixin.js} (72%)
 delete mode 100644 packages/@vuepress/core/lib/data-mixins/client.js
 delete mode 100644 packages/@vuepress/core/lib/internal-plugins/data-mixins.js

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index ebe0359116..f2ea2b02e6 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -1,7 +1,7 @@
 /* global VUEPRESS_TEMP_PATH */
 import Vue from 'vue'
 import Router from 'vue-router'
-import dataMixin from '../data-mixins/client'
+import dataMixin from './dataMixin'
 import { routes } from '@internal/routes'
 import { siteData } from '@internal/siteData'
 import appEnhancers from '@internal/app-enhancers'
diff --git a/packages/@vuepress/core/lib/data-mixins/base.js b/packages/@vuepress/core/lib/app/dataMixin.js
similarity index 72%
rename from packages/@vuepress/core/lib/data-mixins/base.js
rename to packages/@vuepress/core/lib/app/dataMixin.js
index 35f5405929..3a109e1cf4 100644
--- a/packages/@vuepress/core/lib/data-mixins/base.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -1,25 +1,30 @@
-// This file would be used at both client and server side.
+/* global VUEPRESS_TEMP_PATH */
 
-function findPageForPath (pages, path) {
-  for (let i = 0; i < pages.length; i++) {
-    const page = pages[i]
-    if (page.path === path) {
-      return page
+import Vue from 'vue'
+import { findPageForPath } from './util'
+
+export default function dataMixin (siteData) {
+  prepare(siteData)
+  const store = new Vue({
+    data: {
+      siteData,
+      disableScrollBehavior: false
     }
+  })
+  Vue.$store = store
+
+  if (module.hot) {
+    module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
+      prepare(siteData)
+      store.siteData = siteData
+    })
   }
-  return {
-    path: '',
-    frontmatter: {}
-  }
-}
 
-module.exports = function dataMixin (siteData, route) {
   return {
     computed: {
       $site () {
-        return siteData
+        return store.siteData
       },
-
       $localeConfig () {
         const { locales = {}} = this.$site
         let targetLang
@@ -33,11 +38,9 @@ module.exports = function dataMixin (siteData, route) {
         }
         return targetLang || defaultLang || {}
       },
-
       $siteTitle () {
         return this.$localeConfig.title || this.$site.title || ''
       },
-
       $title () {
         const page = this.$page
         const siteTitle = this.$siteTitle
@@ -51,7 +54,6 @@ module.exports = function dataMixin (siteData, route) {
             : siteTitle
           : selfTitle || 'VuePress'
       },
-
       $description () {
         // #565 hoist description from meta
         if (this.$page.frontmatter.meta) {
@@ -60,26 +62,30 @@ module.exports = function dataMixin (siteData, route) {
         }
         return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''
       },
-
       $lang () {
         return this.$page.frontmatter.lang || this.$localeConfig.lang || 'en-US'
       },
-
       $localePath () {
         return this.$localeConfig.path || '/'
       },
-
       $themeLocaleConfig () {
         return (this.$site.themeConfig.locales || {})[this.$localePath] || {}
       },
-
       $page () {
         return findPageForPath(
           this.$site.pages,
-          route && route.path || this.$route.path
+          this.$route.path
         )
       }
     }
   }
 }
 
+function prepare (siteData) {
+  if (siteData.locales) {
+    Object.keys(siteData.locales).forEach(path => {
+      siteData.locales[path].path = path
+    })
+  }
+  Object.freeze(siteData)
+}
diff --git a/packages/@vuepress/core/lib/data-mixins/client.js b/packages/@vuepress/core/lib/data-mixins/client.js
deleted file mode 100644
index 14cd81d787..0000000000
--- a/packages/@vuepress/core/lib/data-mixins/client.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* global VUEPRESS_TEMP_PATH */
-
-import Vue from 'vue'
-import dataMixin from '@internal/data-mixins'
-
-export default function (siteData) {
-  prepare(siteData)
-  const store = new Vue({
-    data: {
-      siteData,
-      disableScrollBehavior: false
-    }
-  })
-  Vue.$store = store
-
-  if (module.hot) {
-    module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
-      prepare(siteData)
-      store.siteData = siteData
-    })
-  }
-
-  return dataMixin(siteData)
-}
-
-function prepare (siteData) {
-  if (siteData.locales) {
-    Object.keys(siteData.locales).forEach(path => {
-      siteData.locales[path].path = path
-    })
-  }
-  Object.freeze(siteData)
-}
diff --git a/packages/@vuepress/core/lib/internal-plugins/data-mixins.js b/packages/@vuepress/core/lib/internal-plugins/data-mixins.js
deleted file mode 100644
index 5090aa9db2..0000000000
--- a/packages/@vuepress/core/lib/internal-plugins/data-mixins.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const path = require('path')
-const { fs } = require('@vuepress/shared-utils')
-
-// This plugin generate a mirror es module of '/core/lib/data-mixins/base.js'
-// Since for now Webpack cannot allow 'ES6 import' to import a a commonjs
-// module.
-//
-// Ref: https://github.com/webpack/webpack/issues/4039
-module.exports = (options, context) => ({
-  name: '@vuepress/internal-enhance-app',
-
-  // @internal/data-mixins
-  async clientDynamicModules () {
-    const dataMixinsCommonjsModule = await fs.readFile(path.resolve(__dirname, '../data-mixins/base.js'), 'utf-8')
-    const dataMixinsEsModule = dataMixinsCommonjsModule.replace('module.exports =', 'export default')
-    return { name: 'data-mixins.js', content: dataMixinsEsModule, dirname: 'internal' }
-  }
-})

From c7d8ee9638cc41323d942a71d5b3d3497c50ff1a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 24 Aug 2018 01:35:03 +0800
Subject: [PATCH 147/242] feat($core): execute 'i18n' (i.e. dataMixin) on both
 server and client side

---
 packages/@vuepress/core/lib/app/dataMixin.js  | 71 +++----------
 .../core/lib/internal-plugins/i18nTemp.js     | 18 ++++
 .../@vuepress/core/lib/prepare/AppContext.js  |  6 +-
 packages/@vuepress/core/lib/prepare/I18n.js   | 99 +++++++++++++++++++
 packages/@vuepress/core/lib/prepare/Page.js   | 12 ++-
 5 files changed, 141 insertions(+), 65 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
 create mode 100644 packages/@vuepress/core/lib/prepare/I18n.js

diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index 3a109e1cf4..21ae871747 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -1,7 +1,7 @@
 /* global VUEPRESS_TEMP_PATH */
 
 import Vue from 'vue'
-import { findPageForPath } from './util'
+import I18n from '@internal/i18n'
 
 export default function dataMixin (siteData) {
   prepare(siteData)
@@ -20,65 +20,18 @@ export default function dataMixin (siteData) {
     })
   }
 
-  return {
-    computed: {
-      $site () {
-        return store.siteData
-      },
-      $localeConfig () {
-        const { locales = {}} = this.$site
-        let targetLang
-        let defaultLang
-        for (const path in locales) {
-          if (path === '/') {
-            defaultLang = locales[path]
-          } else if (this.$page.path.indexOf(path) === 0) {
-            targetLang = locales[path]
-          }
-        }
-        return targetLang || defaultLang || {}
-      },
-      $siteTitle () {
-        return this.$localeConfig.title || this.$site.title || ''
-      },
-      $title () {
-        const page = this.$page
-        const siteTitle = this.$siteTitle
-        const selfTitle = page.frontmatter.home ? null : (
-          page.frontmatter.title || // explicit title
-          page.title // inferred title
-        )
-        return siteTitle
-          ? selfTitle
-            ? (selfTitle + ' | ' + siteTitle)
-            : siteTitle
-          : selfTitle || 'VuePress'
-      },
-      $description () {
-        // #565 hoist description from meta
-        if (this.$page.frontmatter.meta) {
-          const descriptionMeta = this.$page.frontmatter.meta.filter(item => item.name === 'description')[0]
-          if (descriptionMeta) return descriptionMeta.content
-        }
-        return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''
-      },
-      $lang () {
-        return this.$page.frontmatter.lang || this.$localeConfig.lang || 'en-US'
-      },
-      $localePath () {
-        return this.$localeConfig.path || '/'
-      },
-      $themeLocaleConfig () {
-        return (this.$site.themeConfig.locales || {})[this.$localePath] || {}
-      },
-      $page () {
-        return findPageForPath(
-          this.$site.pages,
-          this.$route.path
-        )
-      }
+  const I18nConstructor = I18n(store)
+  const i18n = new I18nConstructor()
+  const descriptors = Object.getOwnPropertyDescriptors(Object.getPrototypeOf(i18n))
+  const computed = {}
+  Object.keys(descriptors).reduce((computed, key) => {
+    if (key.startsWith('$')) {
+      computed[key] = descriptors[key].get
     }
-  }
+    return computed
+  }, computed)
+
+  return { computed }
 }
 
 function prepare (siteData) {
diff --git a/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js b/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
new file mode 100644
index 0000000000..3c510c1a4d
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
@@ -0,0 +1,18 @@
+const path = require('path')
+const { fs } = require('@vuepress/shared-utils')
+
+// This plugin generate a mirror es module of 'lib/prepare/I18n.js'
+// Since for now Webpack doesn't allow 'ES6 import' to import a a commonjs
+// module.
+//
+// Ref: https://github.com/webpack/webpack/issues/4039
+module.exports = () => ({
+  name: '@vuepress/internal-i18n-temp',
+
+  // @internal/i18n
+  async clientDynamicModules () {
+    const i18nCommonjsModule = await fs.readFile(path.resolve(__dirname, '../prepare/i18n.js'), 'utf-8')
+    const i18nEsModule = i18nCommonjsModule.replace('module.exports =', 'export default')
+    return { name: 'i18n.js', content: i18nEsModule, dirname: 'internal' }
+  }
+})
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 1c8ab1916c..3eaed3cc92 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -6,6 +6,7 @@ const { sort } = require('./util')
 const { fs, logger, chalk } = require('@vuepress/shared-utils')
 
 const Page = require('./Page')
+const I18n = require('./I18n')
 const PluginAPI = require('../plugin-api/index')
 
 module.exports = class AppContext {
@@ -33,6 +34,7 @@ module.exports = class AppContext {
     this.markdown = createMarkdown(this.siteConfig)
     this.pluginAPI = new PluginAPI(this)
     this.pages = [] // Array<Page>
+    this.I18nConstructor = I18n(null)
   }
 
   /**
@@ -77,7 +79,7 @@ module.exports = class AppContext {
       .use(require('../internal-plugins/importAsyncComponent'))
       .use(require('../internal-plugins/enhanceApp'))
       .use(require('../internal-plugins/overrideCSS'))
-      .use(require('../internal-plugins/data-mixins'))
+      .use(require('../internal-plugins/i18nTemp'))
       // user plugin
       .useByPluginsConfig(this._options.plugins)
       .useByPluginsConfig(this.siteConfig.plugins)
@@ -147,7 +149,7 @@ module.exports = class AppContext {
    */
   async addPage (filePath, { relative, permalink }) {
     const page = new Page(filePath, { relative, permalink })
-    await page.process(this.markdown)
+    await page.process(this.markdown, new this.I18nConstructor((this.getSiteData.bind(this))))
     await this.pluginAPI.options.extendPageData.apply(page)
     this.pages.push(page)
   }
diff --git a/packages/@vuepress/core/lib/prepare/I18n.js b/packages/@vuepress/core/lib/prepare/I18n.js
new file mode 100644
index 0000000000..ff57b0e5f1
--- /dev/null
+++ b/packages/@vuepress/core/lib/prepare/I18n.js
@@ -0,0 +1,99 @@
+function findPageForPath (pages, path) {
+  for (let i = 0; i < pages.length; i++) {
+    const page = pages[i]
+    if (page.path === path) {
+      return page
+    }
+  }
+  return {
+    path: '',
+    frontmatter: {}
+  }
+}
+
+module.exports = (store /* null in server side */) => class I18n {
+  constructor (dataProvider) {
+    this.__ssrContext = true
+    this.__dataProvider = dataProvider
+  }
+
+  setSSRContext (context) {
+    this.__ssrContext = context
+  }
+
+  get $site () {
+    if (this.__ssrContext) {
+      const siteData = this.__dataProvider()
+      if (siteData.locales) {
+        Object.keys(siteData.locales).forEach(path => {
+          siteData.locales[path].path = path
+        })
+      }
+      return siteData
+    }
+    return store.siteData
+  }
+
+  get $localeConfig () {
+    const { locales = {}} = this.$site
+    let targetLang
+    let defaultLang
+    for (const path in locales) {
+      if (path === '/') {
+        defaultLang = locales[path]
+      } else if (this.$page.path.indexOf(path) === 0) {
+        targetLang = locales[path]
+      }
+    }
+    return targetLang || defaultLang || {}
+  }
+
+  get $siteTitle () {
+    return this.$localeConfig.title || this.$site.title || ''
+  }
+
+  get $title () {
+    const page = this.$page
+    const siteTitle = this.$siteTitle
+    const selfTitle = page.frontmatter.home ? null : (
+      page.frontmatter.title || // explicit title
+      page.title // inferred title
+    )
+    return siteTitle
+      ? selfTitle
+        ? (selfTitle + ' | ' + siteTitle)
+        : siteTitle
+      : selfTitle || 'VuePress'
+  }
+
+  get $description () {
+    // #565 hoist description from meta
+    if (this.$page.frontmatter.meta) {
+      const descriptionMeta = this.$page.frontmatter.meta.filter(item => item.name === 'description')[0]
+      if (descriptionMeta) return descriptionMeta.content
+    }
+    return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''
+  }
+
+  get $lang () {
+    return this.$page.frontmatter.lang || this.$localeConfig.lang || 'en-US'
+  }
+
+  get $localePath () {
+    return this.$localeConfig.path || '/'
+  }
+
+  get $themeLocaleConfig () {
+    return (this.$site.themeConfig.locales || {})[this.$localePath] || {}
+  }
+
+  get $page () {
+    if (this.__ssrContext) {
+      return this.__ssrContext
+    }
+    return findPageForPath(
+      this.$site.pages,
+      this.$route.path
+    )
+  }
+}
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index f8a1927ab1..85fba20767 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -11,18 +11,18 @@ const {
 module.exports = class Page {
   constructor (filePath, {
     relative,
-    routePath
+    permalink
   }) {
     this._filePath = filePath
     if (relative) {
       this._routePath = encodeURI(fileToPath(relative))
-    } else {
-      this._routePath = encodeURI(routePath)
+    } else if (permalink) {
+      this._routePath = encodeURI(permalink)
     }
     this.path = this._routePath
   }
 
-  async process (markdown) {
+  async process (markdown, i18n) {
     this.key = 'v-' + Math.random().toString(16).slice(2)
     this._content = await fs.readFile(this._filePath, 'utf-8')
     const frontmatter = parseFrontmatter(this._content)
@@ -49,6 +49,10 @@ module.exports = class Page {
       const { html } = markdown.render(frontmatter.excerpt)
       this.excerpt = html
     }
+
+    // resolve i18n
+    i18n.setSSRContext(this)
+    this._i18n = i18n
   }
 
   get filename () {

From 2bdf88c9eb882026014d5d01ac6fc27ee955afb7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 01:39:12 +0800
Subject: [PATCH 148/242] feat: blog stage 1 - permalink (#763)

* feat: siteConfig.permalink & frontmatter.permalink

* chore: ensure leading and ending slash

* chore: update comment
---
 .../core/lib/internal-plugins/routes.js       | 12 +++-
 .../@vuepress/core/lib/prepare/AppContext.js  |  6 +-
 packages/@vuepress/core/lib/prepare/Page.js   | 18 +++++-
 packages/@vuepress/core/lib/prepare/util.js   | 61 +++++++++++++++++++
 .../@vuepress/theme-default/src/Layout.vue    |  2 +-
 .../@vuepress/theme-default/src/Sidebar.vue   |  2 +-
 packages/@vuepress/theme-default/src/util.js  | 28 +++++++--
 packages/docs/docs/guide/assets.md            |  5 ++
 8 files changed, 120 insertions(+), 14 deletions(-)

diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index aa8328829e..ef8f9a17e0 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -17,12 +17,12 @@ async function genRoutesFile (pages) {
   function genRoute ({
     path: pagePath,
     key: componentName,
-    frontmatter = {}
+    regularPath
   }) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
-    path: ${JSON.stringify(frontmatter.permalink || pagePath)},
+    path: ${JSON.stringify(pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
       registerComponent(${JSON.stringify(componentName)}).then(() => next())
@@ -46,6 +46,14 @@ async function genRoutesFile (pages) {
   }`
     }
 
+    if (regularPath !== pagePath) {
+      code += `,
+  {
+    path: ${JSON.stringify(regularPath)},
+    redirect: ${JSON.stringify(pagePath)}
+  }`
+    }
+
     return code
   }
 
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 3eaed3cc92..0877c926fb 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -149,7 +149,11 @@ module.exports = class AppContext {
    */
   async addPage (filePath, { relative, permalink }) {
     const page = new Page(filePath, { relative, permalink })
-    await page.process(this.markdown, new this.I18nConstructor((this.getSiteData.bind(this))))
+    await page.process(
+      this.markdown,
+      this.siteConfig.permalink,
+      new this.I18nConstructor((this.getSiteData.bind(this))),
+    )
     await this.pluginAPI.options.extendPageData.apply(page)
     this.pages.push(page)
   }
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 85fba20767..38cb3cb600 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const slugify = require('../markdown/slugify')
 const { fs } = require('@vuepress/shared-utils')
-const { fileToPath } = require('./util')
+const { fileToPath, getPermalink } = require('./util')
 const {
   inferTitle,
   extractHeaders,
@@ -19,10 +19,10 @@ module.exports = class Page {
     } else if (permalink) {
       this._routePath = encodeURI(permalink)
     }
-    this.path = this._routePath
+    this.regularPath = this.path = this._routePath
   }
 
-  async process (markdown, i18n) {
+  async process (markdown, permalinkPattern, i18n) {
     this.key = 'v-' + Math.random().toString(16).slice(2)
     this._content = await fs.readFile(this._filePath, 'utf-8')
     const frontmatter = parseFrontmatter(this._content)
@@ -53,6 +53,18 @@ module.exports = class Page {
     // resolve i18n
     i18n.setSSRContext(this)
     this._i18n = i18n
+
+    this.permalink = getPermalink({
+      pattern: this.frontmatter.permalink || permalinkPattern,
+      slug: this.slug,
+      date: this.frontmatter.date,
+      localePath: i18n.$localePath,
+      regularPath: this.regularPath
+    })
+
+    if (this.permalink) {
+      this.path = this.permalink
+    }
   }
 
   get filename () {
diff --git a/packages/@vuepress/core/lib/prepare/util.js b/packages/@vuepress/core/lib/prepare/util.js
index 4bb3213fd8..54233fe06d 100644
--- a/packages/@vuepress/core/lib/prepare/util.js
+++ b/packages/@vuepress/core/lib/prepare/util.js
@@ -24,3 +24,64 @@ exports.sort = function (arr) {
     return 0
   })
 }
+
+// e.g.
+// filename: docs/_posts/evan you.md
+// content: # yyx 990803
+// date: 2018-08-14 11:22:33
+// :year/:month/:day/:slug/ => 2018/08/14/evan-you/
+// :year-:month-:day-:slug/ => 2018-08-14-evan-you/
+// :year/:month/:day/:title/ => 2018/08/14/yyx 990803/
+// :year/:month/:day/:original/ => 2018/08/14/_posts/evan you.html
+
+exports.getPermalink = function ({
+  pattern,
+  slug,
+  date,
+  regularPath,
+  localePath
+}) {
+  if (!pattern) {
+    return
+  }
+  slug = encodeURI(slug)
+
+  const d = new Date(date)
+  const year = d.getFullYear()
+  const iMonth = d.getMonth() + 1
+  const iDay = d.getDate()
+  const minutes = d.getMinutes()
+  const seconds = d.getSeconds()
+  const month = iMonth < 10 ? `0${iMonth}` : iMonth
+  const day = iDay < 10 ? `0${iDay}` : iDay
+
+  // Remove leading slash
+  pattern = pattern.replace(/^\//, '')
+
+  const link =
+    localePath +
+    pattern
+      .replace(/:year/, year)
+      .replace(/:month/, month)
+      .replace(/:i_month/, iMonth)
+      .replace(/:i_day/, iDay)
+      .replace(/:day/, day)
+      .replace(/:minutes/, minutes)
+      .replace(/:seconds/, seconds)
+      .replace(/:slug/, slug)
+      .replace(/:regular/, regularPath)
+
+  return ensureLeadingSlash(
+    ensureEndingSlash(link)
+  )
+}
+
+function ensureLeadingSlash (path) {
+  return path.replace(/^\/?/, '/')
+}
+
+function ensureEndingSlash (path) {
+  return /(\.html|\/)$/.test(path)
+    ? path
+    : path + '/'
+}
diff --git a/packages/@vuepress/theme-default/src/Layout.vue b/packages/@vuepress/theme-default/src/Layout.vue
index 43583738a0..9a09b0774a 100644
--- a/packages/@vuepress/theme-default/src/Layout.vue
+++ b/packages/@vuepress/theme-default/src/Layout.vue
@@ -103,7 +103,7 @@ export default {
     sidebarItems () {
       return resolveSidebarItems(
         this.$page,
-        this.$route,
+        this.$page.regularPath,
         this.$site,
         this.$localePath
       )
diff --git a/packages/@vuepress/theme-default/src/Sidebar.vue b/packages/@vuepress/theme-default/src/Sidebar.vue
index 7bcf00598b..17e3f6eda1 100644
--- a/packages/@vuepress/theme-default/src/Sidebar.vue
+++ b/packages/@vuepress/theme-default/src/Sidebar.vue
@@ -62,7 +62,7 @@ export default {
     },
 
     isActive (page) {
-      return isActive(this.$route, page.path)
+      return isActive(this.$route, page.regularPath)
     }
   }
 }
diff --git a/packages/@vuepress/theme-default/src/util.js b/packages/@vuepress/theme-default/src/util.js
index ef95bea552..01937e9888 100644
--- a/packages/@vuepress/theme-default/src/util.js
+++ b/packages/@vuepress/theme-default/src/util.js
@@ -59,10 +59,10 @@ export function resolvePage (pages, rawPath, base) {
   }
   const path = normalize(rawPath)
   for (let i = 0; i < pages.length; i++) {
-    if (normalize(pages[i].path) === path) {
+    if (normalize(pages[i].regularPath) === path) {
       return Object.assign({}, pages[i], {
         type: 'page',
-        path: ensureExt(rawPath)
+        path: ensureExt(pages[i].path)
       })
     }
   }
@@ -108,7 +108,14 @@ function resolvePath (relative, base, append) {
   return stack.join('/')
 }
 
-export function resolveSidebarItems (page, route, site, localePath) {
+/**
+ * @param { Page } page
+ * @param { string } regularPath
+ * @param { SiteData } site
+ * @param { string } localePath
+ * @returns { SidebarGroup }
+ */
+export function resolveSidebarItems (page, regularPath, site, localePath) {
   const { pages, themeConfig } = site
 
   const localeConfig = localePath && themeConfig.locales
@@ -124,13 +131,17 @@ export function resolveSidebarItems (page, route, site, localePath) {
   if (!sidebarConfig) {
     return []
   } else {
-    const { base, config } = resolveMatchingConfig(route, sidebarConfig)
+    const { base, config } = resolveMatchingConfig(regularPath, sidebarConfig)
     return config
       ? config.map(item => resolveItem(item, pages, base))
       : []
   }
 }
 
+/**
+ * @param { Page } page
+ * @returns { SidebarGroup }
+ */
 function resolveHeaders (page) {
   const headers = groupHeaders(page.headers || [])
   return [{
@@ -167,7 +178,12 @@ export function resolveNavLinkItem (linkItem) {
   })
 }
 
-export function resolveMatchingConfig (route, config) {
+/**
+ * @param { Route } route
+ * @param { Array<string|string[]> | Array<SidebarGroup> | [link: string]: SidebarConfig } config
+ * @returns { base: string, config: SidebarConfig }
+ */
+export function resolveMatchingConfig (regularPath, config) {
   if (Array.isArray(config)) {
     return {
       base: '/',
@@ -175,7 +191,7 @@ export function resolveMatchingConfig (route, config) {
     }
   }
   for (const base in config) {
-    if (ensureEndingSlash(route.path).indexOf(base) === 0) {
+    if (ensureEndingSlash(regularPath).indexOf(base) === 0) {
       return {
         base,
         config: config[base]
diff --git a/packages/docs/docs/guide/assets.md b/packages/docs/docs/guide/assets.md
index 04a6eb31fe..1d4b8f5571 100644
--- a/packages/docs/docs/guide/assets.md
+++ b/packages/docs/docs/guide/assets.md
@@ -1,3 +1,8 @@
+---
+permalink: :year/:month/:day/:slug
+date: 2018-08-15 11:22:33
+---
+
 # Asset Handling
 
 ## Relative URLs

From 5599ae0b7a53730040aabb8034c85084e8a454ce Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 01:59:29 +0800
Subject: [PATCH 149/242] test($core): use es6 import

ref: https://github.com/facebook/jest/issues/6835
---
 .babelrc                                                 | 9 ---------
 babel.config.js                                          | 9 +++++++++
 .../@vuepress/core/__test__/plugin-api/Option.spec.js    | 5 +----
 .../@vuepress/core/__test__/plugin-api/PluginAPI.spec.js | 4 ++--
 .../core/__test__/plugin-api/PluginUtil.spec.js          | 6 ++----
 5 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 .babelrc
 create mode 100644 babel.config.js

diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 427e7a4d01..0000000000
--- a/.babelrc
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "env": {
-    "test": {
-      "presets": [
-        ["@babel/preset-env", { "targets": { "node": 8 }}]
-      ]
-    }
-  }
-}
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000000..8f54044712
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  'env': {
+    'test': {
+      'presets': [
+        ['@babel/preset-env', { 'targets': { 'node': 8 }}]
+      ]
+    }
+  }
+}
diff --git a/packages/@vuepress/core/__test__/plugin-api/Option.spec.js b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
index a80b3db3e6..9670814ad0 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
@@ -1,7 +1,4 @@
-// TODO change to ES6 import
-// https://github.com/facebook/jest/issues/6835
-
-const Option = require('../../lib/plugin-api/Option')
+import Option from '../../lib/plugin-api/Option'
 
 describe('Option', () => {
   test('shoould option record the key', () => {
diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
index 32895dd6bb..740ca7f767 100644
--- a/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
@@ -2,8 +2,8 @@ jest.mock('vuepress-plugin-a')
 jest.mock('vuepress-plugin-b')
 jest.mock('@org/vuepress-plugin-a')
 
-const PluginAPI = require('../../lib/plugin-api/index')
-const { PLUGIN_OPTION_MAP } = require('../../lib/plugin-api/constants')
+import PluginAPI from '../../lib/plugin-api/index'
+import { PLUGIN_OPTION_MAP } from '../../lib/plugin-api/constants'
 
 describe('Plugin', () => {
   test('should \'registerOption\' work.', () => {
diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
index f0fe55bf44..b1c009f5b9 100644
--- a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
@@ -1,18 +1,16 @@
 jest.mock('vuepress-plugin-a')
 jest.mock('@org/vuepress-plugin-a')
 
-const {
+import {
   resolvePlugin,
   hydratePlugin,
   resolveScopePackage
-} = require('../../lib/plugin-api/util')
+} from '../../lib/plugin-api/util'
 
 function resolveMockModule (name) {
   return require(`../../../../../__mocks__/${name}`)
 }
 
-// const Plugin = require('../../lib/plugin-api/index')
-
 describe('resolvePlugin', () => {
   test('should resolve scope packages correctly.', () => {
     const pkg1 = resolveScopePackage('@vuepress/plugin-a')

From c1d7aeb5519992d428283cb3c320d39068357f05 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 14:28:33 +0800
Subject: [PATCH 150/242] test($core): migrate test for markdown

---
 .../markdown/__snapshots__/containers.spec.js.snap   |  0
 .../markdown/__snapshots__/highlight.spec.js.snap    |  0
 .../__snapshots__/highlightLines.spec.js.snap        |  0
 .../markdown/__snapshots__/hoist.spec.js.snap        |  0
 .../markdown/__snapshots__/lineNumers.spec.js.snap   |  0
 .../markdown/__snapshots__/link.spec.js.snap         |  0
 .../markdown/__snapshots__/snippet.spec.js.snap      |  0
 .../core/__test__}/markdown/containers.spec.js       |  2 +-
 .../fragments/code-highlightLines-multiple.md        |  0
 .../markdown/fragments/code-highlightLines-single.md |  0
 .../code-snippet-highlightLines-multiple.md          |  1 +
 .../fragments/code-snippet-highlightLines-single.md  |  1 +
 .../core/__test__/markdown/fragments/code-snippet.md |  1 +
 .../core/__test__}/markdown/fragments/code.md        |  0
 .../__test__}/markdown/fragments/container-danger.md |  0
 .../markdown/fragments/container-tip-override.md     |  0
 .../__test__}/markdown/fragments/container-tip.md    |  0
 .../__test__}/markdown/fragments/container-v-pre.md  |  0
 .../markdown/fragments/container-warning.md          |  0
 .../core/__test__}/markdown/fragments/hoist.md       |  0
 .../core/__test__}/markdown/fragments/snippet.js     |  0
 .../core/__test__}/markdown/highlight.spec.js        |  2 +-
 .../core/__test__}/markdown/highlightLines.spec.js   |  2 +-
 .../@vuepress/core/__test__}/markdown/hoist.spec.js  |  4 ++--
 .../core/__test__}/markdown/lineNumers.spec.js       |  6 +++---
 .../@vuepress/core/__test__}/markdown/link.spec.js   |  4 ++--
 .../core/__test__}/markdown/slugify.spec.js          |  2 +-
 .../core/__test__}/markdown/snippet.spec.js          |  4 ++--
 .../@vuepress/core/__test__}/markdown/util.js        |  0
 scripts/jest.config.js                               | 12 ------------
 .../code-snippet-highlightLines-multiple.md          |  1 -
 .../fragments/code-snippet-highlightLines-single.md  |  1 -
 test/markdown/fragments/code-snippet.md              |  1 -
 33 files changed, 16 insertions(+), 28 deletions(-)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/containers.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/highlight.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/highlightLines.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/hoist.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/lineNumers.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/link.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/__snapshots__/snippet.spec.js.snap (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/containers.spec.js (87%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/code-highlightLines-multiple.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/code-highlightLines-single.md (100%)
 create mode 100644 packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-multiple.md
 create mode 100644 packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-single.md
 create mode 100644 packages/@vuepress/core/__test__/markdown/fragments/code-snippet.md
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/code.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/container-danger.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/container-tip-override.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/container-tip.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/container-v-pre.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/container-warning.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/hoist.md (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/fragments/snippet.js (100%)
 rename {test => packages/@vuepress/core/__test__}/markdown/highlight.spec.js (87%)
 rename {test => packages/@vuepress/core/__test__}/markdown/highlightLines.spec.js (92%)
 rename {test => packages/@vuepress/core/__test__}/markdown/hoist.spec.js (84%)
 rename {test => packages/@vuepress/core/__test__}/markdown/lineNumers.spec.js (79%)
 rename {test => packages/@vuepress/core/__test__}/markdown/link.spec.js (94%)
 rename {test => packages/@vuepress/core/__test__}/markdown/slugify.spec.js (92%)
 rename {test => packages/@vuepress/core/__test__}/markdown/snippet.spec.js (86%)
 rename {test => packages/@vuepress/core/__test__}/markdown/util.js (100%)
 delete mode 100644 test/markdown/fragments/code-snippet-highlightLines-multiple.md
 delete mode 100644 test/markdown/fragments/code-snippet-highlightLines-single.md
 delete mode 100644 test/markdown/fragments/code-snippet.md

diff --git a/test/markdown/__snapshots__/containers.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/containers.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/containers.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/containers.spec.js.snap
diff --git a/test/markdown/__snapshots__/highlight.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/highlight.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/highlight.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/highlight.spec.js.snap
diff --git a/test/markdown/__snapshots__/highlightLines.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/highlightLines.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/highlightLines.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/highlightLines.spec.js.snap
diff --git a/test/markdown/__snapshots__/hoist.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/hoist.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/hoist.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/hoist.spec.js.snap
diff --git a/test/markdown/__snapshots__/lineNumers.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/lineNumers.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/lineNumers.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/lineNumers.spec.js.snap
diff --git a/test/markdown/__snapshots__/link.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/link.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/link.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/link.spec.js.snap
diff --git a/test/markdown/__snapshots__/snippet.spec.js.snap b/packages/@vuepress/core/__test__/markdown/__snapshots__/snippet.spec.js.snap
similarity index 100%
rename from test/markdown/__snapshots__/snippet.spec.js.snap
rename to packages/@vuepress/core/__test__/markdown/__snapshots__/snippet.spec.js.snap
diff --git a/test/markdown/containers.spec.js b/packages/@vuepress/core/__test__/markdown/containers.spec.js
similarity index 87%
rename from test/markdown/containers.spec.js
rename to packages/@vuepress/core/__test__/markdown/containers.spec.js
index dd4fdb4281..b21523811a 100644
--- a/test/markdown/containers.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/containers.spec.js
@@ -1,5 +1,5 @@
 import { Md, getFragment } from './util'
-import containers from '@/markdown/containers.js'
+import containers from '../../lib/markdown/containers.js'
 
 const mdC = Md().use(containers)
 
diff --git a/test/markdown/fragments/code-highlightLines-multiple.md b/packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-multiple.md
similarity index 100%
rename from test/markdown/fragments/code-highlightLines-multiple.md
rename to packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-multiple.md
diff --git a/test/markdown/fragments/code-highlightLines-single.md b/packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-single.md
similarity index 100%
rename from test/markdown/fragments/code-highlightLines-single.md
rename to packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-single.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-multiple.md b/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-multiple.md
new file mode 100644
index 0000000000..c06bf83f85
--- /dev/null
+++ b/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-multiple.md
@@ -0,0 +1 @@
+<<< @/packages/@vuepress/core/__test__/markdown/fragments/snippet.js{1-3}
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-single.md b/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-single.md
new file mode 100644
index 0000000000..d98c6ce859
--- /dev/null
+++ b/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-single.md
@@ -0,0 +1 @@
+<<< @/packages/@vuepress/core/__test__/markdown/fragments/snippet.js{1,3}
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-snippet.md b/packages/@vuepress/core/__test__/markdown/fragments/code-snippet.md
new file mode 100644
index 0000000000..5b87126e7f
--- /dev/null
+++ b/packages/@vuepress/core/__test__/markdown/fragments/code-snippet.md
@@ -0,0 +1 @@
+<<< @/packages/@vuepress/core/__test__/markdown/fragments/snippet.js
\ No newline at end of file
diff --git a/test/markdown/fragments/code.md b/packages/@vuepress/core/__test__/markdown/fragments/code.md
similarity index 100%
rename from test/markdown/fragments/code.md
rename to packages/@vuepress/core/__test__/markdown/fragments/code.md
diff --git a/test/markdown/fragments/container-danger.md b/packages/@vuepress/core/__test__/markdown/fragments/container-danger.md
similarity index 100%
rename from test/markdown/fragments/container-danger.md
rename to packages/@vuepress/core/__test__/markdown/fragments/container-danger.md
diff --git a/test/markdown/fragments/container-tip-override.md b/packages/@vuepress/core/__test__/markdown/fragments/container-tip-override.md
similarity index 100%
rename from test/markdown/fragments/container-tip-override.md
rename to packages/@vuepress/core/__test__/markdown/fragments/container-tip-override.md
diff --git a/test/markdown/fragments/container-tip.md b/packages/@vuepress/core/__test__/markdown/fragments/container-tip.md
similarity index 100%
rename from test/markdown/fragments/container-tip.md
rename to packages/@vuepress/core/__test__/markdown/fragments/container-tip.md
diff --git a/test/markdown/fragments/container-v-pre.md b/packages/@vuepress/core/__test__/markdown/fragments/container-v-pre.md
similarity index 100%
rename from test/markdown/fragments/container-v-pre.md
rename to packages/@vuepress/core/__test__/markdown/fragments/container-v-pre.md
diff --git a/test/markdown/fragments/container-warning.md b/packages/@vuepress/core/__test__/markdown/fragments/container-warning.md
similarity index 100%
rename from test/markdown/fragments/container-warning.md
rename to packages/@vuepress/core/__test__/markdown/fragments/container-warning.md
diff --git a/test/markdown/fragments/hoist.md b/packages/@vuepress/core/__test__/markdown/fragments/hoist.md
similarity index 100%
rename from test/markdown/fragments/hoist.md
rename to packages/@vuepress/core/__test__/markdown/fragments/hoist.md
diff --git a/test/markdown/fragments/snippet.js b/packages/@vuepress/core/__test__/markdown/fragments/snippet.js
similarity index 100%
rename from test/markdown/fragments/snippet.js
rename to packages/@vuepress/core/__test__/markdown/fragments/snippet.js
diff --git a/test/markdown/highlight.spec.js b/packages/@vuepress/core/__test__/markdown/highlight.spec.js
similarity index 87%
rename from test/markdown/highlight.spec.js
rename to packages/@vuepress/core/__test__/markdown/highlight.spec.js
index 19522235f8..6870dcc370 100644
--- a/test/markdown/highlight.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/highlight.spec.js
@@ -1,5 +1,5 @@
 import { Md, getFragment } from './util'
-import highlight from '@/markdown/highlight.js'
+import highlight from '../../lib/markdown/highlight.js'
 
 const md = Md()
 const mdH = Md().set({ highlight })
diff --git a/test/markdown/highlightLines.spec.js b/packages/@vuepress/core/__test__/markdown/highlightLines.spec.js
similarity index 92%
rename from test/markdown/highlightLines.spec.js
rename to packages/@vuepress/core/__test__/markdown/highlightLines.spec.js
index 49fe7065c4..06f1394b7c 100644
--- a/test/markdown/highlightLines.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/highlightLines.spec.js
@@ -1,5 +1,5 @@
 import { Md, getFragment } from './util'
-import highlightLines from '@/markdown/highlightLines.js'
+import highlightLines from '../../lib/markdown/highlightLines.js'
 
 const md = Md()
 const mdH = Md().use(highlightLines)
diff --git a/test/markdown/hoist.spec.js b/packages/@vuepress/core/__test__/markdown/hoist.spec.js
similarity index 84%
rename from test/markdown/hoist.spec.js
rename to packages/@vuepress/core/__test__/markdown/hoist.spec.js
index b2c5281b27..a625a39c29 100644
--- a/test/markdown/hoist.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/hoist.spec.js
@@ -1,6 +1,6 @@
 import { Md, getFragment } from './util'
-import hoist from '@/markdown/hoist.js'
-import { dataReturnable } from '@/markdown/index.js'
+import hoist from '../../lib/markdown/hoist.js'
+import { dataReturnable } from '../../lib/markdown/index.js'
 
 const md = Md().set({ html: true })
 const mdH = Md().set({ html: true }).use(hoist)
diff --git a/test/markdown/lineNumers.spec.js b/packages/@vuepress/core/__test__/markdown/lineNumers.spec.js
similarity index 79%
rename from test/markdown/lineNumers.spec.js
rename to packages/@vuepress/core/__test__/markdown/lineNumers.spec.js
index f7efafb85f..8f3510659b 100644
--- a/test/markdown/lineNumers.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/lineNumers.spec.js
@@ -1,7 +1,7 @@
 import { Md, getFragment } from './util'
-import preWrapper from '@/markdown/preWrapper.js'
-import lineNumbers from '@/markdown/lineNumbers.js'
-import highlightLines from '@/markdown/highlightLines.js'
+import preWrapper from '../../lib/markdown/preWrapper.js'
+import lineNumbers from '../../lib/markdown/lineNumbers.js'
+import highlightLines from '../../lib/markdown/highlightLines.js'
 
 // lineNumbers must be chained after preWrapper.
 // since lineNumbers needs to add extra stateful class to its block wrapper.
diff --git a/test/markdown/link.spec.js b/packages/@vuepress/core/__test__/markdown/link.spec.js
similarity index 94%
rename from test/markdown/link.spec.js
rename to packages/@vuepress/core/__test__/markdown/link.spec.js
index 620c9fa488..78274b6f3f 100644
--- a/test/markdown/link.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/link.spec.js
@@ -1,6 +1,6 @@
 import { Md } from './util'
-import link from '@/markdown/link.js'
-import { dataReturnable } from '@/markdown/index.js'
+import link from '../../lib/markdown/link.js'
+import { dataReturnable } from '../../lib/markdown/index.js'
 
 const mdL = Md().use(link, {
   target: '_blank',
diff --git a/test/markdown/slugify.spec.js b/packages/@vuepress/core/__test__/markdown/slugify.spec.js
similarity index 92%
rename from test/markdown/slugify.spec.js
rename to packages/@vuepress/core/__test__/markdown/slugify.spec.js
index 7782eaeea0..3247e590e3 100644
--- a/test/markdown/slugify.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/slugify.spec.js
@@ -1,6 +1,6 @@
 import { Md } from './util'
 import anchor from 'markdown-it-anchor'
-import slugify from '@/markdown/slugify.js'
+import slugify from '../../lib/markdown/slugify.js'
 
 const mdS = Md().use(anchor, {
   slugify,
diff --git a/test/markdown/snippet.spec.js b/packages/@vuepress/core/__test__/markdown/snippet.spec.js
similarity index 86%
rename from test/markdown/snippet.spec.js
rename to packages/@vuepress/core/__test__/markdown/snippet.spec.js
index 0131132916..140b68cd64 100644
--- a/test/markdown/snippet.spec.js
+++ b/packages/@vuepress/core/__test__/markdown/snippet.spec.js
@@ -1,6 +1,6 @@
 import { Md, getFragment } from './util'
-import snippet from '@/markdown/snippet.js'
-import highlightLines from '@/markdown/highlightLines.js'
+import snippet from '../../lib/markdown/snippet.js'
+import highlightLines from '../../lib/markdown/highlightLines.js'
 
 const md = Md().use(snippet)
 const mdH = Md().use(snippet).use(highlightLines)
diff --git a/test/markdown/util.js b/packages/@vuepress/core/__test__/markdown/util.js
similarity index 100%
rename from test/markdown/util.js
rename to packages/@vuepress/core/__test__/markdown/util.js
diff --git a/scripts/jest.config.js b/scripts/jest.config.js
index 6ee7a818e0..a6e7eff73a 100644
--- a/scripts/jest.config.js
+++ b/scripts/jest.config.js
@@ -15,18 +15,6 @@ module.exports = {
     'test.js',
     path.resolve(__dirname, '../test')
   ],
-  // projects: [
-  //   '<rootDir>/packages/@vuepress/*',
-  //   {
-  //     displayName: 'test',
-  //     verbose: true,
-  //     runner: 'jest',
-  //     testURL: 'http://localhost/',
-  //     testMatch: [
-  //       '<rootDir>/packages/@vuepress/*.js'
-  //     ]
-  //   }
-  // ],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/$1'
   },
diff --git a/test/markdown/fragments/code-snippet-highlightLines-multiple.md b/test/markdown/fragments/code-snippet-highlightLines-multiple.md
deleted file mode 100644
index 01aef2de27..0000000000
--- a/test/markdown/fragments/code-snippet-highlightLines-multiple.md
+++ /dev/null
@@ -1 +0,0 @@
-<<< @/test/markdown/fragments/snippet.js{1-3}
diff --git a/test/markdown/fragments/code-snippet-highlightLines-single.md b/test/markdown/fragments/code-snippet-highlightLines-single.md
deleted file mode 100644
index 1916b68411..0000000000
--- a/test/markdown/fragments/code-snippet-highlightLines-single.md
+++ /dev/null
@@ -1 +0,0 @@
-<<< @/test/markdown/fragments/snippet.js{1,3}
diff --git a/test/markdown/fragments/code-snippet.md b/test/markdown/fragments/code-snippet.md
deleted file mode 100644
index 65e9148549..0000000000
--- a/test/markdown/fragments/code-snippet.md
+++ /dev/null
@@ -1 +0,0 @@
-<<< @/test/markdown/fragments/snippet.js

From 8e8406527952aef204e903b842b9b540b2bebcd9 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 14:48:28 +0800
Subject: [PATCH 151/242] feat($shared-utils): allow change temp path at
 runtime via env.

---
 packages/@vuepress/shared-utils/lib/writeTemp.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/@vuepress/shared-utils/lib/writeTemp.js b/packages/@vuepress/shared-utils/lib/writeTemp.js
index d75f6f3dd7..76aa70195e 100644
--- a/packages/@vuepress/shared-utils/lib/writeTemp.js
+++ b/packages/@vuepress/shared-utils/lib/writeTemp.js
@@ -5,8 +5,7 @@ if (!process.env.VUEPRESS_TEMP_PATH) {
   process.env.VUEPRESS_TEMP_PATH = path.resolve(__dirname, '../.temp')
 }
 
-const tempPath = process.env.VUEPRESS_TEMP_PATH
-fs.ensureDirSync(tempPath)
+fs.ensureDirSync(process.env.VUEPRESS_TEMP_PATH)
 
 const tempCache = new Map()
 
@@ -17,7 +16,7 @@ const tempCache = new Map()
  * @returns {Promise<*|string>}
  */
 async function writeTemp (file, content) {
-  const destPath = path.join(tempPath, file)
+  const destPath = path.join(process.env.VUEPRESS_TEMP_PATH, file)
   await fs.ensureDir(path.parse(destPath).dir)
   // cache write to avoid hitting the dist if it didn't change
   const cached = tempCache.get(file)

From 11997f029413bac8be70b553e9bac0c139d1cd03 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 15:44:36 +0800
Subject: [PATCH 152/242] chore: normalize prepare API.

---
 packages/@vuepress/core/lib/build.js         | 3 ++-
 packages/@vuepress/core/lib/dev.js           | 5 +++--
 packages/@vuepress/core/lib/prepare/index.js | 9 +++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 7d291d17b4..cb3bbcd5ec 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -14,7 +14,8 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util/index')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare({ sourceDir, cliOptions, isProd: true })
+  const { theme, plugins } = cliOptions
+  const options = await prepare(sourceDir, { theme, plugins, isProd: true })
   if (cliOptions.outDir) {
     options.outDir = cliOptions.outDir
   }
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index a2cfd0a192..019973c5d2 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -18,12 +18,13 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare({ sourceDir, cliOptions, isProd: false })
+  const { theme, plugins } = cliOptions
+  const options = await prepare(sourceDir, { theme, plugins, isProd: false })
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
     options.pluginAPI.options.updated.syncApply()
-    prepare({ sourceDir, cliOptions, isProd: false }).catch(err => {
+    prepare(sourceDir, { theme, plugins, isProd: false }).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
   }
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 68c0998068..9b1613b139 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,12 +1,9 @@
 const AppContext = require('./AppContext')
 
-module.exports = async function prepare ({
-  sourceDir,
+module.exports = async function prepare (sourceDir, {
   isProd,
-  cliOptions: {
-    plugins,
-    theme
-  }
+  plugins,
+  theme
 }) {
   const appContext = new AppContext(sourceDir, { plugins, theme, isProd })
   await appContext.process()

From d708d33123fce07e92ce5e6503db3257a35840ca Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 16:45:10 +0800
Subject: [PATCH 153/242] feat: allow to lanuch multiple apps with isolated
 context at the same time.

1. Move writeTemp utility from @vuepress/shared-utils to @vuepress/core
2. Support for passing temp path from CLI
3. Create writeTemp dynamically
---
 packages/@vuepress/cli/index.js               | 10 ++--
 packages/@vuepress/core/lib/build.js          |  4 +-
 packages/@vuepress/core/lib/dev.js            |  6 +--
 .../core/lib/internal-plugins/overrideCSS.js  |  4 +-
 .../option/ClientDynamicModulesOption.js      |  5 +-
 .../option/EnhanceAppFilesOption.js           | 11 ++--
 .../option/GlobalUIComponentsOption.js        |  5 +-
 .../@vuepress/core/lib/prepare/AppContext.js  | 52 +++++++++++++++++--
 packages/@vuepress/core/lib/prepare/index.js  |  5 +-
 .../core/lib/webpack/createBaseConfig.js      | 11 ++--
 packages/@vuepress/shared-utils/index.js      |  1 -
 .../@vuepress/shared-utils/lib/writeTemp.js   | 30 -----------
 12 files changed, 78 insertions(+), 66 deletions(-)
 delete mode 100644 packages/@vuepress/shared-utils/lib/writeTemp.js

diff --git a/packages/@vuepress/cli/index.js b/packages/@vuepress/cli/index.js
index a1d8d56492..6c60a1f389 100644
--- a/packages/@vuepress/cli/index.js
+++ b/packages/@vuepress/cli/index.js
@@ -42,19 +42,21 @@ exports.bootstrap = function ({
     .description('start development server')
     .option('-p, --port <port>', 'use specified port (default: 8080)')
     .option('-h, --host <host>', 'use specified host (default: 0.0.0.0)')
+    .option('-t, --temp <temp>', 'set the directory of the temporary file')
     .option('--debug', 'start development server in debug mode')
-    .action((dir = '.', { host, port, debug }) => {
-      wrapCommand(dev)(path.resolve(dir), { host, port, debug, plugins, theme })
+    .action((dir = '.', { host, port, debug, temp }) => {
+      wrapCommand(dev)(path.resolve(dir), { host, port, debug, plugins, theme, temp })
     })
 
   program
     .command('build [targetDir]')
     .description('build dir as static site')
     .option('-d, --dest <outDir>', 'specify build output dir (default: .vuepress/dist)')
+    .option('-t, --temp <temp>', 'set the directory of the temporary file')
     .option('--debug', 'build in development mode for debugging')
-    .action((dir = '.', { debug, dest }) => {
+    .action((dir = '.', { debug, dest, temp }) => {
       const outDir = dest ? path.resolve(dest) : null
-      wrapCommand(build)(path.resolve(dir), { debug, outDir, plugins, theme })
+      wrapCommand(build)(path.resolve(dir), { debug, outDir, plugins, theme, temp })
     })
 
   program
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index cb3bbcd5ec..86889b2c25 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -14,8 +14,8 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util/index')
 
   logger.wait('\nExtracting site metadata...')
-  const { theme, plugins } = cliOptions
-  const options = await prepare(sourceDir, { theme, plugins, isProd: true })
+  const { theme, plugins, temp } = cliOptions
+  const options = await prepare(sourceDir, { theme, plugins, temp, isProd: true })
   if (cliOptions.outDir) {
     options.outDir = cliOptions.outDir
   }
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index 019973c5d2..63c39827ff 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -18,13 +18,13 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
   logger.wait('\nExtracting site metadata...')
-  const { theme, plugins } = cliOptions
-  const options = await prepare(sourceDir, { theme, plugins, isProd: false })
+  const { theme, plugins, temp } = cliOptions
+  const options = await prepare(sourceDir, { theme, plugins, temp, isProd: false })
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
     options.pluginAPI.options.updated.syncApply()
-    prepare(sourceDir, { theme, plugins, isProd: false }).catch(err => {
+    prepare(sourceDir, { theme, plugins, temp, isProd: false }).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
   }
diff --git a/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js b/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
index ad54c1106b..9ba5beb449 100644
--- a/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
+++ b/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
@@ -1,11 +1,11 @@
 const path = require('path')
-const { writeTemp, fs, logger, chalk } = require('@vuepress/shared-utils')
+const { fs, logger, chalk } = require('@vuepress/shared-utils')
 
 module.exports = (options, context) => ({
   name: '@vuepress/internal-override-css',
 
   async ready () {
-    const { sourceDir } = context
+    const { sourceDir, writeTemp } = context
 
     const overridePath = path.resolve(sourceDir, '.vuepress/override.styl').replace(/[\\]+/g, '/')
     const hasUserOverride = fs.existsSync(overridePath)
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index 4df740be8e..596abff9d4 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -1,8 +1,7 @@
 const Option = require('../Option')
-const { writeTemp } = require('@vuepress/shared-utils')
 
 module.exports = class ClientDynamicModulesOption extends Option {
-  async apply () {
+  async apply (context) {
     for (const item of this.items) {
       const { value: fn, name: pluginName } = item
       let modules = await fn()
@@ -10,7 +9,7 @@ module.exports = class ClientDynamicModulesOption extends Option {
         modules = [modules]
       }
       for (const { name, content, dirname } of modules) {
-        await writeTemp(
+        await context.writeTemp(
           `${dirname || 'dynamic'}/${name}`,
           `
 /**
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index b1c2b66739..3444c7840b 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -3,7 +3,6 @@ const {
   fs,
   chalk,
   logger,
-  writeTemp,
   codegen: { pathsToModuleCode }
 } = require('@vuepress/shared-utils')
 
@@ -32,7 +31,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
   }
 
-  async apply () {
+  async apply (context) {
     await this.beforeApply()
     const manifest = []
     let moduleId = 0
@@ -44,13 +43,13 @@ module.exports = class EnhanceAppFilesOption extends Option {
       if (typeof filePath === 'object') {
         const { name, content } = filePath
         if (content.includes('export default') || content.includes('module.exports')) {
-          destPath = await writeTemp(`app-enhancers/${name}`, content)
+          destPath = await context.writeTemp(`app-enhancers/${name}`, content)
         } else {
-          destPath = await writeTemp(`app-enhancers/${name}`, content + '\nexport default {}')
+          destPath = await context.writeTemp(`app-enhancers/${name}`, content + '\nexport default {}')
         }
       } else {
         if (fs.existsSync(filePath)) {
-          destPath = await writeTemp(
+          destPath = await context.writeTemp(
             `app-enhancers/enhancer-${moduleId++}.js`,
             `export { default } from '${(filePath)}'`
           )
@@ -67,6 +66,6 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
 
     // 2. write entry file.
-    await writeTemp('internal/app-enhancers.js', pathsToModuleCode(manifest))
+    await context.writeTemp('internal/app-enhancers.js', pathsToModuleCode(manifest))
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
index accc9f4969..ce0dccbcfb 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
@@ -1,9 +1,8 @@
 const Option = require('../Option')
-const { writeTemp } = require('@vuepress/shared-utils')
 
 module.exports = class GlobalUIComponentsOption extends Option {
-  async apply () {
-    await writeTemp(
+  async apply (context) {
+    await context.writeTemp(
       `internal/global-ui.js`,
       `export default ${JSON.stringify(this.values, null, 2)}`
     )
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 0877c926fb..7df603eb08 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -1,9 +1,8 @@
 const path = require('path')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
-const { globby } = require('@vuepress/shared-utils')
 const { sort } = require('./util')
-const { fs, logger, chalk } = require('@vuepress/shared-utils')
+const { fs, logger, chalk, globby } = require('@vuepress/shared-utils')
 
 const Page = require('./Page')
 const I18n = require('./I18n')
@@ -17,12 +16,18 @@ module.exports = class AppContext {
    *  isProd: boolean,
    *  plugins: pluginsConfig,
    *  theme: themeNameConfig
+   *  temp: string
    * }} options
    */
   constructor (sourceDir, options) {
     this.sourceDir = sourceDir
     this._options = options
     this.isProd = options.isProd
+
+    const { tempPath, writeTemp } = createTemp(options.temp)
+    this.tempPath = tempPath
+    this.writeTemp = writeTemp
+
     this.vuepressDir = path.resolve(sourceDir, '.vuepress')
     this.siteConfig = loadConfig(this.vuepressDir)
     this.base = this.siteConfig.base || '/'
@@ -53,9 +58,9 @@ module.exports = class AppContext {
 
     await this.pluginAPI.options.ready.apply()
     this.pluginAPI.options.extendMarkdown.syncApply(this.markdown)
-    await this.pluginAPI.options.clientDynamicModules.apply()
-    await this.pluginAPI.options.globalUIComponents.apply()
-    await this.pluginAPI.options.enhanceAppFiles.apply()
+    await this.pluginAPI.options.clientDynamicModules.apply(this)
+    await this.pluginAPI.options.globalUIComponents.apply(this)
+    await this.pluginAPI.options.enhanceAppFiles.apply(this)
   }
 
   /**
@@ -253,3 +258,40 @@ module.exports = class AppContext {
   }
 }
 
+/**
+ * Create a dynamic temp utility context that allow to lanuch
+ * multiple apps with isolated context at the same time.
+ * @param tempPath
+ * @returns {{
+ *  writeTemp: (function(file: string, content: string): string),
+ *  tempPath: string
+ * }}
+ */
+function createTemp (tempPath) {
+  if (!tempPath) {
+    tempPath = path.resolve(__dirname, '../../.temp')
+  } else {
+    tempPath = path.resolve(tempPath)
+  }
+
+  if (!fs.existsSync(tempPath)) {
+    fs.ensureDirSync(tempPath)
+  }
+
+  logger.tip(`Temp directory: ${chalk.gray(tempPath)}`)
+  const tempCache = new Map()
+
+  async function writeTemp (file, content) {
+    const destPath = path.join(tempPath, file)
+    await fs.ensureDir(path.parse(destPath).dir)
+    // cache write to avoid hitting the dist if it didn't change
+    const cached = tempCache.get(file)
+    if (cached !== content) {
+      await fs.writeFile(destPath, content)
+      tempCache.set(file, content)
+    }
+    return destPath
+  }
+
+  return { writeTemp, tempPath }
+}
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 9b1613b139..3fc0901c49 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -3,9 +3,10 @@ const AppContext = require('./AppContext')
 module.exports = async function prepare (sourceDir, {
   isProd,
   plugins,
-  theme
+  theme,
+  temp
 }) {
-  const appContext = new AppContext(sourceDir, { plugins, theme, isProd })
+  const appContext = new AppContext(sourceDir, { plugins, theme, isProd, temp })
   await appContext.process()
   return appContext
 }
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 43ddf42553..397af6efd2 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -8,7 +8,8 @@ module.exports = function createBaseConfig ({
   themePath,
   themeLayoutPath,
   themeNotFoundPath,
-  markdown
+  markdown,
+  tempPath
 }, { debug } = {}, isServer) {
   const Config = require('webpack-chain')
   const { VueLoaderPlugin } = require('vue-loader')
@@ -40,9 +41,9 @@ module.exports = function createBaseConfig ({
       .set('@themeNotFound', themeNotFoundPath)
       .set('@source', sourceDir)
       .set('@app', path.resolve(__dirname, '../app'))
-      .set('@temp', process.env.VUEPRESS_TEMP_PATH)
-      .set('@dynamic', path.resolve(process.env.VUEPRESS_TEMP_PATH, 'dynamic'))
-      .set('@internal', path.resolve(process.env.VUEPRESS_TEMP_PATH, 'internal'))
+      .set('@temp', tempPath)
+      .set('@dynamic', path.resolve(tempPath, 'dynamic'))
+      .set('@internal', path.resolve(tempPath, 'internal'))
       .end()
     .extensions
       .merge(['.js', '.jsx', '.vue', '.json', '.styl'])
@@ -277,7 +278,7 @@ module.exports = function createBaseConfig ({
     .plugin('injections')
     .use(require('webpack/lib/DefinePlugin'), [{
       VUEPRESS_VERSION: JSON.stringify(require('../../package.json').version),
-      VUEPRESS_TEMP_PATH: JSON.stringify(process.env.VUEPRESS_TEMP_PATH),
+      VUEPRESS_TEMP_PATH: JSON.stringify(tempPath),
       LAST_COMMIT_HASH: JSON.stringify(getLastCommitHash())
     }])
 
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 78b8b5a4e5..0f94487ed5 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -1,6 +1,5 @@
 exports.logger = require('./lib/logger')
 exports.env = require('./lib/env')
-exports.writeTemp = require('./lib/writeTemp')
 exports.codegen = require('./lib/codegen')
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
diff --git a/packages/@vuepress/shared-utils/lib/writeTemp.js b/packages/@vuepress/shared-utils/lib/writeTemp.js
deleted file mode 100644
index 76aa70195e..0000000000
--- a/packages/@vuepress/shared-utils/lib/writeTemp.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const path = require('path')
-const fs = require('fs-extra')
-
-if (!process.env.VUEPRESS_TEMP_PATH) {
-  process.env.VUEPRESS_TEMP_PATH = path.resolve(__dirname, '../.temp')
-}
-
-fs.ensureDirSync(process.env.VUEPRESS_TEMP_PATH)
-
-const tempCache = new Map()
-
-/**
- * A low-level temporary file processing utility
- * @param fileA
- * @param content
- * @returns {Promise<*|string>}
- */
-async function writeTemp (file, content) {
-  const destPath = path.join(process.env.VUEPRESS_TEMP_PATH, file)
-  await fs.ensureDir(path.parse(destPath).dir)
-  // cache write to avoid hitting the dist if it didn't change
-  const cached = tempCache.get(file)
-  if (cached !== content) {
-    await fs.writeFile(destPath, content)
-    tempCache.set(file, content)
-  }
-  return destPath
-}
-
-module.exports = writeTemp

From eca8a61b0475c6d99c3c57ba9f0d16537a6dd080 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 27 Aug 2018 19:35:18 +0800
Subject: [PATCH 154/242] test: init @vuepress/test-utils and migrate all tests

---
 package.json                                  |  9 --
 .../core/__test__}/app/Content.spec.js        |  5 +-
 .../docs-custom-theme/.vuepress/config.js     |  0
 .../.vuepress/theme/Layout.vue                |  0
 .../fixtures/docs-custom-theme/README.md      |  0
 .../docs-simple-config/.vuepress/config.js    |  0
 .../fixtures/docs-simple-config/README.md     |  0
 .../prepare/fixtures/docs-simple/README.md    |  0
 .../core/__test__}/prepare/util.spec.js       |  5 +-
 .../core/__test__}/util/parseHeaders.spec.js  |  2 +-
 packages/@vuepress/core/lib/app/app.js        |  3 +-
 packages/@vuepress/core/lib/app/dataMixin.js  |  3 +-
 packages/@vuepress/test-utils/.npmignore      |  2 +
 packages/@vuepress/test-utils/README.md       |  3 +
 .../@vuepress/test-utils/createJestConfig.js  |  5 +
 .../@vuepress/test-utils/createJestRunner.js  | 14 +++
 .../fixtures/docs-i18n/.vuepress/config.js    | 34 +++++++
 .../test-utils/fixtures/docs-i18n/README.md   |  1 +
 .../fixtures/docs-i18n/zh/README.md           |  1 +
 .../test-utils/fixtures/docs-simple/README.md |  1 +
 packages/@vuepress/test-utils/getRouter.js    |  5 +
 .../@vuepress/test-utils/jest/jest.config.js  | 28 ++++++
 packages/@vuepress/test-utils/meta.js         | 12 +++
 .../@vuepress/test-utils/mockComponent.js     |  2 +-
 .../@vuepress/test-utils/modeTestRunner.js    | 34 +++++++
 packages/@vuepress/test-utils/package.json    | 37 ++++++++
 packages/@vuepress/test-utils/prepare.js      | 17 ++++
 .../__test__/components}/DropdownLink.spec.js |  4 +-
 .../__test__/components}/NavLink.spec.js      |  4 +-
 .../__snapshots__/DropdownLink.spec.js.snap   |  4 +-
 .../__snapshots__/NavLink.spec.js.snap        |  8 +-
 scripts/jest.config.js                        | 29 ++----
 scripts/test.js                               | 20 ++--
 test/docs-simple/README.md                    |  1 -
 test/prepare.js                               | 21 ----
 test/prepare/resolveOptions.spec.js           | 95 -------------------
 test/util.js                                  | 42 --------
 37 files changed, 227 insertions(+), 224 deletions(-)
 rename {test => packages/@vuepress/core/__test__}/app/Content.spec.js (79%)
 rename {test => packages/@vuepress/core/__test__}/prepare/fixtures/docs-custom-theme/.vuepress/config.js (100%)
 rename {test => packages/@vuepress/core/__test__}/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue (100%)
 rename {test => packages/@vuepress/core/__test__}/prepare/fixtures/docs-custom-theme/README.md (100%)
 rename {test => packages/@vuepress/core/__test__}/prepare/fixtures/docs-simple-config/.vuepress/config.js (100%)
 rename {test => packages/@vuepress/core/__test__}/prepare/fixtures/docs-simple-config/README.md (100%)
 rename {test => packages/@vuepress/core/__test__}/prepare/fixtures/docs-simple/README.md (100%)
 rename {test => packages/@vuepress/core/__test__}/prepare/util.spec.js (90%)
 rename {test => packages/@vuepress/core/__test__}/util/parseHeaders.spec.js (98%)
 create mode 100644 packages/@vuepress/test-utils/.npmignore
 create mode 100644 packages/@vuepress/test-utils/README.md
 create mode 100644 packages/@vuepress/test-utils/createJestConfig.js
 create mode 100644 packages/@vuepress/test-utils/createJestRunner.js
 create mode 100644 packages/@vuepress/test-utils/fixtures/docs-i18n/.vuepress/config.js
 create mode 100644 packages/@vuepress/test-utils/fixtures/docs-i18n/README.md
 create mode 100644 packages/@vuepress/test-utils/fixtures/docs-i18n/zh/README.md
 create mode 100644 packages/@vuepress/test-utils/fixtures/docs-simple/README.md
 create mode 100644 packages/@vuepress/test-utils/getRouter.js
 create mode 100644 packages/@vuepress/test-utils/jest/jest.config.js
 create mode 100644 packages/@vuepress/test-utils/meta.js
 rename test/hoc.js => packages/@vuepress/test-utils/mockComponent.js (88%)
 create mode 100644 packages/@vuepress/test-utils/modeTestRunner.js
 create mode 100644 packages/@vuepress/test-utils/package.json
 create mode 100644 packages/@vuepress/test-utils/prepare.js
 rename {test/default-theme => packages/@vuepress/theme-default/__test__/components}/DropdownLink.spec.js (83%)
 rename {test/default-theme => packages/@vuepress/theme-default/__test__/components}/NavLink.spec.js (86%)
 rename {test/default-theme => packages/@vuepress/theme-default/__test__/components}/__snapshots__/DropdownLink.spec.js.snap (86%)
 rename {test/default-theme => packages/@vuepress/theme-default/__test__/components}/__snapshots__/NavLink.spec.js.snap (50%)
 delete mode 100644 test/docs-simple/README.md
 delete mode 100644 test/prepare.js
 delete mode 100644 test/prepare/resolveOptions.spec.js
 delete mode 100644 test/util.js

diff --git a/package.json b/package.json
index 8aa33b1dd1..577567bc31 100644
--- a/package.json
+++ b/package.json
@@ -40,22 +40,13 @@
     ]
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.16",
-    "@babel/core": "^7.0.0-beta.47",
-    "@babel/preset-env": "^7.0.0-beta.47",
-    "babel-core": "^7.0.0-0",
-    "babel-jest": "^23.0.0",
     "conventional-changelog-cli": "^1.3.22",
     "eslint": "^4.19.1",
     "eslint-plugin-jest": "^21.15.1",
     "eslint-plugin-vue-libs": "^3.0.0",
-    "execa": "^0.10.0",
-    "jest": "^23.0.0",
-    "jest-serializer-vue": "^1.0.0",
     "lerna": "^2.11.0",
     "lint-staged": "^7.0.4",
     "minimist": "^1.2.0",
-    "vue-jest": "^2.6.0",
     "yorkie": "^1.0.3"
   },
   "engines": {
diff --git a/test/app/Content.spec.js b/packages/@vuepress/core/__test__/app/Content.spec.js
similarity index 79%
rename from test/app/Content.spec.js
rename to packages/@vuepress/core/__test__/app/Content.spec.js
index 8049befc88..65136a07bf 100644
--- a/test/app/Content.spec.js
+++ b/packages/@vuepress/core/__test__/app/Content.spec.js
@@ -1,6 +1,7 @@
-import Content from '@/app/components/Content'
+import Content from '../../lib/app/components/Content'
 import { mount } from '@vue/test-utils'
-import { getRouter, modeTestRunner } from '../util'
+import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
+import getRouter from '@vuepress/test-utils/getRouter'
 
 function test (mode, localVue) {
   it(`${mode} - add custom class by default.`, () => {
diff --git a/test/prepare/fixtures/docs-custom-theme/.vuepress/config.js b/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/config.js
similarity index 100%
rename from test/prepare/fixtures/docs-custom-theme/.vuepress/config.js
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/config.js
diff --git a/test/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue b/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue
similarity index 100%
rename from test/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue
diff --git a/test/prepare/fixtures/docs-custom-theme/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/README.md
similarity index 100%
rename from test/prepare/fixtures/docs-custom-theme/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/README.md
diff --git a/test/prepare/fixtures/docs-simple-config/.vuepress/config.js b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
similarity index 100%
rename from test/prepare/fixtures/docs-simple-config/.vuepress/config.js
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
diff --git a/test/prepare/fixtures/docs-simple-config/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
similarity index 100%
rename from test/prepare/fixtures/docs-simple-config/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
diff --git a/test/prepare/fixtures/docs-simple/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
similarity index 100%
rename from test/prepare/fixtures/docs-simple/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
diff --git a/test/prepare/util.spec.js b/packages/@vuepress/core/__test__/prepare/util.spec.js
similarity index 90%
rename from test/prepare/util.spec.js
rename to packages/@vuepress/core/__test__/prepare/util.spec.js
index ca8e1691a4..b08a282514 100644
--- a/test/prepare/util.spec.js
+++ b/packages/@vuepress/core/__test__/prepare/util.spec.js
@@ -1,7 +1,4 @@
-import {
-  isIndexFile,
-  fileToPath
-} from '@/prepare/util.js'
+import { isIndexFile, fileToPath } from '../../lib/prepare/util.js'
 
 describe('prepare - util', () => {
   test('isIndexFile', () => {
diff --git a/test/util/parseHeaders.spec.js b/packages/@vuepress/core/__test__/util/parseHeaders.spec.js
similarity index 98%
rename from test/util/parseHeaders.spec.js
rename to packages/@vuepress/core/__test__/util/parseHeaders.spec.js
index da8c19aa21..fabfc6ac64 100644
--- a/test/util/parseHeaders.spec.js
+++ b/packages/@vuepress/core/__test__/util/parseHeaders.spec.js
@@ -2,7 +2,7 @@ import {
   parseHeaders,
   removeNonCodeWrappedHTML,
   deeplyParseHeaders
-} from '@/util/parseHeaders'
+} from '../../lib/util/parseHeaders'
 
 describe('parseHeaders', () => {
   test('should unescape html', () => {
diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index f2ea2b02e6..37afbdfee4 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -6,6 +6,7 @@ import { routes } from '@internal/routes'
 import { siteData } from '@internal/siteData'
 import appEnhancers from '@internal/app-enhancers'
 import globalUIComponents from '@internal/global-ui'
+import I18n from '@internal/i18n'
 
 // generated from user config
 import('@temp/style.styl')
@@ -31,7 +32,7 @@ if (module.hot) {
 Vue.config.productionTip = false
 Vue.use(Router)
 // mixin for exposing $site and $page
-Vue.mixin(dataMixin(siteData))
+Vue.mixin(dataMixin(I18n, siteData))
 // component for rendering markdown content and setting title etc.
 Vue.component('Content', Content)
 Vue.component('OutboundLink', OutboundLink)
diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index 21ae871747..d52115fc2a 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -1,9 +1,8 @@
 /* global VUEPRESS_TEMP_PATH */
 
 import Vue from 'vue'
-import I18n from '@internal/i18n'
 
-export default function dataMixin (siteData) {
+export default function dataMixin (I18n, siteData) {
   prepare(siteData)
   const store = new Vue({
     data: {
diff --git a/packages/@vuepress/test-utils/.npmignore b/packages/@vuepress/test-utils/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/test-utils/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/test-utils/README.md b/packages/@vuepress/test-utils/README.md
new file mode 100644
index 0000000000..a83b912f84
--- /dev/null
+++ b/packages/@vuepress/test-utils/README.md
@@ -0,0 +1,3 @@
+# @vuepress/test-utils
+
+> test-utils for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/test-utils/createJestConfig.js b/packages/@vuepress/test-utils/createJestConfig.js
new file mode 100644
index 0000000000..dc9349efc1
--- /dev/null
+++ b/packages/@vuepress/test-utils/createJestConfig.js
@@ -0,0 +1,5 @@
+const defaultJestConfig = require('./jest/jest.config')
+
+module.exports = function createJestConfig (override) {
+  return Object.assign({}, defaultJestConfig, override)
+}
diff --git a/packages/@vuepress/test-utils/createJestRunner.js b/packages/@vuepress/test-utils/createJestRunner.js
new file mode 100644
index 0000000000..c0600e7936
--- /dev/null
+++ b/packages/@vuepress/test-utils/createJestRunner.js
@@ -0,0 +1,14 @@
+const execa = require('execa')
+const rawArgs = process.argv.slice(2)
+
+module.exports = function createJestRunner (jestArgs) {
+  return async function () {
+    console.log(`running jest with args: ${jestArgs.join(' ')}`)
+    await execa('jest', [
+      ...jestArgs,
+      ...rawArgs
+    ], {
+      stdio: 'inherit'
+    })
+  }
+}
diff --git a/packages/@vuepress/test-utils/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/test-utils/fixtures/docs-i18n/.vuepress/config.js
new file mode 100644
index 0000000000..1fbdc1cec1
--- /dev/null
+++ b/packages/@vuepress/test-utils/fixtures/docs-i18n/.vuepress/config.js
@@ -0,0 +1,34 @@
+module.exports = {
+  dest: 'vuepress',
+  locales: {
+    '/': {
+      lang: 'en-US',
+      title: 'VuePress',
+      description: 'Vue-powered Static Site Generator'
+    },
+    '/zh/': {
+      lang: 'zh-CN',
+      title: 'VuePress',
+      description: 'Vue 驱动的静态网站生成器'
+    }
+  },
+  themeConfig: {
+    repo: 'vuejs/vuepress',
+    editLinks: true,
+    docsDir: 'docs',
+    locales: {
+      '/': {
+        label: 'English',
+        selectText: 'Languages',
+        editLinkText: 'Edit this page on GitHub',
+        lastUpdated: 'Last Updated'
+      },
+      '/zh/': {
+        label: '简体中文',
+        selectText: '选择语言',
+        editLinkText: '在 GitHub 上编辑此页',
+        lastUpdated: '上次更新',
+      }
+    }
+  }
+}
diff --git a/packages/@vuepress/test-utils/fixtures/docs-i18n/README.md b/packages/@vuepress/test-utils/fixtures/docs-i18n/README.md
new file mode 100644
index 0000000000..aef89369f1
--- /dev/null
+++ b/packages/@vuepress/test-utils/fixtures/docs-i18n/README.md
@@ -0,0 +1 @@
+# Hello, VuePress!
diff --git a/packages/@vuepress/test-utils/fixtures/docs-i18n/zh/README.md b/packages/@vuepress/test-utils/fixtures/docs-i18n/zh/README.md
new file mode 100644
index 0000000000..c526a98742
--- /dev/null
+++ b/packages/@vuepress/test-utils/fixtures/docs-i18n/zh/README.md
@@ -0,0 +1 @@
+# 你好, VuePress!
diff --git a/packages/@vuepress/test-utils/fixtures/docs-simple/README.md b/packages/@vuepress/test-utils/fixtures/docs-simple/README.md
new file mode 100644
index 0000000000..aef89369f1
--- /dev/null
+++ b/packages/@vuepress/test-utils/fixtures/docs-simple/README.md
@@ -0,0 +1 @@
+# Hello, VuePress!
diff --git a/packages/@vuepress/test-utils/getRouter.js b/packages/@vuepress/test-utils/getRouter.js
new file mode 100644
index 0000000000..e171fd48d1
--- /dev/null
+++ b/packages/@vuepress/test-utils/getRouter.js
@@ -0,0 +1,5 @@
+const Router = require('vue-router')
+
+module.exports = function () {
+  return new Router()
+}
diff --git a/packages/@vuepress/test-utils/jest/jest.config.js b/packages/@vuepress/test-utils/jest/jest.config.js
new file mode 100644
index 0000000000..a6e7eff73a
--- /dev/null
+++ b/packages/@vuepress/test-utils/jest/jest.config.js
@@ -0,0 +1,28 @@
+// https://github.com/facebook/jest/tree/master/packages/babel-jest
+// TODO remove 'babel-core@^7.0.0-0' when babel-jest can work with '@babel/core'
+
+const path = require('path')
+
+module.exports = {
+  rootDir: path.resolve(__dirname, '..'),
+  verbose: true,
+  testURL: 'http://localhost/',
+  moduleFileExtensions: [
+    'js',
+    'vue'
+  ],
+  testPathIgnorePatterns: [
+    'test.js',
+    path.resolve(__dirname, '../test')
+  ],
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/$1'
+  },
+  transform: {
+    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
+    '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
+  },
+  snapshotSerializers: [
+    '<rootDir>/node_modules/jest-serializer-vue'
+  ]
+}
diff --git a/packages/@vuepress/test-utils/meta.js b/packages/@vuepress/test-utils/meta.js
new file mode 100644
index 0000000000..4f820db1fa
--- /dev/null
+++ b/packages/@vuepress/test-utils/meta.js
@@ -0,0 +1,12 @@
+const { fs } = require('@vuepress/shared-utils')
+const path = require('path')
+
+const docsBaseDir = path.resolve(__dirname, 'fixtures')
+const docsModeNames = fs.readdirSync(docsBaseDir)
+const docsModes = docsModeNames.map(name => {
+  const docsPath = path.resolve(docsBaseDir, name)
+  const docsTempPath = path.resolve(docsPath, '.vuepress/.temp')
+  return { name, docsPath, docsTempPath }
+})
+
+exports.docsModes = docsModes
diff --git a/test/hoc.js b/packages/@vuepress/test-utils/mockComponent.js
similarity index 88%
rename from test/hoc.js
rename to packages/@vuepress/test-utils/mockComponent.js
index 219b214865..36d4e8cda7 100644
--- a/test/hoc.js
+++ b/packages/@vuepress/test-utils/mockComponent.js
@@ -10,7 +10,7 @@ const Component = {
 // When the child component is a pure presentation component,
 // we want to be able to display a sub-component with minimal info,
 // rather than stubbing it directly.
-export function mockComponent (name) {
+module.exports = function mockComponent (name) {
   return {
     render (h) {
       return h(Component, { props: { name }})
diff --git a/packages/@vuepress/test-utils/modeTestRunner.js b/packages/@vuepress/test-utils/modeTestRunner.js
new file mode 100644
index 0000000000..758e1bfbc0
--- /dev/null
+++ b/packages/@vuepress/test-utils/modeTestRunner.js
@@ -0,0 +1,34 @@
+const { createLocalVue } = require('@vue/test-utils')
+const dataMixin = require('@vuepress/core/lib/app/dataMixin').default
+const I18n = require('@vuepress/core/lib/prepare/I18n')
+const Router = require('vue-router')
+const mockComponent = require('./mockComponent')
+const { docsModes } = require('./meta')
+
+function getLocalVueByMode (mode) {
+  const localVue = createLocalVue()
+  localVue.use(Router)
+
+  // register global component
+  localVue.component('OutboundLink', mockComponent('outbound-link'))
+
+  const { siteData } = require(`${mode.docsTempPath}/internal/siteData.js`)
+  localVue.component(siteData.pages[0].key, mockComponent('page-component'))
+  localVue.mixin(dataMixin(I18n, siteData))
+  return localVue
+}
+
+/**
+ * Used to test components in VuePress at different mode.
+ * Since VuePress has two main modes, i18n or normal mode, we need to make
+ * sure that the core Vue components in VuePress work well in both modes.
+ * @param description
+ * @param testFn
+ */
+module.exports = function modeTestRunner (description, testFn) {
+  docsModes.forEach(mode => {
+    describe(description, () => {
+      testFn(mode.name, getLocalVueByMode(mode))
+    })
+  })
+}
diff --git a/packages/@vuepress/test-utils/package.json b/packages/@vuepress/test-utils/package.json
new file mode 100644
index 0000000000..663462d50a
--- /dev/null
+++ b/packages/@vuepress/test-utils/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@vuepress/test-utils",
+  "version": "1.0.0",
+  "description": "test-utils for vuepress",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "@vuepress/core": "^1.0.0",
+    "@vuepress/shared-utils": "^1.0.0",
+    "@vue/test-utils": "^1.0.0-beta.16",
+    "@babel/core": "^7.0.0-beta.47",
+    "@babel/preset-env": "^7.0.0-beta.47",
+    "babel-core": "^7.0.0-0",
+    "babel-jest": "^23.0.0",
+    "jest": "^23.0.0",
+    "jest-serializer-vue": "^1.0.0",
+    "vue-jest": "^2.6.0",
+    "execa": "^0.10.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/test-utils#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/test-utils/prepare.js b/packages/@vuepress/test-utils/prepare.js
new file mode 100644
index 0000000000..1f289598ae
--- /dev/null
+++ b/packages/@vuepress/test-utils/prepare.js
@@ -0,0 +1,17 @@
+const { fs, logger } = require('@vuepress/shared-utils')
+const prepare = require('@vuepress/core/lib/prepare')
+const { docsModes } = require('./meta')
+
+async function prepareForTest () {
+  await Promise.all(docsModes.map(async ({ docsPath, docsTempPath }) => {
+    await fs.ensureDir(docsTempPath)
+    await prepare(docsPath, { theme: 'default', temp: docsTempPath })
+  }))
+}
+
+module.exports = function globalSetup () {
+  logger.wait('Start preparing for testing ...')
+  return prepareForTest().then(() => {
+    logger.wait('Finished preparing for testing ...')
+  })
+}
diff --git a/test/default-theme/DropdownLink.spec.js b/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
similarity index 83%
rename from test/default-theme/DropdownLink.spec.js
rename to packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
index ef868a70a7..d5b5837c06 100644
--- a/test/default-theme/DropdownLink.spec.js
+++ b/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
@@ -1,6 +1,6 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import DropdownLink from '@/default-theme/DropdownLink.vue'
-import { modeTestRunner } from '../util'
+import DropdownLink from '../../src/DropdownLink.vue'
+import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
 
 function test (mode, localVue) {
   it(`$${mode} - renders dropdown link.`, () => {
diff --git a/test/default-theme/NavLink.spec.js b/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
similarity index 86%
rename from test/default-theme/NavLink.spec.js
rename to packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
index 86e501fc90..98ffa38fb4 100644
--- a/test/default-theme/NavLink.spec.js
+++ b/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
@@ -1,6 +1,6 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import { modeTestRunner } from '../util'
-import NavLink from '@/default-theme/NavLink.vue'
+import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
+import NavLink from '../../src/NavLink.vue'
 
 function test (mode, localVue) {
   it(`$${mode} - renders nav link with internal link`, () => {
diff --git a/test/default-theme/__snapshots__/DropdownLink.spec.js.snap b/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
similarity index 86%
rename from test/default-theme/__snapshots__/DropdownLink.spec.js.snap
rename to packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
index a302d2112a..56f54d5d32 100644
--- a/test/default-theme/__snapshots__/DropdownLink.spec.js.snap
+++ b/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DropdownLink $i18n - renders dropdown link. 1`] = `
+exports[`DropdownLink $docs-i18n - renders dropdown link. 1`] = `
 <div class="dropdown-wrapper">
   <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
   <ul class="nav-dropdown" style="display: none;" name="dropdown">
@@ -16,7 +16,7 @@ exports[`DropdownLink $i18n - renders dropdown link. 1`] = `
 </div>
 `;
 
-exports[`DropdownLink $simple - renders dropdown link. 1`] = `
+exports[`DropdownLink $docs-simple - renders dropdown link. 1`] = `
 <div class="dropdown-wrapper">
   <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
   <ul class="nav-dropdown" style="display: none;" name="dropdown">
diff --git a/test/default-theme/__snapshots__/NavLink.spec.js.snap b/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
similarity index 50%
rename from test/default-theme/__snapshots__/NavLink.spec.js.snap
rename to packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
index 4b9cd02ccc..df01c1547a 100644
--- a/test/default-theme/__snapshots__/NavLink.spec.js.snap
+++ b/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
@@ -1,19 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`NavLink $i18n - renders nav link with external link 1`] = `
+exports[`NavLink $docs-i18n - renders nav link with external link 1`] = `
 <a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
   Vue
   <p class="component outbound-link">outbound-link</p>
 </a>
 `;
 
-exports[`NavLink $i18n - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
+exports[`NavLink $docs-i18n - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
 
-exports[`NavLink $simple - renders nav link with external link 1`] = `
+exports[`NavLink $docs-simple - renders nav link with external link 1`] = `
 <a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
   Vue
   <p class="component outbound-link">outbound-link</p>
 </a>
 `;
 
-exports[`NavLink $simple - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
+exports[`NavLink $docs-simple - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
diff --git a/scripts/jest.config.js b/scripts/jest.config.js
index a6e7eff73a..a1f7bbd126 100644
--- a/scripts/jest.config.js
+++ b/scripts/jest.config.js
@@ -1,28 +1,11 @@
-// https://github.com/facebook/jest/tree/master/packages/babel-jest
-// TODO remove 'babel-core@^7.0.0-0' when babel-jest can work with '@babel/core'
-
 const path = require('path')
+const createJestConfig = require('@vuepress/test-utils/createJestConfig')
 
-module.exports = {
+module.exports = createJestConfig({
   rootDir: path.resolve(__dirname, '..'),
-  verbose: true,
-  testURL: 'http://localhost/',
-  moduleFileExtensions: [
-    'js',
-    'vue'
-  ],
-  testPathIgnorePatterns: [
-    'test.js',
-    path.resolve(__dirname, '../test')
-  ],
   moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/$1'
-  },
-  transform: {
-    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
-    '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
+    '^@/(.*)$': '<rootDir>/$1',
+    '^@core/(.*)$': '<rootDir>/packages/@vuepress/core/$1'
   },
-  snapshotSerializers: [
-    '<rootDir>/node_modules/jest-serializer-vue'
-  ]
-}
+  globalSetup: '<rootDir>/packages/@vuepress/test-utils/prepare.js'
+})
diff --git a/scripts/test.js b/scripts/test.js
index bff2df2f54..489d67d4f6 100644
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -1,5 +1,5 @@
-const execa = require('execa')
 const minimist = require('minimist')
+const createJestRunner = require('@vuepress/test-utils/createJestRunner')
 
 const rawArgs = process.argv.slice(2)
 const args = minimist(rawArgs)
@@ -12,19 +12,15 @@ if (args.p) {
   rawArgs.splice(i, 2)
 }
 
-;(async () => {
-  const jestArgs = [
-    '--env', 'node',
+const jestRunner = createJestRunner(
+  [
     '--config', 'scripts/jest.config.js',
     '--runInBand',
-    ...rawArgs,
     ...(regex ? [regex] : [])
-  ]
-  console.log(`running jest with args: ${jestArgs.join(' ')}`)
-  await execa('jest', jestArgs, {
-    stdio: 'inherit'
-  })
-})().catch(err => {
-  err
+  ])
+
+;(jestRunner)().catch(err => {
+  console.error(err)
   process.exit(1)
 })
+
diff --git a/test/docs-simple/README.md b/test/docs-simple/README.md
deleted file mode 100644
index 9e126f919b..0000000000
--- a/test/docs-simple/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Hello Simple
diff --git a/test/prepare.js b/test/prepare.js
deleted file mode 100644
index 9960d5dfb1..0000000000
--- a/test/prepare.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const path = require('path')
-const fs = require('fs-extra')
-const prepare = require('../lib/prepare')
-const logger = require('../lib/util/logger')
-
-const tempPath = path.resolve(__dirname, '.temp')
-const siteDatePath = path.resolve(__dirname, '../lib/app/.temp/siteData.js')
-
-async function prepareForTest () {
-  await fs.ensureDir(tempPath)
-
-  await prepare(path.resolve(__dirname, '../docs'))
-  await fs.copy(siteDatePath, path.join(tempPath, 'siteData-i18n.js'))
-
-  await prepare(path.resolve(__dirname, 'docs-simple'))
-  await fs.copy(siteDatePath, path.join(tempPath, 'siteData-simple.js'))
-}
-
-prepareForTest().then(() => {
-  logger.wait('Preparing for testing ...')
-})
diff --git a/test/prepare/resolveOptions.spec.js b/test/prepare/resolveOptions.spec.js
deleted file mode 100644
index 433c565214..0000000000
--- a/test/prepare/resolveOptions.spec.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import path from 'path'
-import resolveOptions from '@/prepare/resolveOptions.js'
-
-const DEFAULT_THEME_PATH = path.resolve(__dirname, '../../lib/default-theme')
-const DEFAULT_THEME_LAYOUT_PATH = path.resolve(DEFAULT_THEME_PATH, 'Layout.vue')
-const DEFAULT_THEME_NOT_FOOUND_PATH = path.resolve(DEFAULT_THEME_PATH, 'NotFound.vue')
-
-describe('prepare - resolveOptions', () => {
-  test('single file docs without config.', async () => {
-    const { docsDir } = getDocsPaths('docs-simple')
-    const options = await resolveOptions(docsDir)
-    const {
-      siteConfig,
-      siteData,
-      sourceDir,
-      outDir,
-      publicPath,
-      pageFiles,
-      pagesData,
-      themePath,
-      themeLayoutPath,
-      themeNotFoundPath,
-      themeEnhanceAppPath,
-      useDefaultTheme,
-      isAlgoliaSearch,
-      markdown
-    } = options
-    expect(siteConfig).toEqual({})
-    expect(siteData).toEqual({
-      title: '',
-      description: '',
-      base: '/',
-      pages: pagesData,
-      themeConfig: {},
-      locales: undefined
-    })
-    expect(sourceDir).toBe(docsDir)
-    expect(outDir).toBe(path.resolve(docsDir, '.vuepress/dist'))
-    expect(publicPath).toBe('/')
-    expect(pageFiles).toHaveLength(1)
-    expect(pageFiles[0]).toBe('README.md')
-    expect(themePath).toBe(DEFAULT_THEME_PATH)
-    expect(themeLayoutPath).toBe(DEFAULT_THEME_LAYOUT_PATH)
-    expect(themeNotFoundPath).toBe(DEFAULT_THEME_NOT_FOOUND_PATH)
-    expect(themeEnhanceAppPath).toBe(null)
-    expect(useDefaultTheme).toBe(true)
-    expect(isAlgoliaSearch).toBe(false)
-    expect(typeof markdown).toBe('object')
-  })
-
-  test('single file docs with config', async () => {
-    const { docsDir, configPath } = getDocsPaths('docs-simple-config')
-    const options = await resolveOptions(docsDir)
-    const {
-      siteConfig,
-      outDir,
-      publicPath
-    } = options
-    expect(siteConfig).toEqual(require(configPath))
-    expect(siteConfig.base).toBe('vuepress')
-    expect(siteConfig.dest).toBe('vuepress')
-    expect(outDir).toBe(path.resolve('vuepress'))
-    expect(publicPath).toBe('vuepress')
-  })
-
-  test('simple docs with custom theme', async () => {
-    const paths = getDocsPaths('docs-custom-theme')
-    const options = await resolveOptions(paths.docsDir)
-    const {
-      themePath,
-      themeLayoutPath,
-      themeNotFoundPath,
-      useDefaultTheme
-    } = options
-    expect(useDefaultTheme).toBe(false)
-    expect(themePath).toBe(paths.themePath)
-    expect(themeLayoutPath).toBe(paths.themeLayoutPath)
-    expect(themeNotFoundPath).toBe(DEFAULT_THEME_NOT_FOOUND_PATH) // fallbacks to default theme's NotFound component.
-  })
-})
-
-function getDocsPaths (name) {
-  const docsDir = path.join(__dirname, `fixtures/${name}`)
-  const configPath = path.join(docsDir, '.vuepress/config.js')
-  const themePath = path.join(docsDir, '.vuepress/theme')
-  const themeLayoutPath = path.join(themePath, 'Layout.vue')
-  const themeNotFoundPath = path.join(themePath, 'NotFound.vue')
-  return {
-    docsDir,
-    configPath,
-    themePath,
-    themeLayoutPath,
-    themeNotFoundPath
-  }
-}
diff --git a/test/util.js b/test/util.js
deleted file mode 100644
index 1696c5c552..0000000000
--- a/test/util.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { createLocalVue } from '@vue/test-utils'
-import dataMixin from '@/app/dataMixin'
-import Router from 'vue-router'
-import { mockComponent } from './hoc'
-import { siteData as i18nSiteData } from './.temp/siteData-i18n'
-import { siteData as simpleSiteData } from './.temp/siteData-simple'
-
-export function getRouter () {
-  return new Router()
-}
-
-export function getLocalVueByMode (mode) {
-  const localVue = createLocalVue()
-  localVue.use(Router)
-
-  // register global component
-  localVue.component('OutboundLink', mockComponent('outbound-link'))
-
-  // register page component in root route.
-  localVue.component(i18nSiteData.pages[0].key, mockComponent('page-component'))
-  localVue.component(simpleSiteData.pages[0].key, mockComponent('page-component'))
-
-  // data mixin
-  if (mode === 'i18n') {
-    localVue.mixin(dataMixin(i18nSiteData))
-  } else {
-    localVue.mixin(dataMixin(simpleSiteData))
-  }
-
-  return localVue
-}
-
-export function modeTestRunner (description, testFn, modes = ['simple', 'i18n']) {
-  if (!Array.isArray(modes)) {
-    modes = [modes]
-  }
-  modes.forEach(mode => {
-    describe(description, () => {
-      testFn(mode, getLocalVueByMode(mode))
-    })
-  })
-}

From 4487149f4675581c02df58bdb71ee3bef81909d1 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 28 Aug 2018 23:34:27 +0800
Subject: [PATCH 155/242] docs: enhance plugin documents

---
 packages/docs/docs/plugin/README.md | 125 +++++++++++++++++++++++-----
 1 file changed, 102 insertions(+), 23 deletions(-)

diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index f41c5184b3..359df08923 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -9,11 +9,11 @@ sidebar: auto
 Plugins usually add global-level functionality to VuePress. There is no strictly defined scope for a plugin - there are typically several types of plugins you can write:
 
 1. Extend the data generated at compile time. e.g. [@vuepress/plugin-last-updated](https://github.com/vuejs/vuepress/tree/next/packages/@vuepress/plugin-last-updated).
-2. Generate extra files before or after compilation. e.g. `PWA support`.
+2. Generate extra files before or after compilation. e.g. [@vuepress/plugin-pwa](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/plugin-pwa)
 3. Add extra pages. e.g. [@vuepress/plugin-i18n-ui](https://github.com/vuejs/vuepress/tree/next/packages/@vuepress/plugin-i18n-ui)
 4. Inject global UI. e.g. [@vuepress/plugin-back-to-top](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/plugin-back-to-top).
 
-A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with [plugin context](#plugin-context) which provides some compile-time context.
+A plugin should export a `plain object`(`#1`). If the plugin needs to take options, it can be a function that exports a plain object(`#2`). The function will be called with the plugin's options as the first argument, along with [context](#plugin-context) which provides some compile-time metadata.
 
 ``` js
 // #1
@@ -32,7 +32,7 @@ module.exports = (options, context) => {
 ```
 
 ::: tip
-A plugin module should use `CommonJS` instead of ES6's `export default` because the VuePress plugin runs on the Node side.
+A VuePress plugin module should leverage `CommonJS` instead of `ES module` because VuePress plugins runs on the Node side.
 :::
 
 ## Using a plugin
@@ -127,9 +127,9 @@ module.exports = {
 ```
 
 ::: warning Note
-The plugin will be disabled when you explicitly pass a false.
+The plugin will be disabled when you explicitly pass a `false`.
 
-- babel style
+- Babel style
 
 ``` js
 module.exports = {
@@ -139,7 +139,7 @@ module.exports = {
 }
 ```
 
-- object style
+- Object style
 
 ``` js
 module.exports = {
@@ -158,19 +158,34 @@ module.exports = {
 - Type: `string`
 - Default: undefined
 
-The name of the plugin.
+The name of the plugin. 
 
-### enable
+Internally, vuepress will use the plugin's package name as the plugin name. When your plugin is a local plugin (i.e. use a pure plugin function directly), please be sure to configure this option, that is good for debug tracking.
+
+```js
+module.exports = {
+  plugins: [
+    [
+      (pluginOptions, context) => ({
+        name: 'my-xxx-plugin'
+        // ... the rest of options
+      })
+    ]
+  ]
+}
+```
+
+### enabled
 
 - Type: `boolean`
 - Default: true
 
 Configure whether to enable this plugin. e.g. if you want to enable a plugin only in development mode:
 
-``` js
+```js
 module.exports = (options, context) => {
   return {
-    enable: !context.isProd
+    enabled: !context.isProd
   }
 }
 ```
@@ -182,19 +197,60 @@ module.exports = (options, context) => {
 
 Modify the internal webpack config with [webpack-chain](https://github.com/mozilla-neutrino/webpack-chain).
 
+```js
+module.exports = {
+  chainWebpack (config, isServer) {
+    // config is an instance of ChainableConfig
+  }
+}
+```
+
+::: tip
+Since VuePress is a Vue SSR based application, there will be two webpack configurations, `isServer` is used to determine whether the current webpack config is applied to the server or client. 
+
+**Also see:** 
+
+- [Vue SSR > Build Configuration](https://ssr.vuejs.org/guide/build-config.html)
+:::
+
 ### enhanceDevServer
 
 - Type: `Function`
 - Default: undefined
 
+Enhance the underlying [Koa](https://github.com/koajs/koa) app.
+
 ``` js
 module.exports = {
-  enhanceDevServer(app) {
+  enhanceDevServer (app) {
     // app: poa instance
   }
 }
 ```
 
+A simple plugin to create a sub public directory is as follows:
+
+```js
+const path = require('path')
+
+module.exports = (options, context) => ({
+  // For development
+  enhanceDevServer (app) {
+    const mount = require('koa-mount')
+    const serveStatic = require('koa-static')
+    // The context object can be used to pass information on different plugin options
+    context.imagesAssetsPath = path.resolve(context.sourceDir, '.vuepress/images')
+    app.use(mount(path.join(context.publicPath, 'images'), serveStatic(context.imagesAssetsPath)))
+  },
+  
+  // For productions
+  async generated () {
+    const { fs } = require('@vuepress/shared-utils')
+    await fs.copy(context.imagesAssetsPath, path.resolve(context.outDir, 'images'))
+  }
+})
+```
+
 ### extendMarkdown
 
 - Type: `Function`
@@ -202,7 +258,7 @@ module.exports = {
 
 A function to modify default config or apply additional plugins to the [markdown-it](https://github.com/markdown-it/markdown-it) instance used to render source files. Example:
 
-``` js
+```js
 module.exports = {
   extendMarkdown: md => {
     md.set({ breaks: true })
@@ -257,11 +313,12 @@ A function that exports a plain object which will be merged into each page's dat
 ``` js
 module.exports = {
   extendPageData ({ 
-    base,      // file's relative path
-    filepath,  // file's absolute path
-    routePath, // url to access this file (client side)
-    content,   // file's raw content
-    key,       // file's key
+    _filePath,   // file's absolute path
+    _i18n,       // access the client global mixins at build time, e.g _i18n.$localePath.
+    content,     // file's raw content string
+    key,         // file's hash key
+    regularPath, // current page's default link (follow the file hierarchy)
+    path,        // current page's permalink
   }) {
     return {
       // ...
@@ -270,6 +327,10 @@ module.exports = {
 }
 ```
 
+::: warning Note
+These fields starting with an `_` means you can only access them during build time.
+:::
+
 e.g.
 
 ``` js
@@ -309,12 +370,18 @@ Then you can use this module at client side code by:
 import { SOURCE_DIR } from '@dynamic/constans'
 ```
 
+::: tip Q & A
+**Q**: Both `clientDynamicModules` and `enhanceAppFiles` can generate dynamic javascript code during build time, so what is the difference between the two?
+
+**A**: The files generated by `clientDynamicModules` needs to be imported as `@dynamic/xxx` by the consumers themselves. But all the files generated by `enhanceAppFiles` will be loaded automatically when the APP is initialized on the client side.
+:::
+
 ### clientRootMixin
 
 - Type: `String`
 - Default: `undefined`
 
-A path to the mixin file which allow you to control the life cycle of APP's root component.
+A path to the mixin file which allow you to control the life cycle of root component.
 
 ``` js
 // plugin's entry
@@ -394,9 +461,15 @@ Then, VuePress will automatically inject these components behind the theme conta
 </div>
 ```
 
-## Plugin Context
+## Context
 
-```
+Starting with VuePress 1.x.x, VuePress provides an `AppContext` object that stores all the state of the current app and can be accessed through the plugin API. 
+
+::: warning Note
+Context of each plugin is a isolated context, they just inherit from the same app context.
+:::
+
+```js
 module.exports = (options, context) => {
   // ...
 }
@@ -412,7 +485,13 @@ Whether vuepress run in production environment mode.
 
 - Type: `string`
 
-Root path of the docs.
+Root directory where the documents are located.
+
+### context.tempPath
+
+- Type: `string`
+
+Root directory where the temporary files are located.
 
 ### context.outDir
 
@@ -426,7 +505,7 @@ Output path.
 
 The path of the currently active theme.
 
-### context.publicPath
+### context.base
 
 - Type: `string`
 
@@ -440,7 +519,7 @@ See: [base](../config/README.md#base).
 
 - Type: `Function`
 
-
+A utility for writing temporary files to tempPath.
 
 ## Lifecycle
 

From c575d62189eee7235634b7d6f791260f0e60974e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 29 Aug 2018 00:31:41 +0800
Subject: [PATCH 156/242] docs: refine 'Introduction'

---
 packages/docs/docs/guide/README.md        | 15 ++++++++++++++-
 packages/docs/docs/guide/custom-themes.md |  1 -
 packages/docs/docs/plugin/README.md       |  7 +------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/docs/docs/guide/README.md b/packages/docs/docs/guide/README.md
index 58f39edf50..e5bba84ccc 100644
--- a/packages/docs/docs/guide/README.md
+++ b/packages/docs/docs/guide/README.md
@@ -2,7 +2,7 @@
 
 <Bit/>
 
-VuePress is composed of two parts: a minimalistic static site generator with a Vue-powered theming system, and a default theme optimized for writing technical documentation. It was created to support the documentation needs of Vue's own sub projects.
+VuePress is composed of two parts: a [minimalistic static site generator](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/core) with a Vue-powered theming system and [Plugin API](../plugin/README.md), and a [default theme](../default-theme-config/README.md) optimized for writing technical documentation. It was created to support the documentation needs of Vue's own sub projects.
 
 Each page generated by VuePress has its own pre-rendered static HTML, providing great loading performance and is SEO-friendly. Once the page is loaded, however, Vue takes over the static content and turns it into a full Single-Page Application (SPA). Additional pages are fetched on demand as the user navigates around the site.
 
@@ -14,8 +14,21 @@ During the build, we create a server-rendered version of the app and render the
 
 Each markdown file is compiled into HTML with [markdown-it](https://github.com/markdown-it/markdown-it) and then processed as the template of a Vue component. This allows you to directly use Vue inside your markdown files and is great when you need to embed dynamic content.
 
+## Life cycle
+
+Below is a diagram for the VuePress application lifecycle in dev and build modes.
+
+![image](/plugin.png)
+
+It is worth noting that during the `prepare` phase, VuePress does the following:
+
+1. Resolve config
+2. Initialize and apply [Plugin API](../plugin/README.md)
+3. Initialize [webpack](http://webpack.js.org/) configuration and create [markdown-it](https://github.com/markdown-it/markdown-it) instance
+
 ## Features
 
+- [Powerful Plugin API](../plugin/README.md)
 - [Built-in markdown extensions](markdown.md) optimized for technical documentation
 - [Ability to leverage Vue inside markdown files](using-vue.md)
 - [Vue-powered custom theme system](custom-themes.md)
diff --git a/packages/docs/docs/guide/custom-themes.md b/packages/docs/docs/guide/custom-themes.md
index ffdbcf520e..374597dba0 100644
--- a/packages/docs/docs/guide/custom-themes.md
+++ b/packages/docs/docs/guide/custom-themes.md
@@ -58,7 +58,6 @@ Finally, don't forget that `this.$route` and `this.$router` are also available a
 
 ::: tip
   `lastUpdated` is the UNIX timestamp of this file's last git commit, for more details, refer to [Last Updated](../default-theme-config/README.md#last-updated).
-
 :::
 
 ## Content Excerpt
diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index 359df08923..5853739b78 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -4,7 +4,7 @@ sidebar: auto
 
 # Plugins
 
-## Writing a Plugin 
+## Writing a Plugin
 
 Plugins usually add global-level functionality to VuePress. There is no strictly defined scope for a plugin - there are typically several types of plugins you can write:
 
@@ -521,11 +521,6 @@ See: [base](../config/README.md#base).
 
 A utility for writing temporary files to tempPath.
 
-## Lifecycle
-
-![image](/plugin.png)
-
-- TODO
 
 
 

From 7f047080f7765f26d1045c0386b7ccbca620598f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 29 Aug 2018 01:35:54 +0800
Subject: [PATCH 157/242] feat($core): let 'core' provide a default NotFound
 component

---
 .../core/lib/app/components/NotFound.vue      | 26 +++++++++++++++++++
 .../@vuepress/core/lib/prepare/AppContext.js  |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 packages/@vuepress/core/lib/app/components/NotFound.vue

diff --git a/packages/@vuepress/core/lib/app/components/NotFound.vue b/packages/@vuepress/core/lib/app/components/NotFound.vue
new file mode 100644
index 0000000000..6aefe797c4
--- /dev/null
+++ b/packages/@vuepress/core/lib/app/components/NotFound.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="theme-container">
+    <div class="content">
+      <h1>404</h1>
+      <blockquote>{{ getMsg() }}</blockquote>
+      <router-link to="/">Take me home.</router-link>
+    </div>
+  </div>
+</template>
+
+<script>
+const msgs = [
+  `There's nothing here.`,
+  `How did we get here?`,
+  `That's a Four-Oh-Four.`,
+  `Looks like we've got some broken links.`
+]
+
+export default {
+  methods: {
+    getMsg () {
+      return msgs[Math.floor(Math.random() * msgs.length)]
+    }
+  }
+}
+</script>
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 7df603eb08..7185329277 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -199,7 +199,7 @@ module.exports = class AppContext {
         throw new Error(`[vuepress] Cannot resolve Layout.vue file in .vuepress/theme.`)
       }
       if (!fs.existsSync(themeNotFoundPath)) {
-        throw new Error(`[vuepress] Cannot resolve NotFound.vue file in .vuepress/theme.`)
+        themeNotFoundPath = path.resolve(__dirname, '../app/components/NotFound.vue')
       }
     } else if (theme) {
       // use external theme

From b45633efcae37dc5d81f00dba3df0700e46e0a15 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 29 Aug 2018 01:37:31 +0800
Subject: [PATCH 158/242] refactor($core): move core resuable utilities to
 'shared-utils and fix tests

---
 .../fixtures/docs-custom-theme/README.md      |  1 -
 .../fixtures/docs-simple-config/README.md     |  1 -
 .../prepare/fixtures/docs-simple/README.md    |  1 -
 .../core/__test__/prepare/util.spec.js        | 34 --------------
 packages/@vuepress/core/lib/markdown/index.js |  2 +-
 .../@vuepress/core/lib/plugin-api/index.js    |  3 +-
 .../@vuepress/core/lib/plugin-api/util.js     |  3 +-
 .../@vuepress/core/lib/prepare/AppContext.js  |  3 +-
 packages/@vuepress/core/lib/prepare/Page.js   |  9 +---
 packages/@vuepress/core/lib/util/index.js     | 15 +-----
 .../core/lib/webpack/markdownLoader.js        |  3 +-
 .../__test__/deeplyParseHeaders.spec.js}      | 35 +-------------
 .../shared-utils/__test__/fileToPath.spec.js  | 14 ++++++
 .../shared-utils/__test__/isIndexFile.spec.js | 20 ++++++++
 .../__test__/parseHeaders.spec.js             | 31 +++++++++++++
 .../__test__/unescapeHtml.spec.js             |  7 +++
 packages/@vuepress/shared-utils/index.js      | 13 ++++++
 .../@vuepress/shared-utils/lib/compose.js     | 10 ++++
 .../lib/datatypes.js}                         | 11 -----
 .../shared-utils/lib/deeplyParseHeaders.js    | 17 +++++++
 .../shared-utils/lib/ensureEndingSlash.js     |  5 ++
 .../shared-utils/lib/ensureLeadingSlash.js    |  3 ++
 .../@vuepress/shared-utils/lib/fileToPath.js  | 16 +++++++
 .../lib/getPermalink.js}                      | 46 ++-----------------
 .../@vuepress/shared-utils/lib/isIndexFile.js |  8 ++++
 .../@vuepress/shared-utils/lib/parseEmojis.js |  4 ++
 .../shared-utils/lib/parseFrontmatter.js      | 12 +++++
 .../util => shared-utils/lib}/parseHeaders.js | 35 ++------------
 packages/@vuepress/shared-utils/lib/sort.js   |  7 +++
 .../shared-utils/lib/unescapeHtml.js          |  7 +++
 .../docs-local-theme}/.vuepress/config.js     |  2 +-
 .../.vuepress/theme/Layout.vue                |  0
 .../fixtures/docs-local-theme/README.md       |  1 +
 .../docs-simple-config/.vuepress/config.js    |  2 +-
 .../fixtures/docs-simple-config/README.md     |  1 +
 .../__snapshots__/DropdownLink.spec.js.snap   | 32 +++++++++++++
 .../__snapshots__/NavLink.spec.js.snap        | 18 ++++++++
 packages/docs/docs/plugin/README.md           |  4 --
 38 files changed, 247 insertions(+), 189 deletions(-)
 delete mode 100644 packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/README.md
 delete mode 100644 packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
 delete mode 100644 packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
 delete mode 100644 packages/@vuepress/core/__test__/prepare/util.spec.js
 rename packages/@vuepress/{core/__test__/util/parseHeaders.spec.js => shared-utils/__test__/deeplyParseHeaders.spec.js} (76%)
 create mode 100644 packages/@vuepress/shared-utils/__test__/fileToPath.spec.js
 create mode 100644 packages/@vuepress/shared-utils/__test__/isIndexFile.spec.js
 create mode 100644 packages/@vuepress/shared-utils/__test__/parseHeaders.spec.js
 create mode 100644 packages/@vuepress/shared-utils/__test__/unescapeHtml.spec.js
 create mode 100644 packages/@vuepress/shared-utils/lib/compose.js
 rename packages/@vuepress/{core/lib/util/shared.js => shared-utils/lib/datatypes.js} (84%)
 create mode 100644 packages/@vuepress/shared-utils/lib/deeplyParseHeaders.js
 create mode 100644 packages/@vuepress/shared-utils/lib/ensureEndingSlash.js
 create mode 100644 packages/@vuepress/shared-utils/lib/ensureLeadingSlash.js
 create mode 100644 packages/@vuepress/shared-utils/lib/fileToPath.js
 rename packages/@vuepress/{core/lib/prepare/util.js => shared-utils/lib/getPermalink.js} (56%)
 create mode 100644 packages/@vuepress/shared-utils/lib/isIndexFile.js
 create mode 100644 packages/@vuepress/shared-utils/lib/parseEmojis.js
 create mode 100644 packages/@vuepress/shared-utils/lib/parseFrontmatter.js
 rename packages/@vuepress/{core/lib/util => shared-utils/lib}/parseHeaders.js (50%)
 create mode 100644 packages/@vuepress/shared-utils/lib/sort.js
 create mode 100644 packages/@vuepress/shared-utils/lib/unescapeHtml.js
 rename packages/@vuepress/{core/__test__/prepare/fixtures/docs-custom-theme => test-utils/fixtures/docs-local-theme}/.vuepress/config.js (56%)
 rename packages/@vuepress/{core/__test__/prepare/fixtures/docs-custom-theme => test-utils/fixtures/docs-local-theme}/.vuepress/theme/Layout.vue (100%)
 create mode 100644 packages/@vuepress/test-utils/fixtures/docs-local-theme/README.md
 rename packages/@vuepress/{core/__test__/prepare => test-utils}/fixtures/docs-simple-config/.vuepress/config.js (79%)
 create mode 100644 packages/@vuepress/test-utils/fixtures/docs-simple-config/README.md

diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/README.md
deleted file mode 100644
index fdb4d2b582..0000000000
--- a/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Simple Docs
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
deleted file mode 100644
index fdb4d2b582..0000000000
--- a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Simple Docs
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
deleted file mode 100644
index fdb4d2b582..0000000000
--- a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Simple Docs
diff --git a/packages/@vuepress/core/__test__/prepare/util.spec.js b/packages/@vuepress/core/__test__/prepare/util.spec.js
deleted file mode 100644
index b08a282514..0000000000
--- a/packages/@vuepress/core/__test__/prepare/util.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { isIndexFile, fileToPath } from '../../lib/prepare/util.js'
-
-describe('prepare - util', () => {
-  test('isIndexFile', () => {
-    [
-      'README.md',
-      'readme.md',
-      'INDEX.md',
-      'index.md',
-      'foo/README.md',
-      'foo/index.md'
-    ].forEach(file => {
-      expect(isIndexFile(file)).toBe(true)
-    });
-    [
-      'foo/one.md',
-      'one.md'
-    ].forEach(file => {
-      expect(isIndexFile(file)).toBe(false)
-    })
-  })
-
-  test('fileToPath', () => {
-    const asserts = {
-      'README.md': '/',
-      'foo/README.md': '/foo/',
-      'foo.md': '/foo.html',
-      'foo/bar.md': '/foo/bar.html'
-    }
-    Object.keys(asserts).forEach(file => {
-      expect(fileToPath(file)).toBe(asserts[file])
-    })
-  })
-})
diff --git a/packages/@vuepress/core/lib/markdown/index.js b/packages/@vuepress/core/lib/markdown/index.js
index f4942f6ce6..b398e6118f 100644
--- a/packages/@vuepress/core/lib/markdown/index.js
+++ b/packages/@vuepress/core/lib/markdown/index.js
@@ -11,7 +11,7 @@ const emoji = require('markdown-it-emoji')
 const anchor = require('markdown-it-anchor')
 const toc = require('markdown-it-table-of-contents')
 const _slugify = require('./slugify')
-const { parseHeaders } = require('../util/parseHeaders')
+const { parseHeaders } = require('@vuepress/shared-utils')
 
 module.exports = ({ markdown = {}} = {}) => {
   // allow user config slugify
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index ef4582177c..c73e13a99a 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -1,7 +1,6 @@
-const { logger, chalk } = require('@vuepress/shared-utils')
+const { logger, chalk, datatypes: { assertTypes }} = require('@vuepress/shared-utils')
 const instantiateOption = require('./option/instantiateOption')
 const { resolvePlugin, hydratePlugin, normalizePluginsConfig } = require('./util')
-const { assertTypes } = require('../util/shared')
 const { PLUGIN_OPTION_MAP } = require('./constants')
 
 module.exports = class PluginAPI {
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 84ef93418e..d3b17ec1a3 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -1,5 +1,4 @@
-const { logger, chalk, env } = require('@vuepress/shared-utils')
-const { assertTypes } = require('../util/shared')
+const { logger, chalk, env, datatypes: { assertTypes }} = require('@vuepress/shared-utils')
 
 const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
 let anonymousPluginIdx = 0
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 7185329277..624822a16d 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -1,8 +1,7 @@
 const path = require('path')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
-const { sort } = require('./util')
-const { fs, logger, chalk, globby } = require('@vuepress/shared-utils')
+const { fs, logger, chalk, globby, sort } = require('@vuepress/shared-utils')
 
 const Page = require('./Page')
 const I18n = require('./I18n')
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 38cb3cb600..bc9f18160f 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -1,12 +1,7 @@
 const path = require('path')
 const slugify = require('../markdown/slugify')
-const { fs } = require('@vuepress/shared-utils')
-const { fileToPath, getPermalink } = require('./util')
-const {
-  inferTitle,
-  extractHeaders,
-  parseFrontmatter
-} = require('../util/index')
+const { fs, fileToPath, parseFrontmatter, getPermalink } = require('@vuepress/shared-utils')
+const { inferTitle, extractHeaders } = require('../util/index')
 
 module.exports = class Page {
   constructor (filePath, {
diff --git a/packages/@vuepress/core/lib/util/index.js b/packages/@vuepress/core/lib/util/index.js
index 8918ee3e6b..926e3af30e 100644
--- a/packages/@vuepress/core/lib/util/index.js
+++ b/packages/@vuepress/core/lib/util/index.js
@@ -1,4 +1,4 @@
-const { deeplyParseHeaders } = require('./parseHeaders')
+const { deeplyParseHeaders } = require('@vuepress/shared-utils')
 
 exports.normalizeHeadTag = function (tag) {
   if (typeof tag === 'string') {
@@ -40,19 +40,6 @@ exports.inferTitle = function (frontmatter) {
   }
 }
 
-exports.parseFrontmatter = function (content) {
-  const matter = require('gray-matter')
-  const toml = require('toml')
-
-  return matter(content, {
-    excerpt_separator: '<!-- more -->',
-    engines: {
-      toml: toml.parse.bind(toml),
-      excerpt: false
-    }
-  })
-}
-
 const LRU = require('lru-cache')
 const cache = LRU({ max: 1000 })
 
diff --git a/packages/@vuepress/core/lib/webpack/markdownLoader.js b/packages/@vuepress/core/lib/webpack/markdownLoader.js
index 53edbc2575..7a7fa54228 100644
--- a/packages/@vuepress/core/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/core/lib/webpack/markdownLoader.js
@@ -3,7 +3,8 @@ const path = require('path')
 const hash = require('hash-sum')
 const { EventEmitter } = require('events')
 const { getOptions } = require('loader-utils')
-const { inferTitle, extractHeaders, parseFrontmatter } = require('../util/index')
+const { inferTitle, extractHeaders } = require('../util/index')
+const { parseFrontmatter } = require('@vuepress/shared-utils')
 const LRU = require('lru-cache')
 
 const cache = LRU({ max: 1000 })
diff --git a/packages/@vuepress/core/__test__/util/parseHeaders.spec.js b/packages/@vuepress/shared-utils/__test__/deeplyParseHeaders.spec.js
similarity index 76%
rename from packages/@vuepress/core/__test__/util/parseHeaders.spec.js
rename to packages/@vuepress/shared-utils/__test__/deeplyParseHeaders.spec.js
index fabfc6ac64..bfa6580ec2 100644
--- a/packages/@vuepress/core/__test__/util/parseHeaders.spec.js
+++ b/packages/@vuepress/shared-utils/__test__/deeplyParseHeaders.spec.js
@@ -1,37 +1,6 @@
-import {
-  parseHeaders,
-  removeNonCodeWrappedHTML,
-  deeplyParseHeaders
-} from '../../lib/util/parseHeaders'
-
-describe('parseHeaders', () => {
-  test('should unescape html', () => {
-    const input = '&lt;div&gt;'
-    expect(parseHeaders(input)).toBe('<div>')
-  })
-
-  test('should remove markdown tokens correctly', () => {
-    const asserts = {
-      // #238
-      '[vue](vuejs.org)': 'vue',
-      '`vue`': 'vue',
-      '*vue*': 'vue',
-      '**vue**': 'vue',
-      '***vue***': 'vue',
-      '_vue_': 'vue',
-      '\\_vue\\_': '_vue_',
-      '\\*vue\\*': '*vue*',
-
-      // #564 For multiple markdown tokens
-      '`a` and `b`': 'a and b',
-      '***bold and italic***': 'bold and italic',
-      '**bold** and *italic*': 'bold and italic'
-    }
-    Object.keys(asserts).forEach(input => {
-      expect(parseHeaders(input)).toBe(asserts[input])
-    })
-  })
+import deeplyParseHeaders, { removeNonCodeWrappedHTML } from '../lib/deeplyParseHeaders'
 
+describe('deeplyParseHeaders', () => {
   test('should remove non-code-wrapped html correctly', () => {
     const asserts = {
       // Remove tail html
diff --git a/packages/@vuepress/shared-utils/__test__/fileToPath.spec.js b/packages/@vuepress/shared-utils/__test__/fileToPath.spec.js
new file mode 100644
index 0000000000..d0b2683283
--- /dev/null
+++ b/packages/@vuepress/shared-utils/__test__/fileToPath.spec.js
@@ -0,0 +1,14 @@
+import fileToPath from '../lib/fileToPath'
+
+test('fileToPath', () => {
+  const asserts = {
+    'README.md': '/',
+    'foo/README.md': '/foo/',
+    'foo.md': '/foo.html',
+    'foo/bar.md': '/foo/bar.html'
+  }
+  Object.keys(asserts).forEach(file => {
+    expect(fileToPath(file)).toBe(asserts[file])
+  })
+})
+
diff --git a/packages/@vuepress/shared-utils/__test__/isIndexFile.spec.js b/packages/@vuepress/shared-utils/__test__/isIndexFile.spec.js
new file mode 100644
index 0000000000..28ddc16e6d
--- /dev/null
+++ b/packages/@vuepress/shared-utils/__test__/isIndexFile.spec.js
@@ -0,0 +1,20 @@
+import isIndexFile from '../lib/isIndexFile'
+
+test('isIndexFile', () => {
+  [
+    'README.md',
+    'readme.md',
+    'INDEX.md',
+    'index.md',
+    'foo/README.md',
+    'foo/index.md'
+  ].forEach(file => {
+    expect(isIndexFile(file)).toBe(true)
+  });
+  [
+    'foo/one.md',
+    'one.md'
+  ].forEach(file => {
+    expect(isIndexFile(file)).toBe(false)
+  })
+})
diff --git a/packages/@vuepress/shared-utils/__test__/parseHeaders.spec.js b/packages/@vuepress/shared-utils/__test__/parseHeaders.spec.js
new file mode 100644
index 0000000000..1cc9722014
--- /dev/null
+++ b/packages/@vuepress/shared-utils/__test__/parseHeaders.spec.js
@@ -0,0 +1,31 @@
+import parseHeaders from '../lib/parseHeaders'
+
+describe('parseHeaders', () => {
+  test('should unescape html', () => {
+    const input = '&lt;div&gt;'
+    expect(parseHeaders(input)).toBe('<div>')
+  })
+
+  test('should remove markdown tokens correctly', () => {
+    const asserts = {
+      // #238
+      '[vue](vuejs.org)': 'vue',
+      '`vue`': 'vue',
+      '*vue*': 'vue',
+      '**vue**': 'vue',
+      '***vue***': 'vue',
+      '_vue_': 'vue',
+      '\\_vue\\_': '_vue_',
+      '\\*vue\\*': '*vue*',
+      '\\!vue\\!': '!vue!',
+
+      // #564 For multiple markdown tokens
+      '`a` and `b`': 'a and b',
+      '***bold and italic***': 'bold and italic',
+      '**bold** and *italic*': 'bold and italic'
+    }
+    Object.keys(asserts).forEach(input => {
+      expect(parseHeaders(input)).toBe(asserts[input])
+    })
+  })
+})
diff --git a/packages/@vuepress/shared-utils/__test__/unescapeHtml.spec.js b/packages/@vuepress/shared-utils/__test__/unescapeHtml.spec.js
new file mode 100644
index 0000000000..81fdb79321
--- /dev/null
+++ b/packages/@vuepress/shared-utils/__test__/unescapeHtml.spec.js
@@ -0,0 +1,7 @@
+import unescapeHtml from '../lib/unescapeHtml'
+
+test('should unescape html', () => {
+  const input = '&lt;div&gt;'
+  expect(unescapeHtml(input)).toBe('<div>')
+})
+
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 0f94487ed5..86be39d68d 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -1,6 +1,19 @@
 exports.logger = require('./lib/logger')
 exports.env = require('./lib/env')
 exports.codegen = require('./lib/codegen')
+exports.compose = require('./lib/compose')
+exports.datatypes = require('./lib/datatypes')
+exports.parseFrontmatter = require('./lib/parseFrontmatter')
+exports.unescapeHtml = require('./lib/unescapeHtml')
+exports.parseEmojis = require('./lib/parseEmojis')
+exports.parseHeaders = require('./lib/parseHeaders')
+exports.deeplyParseHeaders = require('./lib/deeplyParseHeaders')
+exports.fileToPath = require('./lib/fileToPath')
+exports.sort = require('./lib/sort')
+exports.ensureLeadingSlash = require('./lib/ensureLeadingSlash')
+exports.ensureEndingSlash = require('./lib/ensureEndingSlash')
+exports.getPermalink = require('./lib/getPermalink')
+
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
 exports.globby = require('globby')
diff --git a/packages/@vuepress/shared-utils/lib/compose.js b/packages/@vuepress/shared-utils/lib/compose.js
new file mode 100644
index 0000000000..519271dc6c
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/compose.js
@@ -0,0 +1,10 @@
+/**
+ * Build functional pipeline.
+ */
+module.exports = function compose (...processors) {
+  if (processors.length === 0) return input => input
+  if (processors.length === 1) return processors[0]
+  return processors.reduce((prev, next) => {
+    return (...args) => next(prev(...args))
+  })
+}
diff --git a/packages/@vuepress/core/lib/util/shared.js b/packages/@vuepress/shared-utils/lib/datatypes.js
similarity index 84%
rename from packages/@vuepress/core/lib/util/shared.js
rename to packages/@vuepress/shared-utils/lib/datatypes.js
index b3b1919048..c2c1a36a67 100644
--- a/packages/@vuepress/core/lib/util/shared.js
+++ b/packages/@vuepress/shared-utils/lib/datatypes.js
@@ -1,16 +1,5 @@
 const chalk = require('chalk')
 
-/**
- * Build functional pipeline.
- */
-exports.compose = (...processors) => {
-  if (processors.length === 0) return input => input
-  if (processors.length === 1) return processors[0]
-  return processors.reduce((prev, next) => {
-    return (...args) => next(prev(...args))
-  })
-}
-
 exports.isObject = obj => obj !== null && typeof obj === 'object'
 
 /**
diff --git a/packages/@vuepress/shared-utils/lib/deeplyParseHeaders.js b/packages/@vuepress/shared-utils/lib/deeplyParseHeaders.js
new file mode 100644
index 0000000000..64685b11fe
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/deeplyParseHeaders.js
@@ -0,0 +1,17 @@
+// This method remove the raw HTML but reserve the HTML wrapped by `<code>`.
+// e.g.
+// Input: "<a> b",   Output: "b"
+// Input: "`<a>` b", Output: "`<a>` b"
+function removeNonCodeWrappedHTML (str) {
+  return String(str).replace(/(^|[^><`])<.*>([^><`]|$)/g, '$1$2')
+}
+
+// Also clean the html that isn't wrapped by code.
+// Because we want to support using VUE components in headers.
+// e.g. https://vuepress.vuejs.org/guide/using-vue.html#badge
+module.exports = require('./compose')(
+  removeNonCodeWrappedHTML,
+  require('./parseHeaders')
+)
+
+module.exports.removeNonCodeWrappedHTML = removeNonCodeWrappedHTML
diff --git a/packages/@vuepress/shared-utils/lib/ensureEndingSlash.js b/packages/@vuepress/shared-utils/lib/ensureEndingSlash.js
new file mode 100644
index 0000000000..3e7e4ea777
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/ensureEndingSlash.js
@@ -0,0 +1,5 @@
+module.exports = function ensureEndingSlash (path) {
+  return /(\.html|\/)$/.test(path)
+    ? path
+    : path + '/'
+}
diff --git a/packages/@vuepress/shared-utils/lib/ensureLeadingSlash.js b/packages/@vuepress/shared-utils/lib/ensureLeadingSlash.js
new file mode 100644
index 0000000000..e4cd98cfba
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/ensureLeadingSlash.js
@@ -0,0 +1,3 @@
+module.exports = function ensureLeadingSlash (path) {
+  return path.replace(/^\/?/, '/')
+}
diff --git a/packages/@vuepress/shared-utils/lib/fileToPath.js b/packages/@vuepress/shared-utils/lib/fileToPath.js
new file mode 100644
index 0000000000..57bdf599ec
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/fileToPath.js
@@ -0,0 +1,16 @@
+const { indexRE } = require('./isIndexFile')
+const isIndexFile = require('./isIndexFile')
+
+const extRE = /\.(vue|md)$/
+
+module.exports = function fileToPath (file) {
+  if (isIndexFile(file)) {
+    // README.md -> /
+    // foo/README.md -> /foo/
+    return file.replace(indexRE, '/$1')
+  } else {
+    // foo.md -> /foo.html
+    // foo/bar.md -> /foo/bar.html
+    return `/${file.replace(extRE, '').replace(/\\/g, '/')}.html`
+  }
+}
diff --git a/packages/@vuepress/core/lib/prepare/util.js b/packages/@vuepress/shared-utils/lib/getPermalink.js
similarity index 56%
rename from packages/@vuepress/core/lib/prepare/util.js
rename to packages/@vuepress/shared-utils/lib/getPermalink.js
index 54233fe06d..8a2ee865ef 100644
--- a/packages/@vuepress/core/lib/prepare/util.js
+++ b/packages/@vuepress/shared-utils/lib/getPermalink.js
@@ -1,29 +1,5 @@
-const indexRE = /(^|.*\/)(index|readme)\.md$/i
-const extRE = /\.(vue|md)$/
-
-exports.fileToPath = function (file) {
-  if (exports.isIndexFile(file)) {
-    // README.md -> /
-    // foo/README.md -> /foo/
-    return file.replace(indexRE, '/$1')
-  } else {
-    // foo.md -> /foo.html
-    // foo/bar.md -> /foo/bar.html
-    return `/${file.replace(extRE, '').replace(/\\/g, '/')}.html`
-  }
-}
-
-exports.isIndexFile = function (file) {
-  return indexRE.test(file)
-}
-
-exports.sort = function (arr) {
-  return arr.sort((a, b) => {
-    if (a < b) return -1
-    if (a > b) return 1
-    return 0
-  })
-}
+const ensureEndingSlash = require('./ensureEndingSlash')
+const ensureLeadingSlash = require('./ensureLeadingSlash')
 
 // e.g.
 // filename: docs/_posts/evan you.md
@@ -34,12 +10,12 @@ exports.sort = function (arr) {
 // :year/:month/:day/:title/ => 2018/08/14/yyx 990803/
 // :year/:month/:day/:original/ => 2018/08/14/_posts/evan you.html
 
-exports.getPermalink = function ({
+module.exports = function getPermalink ({
   pattern,
   slug,
   date,
   regularPath,
-  localePath
+  localePath = '/'
 }) {
   if (!pattern) {
     return
@@ -71,17 +47,5 @@ exports.getPermalink = function ({
       .replace(/:slug/, slug)
       .replace(/:regular/, regularPath)
 
-  return ensureLeadingSlash(
-    ensureEndingSlash(link)
-  )
-}
-
-function ensureLeadingSlash (path) {
-  return path.replace(/^\/?/, '/')
-}
-
-function ensureEndingSlash (path) {
-  return /(\.html|\/)$/.test(path)
-    ? path
-    : path + '/'
+  return ensureLeadingSlash(ensureEndingSlash(link))
 }
diff --git a/packages/@vuepress/shared-utils/lib/isIndexFile.js b/packages/@vuepress/shared-utils/lib/isIndexFile.js
new file mode 100644
index 0000000000..53e7df9141
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/isIndexFile.js
@@ -0,0 +1,8 @@
+const indexRE = /(^|.*\/)(index|readme)\.md$/i
+
+function isIndexFile (file) {
+  return indexRE.test(file)
+}
+
+module.exports = isIndexFile
+module.exports.indexRE = indexRE
diff --git a/packages/@vuepress/shared-utils/lib/parseEmojis.js b/packages/@vuepress/shared-utils/lib/parseEmojis.js
new file mode 100644
index 0000000000..e2f45d7a11
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/parseEmojis.js
@@ -0,0 +1,4 @@
+module.exports = str => {
+  const emojiData = require('markdown-it-emoji/lib/data/full.json')
+  return String(str).replace(/:(.+?):/g, (placeholder, key) => emojiData[key] || placeholder)
+}
diff --git a/packages/@vuepress/shared-utils/lib/parseFrontmatter.js b/packages/@vuepress/shared-utils/lib/parseFrontmatter.js
new file mode 100644
index 0000000000..64e8e508ba
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/parseFrontmatter.js
@@ -0,0 +1,12 @@
+module.exports = function parseFrontmatter (content) {
+  const matter = require('gray-matter')
+  const toml = require('toml')
+
+  return matter(content, {
+    excerpt_separator: '<!-- more -->',
+    engines: {
+      toml: toml.parse.bind(toml),
+      excerpt: false
+    }
+  })
+}
diff --git a/packages/@vuepress/core/lib/util/parseHeaders.js b/packages/@vuepress/shared-utils/lib/parseHeaders.js
similarity index 50%
rename from packages/@vuepress/core/lib/util/parseHeaders.js
rename to packages/@vuepress/shared-utils/lib/parseHeaders.js
index 2c9fe641f9..c01088a9d0 100644
--- a/packages/@vuepress/core/lib/util/parseHeaders.js
+++ b/packages/@vuepress/shared-utils/lib/parseHeaders.js
@@ -10,20 +10,6 @@
 // so that we can write HTML/Vue in the header. One exception is the HTML
 // wrapped by <code>(markdown token: '`') tag.
 
-const { compose } = require('./shared')
-
-const parseEmojis = str => {
-  const emojiData = require('markdown-it-emoji/lib/data/full.json')
-  return String(str).replace(/:(.+?):/g, (placeholder, key) => emojiData[key] || placeholder)
-}
-
-const unescapeHtml = html => String(html)
-  .replace(/&quot;/g, '"')
-  .replace(/&#39;/g, '\'')
-  .replace(/&#x3A;/g, ':')
-  .replace(/&lt;/g, '<')
-  .replace(/&gt;/g, '>')
-
 const removeMarkdownTokens = str => String(str)
   .replace(/\[(.*)\]\(.*\)/, '$1')              // []()
   .replace(/(`|\*{1,3}|_)(.*?[^\\])\1/g, '$2')  // `{t}` | *{t}* | **{t}** | ***{t}*** | _{t}_
@@ -31,26 +17,11 @@ const removeMarkdownTokens = str => String(str)
 
 const trim = str => str.trim()
 
-// This method remove the raw HTML but reserve the HTML wrapped by `<code>`.
-// e.g.
-// Input: "<a> b",   Output: "b"
-// Input: "`<a>` b", Output: "`<a>` b"
-exports.removeNonCodeWrappedHTML = (str) => {
-  return String(str).replace(/(^|[^><`])<.*>([^><`]|$)/g, '$1$2')
-}
-
 // Unescape html, parse emojis and remove some md tokens.
-exports.parseHeaders = compose(
-  unescapeHtml,
-  parseEmojis,
+module.exports = require('./compose')(
+  require('./unescapeHtml'),
+  require('./parseEmojis'),
   removeMarkdownTokens,
   trim
 )
 
-// Also clean the html that isn't wrapped by code.
-// Because we want to support using VUE components in headers.
-// e.g. https://vuepress.vuejs.org/guide/using-vue.html#badge
-exports.deeplyParseHeaders = compose(
-  exports.removeNonCodeWrappedHTML,
-  exports.parseHeaders,
-)
diff --git a/packages/@vuepress/shared-utils/lib/sort.js b/packages/@vuepress/shared-utils/lib/sort.js
new file mode 100644
index 0000000000..6de7ede632
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/sort.js
@@ -0,0 +1,7 @@
+module.exports = function sort (arr) {
+  return arr.sort((a, b) => {
+    if (a < b) return -1
+    if (a > b) return 1
+    return 0
+  })
+}
diff --git a/packages/@vuepress/shared-utils/lib/unescapeHtml.js b/packages/@vuepress/shared-utils/lib/unescapeHtml.js
new file mode 100644
index 0000000000..897bf49ca8
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/unescapeHtml.js
@@ -0,0 +1,7 @@
+module.exports = html => String(html)
+  .replace(/&quot;/g, '"')
+  .replace(/&#39;/g, '\'')
+  .replace(/&#x3A;/g, ':')
+  .replace(/&lt;/g, '<')
+  .replace(/&gt;/g, '>')
+
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/config.js b/packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/config.js
similarity index 56%
rename from packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/config.js
rename to packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/config.js
index a5f568cb6d..0a8ba98858 100644
--- a/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/config.js
+++ b/packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/config.js
@@ -1,4 +1,4 @@
 module.exports = {
   title: 'Hello VuePress',
-  description: 'Just playing around'
+  description: '# Hello, VuePress!'
 }
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue b/packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/theme/Layout.vue
similarity index 100%
rename from packages/@vuepress/core/__test__/prepare/fixtures/docs-custom-theme/.vuepress/theme/Layout.vue
rename to packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/theme/Layout.vue
diff --git a/packages/@vuepress/test-utils/fixtures/docs-local-theme/README.md b/packages/@vuepress/test-utils/fixtures/docs-local-theme/README.md
new file mode 100644
index 0000000000..aef89369f1
--- /dev/null
+++ b/packages/@vuepress/test-utils/fixtures/docs-local-theme/README.md
@@ -0,0 +1 @@
+# Hello, VuePress!
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js b/packages/@vuepress/test-utils/fixtures/docs-simple-config/.vuepress/config.js
similarity index 79%
rename from packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
rename to packages/@vuepress/test-utils/fixtures/docs-simple-config/.vuepress/config.js
index 70f49c13b3..665e1164b3 100644
--- a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
+++ b/packages/@vuepress/test-utils/fixtures/docs-simple-config/.vuepress/config.js
@@ -1,6 +1,6 @@
 module.exports = {
   title: 'Hello VuePress',
-  description: 'Just playing around',
+  description: '# Hello, VuePress!',
   dest: 'vuepress',
   base: 'vuepress',
   head: [
diff --git a/packages/@vuepress/test-utils/fixtures/docs-simple-config/README.md b/packages/@vuepress/test-utils/fixtures/docs-simple-config/README.md
new file mode 100644
index 0000000000..aef89369f1
--- /dev/null
+++ b/packages/@vuepress/test-utils/fixtures/docs-simple-config/README.md
@@ -0,0 +1 @@
+# Hello, VuePress!
diff --git a/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap b/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
index 56f54d5d32..cad38def2b 100644
--- a/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
+++ b/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
@@ -16,6 +16,22 @@ exports[`DropdownLink $docs-i18n - renders dropdown link. 1`] = `
 </div>
 `;
 
+exports[`DropdownLink $docs-local-theme - renders dropdown link. 1`] = `
+<div class="dropdown-wrapper">
+  <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
+  <ul class="nav-dropdown" style="display: none;" name="dropdown">
+    <li class="dropdown-item">
+      <!---->
+      <a class="nav-link">Guide</a>
+    </li>
+    <li class="dropdown-item">
+      <!---->
+      <a class="nav-link">Config Reference</a>
+    </li>
+  </ul>
+</div>
+`;
+
 exports[`DropdownLink $docs-simple - renders dropdown link. 1`] = `
 <div class="dropdown-wrapper">
   <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
@@ -31,3 +47,19 @@ exports[`DropdownLink $docs-simple - renders dropdown link. 1`] = `
   </ul>
 </div>
 `;
+
+exports[`DropdownLink $docs-simple-config - renders dropdown link. 1`] = `
+<div class="dropdown-wrapper">
+  <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
+  <ul class="nav-dropdown" style="display: none;" name="dropdown">
+    <li class="dropdown-item">
+      <!---->
+      <a class="nav-link">Guide</a>
+    </li>
+    <li class="dropdown-item">
+      <!---->
+      <a class="nav-link">Config Reference</a>
+    </li>
+  </ul>
+</div>
+`;
diff --git a/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap b/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
index df01c1547a..ccb1f78133 100644
--- a/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
+++ b/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
@@ -9,6 +9,15 @@ exports[`NavLink $docs-i18n - renders nav link with external link 1`] = `
 
 exports[`NavLink $docs-i18n - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
 
+exports[`NavLink $docs-local-theme - renders nav link with external link 1`] = `
+<a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
+  Vue
+  <p class="component outbound-link">outbound-link</p>
+</a>
+`;
+
+exports[`NavLink $docs-local-theme - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
+
 exports[`NavLink $docs-simple - renders nav link with external link 1`] = `
 <a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
   Vue
@@ -17,3 +26,12 @@ exports[`NavLink $docs-simple - renders nav link with external link 1`] = `
 `;
 
 exports[`NavLink $docs-simple - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
+
+exports[`NavLink $docs-simple-config - renders nav link with external link 1`] = `
+<a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
+  Vue
+  <p class="component outbound-link">outbound-link</p>
+</a>
+`;
+
+exports[`NavLink $docs-simple-config - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index 5853739b78..a6f936182a 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -511,10 +511,6 @@ The path of the currently active theme.
 
 See: [base](../config/README.md#base).
 
-### context.resolve
-
-- Type: `Function`
-
 ### context.writeTemp
 
 - Type: `Function`

From adb74b78a673dea2bf1f202303372399e7687123 Mon Sep 17 00:00:00 2001
From: YuChao Liang <l.yuch@foxmail.com>
Date: Thu, 30 Aug 2018 23:57:56 +0800
Subject: [PATCH 159/242] fix: valid filename for case-sensitive os (#779)

---
 packages/@vuepress/core/lib/internal-plugins/i18nTemp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js b/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
index 3c510c1a4d..52209b0c9c 100644
--- a/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
+++ b/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
@@ -11,7 +11,7 @@ module.exports = () => ({
 
   // @internal/i18n
   async clientDynamicModules () {
-    const i18nCommonjsModule = await fs.readFile(path.resolve(__dirname, '../prepare/i18n.js'), 'utf-8')
+    const i18nCommonjsModule = await fs.readFile(path.resolve(__dirname, '../prepare/I18n.js'), 'utf-8')
     const i18nEsModule = i18nCommonjsModule.replace('module.exports =', 'export default')
     return { name: 'i18n.js', content: i18nEsModule, dirname: 'internal' }
   }

From 3cf9df3fdf6894946cf1abc8de0464da28aab7b4 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 31 Aug 2018 01:14:24 +0800
Subject: [PATCH 160/242] docs: blog documents (wip - 1)

---
 packages/docs/docs/theme/README.md | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/docs/docs/theme/README.md b/packages/docs/docs/theme/README.md
index 959997de04..f236ebcd35 100644
--- a/packages/docs/docs/theme/README.md
+++ b/packages/docs/docs/theme/README.md
@@ -4,6 +4,37 @@ sidebar: auto
 
 # Themes
 
+## Background
+
+Before 1.x.x, vuepress retrieves all markdown files in the documents source directory and defines the page links based on the file hierarchy. e.g. if you have the following file structure:
+
+```
+├── package.json
+└── source
+    ├── _post
+    │   └── intro-vuepress.md
+    ├── index.md
+    └── tags.md
+```
+
+Then you will get following available pages:
+
+```
+/source/
+/source/tags.html
+/source/_post/intro-vuepress.html
+```
+
+However, for a blog system, we hope that the link of a post can be customized. VuePress started supporting this feature from `1.0.0`. which is known as `permalink`. Then, the actual pages would be:
+
+```
+/source/
+/source/tags/
+/source/2018/4/1/intro-vuepress.html
+```
+
+It seems that we have seen the shadow of the blog. Let's continue to look down.
+
 ## Writing a theme
 
 TODO. integrate with the old docs.

From f2c3a636df143d64930e385a7620855ff9fe306e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 31 Aug 2018 01:29:21 +0800
Subject: [PATCH 161/242] chore: write temp to docs package dir

---
 packages/docs/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/docs/package.json b/packages/docs/package.json
index 00642f6aed..87f280350d 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -3,8 +3,8 @@
   "name": "docs",
   "description": "docs of VuePress",
   "scripts": {
-    "dev": "vuepress dev docs",
-    "build": "vuepress build docs"
+    "dev": "vuepress dev docs --temp .temp",
+    "build": "vuepress build docs --temp .temp"
   },
   "repository": {
     "type": "git",

From 398435901ff4d644c65444424308622adce96997 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Fri, 31 Aug 2018 01:29:46 +0800
Subject: [PATCH 162/242] docs: permalinks

---
 packages/docs/docs/theme/README.md | 44 +++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/packages/docs/docs/theme/README.md b/packages/docs/docs/theme/README.md
index f236ebcd35..d28cf8373a 100644
--- a/packages/docs/docs/theme/README.md
+++ b/packages/docs/docs/theme/README.md
@@ -2,7 +2,7 @@
 sidebar: auto
 ---
 
-# Themes
+# Theme
 
 ## Background
 
@@ -35,6 +35,48 @@ However, for a blog system, we hope that the link of a post can be customized. V
 
 It seems that we have seen the shadow of the blog. Let's continue to look down.
 
+## Permalinks
+
+A permalink is a URL that is intended to remain unchanged for many years into the future, yielding a hyperlink that is less susceptible to link rot<sup>[1]</sup>. VuePress supports a flexible way to build permalinks, allowing you to leverage various template variables.
+
+The default permalink is `/:regular`.
+
+### Configure Permalinks
+
+You can configure globally to apply it for all pages:
+
+```js
+// .vuepress/config.js
+module.exports = {
+  permalink: '/:year/:month/:day/:slug'
+}
+```
+
+Alternatively, you can also set permalink on a page only, and it will have a higher priority than the global settings.
+
+📝 __hello.md__:
+
+```markdown
+---
+title: Hello World
+permalink: /hello-world
+---
+
+Hello!
+```
+
+### Template Variables
+
+| Variable | Description |
+|---|---|
+|:year|Published year of posts (4-digit)|
+|:month|Published month of posts (2-digit)|
+|:i_month|Published month of posts (Without leading zeros)|
+|:day|Published day of posts (2-digit)|
+|:i_day|Published day of posts (Without leading zeros)|
+|:slug|Slugified file path (Without extension)|
+|:regular| Permalink generated by VuePress by default, for implementation see [here](https://github.com/vuejs/vuepress/blob/next/packages/%40vuepress/shared-utils/lib/fileToPath.js) |
+
 ## Writing a theme
 
 TODO. integrate with the old docs.

From b80c81071a5d143b1509ea40e8ec2a485f793186 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 02:36:31 +0800
Subject: [PATCH 163/242] feat($shared-utils): enhance datatypes

---
 packages/@vuepress/shared-utils/lib/datatypes.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/@vuepress/shared-utils/lib/datatypes.js b/packages/@vuepress/shared-utils/lib/datatypes.js
index c2c1a36a67..e409050d4a 100644
--- a/packages/@vuepress/shared-utils/lib/datatypes.js
+++ b/packages/@vuepress/shared-utils/lib/datatypes.js
@@ -7,6 +7,13 @@ exports.isObject = obj => obj !== null && typeof obj === 'object'
  */
 const _toString = Object.prototype.toString
 
+const getObjectType = x => _toString.call(x).slice(8, -1)
+const isOfType = type => x => typeof x === type // eslint-disable-line valid-typeof
+const isObjectOfType = type => x => getObjectType(x) === type
+exports.isFunction = isOfType('function')
+exports.isString = isOfType('string')
+exports.isPlainObject = isObjectOfType('Object')
+
 exports.toRawType = value => _toString.call(value).slice(8, -1)
 
 exports.getType = function (fn) {

From a8fea3c630e706a1b60006bbca187bfd249753c1 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 02:37:04 +0800
Subject: [PATCH 164/242] feat($shared-utils): shortcutPackageResolver

---
 .../__test__/shortcutPackageResolver.spec.js  | 123 ++++++++++++++++++
 packages/@vuepress/shared-utils/index.js      |   1 +
 .../lib/shortcutPackageResolver.js            |  98 ++++++++++++++
 3 files changed, 222 insertions(+)
 create mode 100644 packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js
 create mode 100644 packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js

diff --git a/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js b/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js
new file mode 100644
index 0000000000..f542c3a3ed
--- /dev/null
+++ b/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js
@@ -0,0 +1,123 @@
+jest.mock('vuepress-plugin-a')
+jest.mock('@org/vuepress-plugin-a')
+jest.mock('@vuepress/plugin-a')
+
+jest.mock('vuepress-theme-a')
+jest.mock('@org/vuepress-theme-a')
+jest.mock('@vuepress/theme-a')
+
+import {
+  resolveTheme,
+  resolvePlugin,
+  resolveScopePackage
+} from '../lib/shortcutPackageResolver'
+
+function resolveMockModule (name) {
+  return require(`../../../../__mocks__/${name}`)
+}
+
+test('should resolve scope packages correctly.', () => {
+  const pkg1 = resolveScopePackage('@vuepress/plugin-a')
+  expect(pkg1.org).toBe('vuepress')
+  expect(pkg1.name).toBe('plugin-a')
+
+  const pkg2 = resolveScopePackage('vuepress/plugin-a')
+  expect(pkg2).toBe(null)
+
+  const pkg3 = resolveScopePackage('vuepress-plugin-a')
+  expect(pkg3).toBe(null)
+})
+
+describe('resolvePlugin', () => {
+  test('shoould resolve local plugin as expected.', () => {
+    const plugin1 = () => {}
+    const plugin2 = {}
+    expect(resolvePlugin(plugin1)).toEqual({
+      name: 'plugin1',
+      shortcut: 'plugin1',
+      module: plugin1,
+      isLocal: true
+    })
+    expect(resolvePlugin(plugin2)).toEqual({
+      name: 'anonymous-1',
+      shortcut: 'anonymous-1',
+      module: plugin2,
+      isLocal: true
+    })
+  })
+
+  test('shoould resolve fullname usage correctly.', () => {
+    console.log(resolvePlugin())
+    let plugin = resolvePlugin('vuepress-plugin-a')
+    expect(plugin.name).toBe('vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('a')
+    expect(plugin.module).toBe(resolveMockModule('vuepress-plugin-a'))
+
+    plugin = resolvePlugin('@org/vuepress-plugin-a')
+    expect(plugin.name).toBe('@org/vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('@org/a')
+    expect(plugin.module).toBe(resolveMockModule('@org/vuepress-plugin-a'))
+  })
+
+  test('shoould resolve shortcut usage correctly.', () => {
+    // normal package
+    let plugin = resolvePlugin('a')
+    expect(plugin.name).toBe('vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('a')
+    expect(plugin.module).toBe(resolveMockModule('vuepress-plugin-a'))
+
+    // scope packages
+    plugin = resolvePlugin('@org/a')
+    expect(plugin.name).toBe('@org/vuepress-plugin-a')
+    expect(plugin.shortcut).toBe('@org/a')
+    expect(plugin.module).toBe(resolveMockModule('@org/vuepress-plugin-a'))
+
+    // special case for @vuepress package
+    plugin = resolvePlugin('@vuepress/a')
+    expect(plugin.name).toBe('@vuepress/plugin-a')
+    expect(plugin.shortcut).toBe('@vuepress/a')
+    expect(plugin.module).toBe(resolveMockModule('@vuepress/plugin-a'))
+  })
+
+  test('shoould return null when plugin cannot be resolved.', () => {
+    expect(resolvePlugin('c')).toEqual({ name: 'c', shortcut: 'c', module: null, isLocal: false })
+  })
+})
+
+describe('resolveTheme', () => {
+  test('shoould resolve fullname usage correctly.', () => {
+    let theme = resolveTheme('vuepress-theme-a')
+    expect(theme.name).toBe('vuepress-theme-a')
+    expect(theme.shortcut).toBe('a')
+    expect(theme.module).toBe(resolveMockModule('vuepress-theme-a'))
+
+    theme = resolveTheme('@org/vuepress-theme-a')
+    expect(theme.name).toBe('@org/vuepress-theme-a')
+    expect(theme.shortcut).toBe('@org/a')
+    expect(theme.module).toBe(resolveMockModule('@org/vuepress-theme-a'))
+  })
+
+  test('shoould resolve shortcut usage correctly.', () => {
+    // normal package
+    let theme = resolveTheme('a')
+    expect(theme.name).toBe('vuepress-theme-a')
+    expect(theme.shortcut).toBe('a')
+    expect(theme.module).toBe(resolveMockModule('vuepress-theme-a'))
+
+    // scope packages
+    theme = resolveTheme('@org/a')
+    expect(theme.name).toBe('@org/vuepress-theme-a')
+    expect(theme.shortcut).toBe('@org/a')
+    expect(theme.module).toBe(resolveMockModule('@org/vuepress-theme-a'))
+
+    // special case for @vuepress package
+    theme = resolveTheme('@vuepress/a')
+    expect(theme.name).toBe('@vuepress/theme-a')
+    expect(theme.shortcut).toBe('@vuepress/a')
+    expect(theme.module).toBe(resolveMockModule('@vuepress/theme-a'))
+  })
+
+  test('shoould return null when theme cannot be resolved.', () => {
+    expect(resolveTheme('c')).toEqual({ name: 'c', shortcut: 'c', module: null, isLocal: false })
+  })
+})
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index 86be39d68d..a1a49bd434 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -13,6 +13,7 @@ exports.sort = require('./lib/sort')
 exports.ensureLeadingSlash = require('./lib/ensureLeadingSlash')
 exports.ensureEndingSlash = require('./lib/ensureEndingSlash')
 exports.getPermalink = require('./lib/getPermalink')
+exports.shortcutPackageResolver = require('./lib/shortcutPackageResolver')
 
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
diff --git a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
new file mode 100644
index 0000000000..2a43c37771
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
@@ -0,0 +1,98 @@
+const { isDebug } = require('./env')
+const {
+  isString,
+  assertTypes
+} = require('./datatypes')
+
+const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
+
+/**
+ * Delightful pakcage shortcut resolving utility.
+ * @param {steing} type 'plugin', 'theme', or others.
+ * @param {string} org
+ * @returns {function}
+ */
+function shortcutPackageResolver (
+  type = 'plugin',
+  org = 'vuepress',
+  allowedTypes = [String]
+) {
+  let anonymousPluginIdx = 0
+  const NON_SCOPE_PREFIX = `${org}-${type}-`
+  const SCOPE_PREFIX = `@${org}/${type}-`
+  const SHORT_PREFIX_SLICE_LENGTH = type.length + 1
+  const FULL_PREFIX_SLICE_LENGTH = SHORT_PREFIX_SLICE_LENGTH + org.length + 1
+
+  return function (req) {
+    let _module
+    let name
+    let shortcut
+    let isLocal = false
+
+    const { valid, warnMsg } = assertTypes(req, allowedTypes)
+    if (!valid) {
+      throw new Error(`Invalid value for "${type}": ${warnMsg}`)
+    }
+
+    if (!isString(req)) {
+      _module = req
+      name = shortcut = req.name || `anonymous-${++anonymousPluginIdx}`
+      isLocal = true
+    } else {
+      try {
+        shortcut = req.startsWith(NON_SCOPE_PREFIX)
+          ? req.slice(FULL_PREFIX_SLICE_LENGTH)
+          : req
+        name = `${NON_SCOPE_PREFIX}${shortcut}`
+        _module = require(name)
+      } catch (err) {
+        const pkg = module.exports.resolveScopePackage(req)
+        try {
+          if (pkg) {
+            // speicial handling for default org.
+            if (pkg.org === org) {
+              shortcut = pkg.name.startsWith(`${type}-`)
+                ? pkg.name.slice(SHORT_PREFIX_SLICE_LENGTH)
+                : pkg.name
+              name = `${SCOPE_PREFIX}${shortcut}`
+            } else {
+              shortcut = pkg.name.startsWith(NON_SCOPE_PREFIX)
+                ? pkg.name.slice(FULL_PREFIX_SLICE_LENGTH)
+                : pkg.name
+              name = `@${pkg.org}/${NON_SCOPE_PREFIX}${shortcut}`
+            }
+            shortcut = `@${pkg.org}/${shortcut}`
+            _module = require(name)
+          } else {
+            throw new Error(`Invalid ${type} usage ${req}.`)
+          }
+        } catch (err2) {
+          if (isDebug) {
+            console.error(err2)
+          }
+          name = shortcut = req
+          _module = null
+        }
+      }
+    }
+
+    return { module: _module, name, shortcut, isLocal }
+  }
+}
+
+module.exports = shortcutPackageResolver
+module.exports.resolveScopePackage = function resolveScopePackage (name) {
+  if (SCOPE_PACKAGE_RE.test(name)) {
+    return {
+      org: RegExp.$1,
+      name: RegExp.$2
+    }
+  }
+  return null
+}
+module.exports.resolvePlugin = shortcutPackageResolver(
+  'plugin', 'vuepress', [String, Function, Object]
+)
+module.exports.resolveTheme = shortcutPackageResolver(
+  'theme', 'vuepress', [String]
+)

From 3daac5980694d8cce8cb48640c8f9267433d6496 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 02:45:09 +0800
Subject: [PATCH 165/242] chore($core): clean legacy plugin utils and tests

---
 .../__test__/plugin-api/PluginUtil.spec.js    | 80 +------------------
 .../@vuepress/core/lib/plugin-api/index.js    | 10 ++-
 .../@vuepress/core/lib/plugin-api/util.js     | 66 +--------------
 3 files changed, 11 insertions(+), 145 deletions(-)

diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
index b1c009f5b9..87a3371d07 100644
--- a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
@@ -1,82 +1,4 @@
-jest.mock('vuepress-plugin-a')
-jest.mock('@org/vuepress-plugin-a')
-
-import {
-  resolvePlugin,
-  hydratePlugin,
-  resolveScopePackage
-} from '../../lib/plugin-api/util'
-
-function resolveMockModule (name) {
-  return require(`../../../../../__mocks__/${name}`)
-}
-
-describe('resolvePlugin', () => {
-  test('should resolve scope packages correctly.', () => {
-    const pkg1 = resolveScopePackage('@vuepress/plugin-a')
-    expect(pkg1.org).toBe('vuepress')
-    expect(pkg1.name).toBe('plugin-a')
-
-    const pkg2 = resolveScopePackage('vuepress/plugin-a')
-    expect(pkg2).toBe(null)
-
-    const pkg3 = resolveScopePackage('vuepress-plugin-a')
-    expect(pkg3).toBe(null)
-  })
-
-  test('shoould resolve local plugin as expected.', () => {
-    const plugin1 = () => {}
-    const plugin2 = {}
-    expect(resolvePlugin(plugin1)).toEqual({
-      name: 'plugin1',
-      shortcut: 'plugin1',
-      config: plugin1,
-      isLocal: true
-    })
-    expect(resolvePlugin(plugin2)).toEqual({
-      name: 'anonymous-1',
-      shortcut: 'anonymous-1',
-      config: plugin2,
-      isLocal: true
-    })
-  })
-
-  test('shoould resolve fullname usage correctly.', () => {
-    let plugin = resolvePlugin('vuepress-plugin-a')
-    expect(plugin.name).toBe('vuepress-plugin-a')
-    expect(plugin.shortcut).toBe('a')
-    expect(plugin.config).toBe(resolveMockModule('vuepress-plugin-a'))
-
-    plugin = resolvePlugin('@org/vuepress-plugin-a')
-    expect(plugin.name).toBe('@org/vuepress-plugin-a')
-    expect(plugin.shortcut).toBe('@org/a')
-    expect(plugin.config).toBe(resolveMockModule('@org/vuepress-plugin-a'))
-  })
-
-  test('shoould resolve shortcut usage correctly.', () => {
-    // normal package
-    let plugin = resolvePlugin('a')
-    expect(plugin.name).toBe('vuepress-plugin-a')
-    expect(plugin.shortcut).toBe('a')
-    expect(plugin.config).toBe(resolveMockModule('vuepress-plugin-a'))
-
-    // scope packages
-    plugin = resolvePlugin('@org/a')
-    expect(plugin.name).toBe('@org/vuepress-plugin-a')
-    expect(plugin.shortcut).toBe('@org/a')
-    expect(plugin.config).toBe(resolveMockModule('@org/vuepress-plugin-a'))
-
-    // special case for @vuepress package
-    plugin = resolvePlugin('@vuepress/a')
-    expect(plugin.name).toBe('@vuepress/plugin-a')
-    expect(plugin.shortcut).toBe('@vuepress/a')
-    expect(plugin.config).toBe(resolveMockModule('@vuepress/plugin-a'))
-  })
-
-  test('shoould return null when plugin cannot be resolved.', () => {
-    expect(resolvePlugin('c')).toEqual({ name: 'c', shortcut: 'c', config: null, isLocal: false })
-  })
-})
+import { hydratePlugin } from '../../lib/plugin-api/util'
 
 describe('hydratePlugin', () => {
   test('shoould hydrate plugin correctly', () => {
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index c73e13a99a..02e378e2b7 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -1,7 +1,11 @@
-const { logger, chalk, datatypes: { assertTypes }} = require('@vuepress/shared-utils')
 const instantiateOption = require('./option/instantiateOption')
-const { resolvePlugin, hydratePlugin, normalizePluginsConfig } = require('./util')
+const { hydratePlugin, normalizePluginsConfig } = require('./util')
 const { PLUGIN_OPTION_MAP } = require('./constants')
+const {
+  shortcutPackageResolver: { resolvePlugin },
+  datatypes: { assertTypes },
+  logger, chalk
+} = require('@vuepress/shared-utils')
 
 module.exports = class PluginAPI {
   constructor (context) {
@@ -31,7 +35,7 @@ module.exports = class PluginAPI {
 
   use (pluginRaw, pluginOptions = {}) {
     let plugin = resolvePlugin(pluginRaw)
-    if (!plugin.config) {
+    if (!plugin.module) {
       console.warn(`[vuepress] cannot resolve plugin "${pluginRaw}"`)
       return this
     }
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index d3b17ec1a3..5abc66d305 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -1,74 +1,14 @@
-const { logger, chalk, env, datatypes: { assertTypes }} = require('@vuepress/shared-utils')
-
-const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
-let anonymousPluginIdx = 0
-
-exports.resolveScopePackage = function (name) {
-  if (SCOPE_PACKAGE_RE.test(name)) {
-    return {
-      org: RegExp.$1,
-      name: RegExp.$2
-    }
-  }
-  return null
-}
-
-/**
- * Resolve plugin config, name, and shortcut.
- * @param pluginRaw
- * @returns {{config: Function|Object, name: string, shortcut: string}}
- */
-exports.resolvePlugin = function (pluginRaw) {
-  let name
-  let config
-  let shortcut
-  let isLocal = false
-  if (typeof pluginRaw === 'function' || typeof pluginRaw === 'object') {
-    config = pluginRaw
-    name = shortcut = pluginRaw.name || `anonymous-${++anonymousPluginIdx}`
-    isLocal = true
-  } else if (typeof pluginRaw === 'string') {
-    try {
-      shortcut = pluginRaw.startsWith('vuepress-plugin-') ? pluginRaw.slice(16) : pluginRaw
-      name = `vuepress-plugin-${shortcut}`
-      config = require(name)
-    } catch (err) {
-      const pkg = exports.resolveScopePackage(pluginRaw)
-      try {
-        if (pkg) {
-          if (pkg.org === 'vuepress') {
-            shortcut = pkg.name.startsWith('plugin-') ? pkg.name.slice(7) : pkg.name
-            name = `@vuepress/plugin-${shortcut}`
-          } else {
-            shortcut = pkg.name.startsWith('vuepress-plugin-') ? pkg.name.slice(16) : pkg.name
-            name = `@${pkg.org}/vuepress-plugin-${shortcut}`
-          }
-          shortcut = `@${pkg.org}/${shortcut}`
-          config = require(name)
-        } else {
-          throw new Error(`[vuepress] Invalid plugin usage ${pluginRaw}.`)
-        }
-      } catch (err2) {
-        if (env.isDebug) {
-          console.error(err2)
-        }
-        name = shortcut = pluginRaw
-        config = null
-      }
-    }
-  }
-  return { config, name, shortcut, isLocal }
-}
+const { logger, chalk, datatypes: { assertTypes }} = require('@vuepress/shared-utils')
 
 /**
  * Hydrates your plugin config, options and context.
- * @param {Function | Object} config
+ * @param {Function | Object} module
  * @param {String} name
  * @param {String} hortcut
  * @param {Object} pluginOptions
  * @param {Object} pluginContext
  */
-exports.hydratePlugin = function ({ config, name, shortcut, isLocal }, pluginOptions, pluginContext, self) {
+exports.hydratePlugin = function ({ module: config, name, shortcut, isLocal }, pluginOptions, pluginContext, self) {
   const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
   if (!valid) {
     if (pluginOptions !== undefined) {

From 32a3752a5466b70236948999701dd5ad340251bd Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 03:15:37 +0800
Subject: [PATCH 166/242] chore($test-utils): tweaks

---
 packages/@vuepress/test-utils/createJestRunner.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/@vuepress/test-utils/createJestRunner.js b/packages/@vuepress/test-utils/createJestRunner.js
index c0600e7936..ae3b1600b1 100644
--- a/packages/@vuepress/test-utils/createJestRunner.js
+++ b/packages/@vuepress/test-utils/createJestRunner.js
@@ -3,11 +3,9 @@ const rawArgs = process.argv.slice(2)
 
 module.exports = function createJestRunner (jestArgs) {
   return async function () {
-    console.log(`running jest with args: ${jestArgs.join(' ')}`)
-    await execa('jest', [
-      ...jestArgs,
-      ...rawArgs
-    ], {
+    const args = [...jestArgs, ...rawArgs]
+    console.log(`running jest with args: ${args.join(' ')}`)
+    await execa('jest', args, {
       stdio: 'inherit'
     })
   }

From 9622ed8716aade3027c92ba773f0dd45c5b2ba3f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 03:16:02 +0800
Subject: [PATCH 167/242] chore: clean package.json

---
 packages/@vuepress/cli/package.json  |  2 +-
 packages/@vuepress/core/package.json | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/packages/@vuepress/cli/package.json b/packages/@vuepress/cli/package.json
index 5af747fdce..f6105c8a68 100644
--- a/packages/@vuepress/cli/package.json
+++ b/packages/@vuepress/cli/package.json
@@ -29,4 +29,4 @@
     "@vuepress/core": "^1.0.0"
   },
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/cli#readme"
-}
\ No newline at end of file
+}
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index e11c9e5299..70076f6f96 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -3,12 +3,6 @@
   "version": "1.0.0",
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
-  "scripts": {
-    "lint": "eslint --fix --ext .js,.vue bin/ lib/ test/",
-    "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
-    "release": "/bin/bash scripts/release.sh",
-    "test": "node test/prepare.js && jest --config test/jest.config.js"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vuepress.git"
@@ -24,15 +18,6 @@
     "url": "https://github.com/vuejs/vuepress/issues"
   },
   "homepage": "https://github.com/vuejs/vuepress#readme",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
   "dependencies": {
     "@babel/core": "7.0.0-beta.47",
     "@vue/babel-preset-app": "3.0.0-beta.11",

From 76b74b16d9a8cbfa08cc9e2f34194fb078475071 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 22:49:59 +0800
Subject: [PATCH 168/242] chore: bump jest

---
 packages/@vuepress/test-utils/package.json |   6 +-
 yarn.lock                                  | 207 +++++++++++----------
 2 files changed, 111 insertions(+), 102 deletions(-)

diff --git a/packages/@vuepress/test-utils/package.json b/packages/@vuepress/test-utils/package.json
index 663462d50a..4ac5a17bef 100644
--- a/packages/@vuepress/test-utils/package.json
+++ b/packages/@vuepress/test-utils/package.json
@@ -22,8 +22,8 @@
     "@babel/core": "^7.0.0-beta.47",
     "@babel/preset-env": "^7.0.0-beta.47",
     "babel-core": "^7.0.0-0",
-    "babel-jest": "^23.0.0",
-    "jest": "^23.0.0",
+    "babel-jest": "^23.4.0",
+    "jest": "^23.4.0",
     "jest-serializer-vue": "^1.0.0",
     "vue-jest": "^2.6.0",
     "execa": "^0.10.0"
@@ -34,4 +34,4 @@
     "url": "https://github.com/vuejs/vuepress/issues"
   },
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/test-utils#readme"
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 652f2da55c..4c68320a22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1895,9 +1895,9 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^23.0.0, babel-jest@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.4.0.tgz#22c34c392e2176f6a4c367992a7fcff69d2e8557"
+babel-jest@^23.4.0, babel-jest@^23.4.2:
+  version "23.4.2"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.4.2.tgz#f276de67798a5d68f2d6e87ff518c2f6e1609877"
   dependencies:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
@@ -3836,14 +3836,14 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expect@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.4.0.tgz#6da4ecc99c1471253e7288338983ad1ebadb60c3"
+expect@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.5.0.tgz#18999a0eef8f8acf99023fde766d9c323c2562ed"
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^23.2.0"
+    jest-diff "^23.5.0"
     jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.2.0"
+    jest-matcher-utils "^23.5.0"
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
@@ -4693,7 +4693,7 @@ inquirer@^3.0.6, inquirer@^3.2.2:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-invariant@^2.2.0, invariant@^2.2.2:
+invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
@@ -5104,15 +5104,15 @@ javascript-stringify@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"
 
-jest-changed-files@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.0.tgz#f1b304f98c235af5d9a31ec524262c5e4de3c6ff"
+jest-changed-files@^23.4.2:
+  version "23.4.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.4.1.tgz#c1ffd33254caee376990aa2abe2963e0de4ca76b"
+jest-cli@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.5.0.tgz#d316b8e34a38a610a1efc4f0403d8ef8a55e4492"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -5125,19 +5125,19 @@ jest-cli@^23.4.1:
     istanbul-lib-coverage "^1.2.0"
     istanbul-lib-instrument "^1.10.1"
     istanbul-lib-source-maps "^1.2.4"
-    jest-changed-files "^23.4.0"
-    jest-config "^23.4.1"
+    jest-changed-files "^23.4.2"
+    jest-config "^23.5.0"
     jest-environment-jsdom "^23.4.0"
     jest-get-type "^22.1.0"
-    jest-haste-map "^23.4.1"
+    jest-haste-map "^23.5.0"
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
-    jest-resolve-dependencies "^23.4.1"
-    jest-runner "^23.4.1"
-    jest-runtime "^23.4.1"
-    jest-snapshot "^23.4.1"
+    jest-resolve-dependencies "^23.5.0"
+    jest-runner "^23.5.0"
+    jest-runtime "^23.5.0"
+    jest-snapshot "^23.5.0"
     jest-util "^23.4.0"
-    jest-validate "^23.4.0"
+    jest-validate "^23.5.0"
     jest-watcher "^23.4.0"
     jest-worker "^23.2.0"
     micromatch "^2.3.11"
@@ -5151,32 +5151,33 @@ jest-cli@^23.4.1:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-config@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.4.1.tgz#3172fa21f0507d7f8a088ed1dbe4157057f201e9"
+jest-config@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.5.0.tgz#3770fba03f7507ee15f3b8867c742e48f31a9773"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^23.4.0"
+    babel-jest "^23.4.2"
     chalk "^2.0.1"
     glob "^7.1.1"
     jest-environment-jsdom "^23.4.0"
     jest-environment-node "^23.4.0"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.4.1"
+    jest-jasmine2 "^23.5.0"
     jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
+    jest-resolve "^23.5.0"
     jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    pretty-format "^23.2.0"
+    jest-validate "^23.5.0"
+    micromatch "^2.3.11"
+    pretty-format "^23.5.0"
 
-jest-diff@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.2.0.tgz#9f2cf4b51e12c791550200abc16b47130af1062a"
+jest-diff@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.5.0.tgz#250651a433dd0050290a07642946cc9baaf06fba"
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
     jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-docblock@^23.2.0:
   version "23.2.0"
@@ -5184,12 +5185,12 @@ jest-docblock@^23.2.0:
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.4.0.tgz#2fa9edd89daa1a4edc9ff9bf6062a36b71345143"
+jest-each@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.5.0.tgz#77f7e2afe6132a80954b920006e78239862b10ba"
   dependencies:
     chalk "^2.0.1"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
@@ -5210,47 +5211,49 @@ jest-get-type@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
 
-jest-haste-map@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.4.1.tgz#43a174ba7ac079ae1dd74eaf5a5fe78989474dd2"
+jest-haste-map@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.5.0.tgz#d4ca618188bd38caa6cb20349ce6610e194a8065"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
+    invariant "^2.2.4"
     jest-docblock "^23.2.0"
     jest-serializer "^23.0.1"
     jest-worker "^23.2.0"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.4.1.tgz#fa192262430d418e827636e4a98423e5e7ff0fce"
+jest-jasmine2@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.5.0.tgz#05fe7f1788e650eeb5a03929e6461ea2e9f3db53"
   dependencies:
+    babel-traverse "^6.0.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.4.0"
+    expect "^23.5.0"
     is-generator-fn "^1.0.0"
-    jest-diff "^23.2.0"
-    jest-each "^23.4.0"
-    jest-matcher-utils "^23.2.0"
+    jest-diff "^23.5.0"
+    jest-each "^23.5.0"
+    jest-matcher-utils "^23.5.0"
     jest-message-util "^23.4.0"
-    jest-snapshot "^23.4.1"
+    jest-snapshot "^23.5.0"
     jest-util "^23.4.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
-jest-leak-detector@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz#c289d961dc638f14357d4ef96e0431ecc1aa377d"
+jest-leak-detector@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.5.0.tgz#14ac2a785bd625160a2ea968fd5d98b7dcea3e64"
   dependencies:
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
-jest-matcher-utils@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz#4d4981f23213e939e3cedf23dc34c747b5ae1913"
+jest-matcher-utils@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.5.0.tgz#0e2ea67744cab78c9ab15011c4d888bdd3e49e2a"
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-message-util@^23.4.0:
   version "23.4.0"
@@ -5270,42 +5273,42 @@ jest-regex-util@^23.3.0:
   version "23.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
 
-jest-resolve-dependencies@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.4.1.tgz#a1d85247e2963f8b3859f6b0ec61b741b359378e"
+jest-resolve-dependencies@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.5.0.tgz#10c4d135beb9d2256de1fedc7094916c3ad74af7"
   dependencies:
     jest-regex-util "^23.3.0"
-    jest-snapshot "^23.4.1"
+    jest-snapshot "^23.5.0"
 
-jest-resolve@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.4.1.tgz#7f3c17104732a2c0c940a01256025ed745814982"
+jest-resolve@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.5.0.tgz#3b8e7f67e84598f0caf63d1530bd8534a189d0e6"
   dependencies:
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
-jest-runner@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.4.1.tgz#d41fd1459b95d35d6df685f1468c09e617c8c260"
+jest-runner@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.5.0.tgz#570f7a044da91648b5bb9b6baacdd511076c71d7"
   dependencies:
     exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^23.4.1"
+    jest-config "^23.5.0"
     jest-docblock "^23.2.0"
-    jest-haste-map "^23.4.1"
-    jest-jasmine2 "^23.4.1"
-    jest-leak-detector "^23.2.0"
+    jest-haste-map "^23.5.0"
+    jest-jasmine2 "^23.5.0"
+    jest-leak-detector "^23.5.0"
     jest-message-util "^23.4.0"
-    jest-runtime "^23.4.1"
+    jest-runtime "^23.5.0"
     jest-util "^23.4.0"
     jest-worker "^23.2.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.4.1.tgz#c1822eba5eb19294debe6b25b2760d0a8c532fd1"
+jest-runtime@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.5.0.tgz#eb503525a196dc32f2f9974e3482d26bdf7b63ce"
   dependencies:
     babel-core "^6.0.0"
     babel-plugin-istanbul "^4.1.6"
@@ -5314,14 +5317,14 @@ jest-runtime@^23.4.1:
     exit "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-config "^23.4.1"
-    jest-haste-map "^23.4.1"
+    jest-config "^23.5.0"
+    jest-haste-map "^23.5.0"
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
-    jest-snapshot "^23.4.1"
+    jest-resolve "^23.5.0"
+    jest-snapshot "^23.5.0"
     jest-util "^23.4.0"
-    jest-validate "^23.4.0"
+    jest-validate "^23.5.0"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
     slash "^1.0.0"
@@ -5339,20 +5342,19 @@ jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
 
-jest-snapshot@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.1.tgz#090de9acae927f6a3af3005bda40d912b83e9c96"
+jest-snapshot@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.5.0.tgz#cc368ebd8513e1175e2a7277f37a801b7358ae79"
   dependencies:
-    babel-traverse "^6.0.0"
     babel-types "^6.0.0"
     chalk "^2.0.1"
-    jest-diff "^23.2.0"
-    jest-matcher-utils "^23.2.0"
+    jest-diff "^23.5.0"
+    jest-matcher-utils "^23.5.0"
     jest-message-util "^23.4.0"
-    jest-resolve "^23.4.1"
+    jest-resolve "^23.5.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
     semver "^5.5.0"
 
 jest-util@^23.4.0:
@@ -5377,14 +5379,14 @@ jest-validate@^23.0.0:
     leven "^2.1.0"
     pretty-format "^23.0.1"
 
-jest-validate@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.4.0.tgz#d96eede01ef03ac909c009e9c8e455197d48c201"
+jest-validate@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.5.0.tgz#f5df8f761cf43155e1b2e21d6e9de8a2852d0231"
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-watcher@^23.4.0:
   version "23.4.0"
@@ -5400,12 +5402,12 @@ jest-worker@^23.2.0:
   dependencies:
     merge-stream "^1.0.1"
 
-jest@^23.0.0:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.4.1.tgz#39550c72f3237f63ae1b434d8d122cdf6fa007b6"
+jest@^23.4.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.5.0.tgz#80de353d156ea5ea4a7332f7962ac79135fbc62e"
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^23.4.1"
+    jest-cli "^23.5.0"
 
 joi@^11.1.1:
   version "11.4.0"
@@ -7323,13 +7325,20 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^23.0.1, pretty-format@^23.2.0:
+pretty-format@^23.0.1:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.2.0.tgz#3b0aaa63c018a53583373c1cb3a5d96cc5e83017"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
+pretty-format@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.5.0.tgz#0f9601ad9da70fe690a269cd3efca732c210687c"
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
 pretty-time@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.0.0.tgz#544784adecaa2cd7d045ff8a8f1d4791c8e06e23"

From f81f3732f60723f58d410fcc9dafb12a19737792 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 22:55:44 +0800
Subject: [PATCH 169/242] feat: refine theme API

1. Support scope package and shortcut like plugin.
2. Support relative path for 'layout' and 'notFound' option.
---
 __mocks__/@org/vuepress-theme-a/index.js      |  1 +
 __mocks__/@vuepress/theme-a/index.js          |  1 +
 __mocks__/vuepress-theme-a/index.js           |  1 +
 .../@vuepress/core/lib/prepare/AppContext.js  | 68 +--------------
 .../@vuepress/core/lib/prepare/loadTheme.js   | 75 ++++++++++++++++
 .../__test__/shortcutPackageResolver.spec.js  | 20 +++--
 packages/@vuepress/shared-utils/lib/env.js    |  2 +
 packages/@vuepress/shared-utils/lib/module.js | 85 +++++++++++++++++++
 .../lib/shortcutPackageResolver.js            | 12 +--
 packages/@vuepress/test-utils/prepare.js      |  2 +-
 packages/@vuepress/theme-default/index.js     |  5 +-
 packages/vuepress/vuepress.js                 |  2 +-
 12 files changed, 192 insertions(+), 82 deletions(-)
 create mode 100644 __mocks__/@org/vuepress-theme-a/index.js
 create mode 100644 __mocks__/@vuepress/theme-a/index.js
 create mode 100644 __mocks__/vuepress-theme-a/index.js
 create mode 100644 packages/@vuepress/core/lib/prepare/loadTheme.js
 create mode 100644 packages/@vuepress/shared-utils/lib/module.js

diff --git a/__mocks__/@org/vuepress-theme-a/index.js b/__mocks__/@org/vuepress-theme-a/index.js
new file mode 100644
index 0000000000..4ba52ba2c8
--- /dev/null
+++ b/__mocks__/@org/vuepress-theme-a/index.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/__mocks__/@vuepress/theme-a/index.js b/__mocks__/@vuepress/theme-a/index.js
new file mode 100644
index 0000000000..4ba52ba2c8
--- /dev/null
+++ b/__mocks__/@vuepress/theme-a/index.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/__mocks__/vuepress-theme-a/index.js b/__mocks__/vuepress-theme-a/index.js
new file mode 100644
index 0000000000..4ba52ba2c8
--- /dev/null
+++ b/__mocks__/vuepress-theme-a/index.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 624822a16d..06b05a0d65 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -1,6 +1,7 @@
 const path = require('path')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
+const loadTheme = require('./loadTheme')
 const { fs, logger, chalk, globby, sort } = require('@vuepress/shared-utils')
 
 const Page = require('./Page')
@@ -87,7 +88,7 @@ module.exports = class AppContext {
       // user plugin
       .useByPluginsConfig(this._options.plugins)
       .useByPluginsConfig(this.siteConfig.plugins)
-      .useByPluginsConfig(this.themeplugins)
+      .useByPluginsConfig(this.themePlugins)
       // built-in plugins
       .use('@vuepress/last-updated', shouldUseLastUpdated)
       .use('@vuepress/register-components', {
@@ -168,70 +169,7 @@ module.exports = class AppContext {
    */
   async resolveTheme () {
     const theme = this.siteConfig.theme || this._options.theme
-    const requireResolve = (target) => {
-      return require.resolve(target, {
-        paths: [
-          path.resolve(__dirname, '../../node_modules'),
-          path.resolve(this.sourceDir)
-        ]
-      })
-    }
-
-    // resolve theme
-    const localThemePath = path.resolve(this.vuepressDir, 'theme')
-    const useLocalTheme = await fs.exists(localThemePath)
-
-    let themePath = null
-    let themeLayoutPath = null
-    let themeNotFoundPath = null
-    let themeIndexFile = null
-    let themePlugins = []
-
-    if (useLocalTheme) {
-      logger.tip(`\nApply theme located at ${localThemePath}...`)
-
-      // use local custom theme
-      themePath = localThemePath
-      themeLayoutPath = path.resolve(localThemePath, 'Layout.vue')
-      themeNotFoundPath = path.resolve(localThemePath, 'NotFound.vue')
-      if (!fs.existsSync(themeLayoutPath)) {
-        throw new Error(`[vuepress] Cannot resolve Layout.vue file in .vuepress/theme.`)
-      }
-      if (!fs.existsSync(themeNotFoundPath)) {
-        themeNotFoundPath = path.resolve(__dirname, '../app/components/NotFound.vue')
-      }
-    } else if (theme) {
-      // use external theme
-      try {
-        // backward-compatible 0.x.x.
-        themeLayoutPath = requireResolve(`vuepress-theme-${theme}/Layout.vue`)
-        themePath = path.dirname(themeLayoutPath)
-        themeNotFoundPath = path.resolve(themeLayoutPath, 'NotFound.vue')
-      } catch (e) {
-        try {
-          themeIndexFile = requireResolve(`vuepress-theme-${theme}/index.js`)
-        } catch (e) {
-          try {
-            themeIndexFile = requireResolve(`@vuepress/theme-${theme}`)
-            themePath = path.dirname(themeIndexFile)
-            themeIndexFile = require(themeIndexFile)
-            themeLayoutPath = themeIndexFile.layout
-            themeNotFoundPath = themeIndexFile.notFound
-            themePlugins = themeIndexFile.plugins
-          } catch (e) {
-            throw new Error(`[vuepress] Failed to load custom theme "${theme}". File vuepress-theme-${theme}/Layout.vue does not exist.`)
-          }
-        }
-      }
-      logger.tip(`\nApply theme ${chalk.gray(theme)}`)
-    } else {
-      throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
-    }
-
-    this.themePath = themePath
-    this.themeLayoutPath = themeLayoutPath
-    this.themeNotFoundPath = themeNotFoundPath
-    this.themeplugins = themePlugins
+    Object.assign(this, (await loadTheme(theme, this.sourceDir, this.vuepressDir)))
   }
 
   /**
diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
new file mode 100644
index 0000000000..45467c2278
--- /dev/null
+++ b/packages/@vuepress/core/lib/prepare/loadTheme.js
@@ -0,0 +1,75 @@
+const path = require('path')
+const fs = require('fs')
+const {
+  logger, chalk,
+  datatypes: { isString },
+  shortcutPackageResolver: { resolveTheme }
+} = require('@vuepress/shared-utils')
+
+module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
+  // resolve theme
+  const localThemePath = path.resolve(vuepressDir, 'theme')
+  const useLocalTheme =
+    (await fs.exists(localThemePath)) && ((await fs.readdir(localThemePath)).length > 0)
+
+  let themePath = null         // Mandatory
+  let themeLayoutPath = null   // Mandatory
+  let themeNotFoundPath = null // Optional
+  let themeIndexFile = null    // Optional
+  let themePlugins = []        // Optional
+  let themeName
+  let themeShortcut
+
+  if (useLocalTheme) {
+    // use local custom theme
+    themePath = localThemePath
+    logger.tip(`\nApply theme located at ${themePath}...`)
+  } else if (isString(theme)) {
+    // use external theme
+    const { module: modulePath, name, shortcut } = resolveTheme(theme, sourceDir)
+    if (modulePath.endsWith('.js') || modulePath.endsWith('.vue')) {
+      themePath = path.parse(modulePath).dir
+    }
+    themeName = name
+    themeShortcut = shortcut
+    logger.tip(`\nApply theme ${chalk.gray(themeName)}`)
+  } else {
+    throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
+  }
+
+  try {
+    themeIndexFile = require(themePath)
+  } catch (error) {
+    console.log(error)
+    themeIndexFile = {}
+  }
+
+  // handle theme api
+  const { layout, notFound, plugins } = themeIndexFile
+  themePlugins = plugins
+  themeLayoutPath = layout
+    ? path.resolve(themePath, layout)
+    : path.resolve(themePath, 'Layout.vue')
+
+  themeNotFoundPath = notFound
+    ? path.resolve(themePath, notFound)
+    : path.resolve(themePath, 'NotFound.vue')
+
+  if (!fs.existsSync(themeLayoutPath)) {
+    throw new Error(`[vuepress] Cannot resolve Layout.vue file in \n ${themeLayoutPath}`)
+  }
+
+  if (!fs.existsSync(themeNotFoundPath)) {
+    themeNotFoundPath = path.resolve(__dirname, '../app/components/NotFound.vue')
+  }
+
+  return {
+    themePath,
+    themeLayoutPath,
+    themeNotFoundPath,
+    themeIndexFile,
+    themePlugins,
+    themeName,
+    themeShortcut
+  }
+}
diff --git a/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js b/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js
index f542c3a3ed..b454c1d7de 100644
--- a/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js
+++ b/packages/@vuepress/shared-utils/__test__/shortcutPackageResolver.spec.js
@@ -6,14 +6,21 @@ jest.mock('vuepress-theme-a')
 jest.mock('@org/vuepress-theme-a')
 jest.mock('@vuepress/theme-a')
 
+import path from 'path'
 import {
   resolveTheme,
   resolvePlugin,
   resolveScopePackage
 } from '../lib/shortcutPackageResolver'
 
+const MOCK_RELATIVE = '../../../../__mocks__'
+
+function loadMockModule (name) {
+  return require(`${MOCK_RELATIVE}/${name}`)
+}
+
 function resolveMockModule (name) {
-  return require(`../../../../__mocks__/${name}`)
+  return path.resolve(__dirname, `${MOCK_RELATIVE}/${name}`)
 }
 
 test('should resolve scope packages correctly.', () => {
@@ -47,16 +54,15 @@ describe('resolvePlugin', () => {
   })
 
   test('shoould resolve fullname usage correctly.', () => {
-    console.log(resolvePlugin())
     let plugin = resolvePlugin('vuepress-plugin-a')
     expect(plugin.name).toBe('vuepress-plugin-a')
     expect(plugin.shortcut).toBe('a')
-    expect(plugin.module).toBe(resolveMockModule('vuepress-plugin-a'))
+    expect(plugin.module).toBe(loadMockModule('vuepress-plugin-a'))
 
     plugin = resolvePlugin('@org/vuepress-plugin-a')
     expect(plugin.name).toBe('@org/vuepress-plugin-a')
     expect(plugin.shortcut).toBe('@org/a')
-    expect(plugin.module).toBe(resolveMockModule('@org/vuepress-plugin-a'))
+    expect(plugin.module).toBe(loadMockModule('@org/vuepress-plugin-a'))
   })
 
   test('shoould resolve shortcut usage correctly.', () => {
@@ -64,19 +70,19 @@ describe('resolvePlugin', () => {
     let plugin = resolvePlugin('a')
     expect(plugin.name).toBe('vuepress-plugin-a')
     expect(plugin.shortcut).toBe('a')
-    expect(plugin.module).toBe(resolveMockModule('vuepress-plugin-a'))
+    expect(plugin.module).toBe(loadMockModule('vuepress-plugin-a'))
 
     // scope packages
     plugin = resolvePlugin('@org/a')
     expect(plugin.name).toBe('@org/vuepress-plugin-a')
     expect(plugin.shortcut).toBe('@org/a')
-    expect(plugin.module).toBe(resolveMockModule('@org/vuepress-plugin-a'))
+    expect(plugin.module).toBe(loadMockModule('@org/vuepress-plugin-a'))
 
     // special case for @vuepress package
     plugin = resolvePlugin('@vuepress/a')
     expect(plugin.name).toBe('@vuepress/plugin-a')
     expect(plugin.shortcut).toBe('@vuepress/a')
-    expect(plugin.module).toBe(resolveMockModule('@vuepress/plugin-a'))
+    expect(plugin.module).toBe(loadMockModule('@vuepress/plugin-a'))
   })
 
   test('shoould return null when plugin cannot be resolved.', () => {
diff --git a/packages/@vuepress/shared-utils/lib/env.js b/packages/@vuepress/shared-utils/lib/env.js
index 09177f1b29..c7d43844a1 100644
--- a/packages/@vuepress/shared-utils/lib/env.js
+++ b/packages/@vuepress/shared-utils/lib/env.js
@@ -1,5 +1,7 @@
 const isDebug = process.argv.indexOf('--debug') !== -1
 const isProduction = () => process.env.NODE_ENV === 'production'
+const isTest = () => process.env.NODE_ENV === 'test'
 
 exports.isDebug = isDebug
+exports.isTest = isTest
 exports.isProduction = isProduction
diff --git a/packages/@vuepress/shared-utils/lib/module.js b/packages/@vuepress/shared-utils/lib/module.js
new file mode 100644
index 0000000000..dfe646fb25
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/module.js
@@ -0,0 +1,85 @@
+// Midified from https://github.com/vuejs/vue-cli/blob/dev/packages/@0vue/cli-shared-utils/lib/module.js
+
+const semver = require('semver')
+const path = require('path')
+const fs = require('fs-extra')
+const { isTest } = require('./env')
+
+function resolveFallback (request, options) {
+  const Module = require('module')
+  const isMain = false
+  const fakeParent = new Module('', null)
+
+  const paths = []
+
+  for (let i = 0; i < options.paths.length; i++) {
+    const path = options.paths[i]
+    fakeParent.paths = Module._nodeModulePaths(path)
+    const lookupPaths = Module._resolveLookupPaths(request, fakeParent, true)
+
+    if (!paths.includes(path)) paths.push(path)
+
+    for (let j = 0; j < lookupPaths.length; j++) {
+      if (!paths.includes(lookupPaths[j])) paths.push(lookupPaths[j])
+    }
+  }
+
+  const filename = Module._findPath(request, paths, isMain)
+  if (!filename) {
+    const err = new Error(`Cannot find module '${request}'`)
+    err.code = 'MODULE_NOT_FOUND'
+    throw err
+  }
+  return filename
+}
+
+const resolve = semver.satisfies(process.version, '>=10.0.0')
+  ? require.resolve
+  : resolveFallback
+
+exports.resolveModule = function (request, context) {
+  let resolvedPath
+  // TODO
+  // Temporary workaround for jest cannot resolve module path from '__mocks__'
+  // when using 'require.resolve'.
+  if (isTest()) {
+    resolvedPath = path.resolve(__dirname, '../../../../__mocks__', request)
+    if (!fs.existsSync(`${resolvedPath}.js`) && !fs.existsSync(`${resolvedPath}/index.js`)) {
+      throw new Error(`Cannot find module '${request}'`)
+    }
+    return resolvedPath
+  }
+  resolvedPath = resolve(request, {
+    paths: [context || process.cwd()]
+  })
+  return resolvedPath
+}
+
+exports.loadModule = function (request, context, force = false) {
+  const resolvedPath = exports.resolveModule(request, context)
+  if (resolvedPath) {
+    if (force) {
+      clearRequireCache(resolvedPath)
+    }
+    return require(resolvedPath)
+  }
+}
+
+exports.clearModule = function (request, context) {
+  const resolvedPath = exports.resolveModule(request, context)
+  if (resolvedPath) {
+    clearRequireCache(resolvedPath)
+  }
+}
+
+function clearRequireCache (id, map = new Map()) {
+  const module = require.cache[id]
+  if (module) {
+    map.set(id, true)
+    // Clear children modules
+    module.children.forEach(child => {
+      if (!map.get(child.id)) clearRequireCache(child.id, map)
+    })
+    delete require.cache[id]
+  }
+}
diff --git a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
index 2a43c37771..93d34afd62 100644
--- a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
+++ b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
@@ -1,4 +1,5 @@
 const { isDebug } = require('./env')
+const { resolveModule, loadModule } = require('./module')
 const {
   isString,
   assertTypes
@@ -15,7 +16,8 @@ const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
 function shortcutPackageResolver (
   type = 'plugin',
   org = 'vuepress',
-  allowedTypes = [String]
+  allowedTypes = [String],
+  load = false
 ) {
   let anonymousPluginIdx = 0
   const NON_SCOPE_PREFIX = `${org}-${type}-`
@@ -23,7 +25,7 @@ function shortcutPackageResolver (
   const SHORT_PREFIX_SLICE_LENGTH = type.length + 1
   const FULL_PREFIX_SLICE_LENGTH = SHORT_PREFIX_SLICE_LENGTH + org.length + 1
 
-  return function (req) {
+  return function (req, cwd) {
     let _module
     let name
     let shortcut
@@ -44,7 +46,7 @@ function shortcutPackageResolver (
           ? req.slice(FULL_PREFIX_SLICE_LENGTH)
           : req
         name = `${NON_SCOPE_PREFIX}${shortcut}`
-        _module = require(name)
+        _module = load ? loadModule(name, cwd) : resolveModule(name, cwd)
       } catch (err) {
         const pkg = module.exports.resolveScopePackage(req)
         try {
@@ -62,7 +64,7 @@ function shortcutPackageResolver (
               name = `@${pkg.org}/${NON_SCOPE_PREFIX}${shortcut}`
             }
             shortcut = `@${pkg.org}/${shortcut}`
-            _module = require(name)
+            _module = load ? loadModule(name, cwd) : resolveModule(name, cwd)
           } else {
             throw new Error(`Invalid ${type} usage ${req}.`)
           }
@@ -91,7 +93,7 @@ module.exports.resolveScopePackage = function resolveScopePackage (name) {
   return null
 }
 module.exports.resolvePlugin = shortcutPackageResolver(
-  'plugin', 'vuepress', [String, Function, Object]
+  'plugin', 'vuepress', [String, Function, Object], true /* load module */
 )
 module.exports.resolveTheme = shortcutPackageResolver(
   'theme', 'vuepress', [String]
diff --git a/packages/@vuepress/test-utils/prepare.js b/packages/@vuepress/test-utils/prepare.js
index 1f289598ae..5f75af4530 100644
--- a/packages/@vuepress/test-utils/prepare.js
+++ b/packages/@vuepress/test-utils/prepare.js
@@ -5,7 +5,7 @@ const { docsModes } = require('./meta')
 async function prepareForTest () {
   await Promise.all(docsModes.map(async ({ docsPath, docsTempPath }) => {
     await fs.ensureDir(docsTempPath)
-    await prepare(docsPath, { theme: 'default', temp: docsTempPath })
+    await prepare(docsPath, { theme: '@vuepress/default', temp: docsTempPath })
   }))
 }
 
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 59582b2928..44e5eee7a2 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -1,10 +1,9 @@
-const path = require('path')
 const themePlugin = require('./plugin')
 
 // Theme API.
 module.exports = {
-  layout: path.resolve(__dirname, 'src/Layout.vue'),
-  notFound: path.resolve(__dirname, 'src/NotFound.vue'),
+  layout: 'src/Layout.vue',
+  notFound: 'src/NotFound.vue',
   plugins: [
     themePlugin,
     '@vuepress/active-header-links'
diff --git a/packages/vuepress/vuepress.js b/packages/vuepress/vuepress.js
index 7e34722a12..c885579271 100755
--- a/packages/vuepress/vuepress.js
+++ b/packages/vuepress/vuepress.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('@vuepress/cli').bootstrap({ theme: 'default' })
+require('@vuepress/cli').bootstrap({ theme: '@vuepress/default' })

From e08cc2e901499961b2248dfcf122f580fc84d5da Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 2 Sep 2018 23:15:59 +0800
Subject: [PATCH 170/242] chore($core): hide internal plugin log

---
 packages/@vuepress/core/lib/plugin-api/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 02e378e2b7..03097751a4 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -4,6 +4,7 @@ const { PLUGIN_OPTION_MAP } = require('./constants')
 const {
   shortcutPackageResolver: { resolvePlugin },
   datatypes: { assertTypes },
+  env: { isDebug },
   logger, chalk
 } = require('@vuepress/shared-utils')
 
@@ -98,9 +99,10 @@ module.exports = class PluginAPI {
     additionalPages,
     globalUIComponents
   }) {
+    const isInternalPlugin = pluginName.startsWith('@vuepress/internal-')
     if (shortcut) {
-      logger.tip(`\nApply plugin ${chalk.magenta(shortcut)} ${chalk.gray(`(i.e. "${pluginName}")`)} ...`)
-    } else {
+      logger.tip(`\nApply plugin ${chalk.magenta(shortcut)} ${chalk.gray(`(i.e. "${pluginName}")`)} ...`, !isInternalPlugin)
+    } else if (!isInternalPlugin || isDebug) {
       logger.tip(`\nApply plugin ${chalk.magenta(pluginName)} ...`)
     }
 

From c19fb3aa5a32b03faa5604301b5677eac1b29716 Mon Sep 17 00:00:00 2001
From: YuChao Liang <l.yuch@foxmail.com>
Date: Mon, 3 Sep 2018 13:49:21 +0800
Subject: [PATCH 171/242] fix: escape backslash (#787)

---
 .../@vuepress/core/lib/internal-plugins/importAsyncComponent.js | 2 +-
 .../core/lib/plugin-api/option/EnhanceAppFilesOption.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
index 33bfb42316..acb1aec1d1 100644
--- a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
+++ b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
@@ -1,7 +1,7 @@
 function genImportAsyncComponentFile (pages) {
   return `export function loadComponent (key) {
   switch (key) {
-${pages.map(({ key, _filePath }) => `    case "${key}": return import("${_filePath}");`).join('\n')}
+${pages.map(({ key, _filePath }) => `    case ${JSON.stringify(key)}: return import(${JSON.stringify(_filePath)});`).join('\n')}
   }
 }`
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 3444c7840b..3fc8e218db 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -51,7 +51,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
         if (fs.existsSync(filePath)) {
           destPath = await context.writeTemp(
             `app-enhancers/enhancer-${moduleId++}.js`,
-            `export { default } from '${(filePath)}'`
+            `export { default } from ${JSON.stringify(filePath)}`
           )
         } else {
           logger.debug(

From 7f7fe18d40fcd429534ed5966012d1b0cc01b37b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 5 Sep 2018 01:02:19 +0800
Subject: [PATCH 172/242] feat: support clean and multiple custom layout. /
 theme default layouts dir

1. Refine ExtendPageDataOption, simplify the implmentation
2. Introduce LayoutDistributor as the unique route layout entry
3. Inject layout components to LayoutDistributor
4. Register layout components located at themedir/layouts
5. Reorganize the default theme's structure
---
 .../lib/app/components/LayoutDistributor.vue  | 16 +++++++
 packages/@vuepress/core/lib/app/util.js       | 25 ++++++++--
 .../core/lib/internal-plugins/layouts.js      | 22 +++++++++
 .../core/lib/internal-plugins/routes.js       | 40 ++++++++++------
 .../plugin-api/option/ExtendPageDataOption.js | 12 -----
 .../plugin-api/option/instantiateOption.js    |  4 --
 .../@vuepress/core/lib/prepare/AppContext.js  | 19 +++++---
 packages/@vuepress/core/lib/prepare/Page.js   | 47 +++++++++++++-----
 .../@vuepress/core/lib/prepare/loadTheme.js   | 48 ++++++++++++-------
 .../core/lib/webpack/createBaseConfig.js      |  4 --
 .../__test__/components/DropdownLink.spec.js  |  2 +-
 .../__test__/components/NavLink.spec.js       |  2 +-
 .../{src => components}/AlgoliaSearchBox.vue  |  2 +-
 .../theme-default/components/Badge.vue        |  2 +-
 .../{src => components}/DropdownLink.vue      |  2 +-
 .../DropdownTransition.vue                    |  0
 .../{src => components}/Home.vue              |  2 +-
 .../{src => components}/NavLink.vue           |  2 +-
 .../{src => components}/NavLinks.vue          |  4 +-
 .../{src => components}/Navbar.vue            |  2 +-
 .../{src => components}/Page.vue              |  6 +--
 .../{src => components}/SearchBox.vue         |  4 +-
 .../{src => components}/Sidebar.vue           |  4 +-
 .../{src => components}/SidebarButton.vue     |  2 +-
 .../{src => components}/SidebarGroup.vue      |  0
 .../{src => components}/SidebarLink.vue       |  4 +-
 .../{src => components}/search.svg            |  0
 packages/@vuepress/theme-default/index.js     |  2 -
 .../{src/NotFound.vue => layouts/404.vue}     |  0
 .../theme-default/{src => layouts}/Layout.vue | 10 ++--
 .../theme-default/{src => layouts}/util.js    |  0
 .../theme-default/{src => }/styles/arrow.styl |  0
 .../theme-default/{src => }/styles/code.styl  |  0
 .../{src => }/styles/config.styl              |  0
 .../{src => }/styles/custom-blocks.styl       |  0
 .../{src => }/styles/mobile.styl              |  0
 .../{src => }/styles/nprogress.styl           |  0
 .../theme-default/{src => }/styles/theme.styl |  2 +-
 .../theme-default/{src => }/styles/toc.styl   |  0
 .../{src => }/styles/wrapper.styl             |  0
 40 files changed, 189 insertions(+), 102 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/app/components/LayoutDistributor.vue
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/layouts.js
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
 rename packages/@vuepress/theme-default/{src => components}/AlgoliaSearchBox.vue (99%)
 rename packages/@vuepress/theme-default/{src => components}/DropdownLink.vue (99%)
 rename packages/@vuepress/theme-default/{src => components}/DropdownTransition.vue (100%)
 rename packages/@vuepress/theme-default/{src => components}/Home.vue (99%)
 rename packages/@vuepress/theme-default/{src => components}/NavLink.vue (91%)
 rename packages/@vuepress/theme-default/{src => components}/NavLinks.vue (97%)
 rename packages/@vuepress/theme-default/{src => components}/Navbar.vue (99%)
 rename packages/@vuepress/theme-default/{src => components}/Page.vue (98%)
 rename packages/@vuepress/theme-default/{src => components}/SearchBox.vue (98%)
 rename packages/@vuepress/theme-default/{src => components}/Sidebar.vue (96%)
 rename packages/@vuepress/theme-default/{src => components}/SidebarButton.vue (96%)
 rename packages/@vuepress/theme-default/{src => components}/SidebarGroup.vue (100%)
 rename packages/@vuepress/theme-default/{src => components}/SidebarLink.vue (96%)
 rename packages/@vuepress/theme-default/{src => components}/search.svg (100%)
 rename packages/@vuepress/theme-default/{src/NotFound.vue => layouts/404.vue} (100%)
 rename packages/@vuepress/theme-default/{src => layouts}/Layout.vue (93%)
 rename packages/@vuepress/theme-default/{src => layouts}/util.js (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/arrow.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/code.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/config.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/custom-blocks.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/mobile.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/nprogress.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/theme.styl (99%)
 rename packages/@vuepress/theme-default/{src => }/styles/toc.styl (100%)
 rename packages/@vuepress/theme-default/{src => }/styles/wrapper.styl (100%)

diff --git a/packages/@vuepress/core/lib/app/components/LayoutDistributor.vue b/packages/@vuepress/core/lib/app/components/LayoutDistributor.vue
new file mode 100644
index 0000000000..82bc8dcf0c
--- /dev/null
+++ b/packages/@vuepress/core/lib/app/components/LayoutDistributor.vue
@@ -0,0 +1,16 @@
+<template>
+  <component :is="layout"/>
+</template>
+
+<script>
+export default {
+  computed: {
+    layout () {
+      if (this.$page.path) {
+        return this.$page.frontmatter.layout || 'Layout'
+      }
+      return 'NotFound'
+    }
+  }
+}
+</script>
diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index 0228b7e298..6ef758cb4a 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -1,11 +1,28 @@
 import Vue from 'vue'
 import { loadComponent } from '@internal/async-component'
 
-export function injectMixins (options, mixins) {
-  if (!options.mixins) {
-    options.mixins = []
+/**
+ * Inject option to Vue SFC
+ * @param {object} options
+ * @param {string} key
+ * @param {any} value
+ */
+export function injectComponentOption (options, key, value) {
+  const arrayInject = () => {
+    if (!options[key]) options[key] = []
+    options[key].push(...value)
+  }
+  const objectInject = () => {
+    if (!options[key]) options[key] = {}
+    Object.assign(options[key], value)
+  }
+  // const primitiveInject = () => options[key] = value
+
+  switch (key) {
+  case 'components': objectInject(); break
+  case 'mixins': arrayInject(); break
+  default: throw new Error('Unknown option name.')
   }
-  options.mixins.push(...mixins)
 }
 
 export function findPageForPath (pages, path) {
diff --git a/packages/@vuepress/core/lib/internal-plugins/layouts.js b/packages/@vuepress/core/lib/internal-plugins/layouts.js
new file mode 100644
index 0000000000..91ffabf8e1
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/layouts.js
@@ -0,0 +1,22 @@
+module.exports = (options, ctx) => {
+  const { layoutComponentMap } = ctx
+  const componentNames = Object.keys(layoutComponentMap)
+
+  return {
+    name: '@vuepress/internal-layout',
+
+    async clientDynamicModules () {
+      const code = `export default {\n${componentNames
+        .map(name => `  ${JSON.stringify(name)}: () => import(${JSON.stringify(layoutComponentMap[name].path)})`)
+        .join(',\n')} \n}`
+      return { name: 'layout-components.js', content: code, dirname: 'internal' }
+    },
+
+    chainWebpack (config, isServer) {
+      const setAlias = (alias, raw) => config.resolve.alias.set(alias, raw)
+      componentNames.forEach(name => {
+        setAlias(`@${name}`, layoutComponentMap[name].path)
+      })
+    }
+  }
+}
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index ef8f9a17e0..43fe069e9c 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -1,19 +1,35 @@
-module.exports = (options, context) => ({
+module.exports = (options, ctx) => ({
   name: '@vuepress/internal-routes',
 
   // @internal/routes
   async clientDynamicModules () {
-    const routesCode = await genRoutesFile(context.pages)
-    return { name: 'routes.js', content: routesCode, dirname: 'internal' }
+    const code = importCode() + routesCode(ctx.pages)
+    return { name: 'routes.js', content: code, dirname: 'internal' }
   }
 })
 
 /**
- * Generate routes meta data file.
- * @param pages
- * @returns {Promise<string>}
+ * Import utilities
+ * @returns {string}
  */
-async function genRoutesFile (pages) {
+function importCode () {
+  return `
+import { injectComponentOption, registerComponent } from '@app/util'
+import rootMixins from '@internal/root-mixins'
+import components from '@internal/layout-components'
+import LayoutDistributor from '@app/components/LayoutDistributor.vue'
+
+injectComponentOption(LayoutDistributor, 'mixins', rootMixins)
+injectComponentOption(LayoutDistributor, 'components', components)
+`
+}
+
+/**
+ * Get Vue routes code.
+ * @param {array} pages
+ * @returns {string}
+ */
+function routesCode (pages) {
   function genRoute ({
     path: pagePath,
     key: componentName,
@@ -23,7 +39,7 @@ async function genRoutesFile (pages) {
   {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
-    component: ThemeLayout,
+    component: LayoutDistributor,
     beforeEnter: (to, from, next) => {
       registerComponent(${JSON.stringify(componentName)}).then(() => next())
     }
@@ -60,16 +76,10 @@ async function genRoutesFile (pages) {
   const notFoundRoute = `,
   {
     path: '*',
-    component: ThemeNotFound
+    component: LayoutDistributor
   }`
 
   return (
-    `import ThemeLayout from '@themeLayout'\n` +
-    `import ThemeNotFound from '@themeNotFound'\n` +
-    `import { injectMixins, registerComponent } from '@app/util'\n` +
-    `import rootMixins from '@internal/root-mixins'\n\n` +
-    `injectMixins(ThemeLayout, rootMixins)\n` +
-    `injectMixins(ThemeNotFound, rootMixins)\n\n` +
     `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]`
   )
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js b/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
deleted file mode 100644
index e9a78fc593..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/option/ExtendPageDataOption.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const Option = require('../Option')
-
-module.exports = class ExtendPageDataOption extends Option {
-  async apply (data) {
-    for (const fn of this.values) {
-      const res = await fn(data)
-      if (typeof res === 'object') {
-        Object.assign(data, res)
-      }
-    }
-  }
-}
diff --git a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
index 0ef86fa609..2d67da9369 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
@@ -1,5 +1,4 @@
 const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
-const ExtendPageDataOption = require('./ExtendPageDataOption')
 const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
 const AdditionalPagesOption = require('./AdditionalPagesOption')
 const GlobalUIComponentsOption = require('./GlobalUIComponentsOption')
@@ -11,9 +10,6 @@ module.exports = function instantiateOption (name) {
   case PLUGIN_OPTION_MAP.ENHANCE_APP_FILES.name:
     return new EnhanceAppFilesOption(name)
 
-  case PLUGIN_OPTION_MAP.EXTEND_PAGE_DATA.name:
-    return new ExtendPageDataOption(name)
-
   case PLUGIN_OPTION_MAP.CLIENT_DYNAMIC_MODULES.name:
     return new ClientDynamicModulesOption(name)
 
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 06b05a0d65..a8f288ae9a 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -52,9 +52,11 @@ module.exports = class AppContext {
     this.resolvePlugins()
 
     await this.resolvePages()
-    await this.pluginAPI.options.additionalPages.values.map(async ({ path, permalink }) => {
-      await this.addPage(path, { permalink })
-    })
+    await Promise.all(
+      this.pluginAPI.options.additionalPages.values.map(async ({ path, permalink }) => {
+        await this.addPage(path, { permalink })
+      })
+    )
 
     await this.pluginAPI.options.ready.apply()
     this.pluginAPI.options.extendMarkdown.syncApply(this.markdown)
@@ -85,6 +87,7 @@ module.exports = class AppContext {
       .use(require('../internal-plugins/enhanceApp'))
       .use(require('../internal-plugins/overrideCSS'))
       .use(require('../internal-plugins/i18nTemp'))
+      .use(require('../internal-plugins/layouts'))
       // user plugin
       .useByPluginsConfig(this._options.plugins)
       .useByPluginsConfig(this.siteConfig.plugins)
@@ -153,13 +156,16 @@ module.exports = class AppContext {
    * @returns { Promise<void> }
    */
   async addPage (filePath, { relative, permalink }) {
-    const page = new Page(filePath, { relative, permalink })
+    const page = new Page(filePath, {
+      relative,
+      permalink,
+      permalinkPattern: this.siteConfig.permalink
+    })
     await page.process(
       this.markdown,
-      this.siteConfig.permalink,
       new this.I18nConstructor((this.getSiteData.bind(this))),
+      this.pluginAPI.options.extendPageData.items
     )
-    await this.pluginAPI.options.extendPageData.apply(page)
     this.pages.push(page)
   }
 
@@ -184,6 +190,7 @@ module.exports = class AppContext {
    * }}
    */
   getSiteData () {
+    console.log('2')
     return {
       title: this.siteConfig.title || '',
       description: this.siteConfig.description || '',
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index bc9f18160f..4d349ad771 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -1,12 +1,16 @@
 const path = require('path')
 const slugify = require('../markdown/slugify')
-const { fs, fileToPath, parseFrontmatter, getPermalink } = require('@vuepress/shared-utils')
 const { inferTitle, extractHeaders } = require('../util/index')
+const {
+  fs, fileToPath, parseFrontmatter, getPermalink,
+  datatypes: { isPlainObject }
+} = require('@vuepress/shared-utils')
 
 module.exports = class Page {
   constructor (filePath, {
     relative,
-    permalink
+    permalink,
+    permalinkPattern
   }) {
     this._filePath = filePath
     if (relative) {
@@ -15,22 +19,23 @@ module.exports = class Page {
       this._routePath = encodeURI(permalink)
     }
     this.regularPath = this.path = this._routePath
+    this._permalinkPattern = permalinkPattern
   }
 
-  async process (markdown, permalinkPattern, i18n) {
+  async process (markdown, i18n, enhancers) {
     this.key = 'v-' + Math.random().toString(16).slice(2)
     this._content = await fs.readFile(this._filePath, 'utf-8')
-    const frontmatter = parseFrontmatter(this._content)
+    this._frontmatterMeta = parseFrontmatter(this._content)
 
     // infer title
-    const title = inferTitle(frontmatter)
+    const title = inferTitle(this._frontmatterMeta)
     if (title) {
       this.title = title
     }
 
     // headers
     const headers = extractHeaders(
-      frontmatter.content,
+      this._frontmatterMeta.content,
       ['h2', 'h3'],
       markdown
     )
@@ -38,10 +43,26 @@ module.exports = class Page {
       this.headers = headers
     }
 
-    this.frontmatter = frontmatter.data
+    for (const { name: pluginName, value: enhancer } of enhancers) {
+      let response
+      try {
+        response = enhancer(this)
+      } catch (error) {
+        throw new Error(`[${pluginName}] excuete extendPageData failed.`)
+      }
+      if (isPlainObject(response)) {
+        Object.keys(response).forEach(key => {
+          if (!this[key]) {
+            this[key] = response[key]
+          }
+        })
+      }
+    }
+
+    this.frontmatter = this._frontmatterMeta.data
 
-    if (frontmatter.excerpt) {
-      const { html } = markdown.render(frontmatter.excerpt)
+    if (this._frontmatterMeta.excerpt) {
+      const { html } = markdown.render(this._frontmatterMeta.excerpt)
       this.excerpt = html
     }
 
@@ -49,16 +70,16 @@ module.exports = class Page {
     i18n.setSSRContext(this)
     this._i18n = i18n
 
-    this.permalink = getPermalink({
-      pattern: this.frontmatter.permalink || permalinkPattern,
+    this._permalink = getPermalink({
+      pattern: this.frontmatter.permalink || this._permalinkPattern,
       slug: this.slug,
       date: this.frontmatter.date,
       localePath: i18n.$localePath,
       regularPath: this.regularPath
     })
 
-    if (this.permalink) {
-      this.path = this.permalink
+    if (this._permalink) {
+      this.path = this._permalink
     }
   }
 
diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
index 45467c2278..36a81d249b 100644
--- a/packages/@vuepress/core/lib/prepare/loadTheme.js
+++ b/packages/@vuepress/core/lib/prepare/loadTheme.js
@@ -13,8 +13,6 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
     (await fs.exists(localThemePath)) && ((await fs.readdir(localThemePath)).length > 0)
 
   let themePath = null         // Mandatory
-  let themeLayoutPath = null   // Mandatory
-  let themeNotFoundPath = null // Optional
   let themeIndexFile = null    // Optional
   let themePlugins = []        // Optional
   let themeName
@@ -40,33 +38,51 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
   try {
     themeIndexFile = require(themePath)
   } catch (error) {
-    console.log(error)
     themeIndexFile = {}
   }
 
   // handle theme api
-  const { layout, notFound, plugins } = themeIndexFile
+  const { plugins, layoutDir = useLocalTheme ? '.' : 'layouts' } = themeIndexFile
   themePlugins = plugins
-  themeLayoutPath = layout
-    ? path.resolve(themePath, layout)
-    : path.resolve(themePath, 'Layout.vue')
 
-  themeNotFoundPath = notFound
-    ? path.resolve(themePath, notFound)
-    : path.resolve(themePath, 'NotFound.vue')
+  const layoutDirPath = path.resolve(themePath, layoutDir)
 
-  if (!fs.existsSync(themeLayoutPath)) {
-    throw new Error(`[vuepress] Cannot resolve Layout.vue file in \n ${themeLayoutPath}`)
+  // normalize component name
+  const getComponentName = filename => {
+    filename = filename.slice(0, -4)
+    if (filename === '404') {
+      filename = 'NotFound'
+    }
+    return filename
+  }
+
+  // built-in named layout or not.
+  const isInternal = componentName => componentName === 'Layout' ||
+    componentName === 'NotFound'
+
+  const layoutComponentMap = fs.readdirSync(layoutDirPath)
+    .filter(filename => filename.endsWith('.vue'))
+    .reduce((map, filename) => {
+      const componentName = getComponentName(filename)
+      const componentPath = path.resolve(layoutDirPath, filename)
+      map[componentName] = { filename, componentName, path: componentPath }
+      if (isInternal(componentName)) {
+        map[componentName].isInternal = true
+      }
+      return map
+    }, {})
+
+  if (!fs.existsSync(layoutComponentMap.Layout.path)) {
+    throw new Error(`[vuepress] Cannot resolve Layout.vue file in \n ${layoutComponentMap.Layout.path}`)
   }
 
-  if (!fs.existsSync(themeNotFoundPath)) {
-    themeNotFoundPath = path.resolve(__dirname, '../app/components/NotFound.vue')
+  if (!fs.existsSync(layoutComponentMap.NotFound.path)) {
+    layoutComponentMap['404'].path = path.resolve(__dirname, '../app/components/NotFound.vue')
   }
 
   return {
     themePath,
-    themeLayoutPath,
-    themeNotFoundPath,
+    layoutComponentMap,
     themeIndexFile,
     themePlugins,
     themeName,
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 397af6efd2..11da5046d1 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -6,8 +6,6 @@ module.exports = function createBaseConfig ({
   outDir,
   base: publicPath,
   themePath,
-  themeLayoutPath,
-  themeNotFoundPath,
   markdown,
   tempPath
 }, { debug } = {}, isServer) {
@@ -37,8 +35,6 @@ module.exports = function createBaseConfig ({
     .set('symlinks', true)
     .alias
       .set('@theme', themePath)
-      .set('@themeLayout', themeLayoutPath)
-      .set('@themeNotFound', themeNotFoundPath)
       .set('@source', sourceDir)
       .set('@app', path.resolve(__dirname, '../app'))
       .set('@temp', tempPath)
diff --git a/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js b/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
index d5b5837c06..1667e93e0a 100644
--- a/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
+++ b/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
@@ -1,5 +1,5 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import DropdownLink from '../../src/DropdownLink.vue'
+import DropdownLink from '../../components/DropdownLink.vue'
 import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
 
 function test (mode, localVue) {
diff --git a/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js b/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
index 98ffa38fb4..6945ac6b91 100644
--- a/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
+++ b/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
@@ -1,6 +1,6 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
 import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
-import NavLink from '../../src/NavLink.vue'
+import NavLink from '../../components/NavLink.vue'
 
 function test (mode, localVue) {
   it(`$${mode} - renders nav link with internal link`, () => {
diff --git a/packages/@vuepress/theme-default/src/AlgoliaSearchBox.vue b/packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue
similarity index 99%
rename from packages/@vuepress/theme-default/src/AlgoliaSearchBox.vue
rename to packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue
index 0334ae0bbf..fdd703dc6e 100644
--- a/packages/@vuepress/theme-default/src/AlgoliaSearchBox.vue
+++ b/packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .algolia-search-wrapper
   & > span
diff --git a/packages/@vuepress/theme-default/components/Badge.vue b/packages/@vuepress/theme-default/components/Badge.vue
index 2035600e29..e5701b5f7f 100644
--- a/packages/@vuepress/theme-default/components/Badge.vue
+++ b/packages/@vuepress/theme-default/components/Badge.vue
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-@import '../src/styles/config.styl'
+@import '../styles/config.styl'
 
 .badge
   display inline-block
diff --git a/packages/@vuepress/theme-default/src/DropdownLink.vue b/packages/@vuepress/theme-default/components/DropdownLink.vue
similarity index 99%
rename from packages/@vuepress/theme-default/src/DropdownLink.vue
rename to packages/@vuepress/theme-default/components/DropdownLink.vue
index e6000a604a..72642448df 100644
--- a/packages/@vuepress/theme-default/src/DropdownLink.vue
+++ b/packages/@vuepress/theme-default/components/DropdownLink.vue
@@ -77,7 +77,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .dropdown-wrapper
   cursor pointer
diff --git a/packages/@vuepress/theme-default/src/DropdownTransition.vue b/packages/@vuepress/theme-default/components/DropdownTransition.vue
similarity index 100%
rename from packages/@vuepress/theme-default/src/DropdownTransition.vue
rename to packages/@vuepress/theme-default/components/DropdownTransition.vue
diff --git a/packages/@vuepress/theme-default/src/Home.vue b/packages/@vuepress/theme-default/components/Home.vue
similarity index 99%
rename from packages/@vuepress/theme-default/src/Home.vue
rename to packages/@vuepress/theme-default/components/Home.vue
index 69ac0e1192..e9f4275b5f 100644
--- a/packages/@vuepress/theme-default/src/Home.vue
+++ b/packages/@vuepress/theme-default/components/Home.vue
@@ -70,7 +70,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .home
   padding $navbarHeight 2rem 0
diff --git a/packages/@vuepress/theme-default/src/NavLink.vue b/packages/@vuepress/theme-default/components/NavLink.vue
similarity index 91%
rename from packages/@vuepress/theme-default/src/NavLink.vue
rename to packages/@vuepress/theme-default/components/NavLink.vue
index d9fa488629..42c969f270 100644
--- a/packages/@vuepress/theme-default/src/NavLink.vue
+++ b/packages/@vuepress/theme-default/components/NavLink.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { isExternal, isMailto, isTel, ensureExt } from './util'
+import { isExternal, isMailto, isTel, ensureExt } from '../layouts/util'
 
 export default {
   props: {
diff --git a/packages/@vuepress/theme-default/src/NavLinks.vue b/packages/@vuepress/theme-default/components/NavLinks.vue
similarity index 97%
rename from packages/@vuepress/theme-default/src/NavLinks.vue
rename to packages/@vuepress/theme-default/components/NavLinks.vue
index 4037f2889d..5ab10f68ab 100644
--- a/packages/@vuepress/theme-default/src/NavLinks.vue
+++ b/packages/@vuepress/theme-default/components/NavLinks.vue
@@ -35,7 +35,7 @@
 
 <script>
 import DropdownLink from './DropdownLink.vue'
-import { resolveNavLinkItem } from './util'
+import { resolveNavLinkItem } from '../layouts/util'
 import NavLink from './NavLink.vue'
 
 export default {
@@ -116,7 +116,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .nav-links
   display inline-block
diff --git a/packages/@vuepress/theme-default/src/Navbar.vue b/packages/@vuepress/theme-default/components/Navbar.vue
similarity index 99%
rename from packages/@vuepress/theme-default/src/Navbar.vue
rename to packages/@vuepress/theme-default/components/Navbar.vue
index 12795665b7..55a844bb1a 100644
--- a/packages/@vuepress/theme-default/src/Navbar.vue
+++ b/packages/@vuepress/theme-default/components/Navbar.vue
@@ -86,7 +86,7 @@ function css (el, property) {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 $navbar-vertical-padding = 0.7rem
 $navbar-horizontal-padding = 1.5rem
diff --git a/packages/@vuepress/theme-default/src/Page.vue b/packages/@vuepress/theme-default/components/Page.vue
similarity index 98%
rename from packages/@vuepress/theme-default/src/Page.vue
rename to packages/@vuepress/theme-default/components/Page.vue
index 37d65b41a7..ba733824c2 100644
--- a/packages/@vuepress/theme-default/src/Page.vue
+++ b/packages/@vuepress/theme-default/components/Page.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { resolvePage, normalize, outboundRE, endingSlashRE } from './util'
+import { resolvePage, normalize, outboundRE, endingSlashRE } from '../layouts/util'
 
 export default {
   props: ['sidebarItems'],
@@ -195,8 +195,8 @@ function find (page, items, offset) {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
-@require './styles/wrapper.styl'
+@import '../styles/config.styl'
+@require '../styles/wrapper.styl'
 
 .page
   padding-bottom 2rem
diff --git a/packages/@vuepress/theme-default/src/SearchBox.vue b/packages/@vuepress/theme-default/components/SearchBox.vue
similarity index 98%
rename from packages/@vuepress/theme-default/src/SearchBox.vue
rename to packages/@vuepress/theme-default/components/SearchBox.vue
index 9860855244..5923f1d93e 100644
--- a/packages/@vuepress/theme-default/src/SearchBox.vue
+++ b/packages/@vuepress/theme-default/components/SearchBox.vue
@@ -152,7 +152,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .search-box
   display inline-block
@@ -170,7 +170,7 @@ export default {
     padding 0 0.5rem 0 2rem
     outline none
     transition all .2s ease
-    background #fff url(./search.svg) 0.6rem 0.5rem no-repeat
+    background #fff url(search.svg) 0.6rem 0.5rem no-repeat
     background-size 1rem
     &:focus
       cursor auto
diff --git a/packages/@vuepress/theme-default/src/Sidebar.vue b/packages/@vuepress/theme-default/components/Sidebar.vue
similarity index 96%
rename from packages/@vuepress/theme-default/src/Sidebar.vue
rename to packages/@vuepress/theme-default/components/Sidebar.vue
index 17e3f6eda1..b8ce6c6edc 100644
--- a/packages/@vuepress/theme-default/src/Sidebar.vue
+++ b/packages/@vuepress/theme-default/components/Sidebar.vue
@@ -23,7 +23,7 @@
 import SidebarGroup from './SidebarGroup.vue'
 import SidebarLink from './SidebarLink.vue'
 import NavLinks from './NavLinks.vue'
-import { isActive } from './util'
+import { isActive } from '../layouts/util'
 
 export default {
   components: { SidebarGroup, SidebarLink, NavLinks },
@@ -79,7 +79,7 @@ function resolveOpenGroupIndex (route, items) {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .sidebar
   ul
diff --git a/packages/@vuepress/theme-default/src/SidebarButton.vue b/packages/@vuepress/theme-default/components/SidebarButton.vue
similarity index 96%
rename from packages/@vuepress/theme-default/src/SidebarButton.vue
rename to packages/@vuepress/theme-default/components/SidebarButton.vue
index 0a22243456..0f1c21fc33 100644
--- a/packages/@vuepress/theme-default/src/SidebarButton.vue
+++ b/packages/@vuepress/theme-default/components/SidebarButton.vue
@@ -7,7 +7,7 @@
 </template>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .sidebar-button
   display none
diff --git a/packages/@vuepress/theme-default/src/SidebarGroup.vue b/packages/@vuepress/theme-default/components/SidebarGroup.vue
similarity index 100%
rename from packages/@vuepress/theme-default/src/SidebarGroup.vue
rename to packages/@vuepress/theme-default/components/SidebarGroup.vue
diff --git a/packages/@vuepress/theme-default/src/SidebarLink.vue b/packages/@vuepress/theme-default/components/SidebarLink.vue
similarity index 96%
rename from packages/@vuepress/theme-default/src/SidebarLink.vue
rename to packages/@vuepress/theme-default/components/SidebarLink.vue
index 8288bf9658..dd2393ade5 100644
--- a/packages/@vuepress/theme-default/src/SidebarLink.vue
+++ b/packages/@vuepress/theme-default/components/SidebarLink.vue
@@ -1,5 +1,5 @@
 <script>
-import { isActive, hashRE, groupHeaders } from './util'
+import { isActive, hashRE, groupHeaders } from '../layouts/util'
 
 export default {
   functional: true,
@@ -59,7 +59,7 @@ function renderChildren (h, children, path, route, maxDepth, depth = 1) {
 </script>
 
 <style lang="stylus">
-@import './styles/config.styl'
+@import '../styles/config.styl'
 
 .sidebar .sidebar-sub-headers
   padding-left 1rem
diff --git a/packages/@vuepress/theme-default/src/search.svg b/packages/@vuepress/theme-default/components/search.svg
similarity index 100%
rename from packages/@vuepress/theme-default/src/search.svg
rename to packages/@vuepress/theme-default/components/search.svg
diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index 44e5eee7a2..d1463ed79a 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -2,8 +2,6 @@ const themePlugin = require('./plugin')
 
 // Theme API.
 module.exports = {
-  layout: 'src/Layout.vue',
-  notFound: 'src/NotFound.vue',
   plugins: [
     themePlugin,
     '@vuepress/active-header-links'
diff --git a/packages/@vuepress/theme-default/src/NotFound.vue b/packages/@vuepress/theme-default/layouts/404.vue
similarity index 100%
rename from packages/@vuepress/theme-default/src/NotFound.vue
rename to packages/@vuepress/theme-default/layouts/404.vue
diff --git a/packages/@vuepress/theme-default/src/Layout.vue b/packages/@vuepress/theme-default/layouts/Layout.vue
similarity index 93%
rename from packages/@vuepress/theme-default/src/Layout.vue
rename to packages/@vuepress/theme-default/layouts/Layout.vue
index 9a09b0774a..0ab5760482 100644
--- a/packages/@vuepress/theme-default/src/Layout.vue
+++ b/packages/@vuepress/theme-default/layouts/Layout.vue
@@ -57,10 +57,10 @@
 <script>
 import Vue from 'vue'
 import nprogress from 'nprogress'
-import Home from './Home.vue'
-import Navbar from './Navbar.vue'
-import Page from './Page.vue'
-import Sidebar from './Sidebar.vue'
+import Home from '../components/Home.vue'
+import Navbar from '../components/Navbar.vue'
+import Page from '../components/Page.vue'
+import Sidebar from '../components/Sidebar.vue'
 import { resolveSidebarItems } from './util'
 
 export default {
@@ -170,4 +170,4 @@ export default {
 </script>
 
 <style src="prismjs/themes/prism-tomorrow.css"></style>
-<style src="./styles/theme.styl" lang="stylus"></style>
+<style src="../styles/theme.styl" lang="stylus"></style>
diff --git a/packages/@vuepress/theme-default/src/util.js b/packages/@vuepress/theme-default/layouts/util.js
similarity index 100%
rename from packages/@vuepress/theme-default/src/util.js
rename to packages/@vuepress/theme-default/layouts/util.js
diff --git a/packages/@vuepress/theme-default/src/styles/arrow.styl b/packages/@vuepress/theme-default/styles/arrow.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/arrow.styl
rename to packages/@vuepress/theme-default/styles/arrow.styl
diff --git a/packages/@vuepress/theme-default/src/styles/code.styl b/packages/@vuepress/theme-default/styles/code.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/code.styl
rename to packages/@vuepress/theme-default/styles/code.styl
diff --git a/packages/@vuepress/theme-default/src/styles/config.styl b/packages/@vuepress/theme-default/styles/config.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/config.styl
rename to packages/@vuepress/theme-default/styles/config.styl
diff --git a/packages/@vuepress/theme-default/src/styles/custom-blocks.styl b/packages/@vuepress/theme-default/styles/custom-blocks.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/custom-blocks.styl
rename to packages/@vuepress/theme-default/styles/custom-blocks.styl
diff --git a/packages/@vuepress/theme-default/src/styles/mobile.styl b/packages/@vuepress/theme-default/styles/mobile.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/mobile.styl
rename to packages/@vuepress/theme-default/styles/mobile.styl
diff --git a/packages/@vuepress/theme-default/src/styles/nprogress.styl b/packages/@vuepress/theme-default/styles/nprogress.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/nprogress.styl
rename to packages/@vuepress/theme-default/styles/nprogress.styl
diff --git a/packages/@vuepress/theme-default/src/styles/theme.styl b/packages/@vuepress/theme-default/styles/theme.styl
similarity index 99%
rename from packages/@vuepress/theme-default/src/styles/theme.styl
rename to packages/@vuepress/theme-default/styles/theme.styl
index a733861fa6..5b2243db68 100644
--- a/packages/@vuepress/theme-default/src/styles/theme.styl
+++ b/packages/@vuepress/theme-default/styles/theme.styl
@@ -187,4 +187,4 @@ th, td
     .page
       padding-left 0
 
-@require './mobile.styl'
+@require 'mobile.styl'
diff --git a/packages/@vuepress/theme-default/src/styles/toc.styl b/packages/@vuepress/theme-default/styles/toc.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/toc.styl
rename to packages/@vuepress/theme-default/styles/toc.styl
diff --git a/packages/@vuepress/theme-default/src/styles/wrapper.styl b/packages/@vuepress/theme-default/styles/wrapper.styl
similarity index 100%
rename from packages/@vuepress/theme-default/src/styles/wrapper.styl
rename to packages/@vuepress/theme-default/styles/wrapper.styl

From 0aa3d950ce265f6253f16355510323a85d9bf86d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 5 Sep 2018 01:15:26 +0800
Subject: [PATCH 173/242] chore: tweaks

---
 .../lib/internal-plugins/{layouts.js => layoutComponents.js}   | 2 +-
 packages/@vuepress/core/lib/prepare/AppContext.js              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename packages/@vuepress/core/lib/internal-plugins/{layouts.js => layoutComponents.js} (93%)

diff --git a/packages/@vuepress/core/lib/internal-plugins/layouts.js b/packages/@vuepress/core/lib/internal-plugins/layoutComponents.js
similarity index 93%
rename from packages/@vuepress/core/lib/internal-plugins/layouts.js
rename to packages/@vuepress/core/lib/internal-plugins/layoutComponents.js
index 91ffabf8e1..97f781b933 100644
--- a/packages/@vuepress/core/lib/internal-plugins/layouts.js
+++ b/packages/@vuepress/core/lib/internal-plugins/layoutComponents.js
@@ -3,7 +3,7 @@ module.exports = (options, ctx) => {
   const componentNames = Object.keys(layoutComponentMap)
 
   return {
-    name: '@vuepress/internal-layout',
+    name: '@vuepress/internal-layout-components',
 
     async clientDynamicModules () {
       const code = `export default {\n${componentNames
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index a8f288ae9a..42300075e4 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -87,7 +87,7 @@ module.exports = class AppContext {
       .use(require('../internal-plugins/enhanceApp'))
       .use(require('../internal-plugins/overrideCSS'))
       .use(require('../internal-plugins/i18nTemp'))
-      .use(require('../internal-plugins/layouts'))
+      .use(require('../internal-plugins/layoutComponents'))
       // user plugin
       .useByPluginsConfig(this._options.plugins)
       .useByPluginsConfig(this.siteConfig.plugins)
@@ -190,7 +190,6 @@ module.exports = class AppContext {
    * }}
    */
   getSiteData () {
-    console.log('2')
     return {
       title: this.siteConfig.title || '',
       description: this.siteConfig.description || '',

From 04723be4efdad6398a5c9f2af77ab3675918ba1d Mon Sep 17 00:00:00 2001
From: Eko Eryanto <36023898+ekoeryanto@users.noreply.github.com>
Date: Thu, 6 Sep 2018 08:19:06 +0700
Subject: [PATCH 174/242] chore: change config load order (#804)

---
 packages/@vuepress/core/lib/prepare/loadConfig.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
index 949e4c6efa..7a27d5084b 100644
--- a/packages/@vuepress/core/lib/prepare/loadConfig.js
+++ b/packages/@vuepress/core/lib/prepare/loadConfig.js
@@ -14,12 +14,12 @@ module.exports = function loadConfig (vuepressDir, bustCache = true) {
 
   // resolve siteConfig
   let siteConfig = {}
-  if (fs.existsSync(configYmlPath)) {
-    siteConfig = parseConfig(configYmlPath)
+  if (fs.existsSync(configPath)) {
+    siteConfig = parseConfig(configPath)
   } else if (fs.existsSync(configTomlPath)) {
     siteConfig = parseConfig(configTomlPath)
-  } else if (fs.existsSync(configPath)) {
-    siteConfig = require(configPath)
+  } else if (fs.existsSync(configYmlPath)) {
+    siteConfig = require(configYmlPath)
   }
 
   return siteConfig

From cf088f556e4ada419ae712f596a31d59ecf7e6b1 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 6 Sep 2018 23:11:29 +0800
Subject: [PATCH 175/242] refactor($core): simplify page components
 registration

---
 .../core/lib/app/components/Content.js        |  7 ++++++-
 .../internal-plugins/importAsyncComponent.js  | 21 -------------------
 .../lib/internal-plugins/pageComponents.js    | 15 +++++++++++++
 .../core/lib/internal-plugins/routes.js       |  3 ---
 .../@vuepress/core/lib/prepare/AppContext.js  |  2 +-
 .../@vuepress/theme-default/layouts/404.vue   |  2 ++
 6 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
 create mode 100644 packages/@vuepress/core/lib/internal-plugins/pageComponents.js

diff --git a/packages/@vuepress/core/lib/app/components/Content.js b/packages/@vuepress/core/lib/app/components/Content.js
index e05678e5c6..57f7787efd 100644
--- a/packages/@vuepress/core/lib/app/components/Content.js
+++ b/packages/@vuepress/core/lib/app/components/Content.js
@@ -1,3 +1,6 @@
+import Vue from 'vue'
+import components from '@internal/page-components'
+
 export default {
   functional: true,
 
@@ -10,7 +13,9 @@ export default {
   },
 
   render (h, { parent, props, data }) {
-    return h(props.pageKey || parent.$page.key, {
+    const pageKey = props.pageKey || parent.$page.key
+    Vue.component(pageKey, components[pageKey])
+    return h(pageKey, {
       class: [props.custom ? 'custom' : '', data.class, data.staticClass],
       style: data.style
     })
diff --git a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js b/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
deleted file mode 100644
index acb1aec1d1..0000000000
--- a/packages/@vuepress/core/lib/internal-plugins/importAsyncComponent.js
+++ /dev/null
@@ -1,21 +0,0 @@
-function genImportAsyncComponentFile (pages) {
-  return `export function loadComponent (key) {
-  switch (key) {
-${pages.map(({ key, _filePath }) => `    case ${JSON.stringify(key)}: return import(${JSON.stringify(_filePath)});`).join('\n')}
-  }
-}`
-}
-
-module.exports = (options, context) => ({
-  name: '@vuepress/internal-import-async-component',
-
-  // @internal/async-component
-  async clientDynamicModules () {
-    const importAsyncComponentCode = genImportAsyncComponentFile(context.pages)
-    return {
-      name: 'async-component.js',
-      content: importAsyncComponentCode,
-      dirname: 'internal'
-    }
-  }
-})
diff --git a/packages/@vuepress/core/lib/internal-plugins/pageComponents.js b/packages/@vuepress/core/lib/internal-plugins/pageComponents.js
new file mode 100644
index 0000000000..4f22ad16f4
--- /dev/null
+++ b/packages/@vuepress/core/lib/internal-plugins/pageComponents.js
@@ -0,0 +1,15 @@
+module.exports = (options, ctx) => {
+  const { pages } = ctx
+  // const componentNames = Object.keys(layoutComponentMap)
+
+  return {
+    name: '@vuepress/internal-page-components',
+
+    async clientDynamicModules () {
+      const code = `export default {\n${pages
+        .map(({ key, _filePath }) => `  ${JSON.stringify(key)}: () => import(${JSON.stringify(_filePath)})`)
+        .join(',\n')} \n}`
+      return { name: 'page-components.js', content: code, dirname: 'internal' }
+    }
+  }
+}
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index 43fe069e9c..8393e576f7 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -40,9 +40,6 @@ function routesCode (pages) {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
     component: LayoutDistributor,
-    beforeEnter: (to, from, next) => {
-      registerComponent(${JSON.stringify(componentName)}).then(() => next())
-    }
   }`
 
     const dncodedPath = decodeURIComponent(pagePath)
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 42300075e4..85652152d1 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -83,11 +83,11 @@ module.exports = class AppContext {
       .use(require('../internal-plugins/siteData'))
       .use(require('../internal-plugins/routes'))
       .use(require('../internal-plugins/rootMixins'))
-      .use(require('../internal-plugins/importAsyncComponent'))
       .use(require('../internal-plugins/enhanceApp'))
       .use(require('../internal-plugins/overrideCSS'))
       .use(require('../internal-plugins/i18nTemp'))
       .use(require('../internal-plugins/layoutComponents'))
+      .use(require('../internal-plugins/pageComponents'))
       // user plugin
       .useByPluginsConfig(this._options.plugins)
       .useByPluginsConfig(this.siteConfig.plugins)
diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index 6aefe797c4..4eef36d34e 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -24,3 +24,5 @@ export default {
   }
 }
 </script>
+
+<style src="../styles/theme.styl" lang="stylus"></style>

From fe3c2d15cbe8b09becbf995f3676b80cffe76aec Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 6 Sep 2018 23:27:00 +0800
Subject: [PATCH 176/242] Revert "chore: change config load order (#804)"

This reverts commit 04723be4efdad6398a5c9f2af77ab3675918ba1d.
---
 packages/@vuepress/core/lib/prepare/loadConfig.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
index 7a27d5084b..949e4c6efa 100644
--- a/packages/@vuepress/core/lib/prepare/loadConfig.js
+++ b/packages/@vuepress/core/lib/prepare/loadConfig.js
@@ -14,12 +14,12 @@ module.exports = function loadConfig (vuepressDir, bustCache = true) {
 
   // resolve siteConfig
   let siteConfig = {}
-  if (fs.existsSync(configPath)) {
-    siteConfig = parseConfig(configPath)
+  if (fs.existsSync(configYmlPath)) {
+    siteConfig = parseConfig(configYmlPath)
   } else if (fs.existsSync(configTomlPath)) {
     siteConfig = parseConfig(configTomlPath)
-  } else if (fs.existsSync(configYmlPath)) {
-    siteConfig = require(configYmlPath)
+  } else if (fs.existsSync(configPath)) {
+    siteConfig = require(configPath)
   }
 
   return siteConfig

From f8b8c51e9dcc76bd83d85453bf40cc7d3e5c7fa0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 8 Sep 2018 01:20:27 +0800
Subject: [PATCH 177/242] chore: clean expired code

---
 packages/@vuepress/core/lib/app/util.js                | 10 ----------
 packages/@vuepress/core/lib/internal-plugins/routes.js |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index 6ef758cb4a..bedc0d16b8 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -1,6 +1,3 @@
-import Vue from 'vue'
-import { loadComponent } from '@internal/async-component'
-
 /**
  * Inject option to Vue SFC
  * @param {object} options
@@ -38,13 +35,6 @@ export function findPageForPath (pages, path) {
   }
 }
 
-export function registerComponent (key) {
-  return loadComponent(key).then(comp => {
-    Vue.component(key, comp.default)
-    return comp.default
-  })
-}
-
 /**
  * Normalize config.
  * This utility is mainly for plugin developers. For some
diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index 8393e576f7..d655cb940b 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -14,7 +14,7 @@ module.exports = (options, ctx) => ({
  */
 function importCode () {
   return `
-import { injectComponentOption, registerComponent } from '@app/util'
+import { injectComponentOption } from '@app/util'
 import rootMixins from '@internal/root-mixins'
 import components from '@internal/layout-components'
 import LayoutDistributor from '@app/components/LayoutDistributor.vue'

From 99cd91140a0c1c5578ac3251a9290e024c1f3022 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 8 Sep 2018 01:33:58 +0800
Subject: [PATCH 178/242] feat: markdown slots (close: #594)

Source:

```md
- Evan You

<template slot="projects">

    - Vue.js
    - VueX

</template>
```

Usage:

```
<Content/> // get default slot
<Content slot="projects"> // get named slot
```
---
 packages/@vuepress/core/lib/app/app.js                   | 2 ++
 packages/@vuepress/core/lib/app/components/Content.js    | 8 ++++++--
 .../core/lib/app/components/ContentSlotsDistributor.js   | 9 +++++++++
 packages/@vuepress/core/lib/webpack/markdownLoader.js    | 3 ++-
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 37afbdfee4..074235aa84 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -13,6 +13,7 @@ import('@temp/style.styl')
 
 // built-in components
 import Content from './components/Content'
+import ContentSlotsDistributor from './components/ContentSlotsDistributor'
 import OutboundLink from './components/OutboundLink.vue'
 import ClientOnly from './components/ClientOnly'
 
@@ -35,6 +36,7 @@ Vue.use(Router)
 Vue.mixin(dataMixin(I18n, siteData))
 // component for rendering markdown content and setting title etc.
 Vue.component('Content', Content)
+Vue.component('ContentSlotsDistributor', ContentSlotsDistributor)
 Vue.component('OutboundLink', OutboundLink)
 // component for client-only content
 Vue.component('ClientOnly', ClientOnly)
diff --git a/packages/@vuepress/core/lib/app/components/Content.js b/packages/@vuepress/core/lib/app/components/Content.js
index 57f7787efd..46f47f0da7 100644
--- a/packages/@vuepress/core/lib/app/components/Content.js
+++ b/packages/@vuepress/core/lib/app/components/Content.js
@@ -9,7 +9,8 @@ export default {
       type: Boolean,
       default: true
     },
-    pageKey: String
+    pageKey: String,
+    slot: String
   },
 
   render (h, { parent, props, data }) {
@@ -17,7 +18,10 @@ export default {
     Vue.component(pageKey, components[pageKey])
     return h(pageKey, {
       class: [props.custom ? 'custom' : '', data.class, data.staticClass],
-      style: data.style
+      style: data.style,
+      props: {
+        target: props.slot || 'default'
+      }
     })
   }
 }
diff --git a/packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js b/packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js
new file mode 100644
index 0000000000..f5da1d54be
--- /dev/null
+++ b/packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js
@@ -0,0 +1,9 @@
+export default {
+  functional: true,
+
+  render (h, { props, slots }) {
+    return h('div', {
+      class: 'content'
+    }, slots()[props.target])
+  }
+}
diff --git a/packages/@vuepress/core/lib/webpack/markdownLoader.js b/packages/@vuepress/core/lib/webpack/markdownLoader.js
index 7a7fa54228..52593d3f29 100644
--- a/packages/@vuepress/core/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/core/lib/webpack/markdownLoader.js
@@ -83,8 +83,9 @@ module.exports = function (src) {
 
   const res = (
     `<template>\n` +
-      `<div class="content">${html}</div>\n` +
+      `<ContentSlotsDistributor :target="target">${html}</ContentSlotsDistributor>\n` +
     `</template>\n` +
+    `<script>export default { props: ['target'] }</script>` +
     (hoistedTags || []).join('\n')
   )
   cache.set(key, res)

From 1cba9bcee7092a902e52b6d85dbc00a086a0e0ef Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 8 Sep 2018 23:22:19 +0800
Subject: [PATCH 179/242] feat: init @vuepress/plugin-blog

---
 packages/@vuepress/plugin-blog/.npmignore   |  2 +
 packages/@vuepress/plugin-blog/README.md    |  3 ++
 packages/@vuepress/plugin-blog/index.js     | 47 +++++++++++++++++++++
 packages/@vuepress/plugin-blog/package.json | 25 +++++++++++
 4 files changed, 77 insertions(+)
 create mode 100644 packages/@vuepress/plugin-blog/.npmignore
 create mode 100644 packages/@vuepress/plugin-blog/README.md
 create mode 100644 packages/@vuepress/plugin-blog/index.js
 create mode 100644 packages/@vuepress/plugin-blog/package.json

diff --git a/packages/@vuepress/plugin-blog/.npmignore b/packages/@vuepress/plugin-blog/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-blog/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-blog/README.md b/packages/@vuepress/plugin-blog/README.md
new file mode 100644
index 0000000000..ed7755e68a
--- /dev/null
+++ b/packages/@vuepress/plugin-blog/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-blog
+
+> theme plugin for vuepress
diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
new file mode 100644
index 0000000000..3e8989a94e
--- /dev/null
+++ b/packages/@vuepress/plugin-blog/index.js
@@ -0,0 +1,47 @@
+module.exports = (options, ctx) => ({
+  extendPageData (pageCtx) {
+    const {
+      _frontmatterMeta     // result of parseFrontmatter
+      // type: { data: FrontMatterObject, content: rest content }
+
+      // _filePath,        // file's absolute path
+      // _content,         // file's raw content string
+      // key,              // file's hash key
+      // regularPath       // current page's default link (follow the file hierarchy)
+    } = pageCtx
+
+    const { data: rawFrontmatter } = _frontmatterMeta
+    const { layoutComponentMap } = ctx
+    const { pageEnhancers = [] } = options
+    const isLayoutExists = name => layoutComponentMap[name] !== undefined
+    const getLayout = name => isLayoutExists(name) ? name : 'Layout'
+
+    const enhancers = [
+      {
+        when: ({ regularPath }) => regularPath === '/category/',
+        frontmatter: { layout: getLayout('Category') }
+      },
+      {
+        when: ({ regularPath }) => regularPath === '/tags/',
+        frontmatter: { layout: getLayout('Tag') }
+      },
+      {
+        when: ({ regularPath }) => regularPath.startsWith('/_posts/'),
+        frontmatter: {
+          layout: getLayout('Post'),
+          permalink: '/:year/:month/:day/:slug'
+        }
+      },
+      ...pageEnhancers
+    ]
+
+    enhancers.forEach(({
+      when,
+      frontmatter = {}
+    }) => {
+      if (when(pageCtx)) {
+        Object.assign(rawFrontmatter, frontmatter)
+      }
+    })
+  }
+})
diff --git a/packages/@vuepress/plugin-blog/package.json b/packages/@vuepress/plugin-blog/package.json
new file mode 100644
index 0000000000..2a8cb3aa15
--- /dev/null
+++ b/packages/@vuepress/plugin-blog/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-blog",
+  "version": "1.0.0",
+  "description": "theme plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-blog#readme"
+}

From 20d612c92f71bc64d9ec58caeb43deb704a89720 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 00:09:45 +0800
Subject: [PATCH 180/242] refactor: simplify the implementation of makrdown
 slots

---
 packages/@vuepress/core/lib/app/app.js                   | 2 --
 packages/@vuepress/core/lib/app/components/Content.js    | 5 ++---
 .../core/lib/app/components/ContentSlotsDistributor.js   | 9 ---------
 packages/@vuepress/core/lib/webpack/markdownLoader.js    | 2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js

diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 074235aa84..37afbdfee4 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -13,7 +13,6 @@ import('@temp/style.styl')
 
 // built-in components
 import Content from './components/Content'
-import ContentSlotsDistributor from './components/ContentSlotsDistributor'
 import OutboundLink from './components/OutboundLink.vue'
 import ClientOnly from './components/ClientOnly'
 
@@ -36,7 +35,6 @@ Vue.use(Router)
 Vue.mixin(dataMixin(I18n, siteData))
 // component for rendering markdown content and setting title etc.
 Vue.component('Content', Content)
-Vue.component('ContentSlotsDistributor', ContentSlotsDistributor)
 Vue.component('OutboundLink', OutboundLink)
 // component for client-only content
 Vue.component('ClientOnly', ClientOnly)
diff --git a/packages/@vuepress/core/lib/app/components/Content.js b/packages/@vuepress/core/lib/app/components/Content.js
index 46f47f0da7..4b44fe77ef 100644
--- a/packages/@vuepress/core/lib/app/components/Content.js
+++ b/packages/@vuepress/core/lib/app/components/Content.js
@@ -16,12 +16,11 @@ export default {
   render (h, { parent, props, data }) {
     const pageKey = props.pageKey || parent.$page.key
     Vue.component(pageKey, components[pageKey])
+
     return h(pageKey, {
       class: [props.custom ? 'custom' : '', data.class, data.staticClass],
       style: data.style,
-      props: {
-        target: props.slot || 'default'
-      }
+      slot: props.slot || 'default'
     })
   }
 }
diff --git a/packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js b/packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js
deleted file mode 100644
index f5da1d54be..0000000000
--- a/packages/@vuepress/core/lib/app/components/ContentSlotsDistributor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default {
-  functional: true,
-
-  render (h, { props, slots }) {
-    return h('div', {
-      class: 'content'
-    }, slots()[props.target])
-  }
-}
diff --git a/packages/@vuepress/core/lib/webpack/markdownLoader.js b/packages/@vuepress/core/lib/webpack/markdownLoader.js
index 52593d3f29..1e97475eae 100644
--- a/packages/@vuepress/core/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/core/lib/webpack/markdownLoader.js
@@ -83,7 +83,7 @@ module.exports = function (src) {
 
   const res = (
     `<template>\n` +
-      `<ContentSlotsDistributor :target="target">${html}</ContentSlotsDistributor>\n` +
+      `<div class="content">${html}</div>\n` +
     `</template>\n` +
     `<script>export default { props: ['target'] }</script>` +
     (hoistedTags || []).join('\n')

From 078696e9384590cfd4cad4db89b75bbce38bebed Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 00:20:31 +0800
Subject: [PATCH 181/242] feat($plugin-blog): correct Layout for index page and
 one-level page

---
 packages/@vuepress/plugin-blog/index.js     | 15 +++++++++++++--
 packages/@vuepress/plugin-blog/package.json |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
index 3e8989a94e..5a6365f9e2 100644
--- a/packages/@vuepress/plugin-blog/index.js
+++ b/packages/@vuepress/plugin-blog/index.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 module.exports = (options, ctx) => ({
   extendPageData (pageCtx) {
     const {
@@ -16,15 +18,24 @@ module.exports = (options, ctx) => ({
     const isLayoutExists = name => layoutComponentMap[name] !== undefined
     const getLayout = name => isLayoutExists(name) ? name : 'Layout'
 
+    const isDirectChild = regularPath => path.parse(regularPath).dir === '/'
     const enhancers = [
       {
-        when: ({ regularPath }) => regularPath === '/category/',
+        when: ({ regularPath }) => isDirectChild(regularPath),
+        frontmatter: { layout: getLayout('Page') }
+      },
+      {
+        when: ({ regularPath }) => regularPath === '/category.html',
         frontmatter: { layout: getLayout('Category') }
       },
       {
-        when: ({ regularPath }) => regularPath === '/tags/',
+        when: ({ regularPath }) => regularPath === '/tags.html',
         frontmatter: { layout: getLayout('Tag') }
       },
+      {
+        when: ({ regularPath }) => regularPath === '/',
+        frontmatter: { layout: getLayout('Layout') }
+      },
       {
         when: ({ regularPath }) => regularPath.startsWith('/_posts/'),
         frontmatter: {
diff --git a/packages/@vuepress/plugin-blog/package.json b/packages/@vuepress/plugin-blog/package.json
index 2a8cb3aa15..503103e0a0 100644
--- a/packages/@vuepress/plugin-blog/package.json
+++ b/packages/@vuepress/plugin-blog/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vuepress/plugin-blog",
   "version": "1.0.0",
-  "description": "theme plugin for vuepress",
+  "description": "blog plugin for vuepress",
   "main": "index.js",
   "publishConfig": {
     "access": "public"

From b507faeaf86f48c45e3a7a999b7fa7c058b82d00 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 00:22:22 +0800
Subject: [PATCH 182/242] feat: empty temp dir before launching app

---
 packages/@vuepress/core/lib/prepare/AppContext.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 85652152d1..5afaaa1f54 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -219,6 +219,8 @@ function createTemp (tempPath) {
 
   if (!fs.existsSync(tempPath)) {
     fs.ensureDirSync(tempPath)
+  } else {
+    fs.emptyDirSync(tempPath)
   }
 
   logger.tip(`Temp directory: ${chalk.gray(tempPath)}`)

From 0e34e2d93f115db8ee40779cde3f8cab35680d4b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 01:50:34 +0800
Subject: [PATCH 183/242] refactor($core): clientDynamicModules option - use
 default value

---
 .../core/lib/plugin-api/option/ClientDynamicModulesOption.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
index 596abff9d4..0ec8690eef 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
@@ -8,9 +8,9 @@ module.exports = class ClientDynamicModulesOption extends Option {
       if (!Array.isArray(modules)) {
         modules = [modules]
       }
-      for (const { name, content, dirname } of modules) {
+      for (const { name, content, dirname = 'dynamic' } of modules) {
         await context.writeTemp(
-          `${dirname || 'dynamic'}/${name}`,
+          `${dirname}/${name}`,
           `
 /**
  * Generated by "${pluginName}"

From 463625c78334a22a0d353f82a34219e9fd2da2f0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 03:03:56 +0800
Subject: [PATCH 184/242] feat($theme-blog): add 'type' field to page data and
 more reasonable layout fallback

---
 packages/@vuepress/plugin-blog/index.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
index 5a6365f9e2..03d67d413e 100644
--- a/packages/@vuepress/plugin-blog/index.js
+++ b/packages/@vuepress/plugin-blog/index.js
@@ -16,21 +16,22 @@ module.exports = (options, ctx) => ({
     const { layoutComponentMap } = ctx
     const { pageEnhancers = [] } = options
     const isLayoutExists = name => layoutComponentMap[name] !== undefined
-    const getLayout = name => isLayoutExists(name) ? name : 'Layout'
+    const getLayout = (name, fallback) => isLayoutExists(name) ? name : fallback
 
     const isDirectChild = regularPath => path.parse(regularPath).dir === '/'
     const enhancers = [
       {
         when: ({ regularPath }) => isDirectChild(regularPath),
-        frontmatter: { layout: getLayout('Page') }
+        frontmatter: { layout: getLayout('Page', 'Layout') },
+        data: { type: 'page' }
       },
       {
         when: ({ regularPath }) => regularPath === '/category.html',
-        frontmatter: { layout: getLayout('Category') }
+        frontmatter: { layout: getLayout('Category', 'Page') }
       },
       {
         when: ({ regularPath }) => regularPath === '/tags.html',
-        frontmatter: { layout: getLayout('Tag') }
+        frontmatter: { layout: getLayout('Tag', 'Page') }
       },
       {
         when: ({ regularPath }) => regularPath === '/',
@@ -39,19 +40,22 @@ module.exports = (options, ctx) => ({
       {
         when: ({ regularPath }) => regularPath.startsWith('/_posts/'),
         frontmatter: {
-          layout: getLayout('Post'),
+          layout: getLayout('Post', 'Page'),
           permalink: '/:year/:month/:day/:slug'
-        }
+        },
+        data: { type: 'post' }
       },
       ...pageEnhancers
     ]
 
     enhancers.forEach(({
       when,
+      data = {},
       frontmatter = {}
     }) => {
       if (when(pageCtx)) {
         Object.assign(rawFrontmatter, frontmatter)
+        Object.assign(pageCtx, data)
       }
     })
   }

From f5e1e99415e75e63c068fc9ed0b24137d37933fa Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 04:00:11 +0800
Subject: [PATCH 185/242] refactor($core): simplify Page's interface

---
 .../@vuepress/core/lib/prepare/AppContext.js  |  3 +-
 packages/@vuepress/core/lib/prepare/Page.js   | 40 +++++++++++--------
 packages/@vuepress/core/lib/util/index.js     | 10 ++---
 packages/@vuepress/plugin-blog/index.js       |  6 +--
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 5afaaa1f54..e7aed914f3 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -156,7 +156,8 @@ module.exports = class AppContext {
    * @returns { Promise<void> }
    */
   async addPage (filePath, { relative, permalink }) {
-    const page = new Page(filePath, {
+    const page = new Page({
+      filePath,
       relative,
       permalink,
       permalinkPattern: this.siteConfig.permalink
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 4d349ad771..0e4904c953 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -7,35 +7,42 @@ const {
 } = require('@vuepress/shared-utils')
 
 module.exports = class Page {
-  constructor (filePath, {
+  constructor ({
+    filePath,
+    title,
     relative,
     permalink,
     permalinkPattern
   }) {
     this._filePath = filePath
+
     if (relative) {
       this._routePath = encodeURI(fileToPath(relative))
     } else if (permalink) {
       this._routePath = encodeURI(permalink)
     }
+
+    this.key = 'v-' + Math.random().toString(16).slice(2)
     this.regularPath = this.path = this._routePath
+    this.title = title
     this._permalinkPattern = permalinkPattern
   }
 
   async process (markdown, i18n, enhancers) {
-    this.key = 'v-' + Math.random().toString(16).slice(2)
     this._content = await fs.readFile(this._filePath, 'utf-8')
-    this._frontmatterMeta = parseFrontmatter(this._content)
+    const { excerpt, data, content } = parseFrontmatter(this._content)
+    this._strippedContent = content
+    this.frontmatter = data
 
     // infer title
-    const title = inferTitle(this._frontmatterMeta)
+    const title = inferTitle(this.frontmatter, this._strippedContent)
     if (title) {
       this.title = title
     }
 
     // headers
     const headers = extractHeaders(
-      this._frontmatterMeta.content,
+      this._strippedContent,
       ['h2', 'h3'],
       markdown
     )
@@ -43,6 +50,16 @@ module.exports = class Page {
       this.headers = headers
     }
 
+    if (excerpt) {
+      const { html } = markdown.render(excerpt)
+      this.excerpt = html
+    }
+
+    // resolve i18n
+    i18n.setSSRContext(this)
+    this._i18n = i18n
+    this._localePath = i18n.$localePath
+
     for (const { name: pluginName, value: enhancer } of enhancers) {
       let response
       try {
@@ -59,22 +76,11 @@ module.exports = class Page {
       }
     }
 
-    this.frontmatter = this._frontmatterMeta.data
-
-    if (this._frontmatterMeta.excerpt) {
-      const { html } = markdown.render(this._frontmatterMeta.excerpt)
-      this.excerpt = html
-    }
-
-    // resolve i18n
-    i18n.setSSRContext(this)
-    this._i18n = i18n
-
     this._permalink = getPermalink({
       pattern: this.frontmatter.permalink || this._permalinkPattern,
       slug: this.slug,
       date: this.frontmatter.date,
-      localePath: i18n.$localePath,
+      localePath: this._localePath,
       regularPath: this.regularPath
     })
 
diff --git a/packages/@vuepress/core/lib/util/index.js b/packages/@vuepress/core/lib/util/index.js
index 926e3af30e..b57c36003d 100644
--- a/packages/@vuepress/core/lib/util/index.js
+++ b/packages/@vuepress/core/lib/util/index.js
@@ -27,14 +27,14 @@ exports.applyUserWebpackConfig = function (userConfig, config, isServer) {
   return config
 }
 
-exports.inferTitle = function (frontmatter) {
-  if (frontmatter.data.home) {
+exports.inferTitle = function (frontmatter, strippedContent) {
+  if (frontmatter.home) {
     return 'Home'
   }
-  if (frontmatter.data.title) {
-    return deeplyParseHeaders(frontmatter.data.title)
+  if (frontmatter.title) {
+    return deeplyParseHeaders(frontmatter.title)
   }
-  const match = frontmatter.content.trim().match(/^#+\s+(.*)/)
+  const match = strippedContent.trim().match(/^#+\s+(.*)/)
   if (match) {
     return deeplyParseHeaders(match[1])
   }
diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
index 03d67d413e..dc7de05313 100644
--- a/packages/@vuepress/plugin-blog/index.js
+++ b/packages/@vuepress/plugin-blog/index.js
@@ -3,16 +3,14 @@ const path = require('path')
 module.exports = (options, ctx) => ({
   extendPageData (pageCtx) {
     const {
-      _frontmatterMeta     // result of parseFrontmatter
-      // type: { data: FrontMatterObject, content: rest content }
-
+      frontmatter: rawFrontmatter
       // _filePath,        // file's absolute path
       // _content,         // file's raw content string
+      // _localePath       // '/' or '/zh/'
       // key,              // file's hash key
       // regularPath       // current page's default link (follow the file hierarchy)
     } = pageCtx
 
-    const { data: rawFrontmatter } = _frontmatterMeta
     const { layoutComponentMap } = ctx
     const { pageEnhancers = [] } = options
     const isLayoutExists = name => layoutComponentMap[name] !== undefined

From adb3d564ef8dbbebafa50f35bc87035bf16862db Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:01:47 +0800
Subject: [PATCH 186/242] chore: avoid Content component throw error

---
 .../@vuepress/core/lib/app/components/Content.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/components/Content.js b/packages/@vuepress/core/lib/app/components/Content.js
index 4b44fe77ef..cfc4ba4cbd 100644
--- a/packages/@vuepress/core/lib/app/components/Content.js
+++ b/packages/@vuepress/core/lib/app/components/Content.js
@@ -15,12 +15,14 @@ export default {
 
   render (h, { parent, props, data }) {
     const pageKey = props.pageKey || parent.$page.key
-    Vue.component(pageKey, components[pageKey])
-
-    return h(pageKey, {
-      class: [props.custom ? 'custom' : '', data.class, data.staticClass],
-      style: data.style,
-      slot: props.slot || 'default'
-    })
+    if (components[pageKey]) {
+      Vue.component(pageKey, components[pageKey])
+      return h(pageKey, {
+        class: [props.custom ? 'custom' : '', data.class, data.staticClass],
+        style: data.style,
+        slot: props.slot || 'default'
+      })
+    }
+    return h('')
   }
 }

From 011c3c3ba6dd5a4f53a9396d0eda5c3d6d644559 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:03:39 +0800
Subject: [PATCH 187/242] fix($core): exclude non-content pages from the page
 components

---
 packages/@vuepress/core/lib/internal-plugins/pageComponents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@vuepress/core/lib/internal-plugins/pageComponents.js b/packages/@vuepress/core/lib/internal-plugins/pageComponents.js
index 4f22ad16f4..e4f1377888 100644
--- a/packages/@vuepress/core/lib/internal-plugins/pageComponents.js
+++ b/packages/@vuepress/core/lib/internal-plugins/pageComponents.js
@@ -7,6 +7,7 @@ module.exports = (options, ctx) => {
 
     async clientDynamicModules () {
       const code = `export default {\n${pages
+        .filter(({ _filePath }) => _filePath)
         .map(({ key, _filePath }) => `  ${JSON.stringify(key)}: () => import(${JSON.stringify(_filePath)})`)
         .join(',\n')} \n}`
       return { name: 'page-components.js', content: code, dirname: 'internal' }

From 96ddb59e5de7d1aca4ade7d0d0efe40719e0b99d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:05:10 +0800
Subject: [PATCH 188/242] refactor($core): refine Page / AppContext

---
 .../@vuepress/core/lib/prepare/AppContext.js  |  26 ++--
 packages/@vuepress/core/lib/prepare/Page.js   | 125 +++++++++++-------
 packages/@vuepress/plugin-i18n-ui/index.js    |   5 +-
 3 files changed, 86 insertions(+), 70 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index e7aed914f3..271a3bd74a 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -54,7 +54,7 @@ module.exports = class AppContext {
     await this.resolvePages()
     await Promise.all(
       this.pluginAPI.options.additionalPages.values.map(async ({ path, permalink }) => {
-        await this.addPage(path, { permalink })
+        await this.addPage({ filePath: path, permalink })
       })
     )
 
@@ -143,30 +143,22 @@ module.exports = class AppContext {
 
     await Promise.all(pageFiles.map(async (relative) => {
       const filePath = path.resolve(this.sourceDir, relative)
-      await this.addPage(filePath, { relative })
+      await this.addPage({ filePath, relative })
     }))
   }
 
   /**
    * Add a page
-   * @param { string } filePath
-   * @param { string } relative relative path of source markdown file.
-   * @param { string } permalink the URL (excluding the domain name)
-   *                   for your pages, posts.
    * @returns { Promise<void> }
    */
-  async addPage (filePath, { relative, permalink }) {
-    const page = new Page({
-      filePath,
-      relative,
-      permalink,
-      permalinkPattern: this.siteConfig.permalink
+  async addPage (options) {
+    options.permalinkPattern = this.siteConfig.permalink
+    const page = new Page(options)
+    await page.process({
+      markdown: this.markdown,
+      i18n: new this.I18nConstructor((this.getSiteData.bind(this))),
+      enhancers: this.pluginAPI.options.extendPageData.items
     })
-    await page.process(
-      this.markdown,
-      new this.I18nConstructor((this.getSiteData.bind(this))),
-      this.pluginAPI.options.extendPageData.items
-    )
     this.pages.push(page)
   }
 
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 0e4904c953..8eb5ede819 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -1,58 +1,81 @@
 const path = require('path')
 const slugify = require('../markdown/slugify')
 const { inferTitle, extractHeaders } = require('../util/index')
-const {
-  fs, fileToPath, parseFrontmatter, getPermalink,
-  datatypes: { isPlainObject }
-} = require('@vuepress/shared-utils')
+const { fs, fileToPath, parseFrontmatter, getPermalink } = require('@vuepress/shared-utils')
 
 module.exports = class Page {
+  /**
+   * @param { string } title markdown title
+   * @param { string } content markdown file content
+   * @param { string } filePath absolute file path of source markdown file.
+   * @param { string } relative relative file path of source markdown file.
+   * @param { string } permalink the URL (excluding the domain name) for your pages, posts.
+   * @param { object } frontmatter
+   * @param { string } permalinkPattern
+   */
   constructor ({
-    filePath,
+    path,
     title,
+    content,
+    filePath,
     relative,
     permalink,
+    frontmatter = {},
     permalinkPattern
   }) {
+    this.title = title
     this._filePath = filePath
+    this._content = content
+    this._permalink = permalink
+    this.frontmatter = frontmatter
 
     if (relative) {
       this._routePath = encodeURI(fileToPath(relative))
+    } else if (path) {
+      this._routePath = encodeURI(path)
     } else if (permalink) {
       this._routePath = encodeURI(permalink)
     }
 
     this.key = 'v-' + Math.random().toString(16).slice(2)
     this.regularPath = this.path = this._routePath
-    this.title = title
     this._permalinkPattern = permalinkPattern
   }
 
-  async process (markdown, i18n, enhancers) {
-    this._content = await fs.readFile(this._filePath, 'utf-8')
-    const { excerpt, data, content } = parseFrontmatter(this._content)
-    this._strippedContent = content
-    this.frontmatter = data
-
-    // infer title
-    const title = inferTitle(this.frontmatter, this._strippedContent)
-    if (title) {
-      this.title = title
+  async process ({
+    i18n,
+    markdown,
+    enhancers
+  }) {
+    if (this._filePath) {
+      this._content = await fs.readFile(this._filePath, 'utf-8')
     }
 
-    // headers
-    const headers = extractHeaders(
-      this._strippedContent,
-      ['h2', 'h3'],
-      markdown
-    )
-    if (headers.length) {
-      this.headers = headers
-    }
+    if (this._content) {
+      const { excerpt, data, content } = parseFrontmatter(this._content)
+      this._strippedContent = content
+      this.frontmatter = data
 
-    if (excerpt) {
-      const { html } = markdown.render(excerpt)
-      this.excerpt = html
+      // infer title
+      const title = inferTitle(this.frontmatter, this._strippedContent)
+      if (title) {
+        this.title = title
+      }
+
+      // headers
+      const headers = extractHeaders(
+        this._strippedContent,
+        ['h2', 'h3'],
+        markdown
+      )
+      if (headers.length) {
+        this.headers = headers
+      }
+
+      if (excerpt) {
+        const { html } = markdown.render(excerpt)
+        this.excerpt = html
+      }
     }
 
     // resolve i18n
@@ -60,37 +83,39 @@ module.exports = class Page {
     this._i18n = i18n
     this._localePath = i18n.$localePath
 
+    this._enhance(enhancers)
+    this.buildPermalink()
+  }
+
+  buildPermalink () {
+    if (!this._permalink) {
+      this._permalink = getPermalink({
+        pattern: this.frontmatter.permalink || this._permalinkPattern,
+        slug: this.slug,
+        date: this.frontmatter.date,
+        localePath: this._localePath,
+        regularPath: this.regularPath
+      })
+    }
+
+    if (this._permalink) {
+      this.path = this._permalink
+    }
+  }
+
+  _enhance (enhancers) {
     for (const { name: pluginName, value: enhancer } of enhancers) {
-      let response
       try {
-        response = enhancer(this)
+        enhancer(this)
       } catch (error) {
+        console.log(error)
         throw new Error(`[${pluginName}] excuete extendPageData failed.`)
       }
-      if (isPlainObject(response)) {
-        Object.keys(response).forEach(key => {
-          if (!this[key]) {
-            this[key] = response[key]
-          }
-        })
-      }
-    }
-
-    this._permalink = getPermalink({
-      pattern: this.frontmatter.permalink || this._permalinkPattern,
-      slug: this.slug,
-      date: this.frontmatter.date,
-      localePath: this._localePath,
-      regularPath: this.regularPath
-    })
-
-    if (this._permalink) {
-      this.path = this._permalink
     }
   }
 
   get filename () {
-    return path.parse(this._filePath).name
+    return path.parse(this._filePath || this.regularPath).name
   }
 
   get slug () {
diff --git a/packages/@vuepress/plugin-i18n-ui/index.js b/packages/@vuepress/plugin-i18n-ui/index.js
index 34f15e6442..318c535ae9 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.js
+++ b/packages/@vuepress/plugin-i18n-ui/index.js
@@ -12,9 +12,8 @@ module.exports = (pluginOptions = {}, context) => ({
 
   additionalPages: [
     {
-      override: false,
-      permalink: pluginOptions.route || '/i18n/',
-      path: path.resolve(__dirname, 'index.md')
+      filePath: path.resolve(__dirname, 'index.md'),
+      permalink: pluginOptions.permalink || '/i18n/'
     }
   ]
 })

From 357e1a56c1eccea3ee9d5f53eda852f41369decb Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:05:54 +0800
Subject: [PATCH 189/242] feat($core): detaMixin - expose $themeConfig

---
 packages/@vuepress/core/lib/prepare/I18n.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/@vuepress/core/lib/prepare/I18n.js b/packages/@vuepress/core/lib/prepare/I18n.js
index ff57b0e5f1..3606337897 100644
--- a/packages/@vuepress/core/lib/prepare/I18n.js
+++ b/packages/@vuepress/core/lib/prepare/I18n.js
@@ -34,6 +34,10 @@ module.exports = (store /* null in server side */) => class I18n {
     return store.siteData
   }
 
+  get $themeConfig () {
+    return this.$site.themeConfig
+  }
+
   get $localeConfig () {
     const { locales = {}} = this.$site
     let targetLang

From 4e340fc72ac72938c4ae2d6beb682beffc3244bb Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:06:25 +0800
Subject: [PATCH 190/242] feat: init @vuepress/plugin-pagination

---
 .../@vuepress/plugin-pagination/.npmignore    |  2 +
 .../@vuepress/plugin-pagination/README.md     |  4 +
 .../@vuepress/plugin-pagination/enhanceApp.js | 78 +++++++++++++++++++
 packages/@vuepress/plugin-pagination/index.js | 72 +++++++++++++++++
 .../@vuepress/plugin-pagination/package.json  | 25 ++++++
 5 files changed, 181 insertions(+)
 create mode 100644 packages/@vuepress/plugin-pagination/.npmignore
 create mode 100644 packages/@vuepress/plugin-pagination/README.md
 create mode 100644 packages/@vuepress/plugin-pagination/enhanceApp.js
 create mode 100644 packages/@vuepress/plugin-pagination/index.js
 create mode 100644 packages/@vuepress/plugin-pagination/package.json

diff --git a/packages/@vuepress/plugin-pagination/.npmignore b/packages/@vuepress/plugin-pagination/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-pagination/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-pagination/README.md b/packages/@vuepress/plugin-pagination/README.md
new file mode 100644
index 0000000000..a4eabe695e
--- /dev/null
+++ b/packages/@vuepress/plugin-pagination/README.md
@@ -0,0 +1,4 @@
+# @vuepress/plugin-pagination
+
+> pagination plugin for vuepress
+
diff --git a/packages/@vuepress/plugin-pagination/enhanceApp.js b/packages/@vuepress/plugin-pagination/enhanceApp.js
new file mode 100644
index 0000000000..f5b9af305a
--- /dev/null
+++ b/packages/@vuepress/plugin-pagination/enhanceApp.js
@@ -0,0 +1,78 @@
+import paginationMeta from '@dynamic/pagination'
+
+class Pagination {
+  constructor (pagination, { pages, route }) {
+    let { postsFilter, postsSorter } = pagination
+
+    /* eslint-disable no-eval */
+    postsFilter = eval(postsFilter)
+    postsSorter = eval(postsSorter)
+
+    const { path } = route
+    const { paginationPages } = pagination
+
+    paginationPages.forEach((page, index) => {
+      if (page.path === path) {
+        this.paginationIndex = index
+      }
+    })
+
+    if (!this.paginationIndex) {
+      this.paginationIndex = 0
+    }
+
+    this._paginationPages = paginationPages
+    this._currentPage = paginationPages[this.paginationIndex]
+    this._posts = pages.filter(postsFilter).sort(postsSorter)
+
+    console.log(this)
+  }
+
+  get length () {
+    return this._paginationPages.length
+  }
+
+  get posts () {
+    const [start, end] = this._currentPage.interval
+    return this._posts.slice(start, end)
+  }
+
+  get hasPrev () {
+    return this.paginationIndex !== 0
+  }
+
+  get prevLink () {
+    if (this.hasPrev) {
+      return this._paginationPages[this.paginationIndex - 1].path
+    }
+  }
+
+  get hasNext () {
+    return this.paginationIndex !== this.length - 1
+  }
+
+  get nextLink () {
+    if (this.hasNext) {
+      return this._paginationPages[this.paginationIndex + 1].path
+    }
+  }
+}
+
+export default ({
+  Vue,     // the version of Vue being used in the VuePress app
+  options, // the options for the root Vue instance
+  router,  // the router instance for the app
+  siteData // site metadata
+}) => {
+  Vue.mixin({
+    computed: {
+      $pagination () {
+        const { pages } = this.$site
+        const pagination = new Pagination(paginationMeta, {
+          pages, route: this.$route
+        })
+        return pagination
+      }
+    }
+  })
+}
diff --git a/packages/@vuepress/plugin-pagination/index.js b/packages/@vuepress/plugin-pagination/index.js
new file mode 100644
index 0000000000..3e7f882630
--- /dev/null
+++ b/packages/@vuepress/plugin-pagination/index.js
@@ -0,0 +1,72 @@
+const path = require('path')
+
+function getIntervallers (max, interval) {
+  const count = Math.floor(max / interval)
+  const arr = [...Array(count + 1)]
+  return arr.map((v, index) => {
+    const start = index * interval
+    const end = (index + 1) * interval - 1
+    return [start, end > max ? max : end]
+  })
+}
+
+function withBase (base, path) {
+  if (path.charAt(0) === '/') {
+    return base + path.slice(1)
+  } else {
+    return path
+  }
+}
+
+module.exports = (options, ctx) => ({
+  enhanceAppFiles: [
+    path.resolve(__dirname, 'enhanceApp.js')
+  ],
+
+  ready () {
+    let { postsFilter, postsSorter } = options
+    postsFilter = postsFilter || (({ type }) => type === 'post')
+    postsSorter = postsSorter || ((prev, next) => {
+      const prevTime = new Date(prev.frontmatter.date).getTime()
+      const nextTime = new Date(next.frontmatter.date).getTime()
+      return prevTime - nextTime > 0 ? -1 : 1
+    })
+
+    const { pages, base } = ctx
+    const posts = pages.filter(postsFilter)
+    const {
+      perPagePosts = 10,
+      paginationDir = 'page',
+      firstPagePath = '/',
+      layout = 'Layout'
+    } = options
+
+    const normalizedfirstPagePath = withBase(base, firstPagePath)
+    const intervallers = getIntervallers(posts.length, perPagePosts)
+    const pagination = {
+      paginationPages: intervallers.map((interval, index) => {
+        const path = index === 0
+          ? normalizedfirstPagePath
+          : `/${paginationDir}/${index + 1}/`
+        return { path, interval }
+      }),
+      postsFilter: postsFilter.toString(),
+      postsSorter: postsSorter.toString()
+    }
+
+    ctx.pagination = pagination
+    pagination.paginationPages.forEach(({ path }) => {
+      ctx.addPage({
+        permalink: path,
+        frontmatter: { layout }
+      })
+    })
+  },
+
+  async clientDynamicModules () {
+    return {
+      name: 'pagination.js',
+      content: `export default ${JSON.stringify(ctx.pagination, null, 2)}`
+    }
+  }
+})
diff --git a/packages/@vuepress/plugin-pagination/package.json b/packages/@vuepress/plugin-pagination/package.json
new file mode 100644
index 0000000000..926150129f
--- /dev/null
+++ b/packages/@vuepress/plugin-pagination/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-pagination",
+  "version": "1.0.0",
+  "description": "pagination plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-pagination#readme"
+}
\ No newline at end of file

From 4492bcd4e2edef29c60b4e5ca6ee90a676a72314 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:35:56 +0800
Subject: [PATCH 191/242] feat: @vuepress/plugin-medium-zoom

---
 .../@vuepress/plugin-medium-zoom/.npmignore   |  2 ++
 .../@vuepress/plugin-medium-zoom/README.md    |  3 ++
 .../@vuepress/plugin-medium-zoom/index.js     |  5 ++++
 .../@vuepress/plugin-medium-zoom/mixin.js     | 10 +++++++
 .../@vuepress/plugin-medium-zoom/package.json | 28 +++++++++++++++++++
 .../@vuepress/plugin-medium-zoom/style.css    |  7 +++++
 6 files changed, 55 insertions(+)
 create mode 100644 packages/@vuepress/plugin-medium-zoom/.npmignore
 create mode 100644 packages/@vuepress/plugin-medium-zoom/README.md
 create mode 100644 packages/@vuepress/plugin-medium-zoom/index.js
 create mode 100644 packages/@vuepress/plugin-medium-zoom/mixin.js
 create mode 100644 packages/@vuepress/plugin-medium-zoom/package.json
 create mode 100644 packages/@vuepress/plugin-medium-zoom/style.css

diff --git a/packages/@vuepress/plugin-medium-zoom/.npmignore b/packages/@vuepress/plugin-medium-zoom/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-medium-zoom/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-medium-zoom/README.md b/packages/@vuepress/plugin-medium-zoom/README.md
new file mode 100644
index 0000000000..89e7bf7a23
--- /dev/null
+++ b/packages/@vuepress/plugin-medium-zoom/README.md
@@ -0,0 +1,3 @@
+# @vuepress/plugin-medium-zoom
+
+> medium-zoom plugin for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-medium-zoom/index.js b/packages/@vuepress/plugin-medium-zoom/index.js
new file mode 100644
index 0000000000..7831662368
--- /dev/null
+++ b/packages/@vuepress/plugin-medium-zoom/index.js
@@ -0,0 +1,5 @@
+const path = require('path')
+
+module.exports = {
+  clientRootMixin: path.resolve(__dirname, 'mixin.js')
+}
diff --git a/packages/@vuepress/plugin-medium-zoom/mixin.js b/packages/@vuepress/plugin-medium-zoom/mixin.js
new file mode 100644
index 0000000000..24369a681c
--- /dev/null
+++ b/packages/@vuepress/plugin-medium-zoom/mixin.js
@@ -0,0 +1,10 @@
+import './style.css'
+import zoom from 'medium-zoom'
+
+export default {
+  mounted () {
+    setTimeout(() => {
+      zoom('.content img')
+    }, 1000)
+  }
+}
diff --git a/packages/@vuepress/plugin-medium-zoom/package.json b/packages/@vuepress/plugin-medium-zoom/package.json
new file mode 100644
index 0000000000..2c28d99bf8
--- /dev/null
+++ b/packages/@vuepress/plugin-medium-zoom/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@vuepress/plugin-medium-zoom",
+  "version": "1.0.0",
+  "description": "medium-zoom plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "medium-zoom": "^0.4.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-medium-zoom#readme"
+}
diff --git a/packages/@vuepress/plugin-medium-zoom/style.css b/packages/@vuepress/plugin-medium-zoom/style.css
new file mode 100644
index 0000000000..50437531a8
--- /dev/null
+++ b/packages/@vuepress/plugin-medium-zoom/style.css
@@ -0,0 +1,7 @@
+.medium-zoom-overlay {
+  z-index: 100;
+}
+
+.medium-zoom-overlay ~ img {
+  z-index: 101;
+}

From 070fab7ce454cb0a50dd42cbaf62f97a130aa7d7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:37:03 +0800
Subject: [PATCH 192/242] chore: clean legacy  code

---
 .../plugin-active-header-links/index.js       |  5 ++---
 packages/@vuepress/plugin-i18n-ui/index.vue   | 20 ++-----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/packages/@vuepress/plugin-active-header-links/index.js b/packages/@vuepress/plugin-active-header-links/index.js
index 654654e1a4..7831662368 100644
--- a/packages/@vuepress/plugin-active-header-links/index.js
+++ b/packages/@vuepress/plugin-active-header-links/index.js
@@ -1,6 +1,5 @@
 const path = require('path')
 
-module.exports = (options, context) => ({
-  enable: context.isDev,
+module.exports = {
   clientRootMixin: path.resolve(__dirname, 'mixin.js')
-})
+}
diff --git a/packages/@vuepress/plugin-i18n-ui/index.vue b/packages/@vuepress/plugin-i18n-ui/index.vue
index 95008844f3..a9a2769e38 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.vue
+++ b/packages/@vuepress/plugin-i18n-ui/index.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { findPageForPath, registerComponent } from '@app/util'
+import { findPageForPath } from '@app/util'
 
 export default {
   data () {
@@ -95,25 +95,9 @@ export default {
   methods: {
     handlePageChange (e) {
       this.currentPagePath = e.target.value
-    },
-
-    loadComponent (key, flag) {
-      this[flag] = null
-      registerComponent(key).then(() => {
-        this[flag] = true
-      })
-    }
-  },
-
-  watch: {
-    key (newValue) {
-      this.loadComponent(newValue, 'currentPageComponent')
-    },
-
-    rightKey (newValue) {
-      this.loadComponent(newValue, 'rightPageComponent')
     }
   }
+
 }
 
 function syncScroll () {

From 6550f8681f12ac9b0528d6cb7ac23e0cd8529b9c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 9 Sep 2018 05:37:50 +0800
Subject: [PATCH 193/242] fix($core): regression of changing inferTitle util

---
 packages/@vuepress/core/lib/webpack/markdownLoader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/webpack/markdownLoader.js b/packages/@vuepress/core/lib/webpack/markdownLoader.js
index 1e97475eae..126c16d826 100644
--- a/packages/@vuepress/core/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/core/lib/webpack/markdownLoader.js
@@ -29,7 +29,7 @@ module.exports = function (src) {
   const content = frontmatter.content
 
   if (!isProd && !isServer) {
-    const inferredTitle = inferTitle(frontmatter)
+    const inferredTitle = inferTitle(frontmatter.data, frontmatter.content)
     const headers = extractHeaders(content, ['h2', 'h3'], markdown)
     delete frontmatter.content
 

From feb74ebe666cca4f0e7a1eb122f8a94c3282d984 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 10 Sep 2018 00:25:50 +0800
Subject: [PATCH 194/242] fix($core): SSR error when async components were 
 registered in runtime.

---
 .../core/lib/app/components/Content.js        |  8 +++++-
 .../@vuepress/core/lib/app/serverEntry.js     | 26 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/components/Content.js b/packages/@vuepress/core/lib/app/components/Content.js
index cfc4ba4cbd..c034a47178 100644
--- a/packages/@vuepress/core/lib/app/components/Content.js
+++ b/packages/@vuepress/core/lib/app/components/Content.js
@@ -15,8 +15,14 @@ export default {
 
   render (h, { parent, props, data }) {
     const pageKey = props.pageKey || parent.$page.key
+
     if (components[pageKey]) {
-      Vue.component(pageKey, components[pageKey])
+      // In SSR, if a component is not registered with the component option
+      // vue-server-renderer will not be able to resovle it.
+      if (!parent.$ssrContext) {
+        Vue.component(pageKey, components[pageKey])
+      }
+
       return h(pageKey, {
         class: [props.custom ? 'custom' : '', data.class, data.staticClass],
         style: data.style,
diff --git a/packages/@vuepress/core/lib/app/serverEntry.js b/packages/@vuepress/core/lib/app/serverEntry.js
index defcb9e66e..f046404666 100644
--- a/packages/@vuepress/core/lib/app/serverEntry.js
+++ b/packages/@vuepress/core/lib/app/serverEntry.js
@@ -1,4 +1,7 @@
+import Vue from 'vue'
 import { createApp } from './app'
+import pageComponents from '@internal/page-components'
+import layoutComponents from '@internal/layout-components'
 
 export default context => new Promise((resolve, reject) => {
   const { app, router } = createApp(true /* isServer */)
@@ -10,5 +13,26 @@ export default context => new Promise((resolve, reject) => {
   }
 
   router.push(url)
-  router.onReady(() => resolve(app))
+
+  // In SSR, if a component is not registered with the component option,
+  // vue-server-renderer will not able to resolve it.
+  //
+  // Build also works after deleting this, but the content of all pages
+  // will not appear to the output html, which is not conducive to SEO.
+  const asyncComponentLoadingPromises = [
+    ...getComponentArr(pageComponents),
+    ...getComponentArr(layoutComponents)
+  ].map(({ name, loadFn }) => {
+    return loadFn.then(comp => {
+      Vue.component(name, comp.default)
+    })
+  })
+
+  router.onReady(() => {
+    Promise.all(asyncComponentLoadingPromises).then(() => resolve(app))
+  })
 })
+
+function getComponentArr (components) {
+  return Object.keys(components).map(name => ({ name, loadFn: components[name] }))
+}

From 42e36ed592552a6b8d91defd0598fba7802232f7 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 14:45:29 +0800
Subject: [PATCH 195/242] chore: gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f4b33ee9e6..00154128fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 .temp
 TODOs.md
 packages/docs/vuepress/
+packages/blog-example

From 922bf1344b8094729cbe0b0902592a38faebcf82 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 14:46:02 +0800
Subject: [PATCH 196/242] fix: build error

---
 packages/@vuepress/core/lib/app/serverEntry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/app/serverEntry.js b/packages/@vuepress/core/lib/app/serverEntry.js
index f046404666..84c707b354 100644
--- a/packages/@vuepress/core/lib/app/serverEntry.js
+++ b/packages/@vuepress/core/lib/app/serverEntry.js
@@ -23,7 +23,7 @@ export default context => new Promise((resolve, reject) => {
     ...getComponentArr(pageComponents),
     ...getComponentArr(layoutComponents)
   ].map(({ name, loadFn }) => {
-    return loadFn.then(comp => {
+    return loadFn().then(comp => {
       Vue.component(name, comp.default)
     })
   })

From e2b6be835ebec3b6fc19436f0c1cf7974bfb1e33 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 14:47:22 +0800
Subject: [PATCH 197/242] fix($core): themePath should default to modulePath

---
 packages/@vuepress/core/lib/prepare/loadTheme.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
index 36a81d249b..834cee254e 100644
--- a/packages/@vuepress/core/lib/prepare/loadTheme.js
+++ b/packages/@vuepress/core/lib/prepare/loadTheme.js
@@ -27,6 +27,8 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
     const { module: modulePath, name, shortcut } = resolveTheme(theme, sourceDir)
     if (modulePath.endsWith('.js') || modulePath.endsWith('.vue')) {
       themePath = path.parse(modulePath).dir
+    } else {
+      themePath = modulePath
     }
     themeName = name
     themeShortcut = shortcut

From 93f169a113c0c748ba8a9eec6b4d95e05d941cb8 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 14:48:38 +0800
Subject: [PATCH 198/242] fix($pagination): do not need to withBase & do not
 generate root html

---
 packages/@vuepress/plugin-pagination/index.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/@vuepress/plugin-pagination/index.js b/packages/@vuepress/plugin-pagination/index.js
index 3e7f882630..80a5e99f31 100644
--- a/packages/@vuepress/plugin-pagination/index.js
+++ b/packages/@vuepress/plugin-pagination/index.js
@@ -10,14 +10,6 @@ function getIntervallers (max, interval) {
   })
 }
 
-function withBase (base, path) {
-  if (path.charAt(0) === '/') {
-    return base + path.slice(1)
-  } else {
-    return path
-  }
-}
-
 module.exports = (options, ctx) => ({
   enhanceAppFiles: [
     path.resolve(__dirname, 'enhanceApp.js')
@@ -32,7 +24,7 @@ module.exports = (options, ctx) => ({
       return prevTime - nextTime > 0 ? -1 : 1
     })
 
-    const { pages, base } = ctx
+    const { pages } = ctx
     const posts = pages.filter(postsFilter)
     const {
       perPagePosts = 10,
@@ -41,12 +33,11 @@ module.exports = (options, ctx) => ({
       layout = 'Layout'
     } = options
 
-    const normalizedfirstPagePath = withBase(base, firstPagePath)
     const intervallers = getIntervallers(posts.length, perPagePosts)
     const pagination = {
       paginationPages: intervallers.map((interval, index) => {
         const path = index === 0
-          ? normalizedfirstPagePath
+          ? firstPagePath
           : `/${paginationDir}/${index + 1}/`
         return { path, interval }
       }),
@@ -56,6 +47,9 @@ module.exports = (options, ctx) => ({
 
     ctx.pagination = pagination
     pagination.paginationPages.forEach(({ path }) => {
+      if (path === '/') {
+        return
+      }
       ctx.addPage({
         permalink: path,
         frontmatter: { layout }

From 24840cd7861c1a3e081ab2f5eda29e4d56395e9b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 14:50:22 +0800
Subject: [PATCH 199/242] feat($shared-utils): support pass in an absolute path
 for theme

---
 .../shared-utils/lib/shortcutPackageResolver.js   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
index 93d34afd62..10fa482b18 100644
--- a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
+++ b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
@@ -1,3 +1,6 @@
+const fs = require('fs')
+const path = require('path')
+const chalk = require('chalk')
 const { isDebug } = require('./env')
 const { resolveModule, loadModule } = require('./module')
 const {
@@ -35,12 +38,20 @@ function shortcutPackageResolver (
     if (!valid) {
       throw new Error(`Invalid value for "${type}": ${warnMsg}`)
     }
-
     if (!isString(req)) {
       _module = req
       name = shortcut = req.name || `anonymous-${++anonymousPluginIdx}`
       isLocal = true
+    } else if (fs.existsSync(req)) {
+      // local package.
+      const dirname = path.parse(req).name
+      shortcut = dirname.startsWith(NON_SCOPE_PREFIX)
+        ? dirname.slice(FULL_PREFIX_SLICE_LENGTH)
+        : dirname
+      name = `${NON_SCOPE_PREFIX}${shortcut}`
+      _module = load ? require(req) : req
     } else {
+      // dep package.
       try {
         shortcut = req.startsWith(NON_SCOPE_PREFIX)
           ? req.slice(FULL_PREFIX_SLICE_LENGTH)
@@ -66,7 +77,7 @@ function shortcutPackageResolver (
             shortcut = `@${pkg.org}/${shortcut}`
             _module = load ? loadModule(name, cwd) : resolveModule(name, cwd)
           } else {
-            throw new Error(`Invalid ${type} usage ${req}.`)
+            throw new Error(`Invalid ${type} usage "${chalk.cyan(req)}".`)
           }
         } catch (err2) {
           if (isDebug) {

From ea640337e9841b08c5fff4fe3dea5bd02e81d788 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 16:42:13 +0800
Subject: [PATCH 200/242] chore: expose the dist directory to workspace root

---
 .gitignore                             | 2 +-
 packages/docs/docs/.vuepress/config.js | 5 +++--
 packages/docs/package.json             | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00154128fa..2761c32ce8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@ node_modules
 *.log
 .temp
 TODOs.md
-packages/docs/vuepress/
+vuepress
 packages/blog-example
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index e150af86a0..346ff55bc2 100644
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  dest: 'vuepress',
+  dest: '../../vuepress',
   locales: {
     '/': {
       lang: 'en-US',
@@ -103,7 +103,8 @@ module.exports = {
     '@vuepress/pwa': {
       serviceWorker: true,
       updatePopup: true
-    }
+    },
+    '@vuepress/plugin-medium-zoom': true
   }
 }
 
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 87f280350d..8922bbb461 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -25,6 +25,7 @@
     "vuepress": "^1.0.0",
     "@vuepress/plugin-back-to-top": "^1.0.0",
     "@vuepress/plugin-pwa": "^1.0.0",
-    "@vuepress/plugin-i18n-ui": "^1.0.0"
+    "@vuepress/plugin-i18n-ui": "^1.0.0",
+    "@vuepress/plugin-medium-zoom": "^1.0.0"
   }
 }

From eff7949356b95848ae33e318b86e90ac62821ab4 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 17:22:56 +0800
Subject: [PATCH 201/242] feat($core): enhanceAppFile doesn't need export
 default manually.

---
 .../option/EnhanceAppFilesOption.js           | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
index 3fc8e218db..4e3a88408d 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
@@ -3,7 +3,8 @@ const {
   fs,
   chalk,
   logger,
-  codegen: { pathsToModuleCode }
+  codegen: { pathsToModuleCode },
+  datatypes: { isPlainObject }
 } = require('@vuepress/shared-utils')
 
 module.exports = class EnhanceAppFilesOption extends Option {
@@ -36,30 +37,55 @@ module.exports = class EnhanceAppFilesOption extends Option {
     const manifest = []
     let moduleId = 0
 
+    async function writeEnhancer (name, content, hasDefaultExport = true) {
+      return await context.writeTemp(
+        `app-enhancers/${name}.js`,
+        hasDefaultExport
+          ? content
+          : content + '\nexport default {}'
+      )
+    }
+
     // 1. write enhance app files.
-    for (const { value: filePath, name: pluginName } of this.items) {
+    for (const { value: enhanceAppFile, name: pluginName } of this.items) {
       let destPath
 
-      if (typeof filePath === 'object') {
-        const { name, content } = filePath
-        if (content.includes('export default') || content.includes('module.exports')) {
-          destPath = await context.writeTemp(`app-enhancers/${name}`, content)
+      // 1.1 dynamic code
+      if (isPlainObject(enhanceAppFile)) {
+        const { content } = enhanceAppFile
+        let { name } = enhanceAppFile
+        name = name.replace(/.js$/, '')
+
+        if (hasDefaultExport(content)) {
+          destPath = await writeEnhancer(name, content)
         } else {
-          destPath = await context.writeTemp(`app-enhancers/${name}`, content + '\nexport default {}')
+          destPath = await writeEnhancer(name, content, false /* do not contain default export*/)
         }
+        // 1.2 local file
       } else {
-        if (fs.existsSync(filePath)) {
-          destPath = await context.writeTemp(
-            `app-enhancers/enhancer-${moduleId++}.js`,
-            `export { default } from ${JSON.stringify(filePath)}`
-          )
+        if (fs.existsSync(enhanceAppFile)) {
+          const content = await fs.readFile(enhanceAppFile, 'utf-8')
+
+          if (hasDefaultExport(content)) {
+            destPath = await writeEnhancer(
+              moduleId++,
+              `export { default } from ${JSON.stringify(enhanceAppFile)}`
+            )
+          } else {
+            destPath = await writeEnhancer(
+              moduleId++,
+              `import ${JSON.stringify(enhanceAppFile)}`,
+              false /* do not contain default export*/
+            )
+          }
         } else {
           logger.debug(
             chalk.gray(`[${pluginName}] `) +
-            `${chalk.cyan(filePath)} Not Found.`
+            `${chalk.cyan(enhanceAppFile)} Not Found.`
           )
         }
       }
+
       if (destPath) {
         manifest.push(destPath)
       }
@@ -69,3 +95,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
     await context.writeTemp('internal/app-enhancers.js', pathsToModuleCode(manifest))
   }
 }
+
+function hasDefaultExport (content) {
+  return content.includes('export default') || content.includes('module.exports')
+}

From 38b3468119fab1981c69b62354451700c9482efa Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 16 Sep 2018 23:23:04 +0800
Subject: [PATCH 202/242] feat($core): config the dev and ssr template. (close:
 #733)

---
 packages/@vuepress/core/lib/build.js          |  3 ++-
 packages/@vuepress/core/lib/dev.js            |  2 +-
 .../@vuepress/core/lib/prepare/AppContext.js  | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 86889b2c25..1e03decbf1 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -25,6 +25,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     return console.error(logger.error(chalk.red('Unexpected option: outDir cannot be set to the current working directory.\n'), false))
   }
   await fs.remove(outDir)
+  logger.debug('Dist directory: ' + chalk.gray(path.resolve(outDir)))
 
   let clientConfig = createClientConfig(options, cliOptions).toConfig()
   let serverConfig = createServerConfig(options, cliOptions).toConfig()
@@ -56,7 +57,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     runInNewContext: false,
     inject: false,
     shouldPrefetch: options.siteConfig.shouldPrefetch || (() => true),
-    template: await fs.readFile(path.resolve(__dirname, 'app/index.ssr.html'), 'utf-8')
+    template: await fs.readFile(options.ssrTemplate, 'utf-8')
   })
 
   // pre-render head tags from user config
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index 63c39827ff..b6a586e97c 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -65,7 +65,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
     // using a fork of html-webpack-plugin to avoid it requiring webpack
     // internals from an incompatible version.
     .use(require('vuepress-html-webpack-plugin'), [{
-      template: path.resolve(__dirname, 'app/index.dev.html')
+      template: options.devTemplate
     }])
 
   config
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 271a3bd74a..89dad726b5 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -48,6 +48,7 @@ module.exports = class AppContext {
    */
   async process () {
     this.normalizeHeadTagUrls()
+    this.resolveTemplates()
     await this.resolveTheme()
     this.resolvePlugins()
 
@@ -124,6 +125,30 @@ module.exports = class AppContext {
     }
   }
 
+  /**
+   * Make template configurable
+   */
+  resolveTemplates () {
+    let { ssrTemplate, devTemplate } = this.siteConfig
+    const templateDir = path.resolve(this.vuepressDir, 'templates')
+    if (!devTemplate) {
+      devTemplate = path.resolve(templateDir, 'dev.html')
+      if (!fs.existsSync(devTemplate)) {
+        devTemplate = path.resolve(__dirname, '../app/index.dev.html')
+      }
+    }
+    if (!ssrTemplate) {
+      ssrTemplate = path.resolve(templateDir, 'ssr.html')
+      if (!fs.existsSync(ssrTemplate)) {
+        ssrTemplate = path.resolve(__dirname, '../app/index.ssr.html')
+      }
+    }
+    logger.debug('SSR Template File: ' + chalk.gray(ssrTemplate))
+    logger.debug('DEV Template File: ' + chalk.gray(devTemplate))
+    this.devTemplate = devTemplate
+    this.ssrTemplate = ssrTemplate
+  }
+
   /**
    * Find all page source files located in sourceDir
    * @returns {Promise<void>}

From 2a4617814e6ab657f1eaa2fc10217edd3cd8ff3c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 17 Sep 2018 00:19:41 +0800
Subject: [PATCH 203/242] feat($cli): support '--cache' and '--no-cache' flag

---
 packages/@vuepress/cli/index.js               | 12 +++++++----
 packages/@vuepress/core/lib/build.js          |  3 +--
 packages/@vuepress/core/lib/dev.js            |  7 +++----
 .../@vuepress/core/lib/prepare/AppContext.js  | 12 +++++------
 packages/@vuepress/core/lib/prepare/index.js  |  9 ++------
 .../core/lib/webpack/createBaseConfig.js      | 21 ++++++++++++++++---
 .../core/lib/webpack/createClientConfig.js    | 12 +++++------
 .../core/lib/webpack/createServerConfig.js    | 14 ++++++-------
 8 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/packages/@vuepress/cli/index.js b/packages/@vuepress/cli/index.js
index 6c60a1f389..9c846e4858 100644
--- a/packages/@vuepress/cli/index.js
+++ b/packages/@vuepress/cli/index.js
@@ -43,9 +43,11 @@ exports.bootstrap = function ({
     .option('-p, --port <port>', 'use specified port (default: 8080)')
     .option('-h, --host <host>', 'use specified host (default: 0.0.0.0)')
     .option('-t, --temp <temp>', 'set the directory of the temporary file')
+    .option('-c, --cache <cache>', 'set the directory of cache')
+    .option('--no-cache', 'clean the cache before build')
     .option('--debug', 'start development server in debug mode')
-    .action((dir = '.', { host, port, debug, temp }) => {
-      wrapCommand(dev)(path.resolve(dir), { host, port, debug, plugins, theme, temp })
+    .action((dir = '.', { host, port, debug, temp, cache }) => {
+      wrapCommand(dev)(path.resolve(dir), { host, port, debug, temp, cache, plugins, theme })
     })
 
   program
@@ -53,10 +55,12 @@ exports.bootstrap = function ({
     .description('build dir as static site')
     .option('-d, --dest <outDir>', 'specify build output dir (default: .vuepress/dist)')
     .option('-t, --temp <temp>', 'set the directory of the temporary file')
+    .option('-c, --cache <cache>', 'set the directory of cache')
+    .option('--no-cache', 'clean the cache before build')
     .option('--debug', 'build in development mode for debugging')
-    .action((dir = '.', { debug, dest, temp }) => {
+    .action((dir = '.', { debug, dest, temp, cache }) => {
       const outDir = dest ? path.resolve(dest) : null
-      wrapCommand(build)(path.resolve(dir), { debug, outDir, plugins, theme, temp })
+      wrapCommand(build)(path.resolve(dir), { debug, outDir, plugins, theme, temp, cache })
     })
 
   program
diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 1e03decbf1..402e7fec66 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -14,8 +14,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util/index')
 
   logger.wait('\nExtracting site metadata...')
-  const { theme, plugins, temp } = cliOptions
-  const options = await prepare(sourceDir, { theme, plugins, temp, isProd: true })
+  const options = await prepare(sourceDir, cliOptions, true /* isProd */)
   if (cliOptions.outDir) {
     options.outDir = cliOptions.outDir
   }
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index b6a586e97c..d7606e1331 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -18,13 +18,12 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
   logger.wait('\nExtracting site metadata...')
-  const { theme, plugins, temp } = cliOptions
-  const options = await prepare(sourceDir, { theme, plugins, temp, isProd: false })
+  const options = await prepare(sourceDir, cliOptions, false /* isProd */)
 
   // setup watchers to update options and dynamically generated files
   const update = () => {
     options.pluginAPI.options.updated.syncApply()
-    prepare(sourceDir, { theme, plugins, temp, isProd: false }).catch(err => {
+    prepare(sourceDir, cliOptions, false /* isProd */).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
   }
@@ -58,7 +57,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   frontmatterEmitter.on('update', update)
 
   // resolve webpack config
-  let config = createClientConfig(options, cliOptions)
+  let config = createClientConfig(options)
 
   config
     .plugin('html')
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 89dad726b5..c7704e9e34 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -19,12 +19,12 @@ module.exports = class AppContext {
    *  temp: string
    * }} options
    */
-  constructor (sourceDir, options) {
+  constructor (sourceDir, cliOptions = {}, isProd) {
     this.sourceDir = sourceDir
-    this._options = options
-    this.isProd = options.isProd
+    this.cliOptions = cliOptions
+    this.isProd = isProd
 
-    const { tempPath, writeTemp } = createTemp(options.temp)
+    const { tempPath, writeTemp } = createTemp(cliOptions.temp)
     this.tempPath = tempPath
     this.writeTemp = writeTemp
 
@@ -90,7 +90,7 @@ module.exports = class AppContext {
       .use(require('../internal-plugins/layoutComponents'))
       .use(require('../internal-plugins/pageComponents'))
       // user plugin
-      .useByPluginsConfig(this._options.plugins)
+      .useByPluginsConfig(this.cliOptions.plugins)
       .useByPluginsConfig(this.siteConfig.plugins)
       .useByPluginsConfig(this.themePlugins)
       // built-in plugins
@@ -192,7 +192,7 @@ module.exports = class AppContext {
    * @returns { Promise<void> }
    */
   async resolveTheme () {
-    const theme = this.siteConfig.theme || this._options.theme
+    const theme = this.siteConfig.theme || this.cliOptions.theme
     Object.assign(this, (await loadTheme(theme, this.sourceDir, this.vuepressDir)))
   }
 
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 3fc0901c49..73bfa46905 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,12 +1,7 @@
 const AppContext = require('./AppContext')
 
-module.exports = async function prepare (sourceDir, {
-  isProd,
-  plugins,
-  theme,
-  temp
-}) {
-  const appContext = new AppContext(sourceDir, { plugins, theme, isProd, temp })
+module.exports = async function prepare (sourceDir, cliOptions, isProd) {
+  const appContext = new AppContext(sourceDir, cliOptions, isProd)
   await appContext.process()
   return appContext
 }
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 11da5046d1..4a445d6520 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -1,4 +1,5 @@
 const path = require('path')
+const { fs, logger, chalk } = require('@vuepress/shared-utils')
 
 module.exports = function createBaseConfig ({
   siteConfig,
@@ -7,8 +8,12 @@ module.exports = function createBaseConfig ({
   base: publicPath,
   themePath,
   markdown,
-  tempPath
-}, { debug } = {}, isServer) {
+  tempPath,
+  cliOptions: {
+    debug,
+    cache
+  }
+}, isServer) {
   const Config = require('webpack-chain')
   const { VueLoaderPlugin } = require('vue-loader')
   const CSSExtractPlugin = require('mini-css-extract-plugin')
@@ -61,7 +66,17 @@ module.exports = function createBaseConfig ({
   config.module
     .noParse(/^(vue|vue-router|vuex|vuex-router-sync)$/)
 
-  const cacheDirectory = path.resolve(__dirname, '../../node_modules/.cache/vuepress')
+  let cacheDirectory
+  if (cache && typeof cache === 'string') {
+    cacheDirectory = path.resolve(cache)
+  } else {
+    cacheDirectory = path.resolve(__dirname, '../../node_modules/.cache/vuepress')
+  }
+  logger.debug('Cache directory: ' + chalk.gray(cacheDirectory))
+  if (!cache) {
+    logger.tip('\nClean cache...\n')
+    fs.emptyDirSync(cacheDirectory)
+  }
   const cacheIdentifier = JSON.stringify({
     vuepress: require('../../package.json').version,
     'cache-loader': require('cache-loader').version,
diff --git a/packages/@vuepress/core/lib/webpack/createClientConfig.js b/packages/@vuepress/core/lib/webpack/createClientConfig.js
index 40eafc0ec2..592d29df34 100644
--- a/packages/@vuepress/core/lib/webpack/createClientConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createClientConfig.js
@@ -1,9 +1,9 @@
-module.exports = function createClientConfig (options, cliOptions) {
+module.exports = function createClientConfig (ctx) {
   const path = require('path')
   const WebpackBar = require('webpackbar')
   const createBaseConfig = require('./createBaseConfig')
 
-  const config = createBaseConfig(options, cliOptions)
+  const config = createBaseConfig(ctx)
 
   config
     .entry('app')
@@ -51,7 +51,7 @@ module.exports = function createClientConfig (options, cliOptions) {
       }])
   }
 
-  if (!cliOptions.debug) {
+  if (!ctx.cliOptions.debug) {
     config
       .plugin('bar')
       .use(WebpackBar, [{
@@ -61,11 +61,11 @@ module.exports = function createClientConfig (options, cliOptions) {
       }])
   }
 
-  if (options.siteConfig.chainWebpack) {
-    options.siteConfig.chainWebpack(config, false /* isServer */)
+  if (ctx.siteConfig.chainWebpack) {
+    ctx.siteConfig.chainWebpack(config, false /* isServer */)
   }
 
-  options.pluginAPI.options.chainWebpack.syncApply(config, false /* isServer */)
+  ctx.pluginAPI.options.chainWebpack.syncApply(config, false /* isServer */)
 
   return config
 }
diff --git a/packages/@vuepress/core/lib/webpack/createServerConfig.js b/packages/@vuepress/core/lib/webpack/createServerConfig.js
index 058c79720c..764923d5ac 100644
--- a/packages/@vuepress/core/lib/webpack/createServerConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createServerConfig.js
@@ -1,4 +1,4 @@
-module.exports = function createServerConfig (options, cliOptions) {
+module.exports = function createServerConfig (ctx) {
   const fs = require('fs')
   const path = require('path')
   const WebpackBar = require('webpackbar')
@@ -6,8 +6,8 @@ module.exports = function createServerConfig (options, cliOptions) {
   const VueSSRServerPlugin = require('vue-server-renderer/server-plugin')
   const CopyPlugin = require('copy-webpack-plugin')
 
-  const config = createBaseConfig(options, cliOptions, true /* isServer */)
-  const { sourceDir, outDir } = options
+  const config = createBaseConfig(ctx, true /* isServer */)
+  const { sourceDir, outDir } = ctx
 
   config
     .target('node')
@@ -40,7 +40,7 @@ module.exports = function createServerConfig (options, cliOptions) {
       ]])
   }
 
-  if (!cliOptions.debug) {
+  if (!ctx.cliOptions.debug) {
     config
       .plugin('bar')
       .use(WebpackBar, [{
@@ -50,11 +50,11 @@ module.exports = function createServerConfig (options, cliOptions) {
       }])
   }
 
-  if (options.siteConfig.chainWebpack) {
-    options.siteConfig.chainWebpack(config, true /* isServer */)
+  if (ctx.siteConfig.chainWebpack) {
+    ctx.siteConfig.chainWebpack(config, true /* isServer */)
   }
 
-  options.pluginAPI.options.chainWebpack.syncApply(config, true /* isServer */)
+  ctx.pluginAPI.options.chainWebpack.syncApply(config, true /* isServer */)
 
   return config
 }

From 394d013e48005313bc99a7738ad979f7a7757638 Mon Sep 17 00:00:00 2001
From: Qian <22893252+qianhum@users.noreply.github.com>
Date: Mon, 17 Sep 2018 13:15:18 +0800
Subject: [PATCH 204/242] chore: sunset 'fs.existsSync' (#847)

---
 packages/@vuepress/core/lib/prepare/loadTheme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
index 834cee254e..da958e74d6 100644
--- a/packages/@vuepress/core/lib/prepare/loadTheme.js
+++ b/packages/@vuepress/core/lib/prepare/loadTheme.js
@@ -10,7 +10,7 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
   // resolve theme
   const localThemePath = path.resolve(vuepressDir, 'theme')
   const useLocalTheme =
-    (await fs.exists(localThemePath)) && ((await fs.readdir(localThemePath)).length > 0)
+    fs.existsSync(localThemePath) && (fs.readdirSync(localThemePath)).length > 0
 
   let themePath = null         // Mandatory
   let themeIndexFile = null    // Optional

From 1798603cd24b7b73e41c7563f3cd1b45fc3019c3 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 18 Sep 2018 23:24:52 +0800
Subject: [PATCH 205/242] chore($pagination): reanme enhanceApp to clientPlugin

---
 .../plugin-pagination/{enhanceApp.js => clientPlugin.js} | 9 +--------
 packages/@vuepress/plugin-pagination/index.js            | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)
 rename packages/@vuepress/plugin-pagination/{enhanceApp.js => clientPlugin.js} (86%)

diff --git a/packages/@vuepress/plugin-pagination/enhanceApp.js b/packages/@vuepress/plugin-pagination/clientPlugin.js
similarity index 86%
rename from packages/@vuepress/plugin-pagination/enhanceApp.js
rename to packages/@vuepress/plugin-pagination/clientPlugin.js
index f5b9af305a..f61fcbf7b0 100644
--- a/packages/@vuepress/plugin-pagination/enhanceApp.js
+++ b/packages/@vuepress/plugin-pagination/clientPlugin.js
@@ -24,8 +24,6 @@ class Pagination {
     this._paginationPages = paginationPages
     this._currentPage = paginationPages[this.paginationIndex]
     this._posts = pages.filter(postsFilter).sort(postsSorter)
-
-    console.log(this)
   }
 
   get length () {
@@ -58,12 +56,7 @@ class Pagination {
   }
 }
 
-export default ({
-  Vue,     // the version of Vue being used in the VuePress app
-  options, // the options for the root Vue instance
-  router,  // the router instance for the app
-  siteData // site metadata
-}) => {
+export default ({ Vue }) => {
   Vue.mixin({
     computed: {
       $pagination () {
diff --git a/packages/@vuepress/plugin-pagination/index.js b/packages/@vuepress/plugin-pagination/index.js
index 80a5e99f31..7b9315a445 100644
--- a/packages/@vuepress/plugin-pagination/index.js
+++ b/packages/@vuepress/plugin-pagination/index.js
@@ -12,7 +12,7 @@ function getIntervallers (max, interval) {
 
 module.exports = (options, ctx) => ({
   enhanceAppFiles: [
-    path.resolve(__dirname, 'enhanceApp.js')
+    path.resolve(__dirname, 'clientPlugin.js')
   ],
 
   ready () {

From cb36ae673fce6c6cefa44c6e0a056b73c0ffa3a0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 18 Sep 2018 23:25:59 +0800
Subject: [PATCH 206/242] feat($core): support passing in meta

---
 packages/@vuepress/core/lib/internal-plugins/routes.js | 5 +++--
 packages/@vuepress/core/lib/prepare/Page.js            | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/internal-plugins/routes.js b/packages/@vuepress/core/lib/internal-plugins/routes.js
index d655cb940b..799610f079 100644
--- a/packages/@vuepress/core/lib/internal-plugins/routes.js
+++ b/packages/@vuepress/core/lib/internal-plugins/routes.js
@@ -33,13 +33,14 @@ function routesCode (pages) {
   function genRoute ({
     path: pagePath,
     key: componentName,
-    regularPath
+    regularPath,
+    _meta
   }) {
     let code = `
   {
     name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
-    component: LayoutDistributor,
+    component: LayoutDistributor,${_meta ? `\n    meta: ${JSON.stringify(_meta)}` : ''}
   }`
 
     const dncodedPath = decodeURIComponent(pagePath)
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 8eb5ede819..40fae91041 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -15,6 +15,7 @@ module.exports = class Page {
    */
   constructor ({
     path,
+    meta,
     title,
     content,
     filePath,
@@ -24,6 +25,7 @@ module.exports = class Page {
     permalinkPattern
   }) {
     this.title = title
+    this._meta = meta
     this._filePath = filePath
     this._content = content
     this._permalink = permalink

From 163f8a5439e91ec7b93174de8a430a56bdafcd4e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 19 Sep 2018 00:26:59 +0800
Subject: [PATCH 207/242] feat($blog): support category and tag

---
 packages/@vuepress/core/lib/app/util.js       |  13 ++
 .../@vuepress/plugin-blog/clientPlugin.js     |  63 ++++++
 packages/@vuepress/plugin-blog/index.js       | 209 +++++++++++++-----
 3 files changed, 232 insertions(+), 53 deletions(-)
 create mode 100644 packages/@vuepress/plugin-blog/clientPlugin.js

diff --git a/packages/@vuepress/core/lib/app/util.js b/packages/@vuepress/core/lib/app/util.js
index bedc0d16b8..8b52325409 100644
--- a/packages/@vuepress/core/lib/app/util.js
+++ b/packages/@vuepress/core/lib/app/util.js
@@ -35,6 +35,19 @@ export function findPageForPath (pages, path) {
   }
 }
 
+export function findPageByKey (pages, key) {
+  for (let i = 0; i < pages.length; i++) {
+    const page = pages[i]
+    if (page.key === key) {
+      return page
+    }
+  }
+  return {
+    path: '',
+    frontmatter: {}
+  }
+}
+
 /**
  * Normalize config.
  * This utility is mainly for plugin developers. For some
diff --git a/packages/@vuepress/plugin-blog/clientPlugin.js b/packages/@vuepress/plugin-blog/clientPlugin.js
new file mode 100644
index 0000000000..98b88de794
--- /dev/null
+++ b/packages/@vuepress/plugin-blog/clientPlugin.js
@@ -0,0 +1,63 @@
+import { findPageByKey } from '@app/util'
+import tagMeta from '@dynamic/tag'
+import categoryMeta from '@dynamic/category'
+
+class Classifiable {
+  constructor (metaMap, pages) {
+    this._metaMap = Object.assign({}, metaMap)
+    Object.keys(this._metaMap).forEach(name => {
+      const { pageKeys } = this._metaMap[name]
+      this._metaMap[name].posts = pageKeys.map(key => findPageByKey(pages, key))
+    })
+  }
+
+  get length () {
+    return Object.keys(this._metaMap).length
+  }
+
+  get map () {
+    return this._metaMap
+  }
+
+  get list () {
+    return this.toArray()
+  }
+
+  toArray () {
+    const tags = []
+    Object.keys(this._metaMap).forEach(name => {
+      const { posts, path } = this._metaMap[name]
+      tags.push({ name, posts, path })
+    })
+    return tags
+  }
+
+  getItemByName (name) {
+    return this._metaMap[name]
+  }
+}
+
+export default ({ Vue }) => {
+  Vue.mixin({
+    computed: {
+      $tags () {
+        const { pages } = this.$site
+        const tags = new Classifiable(tagMeta, pages)
+        return tags
+      },
+      $tag () {
+        const tagName = this.$route.meta.tagName
+        return this.$tags.getItemByName(tagName)
+      },
+      $categories () {
+        const { pages } = this.$site
+        const categories = new Classifiable(categoryMeta, pages)
+        return categories
+      },
+      $category () {
+        const categoryName = this.$route.meta.categoryName
+        return this.$categories.getItemByName(categoryName)
+      }
+    }
+  })
+}
diff --git a/packages/@vuepress/plugin-blog/index.js b/packages/@vuepress/plugin-blog/index.js
index dc7de05313..d09ddc6d2b 100644
--- a/packages/@vuepress/plugin-blog/index.js
+++ b/packages/@vuepress/plugin-blog/index.js
@@ -1,60 +1,163 @@
 const path = require('path')
+const { datatypes: { isString }} = require('@vuepress/shared-utils')
 
-module.exports = (options, ctx) => ({
-  extendPageData (pageCtx) {
-    const {
-      frontmatter: rawFrontmatter
-      // _filePath,        // file's absolute path
-      // _content,         // file's raw content string
-      // _localePath       // '/' or '/zh/'
-      // key,              // file's hash key
-      // regularPath       // current page's default link (follow the file hierarchy)
-    } = pageCtx
-
-    const { layoutComponentMap } = ctx
-    const { pageEnhancers = [] } = options
-    const isLayoutExists = name => layoutComponentMap[name] !== undefined
-    const getLayout = (name, fallback) => isLayoutExists(name) ? name : fallback
-
-    const isDirectChild = regularPath => path.parse(regularPath).dir === '/'
-    const enhancers = [
-      {
-        when: ({ regularPath }) => isDirectChild(regularPath),
-        frontmatter: { layout: getLayout('Page', 'Layout') },
-        data: { type: 'page' }
-      },
-      {
-        when: ({ regularPath }) => regularPath === '/category.html',
-        frontmatter: { layout: getLayout('Category', 'Page') }
-      },
-      {
-        when: ({ regularPath }) => regularPath === '/tags.html',
-        frontmatter: { layout: getLayout('Tag', 'Page') }
-      },
-      {
-        when: ({ regularPath }) => regularPath === '/',
-        frontmatter: { layout: getLayout('Layout') }
+module.exports = (options, ctx) => {
+  const { layoutComponentMap } = ctx
+  const {
+    pageEnhancers = [],
+    categoryIndexPageUrl = '/category/',
+    tagIndexPageUrl = '/tag/'
+  } = options
+
+  const isLayoutExists = name => layoutComponentMap[name] !== undefined
+  const getLayout = (name, fallback) => isLayoutExists(name) ? name : fallback
+  const isDirectChild = regularPath => path.parse(regularPath).dir === '/'
+
+  const enhancers = [
+    {
+      when: ({ regularPath }) => isDirectChild(regularPath),
+      frontmatter: { layout: getLayout('Page', 'Layout') },
+      data: { type: 'page' }
+    },
+    {
+      when: ({ regularPath }) => regularPath.startsWith('/category/'),
+      frontmatter: { layout: getLayout('Category', 'Page') }
+    },
+    {
+      when: ({ regularPath }) => regularPath === categoryIndexPageUrl,
+      frontmatter: { layout: getLayout('Categories', 'Page') }
+    },
+    {
+      when: ({ regularPath }) => regularPath.startsWith('/tag/'),
+      frontmatter: { layout: getLayout('Tag', 'Page') }
+    },
+    {
+      when: ({ regularPath }) => regularPath === tagIndexPageUrl,
+      frontmatter: { layout: getLayout('Tags', 'Page') }
+    },
+    {
+      when: ({ regularPath }) => regularPath === '/',
+      frontmatter: { layout: getLayout('Layout') }
+    },
+    {
+      when: ({ regularPath }) => regularPath.startsWith('/_posts/'),
+      frontmatter: {
+        layout: getLayout('Post', 'Page'),
+        permalink: '/:year/:month/:day/:slug'
       },
-      {
-        when: ({ regularPath }) => regularPath.startsWith('/_posts/'),
+      data: { type: 'post' }
+    },
+    ...pageEnhancers
+  ]
+
+  return {
+    /**
+     * Modify page's metadata according to the habits of blog users.
+     */
+    extendPageData (pageCtx) {
+      const { frontmatter: rawFrontmatter } = pageCtx
+
+      enhancers.forEach(({
+        when,
+        data = {},
+        frontmatter = {}
+      }) => {
+        if (when(pageCtx)) {
+          Object.assign(rawFrontmatter, frontmatter)
+          Object.assign(pageCtx, data)
+        }
+      })
+    },
+
+    /**
+     * Create tag page and category page.
+     */
+    ready () {
+      const { pages } = ctx
+      const tagMap = {}
+      const categoryMap = {}
+
+      const curryHandler = (scope, map) => (key, pageKey) => {
+        if (key) {
+          if (!map[key]) {
+            map[key] = {}
+            map[key].path = `/${scope}/${key}.html`
+            map[key].pageKeys = []
+          }
+          map[key].pageKeys.push(pageKey)
+        }
+      }
+
+      const handleTag = curryHandler('tag', tagMap)
+      const handleCategory = curryHandler('category', categoryMap)
+
+      pages.forEach(({
+        key,
         frontmatter: {
-          layout: getLayout('Post', 'Page'),
-          permalink: '/:year/:month/:day/:slug'
+          tag,
+          tags,
+          category,
+          categories
+        }
+      }) => {
+        if (isString(tag)) {
+          handleTag(tag, key)
+        }
+        if (Array.isArray(tags)) {
+          tags.forEach(tag => handleTag(tag, key))
+        }
+        if (isString(category)) {
+          handleCategory(categories, key)
+        }
+        if (Array.isArray(categories)) {
+          categories.forEach(category => handleCategory(category, key))
+        }
+      })
+
+      ctx.tagMap = tagMap
+      ctx.categoryMap = categoryMap
+
+      const extraPages = [
+        {
+          permalink: tagIndexPageUrl,
+          frontmatter: { title: `Tags` }
         },
-        data: { type: 'post' }
-      },
-      ...pageEnhancers
-    ]
+        {
+          permalink: categoryIndexPageUrl,
+          frontmatter: { title: `Categories` }
+        },
+        ...Object.keys(tagMap).map(tagName => ({
+          permalink: tagMap[tagName].path,
+          meta: { tagName },
+          frontmatter: { title: `${tagName} | Tag` }
+        })),
+        ...Object.keys(categoryMap).map(categoryName => ({
+          permalink: categoryMap[categoryName].path,
+          meta: { categoryName },
+          frontmatter: { title: `${categoryName} | Category` }
+        }))
+      ]
+      extraPages.forEach(page => ctx.addPage(page))
+    },
 
-    enhancers.forEach(({
-      when,
-      data = {},
-      frontmatter = {}
-    }) => {
-      if (when(pageCtx)) {
-        Object.assign(rawFrontmatter, frontmatter)
-        Object.assign(pageCtx, data)
-      }
-    })
+    /**
+     * Generate tag and category metadata.
+     */
+    async clientDynamicModules () {
+      return [
+        {
+          name: 'tag.js',
+          content: `export default ${JSON.stringify(ctx.tagMap, null, 2)}`
+        },
+        {
+          name: 'category.js',
+          content: `export default ${JSON.stringify(ctx.categoryMap, null, 2)}`
+        }
+      ]
+    },
+
+    enhanceAppFiles: [
+      path.resolve(__dirname, 'clientPlugin.js')
+    ]
   }
-})
+}

From 8a7ee6c379c6fc67870f437d0ff648390fcc9481 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 20 Sep 2018 00:33:12 +0800
Subject: [PATCH 208/242] feat($core): site config as plugin

---
 packages/@vuepress/core/lib/prepare/AppContext.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index c7704e9e34..4420296a7b 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -2,7 +2,7 @@ const path = require('path')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
 const loadTheme = require('./loadTheme')
-const { fs, logger, chalk, globby, sort } = require('@vuepress/shared-utils')
+const { fs, logger, chalk, globby, sort, datatypes: { isFunction }} = require('@vuepress/shared-utils')
 
 const Page = require('./Page')
 const I18n = require('./I18n')
@@ -30,6 +30,10 @@ module.exports = class AppContext {
 
     this.vuepressDir = path.resolve(sourceDir, '.vuepress')
     this.siteConfig = loadConfig(this.vuepressDir)
+    if (isFunction(this.siteConfig)) {
+      this.siteConfig = this.siteConfig(this)
+    }
+
     this.base = this.siteConfig.base || '/'
     this.themeConfig = this.siteConfig.themeConfig || {}
     this.outDir = this.siteConfig.dest
@@ -81,6 +85,7 @@ module.exports = class AppContext {
 
     this.pluginAPI
       // internl core plugins
+      .use(Object.assign({}, siteConfig, { name: '@vuepress/internal-site-config' }))
       .use(require('../internal-plugins/siteData'))
       .use(require('../internal-plugins/routes'))
       .use(require('../internal-plugins/rootMixins'))

From 0263f155941f6d85b6ea1e4a6de1bdce603f8ebf Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 22 Sep 2018 22:12:52 +0800
Subject: [PATCH 209/242] feat($core): 'define' plugin option and rewrite
 plugin API.

---
 .../__test__/plugin-api/AsyncOption.spec.js   |  24 ++++
 .../core/__test__/plugin-api/Option.spec.js   |  82 +++++++++-----
 .../__test__/plugin-api/PluginAPI.spec.js     |  12 +-
 .../__test__/plugin-api/PluginUtil.spec.js    |  24 ++--
 .../@vuepress/core/lib/plugin-api/Option.js   |  59 ----------
 .../lib/plugin-api/abstract/AsyncOption.js    |  67 +++++++++++
 .../core/lib/plugin-api/abstract/Option.js    | 106 ++++++++++++++++++
 .../core/lib/plugin-api/constants.js          |   5 +-
 .../@vuepress/core/lib/plugin-api/index.js    |  96 +++++++++++++---
 .../option/AdditionalPagesOption.js           |  10 --
 .../option/ClientDynamicModulesOption.js      |  23 ----
 .../option/GlobalUIComponentsOption.js        |  10 --
 .../override/ClientDynamicModulesOption.js    |  37 ++++++
 .../lib/plugin-api/override/DefineOption.js   |  26 +++++
 .../EnhanceAppFilesOption.js                  |  48 +++-----
 .../override/GlobalUIComponentsOption.js      |  20 ++++
 .../{option => override}/instantiateOption.js |  10 +-
 .../@vuepress/core/lib/plugin-api/util.js     |  31 +++--
 .../core/lib/webpack/createBaseConfig.js      |   5 +-
 .../@vuepress/shared-utils/lib/datatypes.js   |   1 +
 20 files changed, 485 insertions(+), 211 deletions(-)
 create mode 100644 packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/Option.js
 create mode 100644 packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
 create mode 100644 packages/@vuepress/core/lib/plugin-api/abstract/Option.js
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
 delete mode 100644 packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
 create mode 100644 packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js
 create mode 100644 packages/@vuepress/core/lib/plugin-api/override/DefineOption.js
 rename packages/@vuepress/core/lib/plugin-api/{option => override}/EnhanceAppFilesOption.js (64%)
 create mode 100644 packages/@vuepress/core/lib/plugin-api/override/GlobalUIComponentsOption.js
 rename packages/@vuepress/core/lib/plugin-api/{option => override}/instantiateOption.js (77%)

diff --git a/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js b/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js
new file mode 100644
index 0000000000..c999f40ffd
--- /dev/null
+++ b/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js
@@ -0,0 +1,24 @@
+import AsyncOption from '../../lib/plugin-api/abstract/AsyncOption'
+
+describe('AsyncOption', () => {
+  test('parallelApply', async () => {
+    const option = new AsyncOption('option')
+    const handler1 = jest.fn()
+    const handler2 = jest.fn()
+
+    option.add('plugin-a', handler1)
+    option.add('plugin-b', handler2)
+
+    // TODO for now, if a class extends from another class.
+    // the original methods in that class will be lost.
+
+    // await option.parallelApply(1, 2)
+    // expect(handler1.mock.calls).toHaveLength(1)
+    // expect(handler2.mock.calls).toHaveLength(1)
+    // expect(handler1.mock.calls[0][0]).toBe(1)
+    // expect(handler1.mock.calls[0][1]).toBe(2)
+    // expect(handler2.mock.calls[0][0]).toBe(1)
+    // expect(handler2.mock.calls[0][1]).toBe(2)
+  })
+})
+
diff --git a/packages/@vuepress/core/__test__/plugin-api/Option.spec.js b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
index 9670814ad0..e00a73608c 100644
--- a/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/Option.spec.js
@@ -1,66 +1,90 @@
-import Option from '../../lib/plugin-api/Option'
+import Option from '../../lib/plugin-api/abstract/Option'
 
 describe('Option', () => {
-  test('shoould option record the key', () => {
+  test('key', () => {
     const option = new Option('option')
     expect(option.key).toBe('option')
   })
 
-  test('should \'tap\' work', () => {
+  test('add', () => {
     const option = new Option('option')
-    option.tap('plugin-a', 'a')
-    option.tap('plugin-b', 'b')
+    option.add('plugin-a', 'a')
+    option.add('plugin-b', 'b')
+
     expect(option.items).toEqual([
       { value: 'a', name: 'plugin-a' },
       { value: 'b', name: 'plugin-b' }
     ])
+
     expect(option.values).toEqual(['a', 'b'])
   })
 
-  test('should \'tap\' resolve array value', () => {
+  test('add - resolve array', () => {
     const option = new Option('option')
-    option.tap('plugin-a', ['a-1', 'a-2'])
-    option.tap('plugin-b', 'b')
+    option.add('plugin-a', ['a-1', 'a-2'])
+    option.add('plugin-b', 'b')
+
     expect(option.items).toEqual([
       { value: 'a-1', name: 'plugin-a' },
       { value: 'a-2', name: 'plugin-a' },
       { value: 'b', name: 'plugin-b' }
     ])
-    expect(option.values).toEqual(['a-1', 'a-2', 'b'])
   })
 
-  test('should \'apply\' work', async () => {
+  test('delete', () => {
     const option = new Option('option')
-    const handler1 = jest.fn()
-    const handler2 = jest.fn()
+    option.add('plugin-a', ['a-1', 'a-2'])
+    option.add('plugin-b', 'b')
 
-    option.tap('plugin-a', handler1)
-    option.tap('plugin-b', handler2)
+    option.delete('plugin-a')
 
-    await option.apply(1, 2)
-    expect(handler1.mock.calls).toHaveLength(1)
-    expect(handler2.mock.calls).toHaveLength(1)
-    expect(handler1.mock.calls[0][0]).toBe(1)
-    expect(handler1.mock.calls[0][1]).toBe(2)
-    expect(handler2.mock.calls[0][0]).toBe(1)
-    expect(handler2.mock.calls[0][1]).toBe(2)
+    expect(option.items).toEqual([
+      { value: 'b', name: 'plugin-b' }
+    ])
+  })
+
+  test('clear', () => {
+    const option = new Option('option')
+    option.add('plugin-a', ['a-1', 'a-2'])
+
+    option.clear()
+
+    expect(option.items).toEqual([])
   })
 
-  test('should \'parallelApply\' work', async () => {
+  test('syncApply', () => {
     const option = new Option('option')
     const handler1 = jest.fn()
     const handler2 = jest.fn()
 
-    option.tap('plugin-a', handler1)
-    option.tap('plugin-b', handler2)
+    option.add('plugin-a', handler1)
+    option.add('plugin-b', handler2)
 
-    await option.parallelApply(1, 2)
+    option.syncApply('p1', 'p2')
     expect(handler1.mock.calls).toHaveLength(1)
     expect(handler2.mock.calls).toHaveLength(1)
-    expect(handler1.mock.calls[0][0]).toBe(1)
-    expect(handler1.mock.calls[0][1]).toBe(2)
-    expect(handler2.mock.calls[0][0]).toBe(1)
-    expect(handler2.mock.calls[0][1]).toBe(2)
+    expect(handler1.mock.calls[0][0]).toBe('p1')
+    expect(handler1.mock.calls[0][1]).toBe('p2')
+    expect(handler2.mock.calls[0][0]).toBe('p1')
+    expect(handler2.mock.calls[0][1]).toBe('p2')
+  })
+
+  test('appliedItems', () => {
+    const option = new Option('option')
+    const fn1 = () => 'fn1'
+    const fn2 = () => 'fn2'
+    const handler1 = jest.fn(fn1)
+    const handler2 = jest.fn(fn2)
+
+    option.add('plugin-a', handler1)
+    option.add('plugin-b', handler2)
+
+    option.syncApply(1, 2)
+
+    expect(option.appliedItems).toEqual([
+      { value: 'fn1', name: 'plugin-a' },
+      { value: 'fn2', name: 'plugin-b' }
+    ])
   })
 })
 
diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
index 740ca7f767..7c580aacde 100644
--- a/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginAPI.spec.js
@@ -6,7 +6,7 @@ import PluginAPI from '../../lib/plugin-api/index'
 import { PLUGIN_OPTION_MAP } from '../../lib/plugin-api/constants'
 
 describe('Plugin', () => {
-  test('should \'registerOption\' work.', () => {
+  test('registerOption', () => {
     const api = new PluginAPI()
     const readyHandler = () => {}
     api.registerOption(PLUGIN_OPTION_MAP.READY.key, readyHandler)
@@ -14,7 +14,7 @@ describe('Plugin', () => {
     expect(api.options.ready.values[0]).toBe(readyHandler)
   })
 
-  test('should \'useByPluginsConfig\' work.', () => {
+  test('useByPluginsConfig', () => {
     [
       ['a'],
       [['a']],
@@ -29,7 +29,7 @@ describe('Plugin', () => {
     })
   })
 
-  test('should \'useByPluginsConfig\' work. - disable plugin', () => {
+  test('useByPluginsConfig - disable plugin', () => {
     [
       [['a', false]],
       { a: false }
@@ -42,7 +42,7 @@ describe('Plugin', () => {
     })
   })
 
-  test('should \'useByPluginsConfig\' work. - get options', () => {
+  test('useByPluginsConfig - get options', () => {
     const pluginOptions = {};
     [
       [['a', pluginOptions]],
@@ -54,7 +54,7 @@ describe('Plugin', () => {
     })
   })
 
-  test('make sure the namesake plugin is only executed once.', () => {
+  test('ensure the namesake plugin is only executed once.', () => {
     const pluginOptions1 = {}
     const pluginOptions2 = {}
     const pluginOptions3 = {}
@@ -70,7 +70,7 @@ describe('Plugin', () => {
     expect(api.enabledPlugins[0].$$options).toBe(pluginOptions3)
   })
 
-  test('a "multuple" plugin can be applied multuple times.', () => {
+  test('ensure a "multuple" plugin can be applied multuple times.', () => {
     const pluginOptions1 = { a: 1 }
     const pluginOptions2 = { b: 1 }
     const pluginsConfig = [
diff --git a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
index 87a3371d07..2bc618c2d3 100644
--- a/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/PluginUtil.spec.js
@@ -1,9 +1,9 @@
-import { hydratePlugin } from '../../lib/plugin-api/util'
+import { flattenPlugin } from '../../lib/plugin-api/util'
 
-describe('hydratePlugin', () => {
+describe('flattenPlugin', () => {
   test('shoould hydrate plugin correctly', () => {
-    const plugin = { name: 'a', shortcut: 'a', config: { enhanceAppFiles: 'file' }}
-    const hydratedPlugin = hydratePlugin(plugin, {}, {})
+    const plugin = { name: 'a', shortcut: 'a', module: { enhanceAppFiles: 'file' }}
+    const hydratedPlugin = flattenPlugin(plugin, {}, {})
     expect(hydratedPlugin.name).toBe('a')
     expect(hydratedPlugin.shortcut).toBe('a')
     expect(hydratedPlugin.enabled).toBe(true)
@@ -11,19 +11,19 @@ describe('hydratePlugin', () => {
   })
 
   test('shoould set \'enabled\' to false when \'pluginOptions\' is set to false.', () => {
-    const plugin = { name: 'a', shortcut: 'a', config: {}}
-    const hydratedPlugin = hydratePlugin(plugin, false, {})
+    const plugin = { name: 'a', shortcut: 'a', module: {}}
+    const hydratedPlugin = flattenPlugin(plugin, false, {})
     expect(hydratedPlugin.name).toBe('a')
     expect(hydratedPlugin.shortcut).toBe('a')
     expect(hydratedPlugin.enabled).toBe(false)
   })
 
-  test('shoould hydrate functional plugin correctly.', () => {
+  test('shoould flatten functional plugin correctly.', () => {
     const config = jest.fn(() => ({ enhanceAppFiles: 'file' }))
-    const plugin = { name: 'a', shortcut: 'a', config }
+    const plugin = { name: 'a', shortcut: 'a', module: config }
     const pluginOptions = {}
     const pluginContext = {}
-    const hydratedPlugin = hydratePlugin(plugin, pluginOptions, pluginContext)
+    const hydratedPlugin = flattenPlugin(plugin, pluginOptions, pluginContext)
     expect(hydratedPlugin.name).toBe('a')
     expect(hydratedPlugin.shortcut).toBe('a')
     expect(hydratedPlugin.enabled).toBe(true)
@@ -33,12 +33,12 @@ describe('hydratePlugin', () => {
     expect(Object.getPrototypeOf(config.mock.calls[0][1])).toBe(pluginContext)
   })
 
-  test('shoould hydrate functional plugin correctly - options defaults to \'{}\'.', () => {
+  test('shoould flatten functional plugin correctly - options defaults to \'{}\'.', () => {
     const config = jest.fn(() => ({ enhanceAppFiles: 'file' }))
-    const plugin = { name: 'a', shortcut: 'a', config }
+    const plugin = { name: 'a', shortcut: 'a', module: config }
     const pluginOptions = undefined
     const pluginContext = {}
-    hydratePlugin(plugin, pluginOptions, pluginContext)
+    flattenPlugin(plugin, pluginOptions, pluginContext)
     expect(config.mock.calls[0][0]).toEqual({})
     expect(Object.getPrototypeOf(config.mock.calls[0][1])).toBe(pluginContext)
   })
diff --git a/packages/@vuepress/core/lib/plugin-api/Option.js b/packages/@vuepress/core/lib/plugin-api/Option.js
deleted file mode 100644
index 852d29fe7a..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/Option.js
+++ /dev/null
@@ -1,59 +0,0 @@
-class Option {
-  constructor (key) {
-    this.key = key
-    this.items = [] // Array<{ value: T, name: string }>
-  }
-
-  /**
-   * Set value with name.
-   * @param {string} name
-   * @param {any} value
-   */
-  tap (name, value) {
-    if (Array.isArray(value)) {
-      return this.items.push(...value.map(i => ({ value: i, name })))
-    }
-    this.items.push({ value, name })
-  }
-
-  /**
-   * Get values.
-   * @returns {Array<T>}
-   */
-  get values () {
-    return this.items.map(item => item.value)
-  }
-
-  /**
-   * Synchronous running
-   * @param {Array<Function>} args
-   */
-  syncApply (...args) {
-    for (const fn of this.values) {
-      fn(...args)
-    }
-  }
-
-  /**
-   * Asynchronous serial running
-   * @param args
-   * @param {Array<AsyncFunction>} args
-   */
-  async asyncApply (...args) {
-    for (const fn of this.values) {
-      await fn(...args)
-    }
-  }
-
-  /**
-   * Asynchronous serial running
-   * @param args
-   * @param {Array<AsyncFunction>} args
-   */
-  async parallelApply (...args) {
-    return await Promise.all(this.values.map(fn => fn(...args)))
-  }
-}
-
-Option.prototype.apply = Option.prototype.asyncApply
-module.exports = Option
diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
new file mode 100644
index 0000000000..a945019880
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
@@ -0,0 +1,67 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const { logger, chalk, datatypes: { isFunction }} = require('@vuepress/shared-utils')
+const Option = require('./Option')
+
+/**
+ * Expose Asynchronous Option.
+ */
+
+class AsyncOption extends Option {
+  /**
+   * Asynchronous serial running
+   * @param args
+   * @param {Array<AsyncFunction>} args
+   */
+
+  async asyncApply (...args) {
+    const items = []
+    for (const { name, value } of this.items) {
+      try {
+        items.push({
+          name,
+          value: isFunction(value)
+            ? await value(...args)
+            : value
+        })
+      } catch (error) {
+        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+        throw error
+      }
+    }
+    this.appliedItems = items
+  }
+
+  /**
+   * Asynchronous serial running
+   * @param args
+   * @param {Array<AsyncFunction>} args
+   */
+
+  async parallelApply (...args) {
+    const items = []
+    await Promise.all(this.items.map(async ({ name, value }) => {
+      try {
+        items.push({
+          name,
+          value: isFunction(value)
+            ? await value(...args)
+            : value
+        })
+      } catch (error) {
+        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+        throw error
+      }
+    })).catch(error => {
+      throw error
+    })
+    return items
+  }
+}
+
+AsyncOption.prototype.apply = AsyncOption.prototype.asyncApply
+module.exports = AsyncOption
diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
new file mode 100644
index 0000000000..948061e009
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
@@ -0,0 +1,106 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const { logger, chalk, datatypes: { isFunction }} = require('@vuepress/shared-utils')
+
+/**
+ * Expose Option.
+ */
+
+class Option {
+  constructor (key) {
+    this.key = key
+    this.items = []
+  }
+
+  /**
+   * Set value with name.
+   * @param {string} name
+   * @param {T} value
+   */
+
+  add (name, value) {
+    if (Array.isArray(value)) {
+      return this.items.push(...value.map(i => ({ value: i, name })))
+    }
+    this.items.push({ value, name })
+  }
+
+  /**
+   * Delete value with name.
+   * @param {string} name
+   */
+
+  delete (name) {
+    let index = this.items.findIndex(({ name: _name }) => _name === name)
+    while (index !== -1) {
+      this.items.splice(index, 1)
+      index = this.items.findIndex(({ name: _name }) => _name === name)
+    }
+  }
+
+  /**
+   * Clean option store
+   * @param {string} name
+   */
+
+  clear (name) {
+    this.items = []
+  }
+
+  /**
+   * Get values.
+   * @returns {any<T>}
+   */
+
+  get values () {
+    return this.items.map(item => item.value)
+  }
+
+  /**
+   *
+   * @returns {Array|*|any[]}
+   */
+
+  get appliedValues () {
+    return this.appliedItems && this.appliedItems.map(item => item.value)
+  }
+
+  /**
+   * Get values.
+   * @returns {any<T>}
+   */
+
+  get entries () {
+    return this.items.map(({ name, value }) => ([name, value]))
+  }
+
+  /**
+   * Synchronous running
+   * @param {Array<Function>} args
+   */
+
+  syncApply (...args) {
+    const items = []
+    for (const { name, value } of this.items) {
+      try {
+        items.push({
+          name,
+          value: isFunction(value)
+            ? value(...args)
+            : value
+        })
+      } catch (error) {
+        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+        throw error
+      }
+    }
+    this.appliedItems = items
+  }
+}
+
+Option.prototype.apply = Option.prototype.syncApply
+module.exports = Option
diff --git a/packages/@vuepress/core/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
index c6c9fa63e8..3ed5051518 100644
--- a/packages/@vuepress/core/lib/plugin-api/constants.js
+++ b/packages/@vuepress/core/lib/plugin-api/constants.js
@@ -1,3 +1,5 @@
+'use strict'
+
 const PLUGIN_OPTION_META_MAP = {
   // hooks
   READY: { name: 'ready', types: [Function] },
@@ -14,7 +16,8 @@ const PLUGIN_OPTION_META_MAP = {
   CLIENT_DYNAMIC_MODULES: { name: 'clientDynamicModules', types: [Function] },
   CLIENT_ROOT_MIXIN: { name: 'clientRootMixin', types: [String] },
   ADDITIONAL_PAGES: { name: 'additionalPages', types: [Function, Array] },
-  GLOBAL_UI_COMPONENTS: { name: 'globalUIComponents', types: [String, Array] }
+  GLOBAL_UI_COMPONENTS: { name: 'globalUIComponents', types: [String, Array] },
+  DEFINE: { name: 'define', types: [Function, Object] }
 }
 
 const PLUGIN_OPTION_MAP = {}
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 03097751a4..f5199f1c26 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -1,5 +1,11 @@
-const instantiateOption = require('./option/instantiateOption')
-const { hydratePlugin, normalizePluginsConfig } = require('./util')
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const instantiateOption = require('./override/instantiateOption')
+const { flattenPlugin, normalizePluginsConfig } = require('./util')
 const { PLUGIN_OPTION_MAP } = require('./constants')
 const {
   shortcutPackageResolver: { resolvePlugin },
@@ -8,24 +14,42 @@ const {
   logger, chalk
 } = require('@vuepress/shared-utils')
 
+/**
+ * Expose PluginAPI class.
+ */
+
 module.exports = class PluginAPI {
   constructor (context) {
     this.options = {}
     this._pluginContext = context
-    this._pluginQuene = []
-    this.initializeOptions(PLUGIN_OPTION_MAP)
+    this._pluginQueue = []
+    this._initializeOptions(PLUGIN_OPTION_MAP)
   }
 
+  /**
+   * Get enabled plugins
+   * @returns {array}
+   */
+
   get enabledPlugins () {
-    return this._pluginQuene.filter(({ enabled }) => enabled)
+    return this._pluginQueue.filter(({ enabled }) => enabled)
   }
 
+  /**
+   * Get disabled plugins
+   * @returns {array}
+   */
+
   get disabledPlugins () {
-    return this._pluginQuene.filter(({ enabled }) => !enabled)
+    return this._pluginQueue.filter(({ enabled }) => !enabled)
   }
 
+  /**
+   * apply plugin.
+   */
+
   apply () {
-    this._pluginQuene.forEach(plugin => {
+    this._pluginQueue.forEach(plugin => {
       if (plugin.enabled) {
         this.applyPlugin(plugin)
       } else {
@@ -34,23 +58,36 @@ module.exports = class PluginAPI {
     })
   }
 
+  /**
+   * Normalize plugin and push it to the plugin queue.
+   * @param {object} pluginRaw
+   * @param {object} pluginOptions
+   * @returns {module.PluginAPI}
+   */
+
   use (pluginRaw, pluginOptions = {}) {
     let plugin = resolvePlugin(pluginRaw)
     if (!plugin.module) {
       console.warn(`[vuepress] cannot resolve plugin "${pluginRaw}"`)
       return this
     }
-    plugin = hydratePlugin(plugin, pluginOptions, this._pluginContext, this)
+    plugin = flattenPlugin(plugin, pluginOptions, this._pluginContext, this)
     if (plugin.multiple !== true) {
-      const duplicateIndex = this._pluginQuene.findIndex(({ name }) => name === plugin.name)
+      const duplicateIndex = this._pluginQueue.findIndex(({ name }) => name === plugin.name)
       if (duplicateIndex !== -1) {
-        this._pluginQuene.splice(duplicateIndex, 1)
+        this._pluginQueue.splice(duplicateIndex, 1)
       }
     }
-    this._pluginQuene.push(plugin)
+    this._pluginQueue.push(plugin)
     return this
   }
 
+  /**
+   * Use plugin by config.
+   * @param pluginsConfig
+   * @returns {module.PluginAPI}
+   */
+
   useByPluginsConfig (pluginsConfig) {
     pluginsConfig = normalizePluginsConfig(pluginsConfig)
     pluginsConfig.forEach(([pluginRaw, pluginOptions]) => {
@@ -59,19 +96,31 @@ module.exports = class PluginAPI {
     return this
   }
 
-  initializeOptions () {
+  /**
+   * initialize plugin options.
+   */
+
+  _initializeOptions () {
     Object.keys(PLUGIN_OPTION_MAP).forEach(key => {
       const option = PLUGIN_OPTION_MAP[key]
       this.options[option.name] = instantiateOption(option.name)
     })
   }
 
+  /**
+   * Register plugin option.
+   * @param {string} key
+   * @param {any} value
+   * @param {string} pluginName
+   * @returns {module.PluginAPI}
+   */
+
   registerOption (key, value, pluginName) {
     const option = PLUGIN_OPTION_MAP[key]
     const types = option.types
     const { valid, warnMsg } = assertTypes(value, types)
     if (valid) {
-      this.options[option.name].tap(pluginName, value)
+      this.options[option.name].add(pluginName, value)
     } else if (value !== undefined) {
       logger.warn(
         `${chalk.gray(pluginName)} ` +
@@ -81,23 +130,33 @@ module.exports = class PluginAPI {
     return this
   }
 
+  /**
+   * apply plugin.
+   */
+
   applyPlugin ({
+    // info
     name: pluginName,
     shortcut,
+
+    // hooks
+    ready,
+    compiled,
+    updated,
+    generated,
+
+    // options
     chainWebpack,
     enhanceDevServer,
     extendMarkdown,
     enhanceAppFiles,
     outFiles,
     extendPageData,
-    ready,
-    compiled,
-    updated,
-    generated,
     clientDynamicModules,
     clientRootMixin,
     additionalPages,
-    globalUIComponents
+    globalUIComponents,
+    define
   }) {
     const isInternalPlugin = pluginName.startsWith('@vuepress/internal-')
     if (shortcut) {
@@ -121,5 +180,6 @@ module.exports = class PluginAPI {
       .registerOption(PLUGIN_OPTION_MAP.CLIENT_ROOT_MIXIN.key, clientRootMixin, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.ADDITIONAL_PAGES.key, additionalPages, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.GLOBAL_UI_COMPONENTS.key, globalUIComponents, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.DEFINE.key, define, pluginName)
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js b/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
deleted file mode 100644
index 920b76c58d..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/option/AdditionalPagesOption.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const Option = require('../Option')
-
-module.exports = class AdditionalPagesOption extends Option {
-  tap (pluginName, value) {
-    if (typeof value === 'function') {
-      value = value()
-    }
-    super.tap(pluginName, value)
-  }
-}
diff --git a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
deleted file mode 100644
index 0ec8690eef..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/option/ClientDynamicModulesOption.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const Option = require('../Option')
-
-module.exports = class ClientDynamicModulesOption extends Option {
-  async apply (context) {
-    for (const item of this.items) {
-      const { value: fn, name: pluginName } = item
-      let modules = await fn()
-      if (!Array.isArray(modules)) {
-        modules = [modules]
-      }
-      for (const { name, content, dirname = 'dynamic' } of modules) {
-        await context.writeTemp(
-          `${dirname}/${name}`,
-          `
-/**
- * Generated by "${pluginName}"
- */
-${content}\n\n
-        `.trim())
-      }
-    }
-  }
-}
diff --git a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
deleted file mode 100644
index ce0dccbcfb..0000000000
--- a/packages/@vuepress/core/lib/plugin-api/option/GlobalUIComponentsOption.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const Option = require('../Option')
-
-module.exports = class GlobalUIComponentsOption extends Option {
-  async apply (context) {
-    await context.writeTemp(
-      `internal/global-ui.js`,
-      `export default ${JSON.stringify(this.values, null, 2)}`
-    )
-  }
-}
diff --git a/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js
new file mode 100644
index 0000000000..8af74fc14e
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js
@@ -0,0 +1,37 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const AsyncOption = require('../abstract/AsyncOption')
+
+/**
+ * clientDynamicModules option.
+ */
+
+module.exports = class ClientDynamicModulesOption extends AsyncOption {
+  async apply (ctx) {
+    await super.asyncApply()
+
+    for (const item of this.appliedItems) {
+      let { value: modules } = item
+      const { name: pluginName } = item
+
+      if (!Array.isArray(modules)) {
+        modules = [modules]
+      }
+
+      await Promise.all(modules.map(async ({ name, content, dirname = 'dynamic' }) => {
+        await ctx.writeTemp(
+          `${dirname}/${name}`,
+          `
+/**
+ * Generated by "${pluginName}"
+ */
+${content}\n\n
+        `.trim())
+      }))
+    }
+  }
+}
diff --git a/packages/@vuepress/core/lib/plugin-api/override/DefineOption.js b/packages/@vuepress/core/lib/plugin-api/override/DefineOption.js
new file mode 100644
index 0000000000..006f0883e5
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/override/DefineOption.js
@@ -0,0 +1,26 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const Option = require('../abstract/Option')
+
+/**
+ * define option.
+ */
+
+module.exports = class DefineOption extends Option {
+  apply (config) {
+    super.syncApply()
+    const defines = this.appliedValues
+    defines.forEach(define => {
+      Object.keys(define).forEach(key => {
+        define[key] = JSON.stringify(define[key])
+      })
+      config.plugin('injections').tap(([options]) => [
+        Object.assign(options, define)
+      ])
+    })
+  }
+}
diff --git a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js
similarity index 64%
rename from packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
rename to packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js
index 4e3a88408d..b96ab515bb 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js
@@ -1,4 +1,11 @@
-const Option = require('../Option')
+
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const AsyncOption = require('../abstract/AsyncOption')
 const {
   fs,
   chalk,
@@ -7,38 +14,19 @@ const {
   datatypes: { isPlainObject }
 } = require('@vuepress/shared-utils')
 
-module.exports = class EnhanceAppFilesOption extends Option {
-  /**
-   * In fact, we can quickly implement support for function parameters
-   * by overriding 'tap', but 'tap' will be executed immediately
-   * when the plugin is initialized so that we cannot get the dynamic
-   * returned value.
-   *
-   * A useful use case for 'dynamic return value' is that the user can
-   * write a dynamic file in the 'ready' hook, and add the dest path to
-   * the current plugin context, then return it with a function and
-   * assign it to enhanceAppFiles.
-   */
-  async beforeApply () {
-    const items = this.items
-    this.items = []
-    for (const { name, value } of items) {
-      if (typeof value === 'function') {
-        const res = await value()
-        this.tap(name, res)
-      } else {
-        this.tap(name, value)
-      }
-    }
-  }
+/**
+ * enhanceAppFiles option.
+ */
+
+module.exports = class EnhanceAppFilesOption extends AsyncOption {
+  async apply (ctx) {
+    await super.asyncApply()
 
-  async apply (context) {
-    await this.beforeApply()
     const manifest = []
     let moduleId = 0
 
     async function writeEnhancer (name, content, hasDefaultExport = true) {
-      return await context.writeTemp(
+      return await ctx.writeTemp(
         `app-enhancers/${name}.js`,
         hasDefaultExport
           ? content
@@ -47,7 +35,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
 
     // 1. write enhance app files.
-    for (const { value: enhanceAppFile, name: pluginName } of this.items) {
+    for (const { value: enhanceAppFile, name: pluginName } of this.appliedItems) {
       let destPath
 
       // 1.1 dynamic code
@@ -92,7 +80,7 @@ module.exports = class EnhanceAppFilesOption extends Option {
     }
 
     // 2. write entry file.
-    await context.writeTemp('internal/app-enhancers.js', pathsToModuleCode(manifest))
+    await ctx.writeTemp('internal/app-enhancers.js', pathsToModuleCode(manifest))
   }
 }
 
diff --git a/packages/@vuepress/core/lib/plugin-api/override/GlobalUIComponentsOption.js b/packages/@vuepress/core/lib/plugin-api/override/GlobalUIComponentsOption.js
new file mode 100644
index 0000000000..fb9f18e2c8
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/override/GlobalUIComponentsOption.js
@@ -0,0 +1,20 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const Option = require('../abstract/Option')
+
+/**
+ * globalUIComponents option.
+ */
+
+module.exports = class GlobalUIComponentsOption extends Option {
+  async apply (ctx) {
+    await ctx.writeTemp(
+      `internal/global-ui.js`,
+      `export default ${JSON.stringify(this.values, null, 2)}`
+    )
+  }
+}
diff --git a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js b/packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js
similarity index 77%
rename from packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
rename to packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js
index 2d67da9369..6d43f8b653 100644
--- a/packages/@vuepress/core/lib/plugin-api/option/instantiateOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js
@@ -1,8 +1,8 @@
 const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
-const AdditionalPagesOption = require('./AdditionalPagesOption')
 const GlobalUIComponentsOption = require('./GlobalUIComponentsOption')
-const Option = require('../Option')
+const DefineOption = require('./DefineOption')
+const Option = require('../abstract/Option')
 const { PLUGIN_OPTION_MAP } = require('../constants')
 
 module.exports = function instantiateOption (name) {
@@ -13,12 +13,12 @@ module.exports = function instantiateOption (name) {
   case PLUGIN_OPTION_MAP.CLIENT_DYNAMIC_MODULES.name:
     return new ClientDynamicModulesOption(name)
 
-  case PLUGIN_OPTION_MAP.ADDITIONAL_PAGES.name:
-    return new AdditionalPagesOption(name)
-
   case PLUGIN_OPTION_MAP.GLOBAL_UI_COMPONENTS.name:
     return new GlobalUIComponentsOption(name)
 
+  case PLUGIN_OPTION_MAP.DEFINE.name:
+    return new DefineOption(name)
+
   default: return new Option(name)
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/util.js b/packages/@vuepress/core/lib/plugin-api/util.js
index 5abc66d305..c7ff8123f0 100644
--- a/packages/@vuepress/core/lib/plugin-api/util.js
+++ b/packages/@vuepress/core/lib/plugin-api/util.js
@@ -1,14 +1,26 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const { logger, chalk, datatypes: { assertTypes }} = require('@vuepress/shared-utils')
 
 /**
- * Hydrates your plugin config, options and context.
- * @param {Function | Object} module
- * @param {String} name
- * @param {String} hortcut
- * @param {Object} pluginOptions
- * @param {Object} pluginContext
+ * flatten your plugin config by passing in name, options and context.
+ * @param {function|object} module
+ * @param {string} name
+ * @param {string} hortcut
+ * @param {object} pluginOptions
+ * @param {object} pluginContext
  */
-exports.hydratePlugin = function ({ module: config, name, shortcut, isLocal }, pluginOptions, pluginContext, self) {
+
+exports.flattenPlugin = function (
+  { module: config, name, shortcut, isLocal },
+  pluginOptions,
+  pluginContext,
+  self
+) {
   const { valid, warnMsg } = assertTypes(pluginOptions, [Object, Boolean])
   if (!valid) {
     if (pluginOptions !== undefined) {
@@ -19,16 +31,19 @@ exports.hydratePlugin = function ({ module: config, name, shortcut, isLocal }, p
     }
     pluginOptions = {}
   }
+
   let enabled = true
   if (typeof pluginOptions === 'boolean') {
     enabled = pluginOptions
     pluginOptions = {}
   }
+
   if (typeof config === 'function') {
     // 'Object.create' here is to give each plugin a separate context,
     // but also own the inheritance context.
     config = config(pluginOptions, Object.create(pluginContext), self)
   }
+
   // respect name in local plugin config
   name = isLocal && config.name || name
   return Object.assign({}, config, {
@@ -43,6 +58,7 @@ exports.hydratePlugin = function ({ module: config, name, shortcut, isLocal }, p
  * Normalize plugins config in `.vuepress/config.js`
  * @param pluginsConfig
  */
+
 exports.normalizePluginsConfig = function (pluginsConfig) {
   const { valid, warnMsg } = assertTypes(pluginsConfig, [Object, Array])
   if (!valid) {
@@ -55,6 +71,7 @@ exports.normalizePluginsConfig = function (pluginsConfig) {
     pluginsConfig = []
     return pluginsConfig
   }
+
   if (Array.isArray(pluginsConfig)) {
     pluginsConfig = pluginsConfig.map(item => {
       return Array.isArray(item) ? item : [item]
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 4a445d6520..c300c307a7 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -12,7 +12,8 @@ module.exports = function createBaseConfig ({
   cliOptions: {
     debug,
     cache
-  }
+  },
+  pluginAPI
 }, isServer) {
   const Config = require('webpack-chain')
   const { VueLoaderPlugin } = require('vue-loader')
@@ -293,6 +294,8 @@ module.exports = function createBaseConfig ({
       LAST_COMMIT_HASH: JSON.stringify(getLastCommitHash())
     }])
 
+  pluginAPI.options.define.apply(config)
+
   return config
 }
 
diff --git a/packages/@vuepress/shared-utils/lib/datatypes.js b/packages/@vuepress/shared-utils/lib/datatypes.js
index e409050d4a..b321a3079c 100644
--- a/packages/@vuepress/shared-utils/lib/datatypes.js
+++ b/packages/@vuepress/shared-utils/lib/datatypes.js
@@ -12,6 +12,7 @@ const isOfType = type => x => typeof x === type // eslint-disable-line valid-typ
 const isObjectOfType = type => x => getObjectType(x) === type
 exports.isFunction = isOfType('function')
 exports.isString = isOfType('string')
+exports.isBoolean = isOfType('boolean')
 exports.isPlainObject = isObjectOfType('Object')
 
 exports.toRawType = value => _toString.call(value).slice(8, -1)

From 116d83216846e6108eba1009a968838a338eb746 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 22 Sep 2018 22:14:51 +0800
Subject: [PATCH 210/242] chore: fix typo

---
 packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
index 10fa482b18..e91f850d1b 100644
--- a/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
+++ b/packages/@vuepress/shared-utils/lib/shortcutPackageResolver.js
@@ -12,10 +12,11 @@ const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
 
 /**
  * Delightful pakcage shortcut resolving utility.
- * @param {steing} type 'plugin', 'theme', or others.
+ * @param {string} type 'plugin', 'theme', or others.
  * @param {string} org
  * @returns {function}
  */
+
 function shortcutPackageResolver (
   type = 'plugin',
   org = 'vuepress',

From a122dfae6711de3d01e59781550c8a00813a0b5d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 22 Sep 2018 22:39:13 +0800
Subject: [PATCH 211/242] feat($core): supoort pipeline plugin API.

---
 .../core/lib/plugin-api/abstract/AsyncOption.js     | 13 +++++++++++++
 .../core/lib/plugin-api/abstract/Option.js          | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
index a945019880..b3ea711d6c 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
@@ -61,6 +61,19 @@ class AsyncOption extends Option {
     })
     return items
   }
+
+  /**
+   * Process a value via a pipeline.
+   * @param input
+   * @returns {*}
+   */
+
+  async pipeline (input) {
+    for (const fn of this.values) {
+      input = await fn(input)
+    }
+    return input
+  }
 }
 
 AsyncOption.prototype.apply = AsyncOption.prototype.asyncApply
diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
index 948061e009..e2dd496f75 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-const { logger, chalk, datatypes: { isFunction }} = require('@vuepress/shared-utils')
+const { logger, chalk, compose, datatypes: { isFunction }} = require('@vuepress/shared-utils')
 
 /**
  * Expose Option.
@@ -100,6 +100,17 @@ class Option {
     }
     this.appliedItems = items
   }
+
+  /**
+   * Process a value via a pipeline.
+   * @param input
+   * @returns {*}
+   */
+
+  pipeline (input) {
+    const fn = compose(this.values)
+    return fn(input)
+  }
 }
 
 Option.prototype.apply = Option.prototype.syncApply

From 4bc4331e55f87f94c06b4acc4ff1dc088561d328 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sat, 22 Sep 2018 23:40:16 +0800
Subject: [PATCH 212/242] feat($core): use markdown-it-chain

---
 packages/@vuepress/core/lib/markdown/index.js | 119 +++++++++++++-----
 .../@vuepress/core/lib/prepare/AppContext.js  |   2 +-
 2 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/packages/@vuepress/core/lib/markdown/index.js b/packages/@vuepress/core/lib/markdown/index.js
index b398e6118f..01e5798390 100644
--- a/packages/@vuepress/core/lib/markdown/index.js
+++ b/packages/@vuepress/core/lib/markdown/index.js
@@ -1,3 +1,10 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const Config = require('markdown-it-chain')
 const highlight = require('./highlight')
 const highlightLines = require('./highlightLines')
 const preWrapper = require('./preWrapper')
@@ -13,49 +20,93 @@ const toc = require('markdown-it-table-of-contents')
 const _slugify = require('./slugify')
 const { parseHeaders } = require('@vuepress/shared-utils')
 
-module.exports = ({ markdown = {}} = {}) => {
+/**
+ * Create markdown by config.
+ */
+
+module.exports = ({
+  markdown = {}
+} = {}) => {
   // allow user config slugify
   const slugify = markdown.slugify || _slugify
+  // using chainedAPI
+  const config = new Config()
+
+  config
+    .options
+      .html(true)
+      .highlight(highlight)
+      .end()
+
+    .plugin('component')
+      .use(component)
+      .end()
+
+    .plugin('highlight-lines')
+      .use(highlightLines)
+      .end()
+
+    .plugin('pre-wrapper')
+      .use(preWrapper)
+      .end()
+
+    .plugin('snippet')
+      .use(snippet)
+      .end()
+
+    .plugin('convert-router-link')
+      .use(convertRouterLink, [Object.assign({
+        target: '_blank',
+        rel: 'noopener noreferrer'
+      }, markdown.externalLinks)])
+      .end()
+
+    .plugin('hoist-script-style')
+      .use(hoistScriptStyle)
+      .end()
+
+    .plugin('containers')
+      .use(containers)
+      .end()
 
-  const md = require('markdown-it')({
-    html: true,
-    highlight
-  })
-    // custom plugins
-    .use(component)
-    .use(highlightLines)
-    .use(preWrapper)
-    .use(snippet)
-    .use(convertRouterLink, Object.assign({
-      target: '_blank',
-      rel: 'noopener noreferrer'
-    }, markdown.externalLinks))
-    .use(hoistScriptStyle)
-    .use(containers)
-
-    // 3rd party plugins
-    .use(emoji)
-    .use(anchor, Object.assign({
-      slugify,
-      permalink: true,
-      permalinkBefore: true,
-      permalinkSymbol: '#'
-    }, markdown.anchor))
-    .use(toc, Object.assign({
-      slugify,
-      includeLevel: [2, 3],
-      format: parseHeaders
-    }, markdown.toc))
+    .plugin('emoji')
+      .use(emoji)
+      .end()
+
+    .plugin('anchor')
+      .use(anchor, [Object.assign({
+        slugify,
+        permalink: true,
+        permalinkBefore: true,
+        permalinkSymbol: '#'
+      }, markdown.anchor)])
+      .end()
+
+    .plugin('toc')
+      .use(toc, [Object.assign({
+        slugify,
+        includeLevel: [2, 3],
+        format: parseHeaders
+      }, markdown.toc)])
+      .end()
+
+  if (markdown.lineNumbers) {
+    config
+      .plugin('line-numbers')
+        .use(lineNumbers)
+  }
+
+  if (markdown.chainMarkdown) {
+    markdown.chainMarkdown(config)
+  }
+
+  const md = config.toMd()
 
   // apply user config
   if (markdown.config) {
     markdown.config(md)
   }
 
-  if (markdown.lineNumbers) {
-    md.use(lineNumbers)
-  }
-
   module.exports.dataReturnable(md)
 
   // expose slugify
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 4420296a7b..89d17a0034 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -40,7 +40,6 @@ module.exports = class AppContext {
       ? path.resolve(this.siteConfig.dest)
       : path.resolve(sourceDir, '.vuepress/dist')
 
-    this.markdown = createMarkdown(this.siteConfig)
     this.pluginAPI = new PluginAPI(this)
     this.pages = [] // Array<Page>
     this.I18nConstructor = I18n(null)
@@ -52,6 +51,7 @@ module.exports = class AppContext {
    */
   async process () {
     this.normalizeHeadTagUrls()
+    this.markdown = createMarkdown(this.siteConfig)
     this.resolveTemplates()
     await this.resolveTheme()
     this.resolvePlugins()

From a5cbd6730b223d79ffcf1df3af41ecce0da94824 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 02:56:28 +0800
Subject: [PATCH 213/242] revert: change AsyncOption to prototype-style.

This change is only for test to delay the assignment of methods in prototype, since babel-jest will
rewrite the child class's prototype. But it's interesting that I cannot repro it at the standalone
repo. Oh, this bug of Jest is so  bad.
---
 .../lib/plugin-api/abstract/AsyncOption.js    | 108 +++++++++---------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
index b3ea711d6c..26186a8bbf 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
@@ -11,69 +11,69 @@ const Option = require('./Option')
  * Expose Asynchronous Option.
  */
 
-class AsyncOption extends Option {
-  /**
-   * Asynchronous serial running
-   * @param args
-   * @param {Array<AsyncFunction>} args
-   */
+class AsyncOption extends Option {}
 
-  async asyncApply (...args) {
-    const items = []
-    for (const { name, value } of this.items) {
-      try {
-        items.push({
-          name,
-          value: isFunction(value)
-            ? await value(...args)
-            : value
-        })
-      } catch (error) {
-        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
-        throw error
-      }
+/**
+ * Asynchronous serial running
+ * @param args
+ * @param {Array<AsyncFunction>} args
+ */
+
+AsyncOption.prototype.asyncApply = async function (...args) {
+  const items = []
+  for (const { name, value } of this.items) {
+    try {
+      items.push({
+        name,
+        value: isFunction(value)
+          ? await value(...args)
+          : value
+      })
+    } catch (error) {
+      logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+      throw error
     }
-    this.appliedItems = items
   }
+  this.appliedItems = items
+}
 
-  /**
-   * Asynchronous serial running
-   * @param args
-   * @param {Array<AsyncFunction>} args
-   */
+/**
+ * Asynchronous serial running
+ * @param args
+ * @param {Array<AsyncFunction>} args
+ */
 
-  async parallelApply (...args) {
-    const items = []
-    await Promise.all(this.items.map(async ({ name, value }) => {
-      try {
-        items.push({
-          name,
-          value: isFunction(value)
-            ? await value(...args)
-            : value
-        })
-      } catch (error) {
-        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
-        throw error
-      }
-    })).catch(error => {
+AsyncOption.prototype.parallelApply = async function (...args) {
+  const items = []
+  await Promise.all(this.items.map(async ({ name, value }) => {
+    try {
+      items.push({
+        name,
+        value: isFunction(value)
+          ? await value(...args)
+          : value
+      })
+    } catch (error) {
+      logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
       throw error
-    })
-    return items
-  }
+    }
+  })).catch(error => {
+    throw error
+  })
+  return items
+}
 
-  /**
-   * Process a value via a pipeline.
-   * @param input
-   * @returns {*}
-   */
+/**
+ * Process a value via a pipeline.
+ * @param input
+ * @returns {*}
+ */
 
-  async pipeline (input) {
-    for (const fn of this.values) {
-      input = await fn(input)
-    }
-    return input
+AsyncOption.prototype.pipeline = async function (input) {
+  for (const fn of this.values) {
+    input = await fn(input)
   }
+  return input
 }
 
 AsyncOption.prototype.apply = AsyncOption.prototype.asyncApply

From 4d89f74e49e6e37dad127b98ac39cc6167baa368 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 13:16:51 +0800
Subject: [PATCH 214/242] chore: add mising deps

---
 packages/@vuepress/core/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 70076f6f96..2d7a33bb9c 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -67,7 +67,8 @@
     "webpack-chain": "^4.6.0",
     "webpack-merge": "^4.1.2",
     "webpack-serve": "^1.0.2",
-    "webpackbar": "^2.6.1"
+    "webpackbar": "^2.6.1",
+    "markdown-it-chain": "^1.2.0"
   },
   "engines": {
     "node": ">=8"

From 91d872074e415052749a156ad9b48787e3e04690 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 13:38:01 +0800
Subject: [PATCH 215/242] fix($test): move babel config to test-utils to get
 correct transform

---
 babel.config.js => packages/@vuepress/test-utils/babel.config.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename babel.config.js => packages/@vuepress/test-utils/babel.config.js (100%)

diff --git a/babel.config.js b/packages/@vuepress/test-utils/babel.config.js
similarity index 100%
rename from babel.config.js
rename to packages/@vuepress/test-utils/babel.config.js

From 3c8339fa55d971458e25607a5b2c8cb986304b89 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 13:39:30 +0800
Subject: [PATCH 216/242] Revert "revert: change AsyncOption to
 prototype-style."

This reverts commit a5cbd6730b223d79ffcf1df3af41ecce0da94824.
---
 .../lib/plugin-api/abstract/AsyncOption.js    | 108 +++++++++---------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
index 26186a8bbf..b3ea711d6c 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
@@ -11,69 +11,69 @@ const Option = require('./Option')
  * Expose Asynchronous Option.
  */
 
-class AsyncOption extends Option {}
+class AsyncOption extends Option {
+  /**
+   * Asynchronous serial running
+   * @param args
+   * @param {Array<AsyncFunction>} args
+   */
 
-/**
- * Asynchronous serial running
- * @param args
- * @param {Array<AsyncFunction>} args
- */
-
-AsyncOption.prototype.asyncApply = async function (...args) {
-  const items = []
-  for (const { name, value } of this.items) {
-    try {
-      items.push({
-        name,
-        value: isFunction(value)
-          ? await value(...args)
-          : value
-      })
-    } catch (error) {
-      logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
-      throw error
+  async asyncApply (...args) {
+    const items = []
+    for (const { name, value } of this.items) {
+      try {
+        items.push({
+          name,
+          value: isFunction(value)
+            ? await value(...args)
+            : value
+        })
+      } catch (error) {
+        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+        throw error
+      }
     }
+    this.appliedItems = items
   }
-  this.appliedItems = items
-}
 
-/**
- * Asynchronous serial running
- * @param args
- * @param {Array<AsyncFunction>} args
- */
+  /**
+   * Asynchronous serial running
+   * @param args
+   * @param {Array<AsyncFunction>} args
+   */
 
-AsyncOption.prototype.parallelApply = async function (...args) {
-  const items = []
-  await Promise.all(this.items.map(async ({ name, value }) => {
-    try {
-      items.push({
-        name,
-        value: isFunction(value)
-          ? await value(...args)
-          : value
-      })
-    } catch (error) {
-      logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+  async parallelApply (...args) {
+    const items = []
+    await Promise.all(this.items.map(async ({ name, value }) => {
+      try {
+        items.push({
+          name,
+          value: isFunction(value)
+            ? await value(...args)
+            : value
+        })
+      } catch (error) {
+        logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
+        throw error
+      }
+    })).catch(error => {
       throw error
-    }
-  })).catch(error => {
-    throw error
-  })
-  return items
-}
+    })
+    return items
+  }
 
-/**
- * Process a value via a pipeline.
- * @param input
- * @returns {*}
- */
+  /**
+   * Process a value via a pipeline.
+   * @param input
+   * @returns {*}
+   */
 
-AsyncOption.prototype.pipeline = async function (input) {
-  for (const fn of this.values) {
-    input = await fn(input)
+  async pipeline (input) {
+    for (const fn of this.values) {
+      input = await fn(input)
+    }
+    return input
   }
-  return input
 }
 
 AsyncOption.prototype.apply = AsyncOption.prototype.asyncApply

From 1dc7cc61fe230beb0aff28358a75473776427074 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:38:49 +0800
Subject: [PATCH 217/242] test: refine

---
 .../babel.config.js => babel.config.js        |  2 +-
 .../__test__/plugin-api/AsyncOption.spec.js   |  4 +-
 .../fixtures/docs-i18n/.vuepress/config.js    |  0
 .../prepare}/fixtures/docs-i18n/README.md     |  0
 .../prepare}/fixtures/docs-i18n/zh/README.md  |  0
 .../docs-local-theme/.vuepress/config.js      |  0
 .../.vuepress/theme/Layout.vue                |  0
 .../fixtures/docs-local-theme/README.md       |  0
 .../docs-simple-config/.vuepress/config.js    |  0
 .../fixtures/docs-simple-config/README.md     |  0
 .../prepare}/fixtures/docs-simple/README.md   |  0
 .../core/__test__/prepare/prepare.spec.js     | 21 +++++++
 .../@vuepress/test-utils/createLocalVue.js    | 17 ++++++
 packages/@vuepress/test-utils/meta.js         | 12 ----
 .../@vuepress/test-utils/modeTestRunner.js    | 34 -----------
 packages/@vuepress/test-utils/prepare.js      | 17 ------
 packages/@vuepress/test-utils/siteData.js     | 56 +++++++++++++++++++
 .../__test__/components/DropdownLink.spec.js  | 12 ++--
 .../__test__/components/NavLink.spec.js       | 16 +++---
 .../__snapshots__/DropdownLink.spec.js.snap   | 50 +----------------
 .../__snapshots__/NavLink.spec.js.snap        | 31 +---------
 scripts/jest.config.js                        |  5 +-
 22 files changed, 116 insertions(+), 161 deletions(-)
 rename packages/@vuepress/test-utils/babel.config.js => babel.config.js (55%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-i18n/.vuepress/config.js (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-i18n/README.md (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-i18n/zh/README.md (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-local-theme/.vuepress/config.js (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-local-theme/.vuepress/theme/Layout.vue (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-local-theme/README.md (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-simple-config/.vuepress/config.js (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-simple-config/README.md (100%)
 rename packages/@vuepress/{test-utils => core/__test__/prepare}/fixtures/docs-simple/README.md (100%)
 create mode 100644 packages/@vuepress/core/__test__/prepare/prepare.spec.js
 create mode 100644 packages/@vuepress/test-utils/createLocalVue.js
 delete mode 100644 packages/@vuepress/test-utils/meta.js
 delete mode 100644 packages/@vuepress/test-utils/modeTestRunner.js
 delete mode 100644 packages/@vuepress/test-utils/prepare.js
 create mode 100644 packages/@vuepress/test-utils/siteData.js

diff --git a/packages/@vuepress/test-utils/babel.config.js b/babel.config.js
similarity index 55%
rename from packages/@vuepress/test-utils/babel.config.js
rename to babel.config.js
index 8f54044712..87edd47c65 100644
--- a/packages/@vuepress/test-utils/babel.config.js
+++ b/babel.config.js
@@ -2,7 +2,7 @@ module.exports = {
   'env': {
     'test': {
       'presets': [
-        ['@babel/preset-env', { 'targets': { 'node': 8 }}]
+        ['@babel/preset-env', { 'targets': { 'node': 'current' }}]
       ]
     }
   }
diff --git a/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js b/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js
index c999f40ffd..357f1fb157 100644
--- a/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js
+++ b/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js
@@ -1,4 +1,4 @@
-import AsyncOption from '../../lib/plugin-api/abstract/AsyncOption'
+const AsyncOption = require('../../lib/plugin-api/abstract/AsyncOption')
 
 describe('AsyncOption', () => {
   test('parallelApply', async () => {
@@ -12,7 +12,7 @@ describe('AsyncOption', () => {
     // TODO for now, if a class extends from another class.
     // the original methods in that class will be lost.
 
-    // await option.parallelApply(1, 2)
+    await option.parallelApply(1, 2)
     // expect(handler1.mock.calls).toHaveLength(1)
     // expect(handler2.mock.calls).toHaveLength(1)
     // expect(handler1.mock.calls[0][0]).toBe(1)
diff --git a/packages/@vuepress/test-utils/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/core/__test__/prepare/fixtures/docs-i18n/.vuepress/config.js
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-i18n/.vuepress/config.js
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-i18n/.vuepress/config.js
diff --git a/packages/@vuepress/test-utils/fixtures/docs-i18n/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-i18n/README.md
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-i18n/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-i18n/README.md
diff --git a/packages/@vuepress/test-utils/fixtures/docs-i18n/zh/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-i18n/zh/README.md
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-i18n/zh/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-i18n/zh/README.md
diff --git a/packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/config.js b/packages/@vuepress/core/__test__/prepare/fixtures/docs-local-theme/.vuepress/config.js
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/config.js
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-local-theme/.vuepress/config.js
diff --git a/packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/theme/Layout.vue b/packages/@vuepress/core/__test__/prepare/fixtures/docs-local-theme/.vuepress/theme/Layout.vue
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-local-theme/.vuepress/theme/Layout.vue
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-local-theme/.vuepress/theme/Layout.vue
diff --git a/packages/@vuepress/test-utils/fixtures/docs-local-theme/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-local-theme/README.md
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-local-theme/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-local-theme/README.md
diff --git a/packages/@vuepress/test-utils/fixtures/docs-simple-config/.vuepress/config.js b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-simple-config/.vuepress/config.js
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
diff --git a/packages/@vuepress/test-utils/fixtures/docs-simple-config/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-simple-config/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
diff --git a/packages/@vuepress/test-utils/fixtures/docs-simple/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
similarity index 100%
rename from packages/@vuepress/test-utils/fixtures/docs-simple/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
diff --git a/packages/@vuepress/core/__test__/prepare/prepare.spec.js b/packages/@vuepress/core/__test__/prepare/prepare.spec.js
new file mode 100644
index 0000000000..420ebaaddc
--- /dev/null
+++ b/packages/@vuepress/core/__test__/prepare/prepare.spec.js
@@ -0,0 +1,21 @@
+const { fs } = require('@vuepress/shared-utils')
+const path = require('path')
+const prepare = require('../../lib/prepare')
+
+const docsBaseDir = path.resolve(__dirname, 'fixtures')
+const docsModeNames = fs.readdirSync(docsBaseDir)
+const docsModes = docsModeNames.map(name => {
+  const docsPath = path.resolve(docsBaseDir, name)
+  const docsTempPath = path.resolve(docsPath, '.vuepress/.temp')
+  return { name, docsPath, docsTempPath }
+})
+
+describe('prepare', () => {
+  test('should not throw error', async () => {
+    await Promise.all(docsModes.map(async ({ name, docsPath, docsTempPath }) => {
+      await fs.ensureDir(docsTempPath)
+      const context = await prepare(docsPath, { theme: '@vuepress/default', temp: docsTempPath })
+      expect(context.sourceDir).toBe(docsPath)
+    }))
+  })
+})
diff --git a/packages/@vuepress/test-utils/createLocalVue.js b/packages/@vuepress/test-utils/createLocalVue.js
new file mode 100644
index 0000000000..b61be84f34
--- /dev/null
+++ b/packages/@vuepress/test-utils/createLocalVue.js
@@ -0,0 +1,17 @@
+const { createLocalVue } = require('@vue/test-utils')
+const dataMixin = require('@vuepress/core/lib/app/dataMixin').default
+const I18n = require('@vuepress/core/lib/prepare/I18n')
+const Router = require('vue-router')
+const mockComponent = require('./mockComponent')
+const siteData = require('./siteData')
+
+export default function () {
+  const localVue = createLocalVue()
+  localVue.use(Router)
+
+  // register global component
+  localVue.component('OutboundLink', mockComponent('outbound-link'))
+  localVue.component(siteData.pages[0].key, mockComponent('page-component'))
+  localVue.mixin(dataMixin(I18n, siteData))
+  return localVue
+}
diff --git a/packages/@vuepress/test-utils/meta.js b/packages/@vuepress/test-utils/meta.js
deleted file mode 100644
index 4f820db1fa..0000000000
--- a/packages/@vuepress/test-utils/meta.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const { fs } = require('@vuepress/shared-utils')
-const path = require('path')
-
-const docsBaseDir = path.resolve(__dirname, 'fixtures')
-const docsModeNames = fs.readdirSync(docsBaseDir)
-const docsModes = docsModeNames.map(name => {
-  const docsPath = path.resolve(docsBaseDir, name)
-  const docsTempPath = path.resolve(docsPath, '.vuepress/.temp')
-  return { name, docsPath, docsTempPath }
-})
-
-exports.docsModes = docsModes
diff --git a/packages/@vuepress/test-utils/modeTestRunner.js b/packages/@vuepress/test-utils/modeTestRunner.js
deleted file mode 100644
index 758e1bfbc0..0000000000
--- a/packages/@vuepress/test-utils/modeTestRunner.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const { createLocalVue } = require('@vue/test-utils')
-const dataMixin = require('@vuepress/core/lib/app/dataMixin').default
-const I18n = require('@vuepress/core/lib/prepare/I18n')
-const Router = require('vue-router')
-const mockComponent = require('./mockComponent')
-const { docsModes } = require('./meta')
-
-function getLocalVueByMode (mode) {
-  const localVue = createLocalVue()
-  localVue.use(Router)
-
-  // register global component
-  localVue.component('OutboundLink', mockComponent('outbound-link'))
-
-  const { siteData } = require(`${mode.docsTempPath}/internal/siteData.js`)
-  localVue.component(siteData.pages[0].key, mockComponent('page-component'))
-  localVue.mixin(dataMixin(I18n, siteData))
-  return localVue
-}
-
-/**
- * Used to test components in VuePress at different mode.
- * Since VuePress has two main modes, i18n or normal mode, we need to make
- * sure that the core Vue components in VuePress work well in both modes.
- * @param description
- * @param testFn
- */
-module.exports = function modeTestRunner (description, testFn) {
-  docsModes.forEach(mode => {
-    describe(description, () => {
-      testFn(mode.name, getLocalVueByMode(mode))
-    })
-  })
-}
diff --git a/packages/@vuepress/test-utils/prepare.js b/packages/@vuepress/test-utils/prepare.js
deleted file mode 100644
index 5f75af4530..0000000000
--- a/packages/@vuepress/test-utils/prepare.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const { fs, logger } = require('@vuepress/shared-utils')
-const prepare = require('@vuepress/core/lib/prepare')
-const { docsModes } = require('./meta')
-
-async function prepareForTest () {
-  await Promise.all(docsModes.map(async ({ docsPath, docsTempPath }) => {
-    await fs.ensureDir(docsTempPath)
-    await prepare(docsPath, { theme: '@vuepress/default', temp: docsTempPath })
-  }))
-}
-
-module.exports = function globalSetup () {
-  logger.wait('Start preparing for testing ...')
-  return prepareForTest().then(() => {
-    logger.wait('Finished preparing for testing ...')
-  })
-}
diff --git a/packages/@vuepress/test-utils/siteData.js b/packages/@vuepress/test-utils/siteData.js
new file mode 100644
index 0000000000..3a08c46d58
--- /dev/null
+++ b/packages/@vuepress/test-utils/siteData.js
@@ -0,0 +1,56 @@
+/* eslint-disable */
+
+module.exports = {
+  "title": "VuePress",
+  "description": "",
+  "base": "/",
+  "pages": [
+    {
+      "title": "Hello, VuePress!",
+      "frontmatter": {},
+      "key": "v-37b29011bd265",
+      "path": "/",
+      "regularPath": "/"
+    },
+    {
+      "title": "你好, VuePress!",
+      "frontmatter": {},
+      "key": "v-6a0244c805bde",
+      "path": "/zh/",
+      "regularPath": "/zh/"
+    }
+  ],
+  "themeConfig": {
+    "repo": "vuejs/vuepress",
+    "editLinks": true,
+    "docsDir": "docs",
+    "locales": {
+      "/": {
+        "label": "English",
+        "selectText": "Languages",
+        "editLinkText": "Edit this page on GitHub",
+        "lastUpdated": "Last Updated"
+      },
+      "/zh/": {
+        "label": "简体中文",
+        "selectText": "选择语言",
+        "editLinkText": "在 GitHub 上编辑此页",
+        "lastUpdated": "上次更新"
+      }
+    }
+  },
+  "locales": {
+    "/": {
+      "lang": "en-US",
+      "title": "VuePress",
+      "description": "Vue-powered Static Site Generator",
+      "path": "/"
+    },
+    "/zh/": {
+      "lang": "zh-CN",
+      "title": "VuePress",
+      "description": "Vue 驱动的静态网站生成器",
+      "path": "/zh/"
+    }
+  }
+}
diff --git a/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js b/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
index 1667e93e0a..14d4f63baf 100644
--- a/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
+++ b/packages/@vuepress/theme-default/__test__/components/DropdownLink.spec.js
@@ -1,9 +1,9 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
 import DropdownLink from '../../components/DropdownLink.vue'
-import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
+import createLocalVue from '@vuepress/test-utils/createLocalVue'
 
-function test (mode, localVue) {
-  it(`$${mode} - renders dropdown link.`, () => {
+describe('DropdownLink', () => {
+  test('renders dropdown link.', () => {
     const item = {
       text: 'VuePress',
       items: [
@@ -18,7 +18,7 @@ function test (mode, localVue) {
       ]
     }
     const wrapper = mount(DropdownLink, {
-      localVue,
+      localVue: createLocalVue(),
       stubs: {
         'router-link': RouterLinkStub
       },
@@ -26,6 +26,4 @@ function test (mode, localVue) {
     })
     expect(wrapper.html()).toMatchSnapshot()
   })
-}
-
-modeTestRunner('DropdownLink', test)
+})
diff --git a/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js b/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
index 6945ac6b91..2dbbc10ef0 100644
--- a/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
+++ b/packages/@vuepress/theme-default/__test__/components/NavLink.spec.js
@@ -1,15 +1,15 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
+import createLocalVue from '@vuepress/test-utils/createLocalVue'
 import NavLink from '../../components/NavLink.vue'
 
-function test (mode, localVue) {
-  it(`$${mode} - renders nav link with internal link`, () => {
+describe('NavLink', () => {
+  test('renders nav link with internal link', () => {
     const item = {
       link: '/',
       text: 'VuePress'
     }
     const wrapper = mount(NavLink, {
-      localVue,
+      localVue: createLocalVue(),
       stubs: {
         'router-link': RouterLinkStub
       },
@@ -18,17 +18,15 @@ function test (mode, localVue) {
     expect(wrapper.html()).toMatchSnapshot()
   })
 
-  it(`$${mode} - renders nav link with external link`, () => {
+  test('renders nav link with external link', () => {
     const item = {
       link: 'http://vuejs.org/',
       text: 'Vue'
     }
     const wrapper = mount(NavLink, {
-      localVue,
+      localVue: createLocalVue(),
       propsData: { item }
     })
     expect(wrapper.html()).toMatchSnapshot()
   })
-}
-
-modeTestRunner('NavLink', test)
+})
diff --git a/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap b/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
index cad38def2b..b91da995f8 100644
--- a/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
+++ b/packages/@vuepress/theme-default/__test__/components/__snapshots__/DropdownLink.spec.js.snap
@@ -1,54 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DropdownLink $docs-i18n - renders dropdown link. 1`] = `
-<div class="dropdown-wrapper">
-  <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
-  <ul class="nav-dropdown" style="display: none;" name="dropdown">
-    <li class="dropdown-item">
-      <!---->
-      <a class="nav-link">Guide</a>
-    </li>
-    <li class="dropdown-item">
-      <!---->
-      <a class="nav-link">Config Reference</a>
-    </li>
-  </ul>
-</div>
-`;
-
-exports[`DropdownLink $docs-local-theme - renders dropdown link. 1`] = `
-<div class="dropdown-wrapper">
-  <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
-  <ul class="nav-dropdown" style="display: none;" name="dropdown">
-    <li class="dropdown-item">
-      <!---->
-      <a class="nav-link">Guide</a>
-    </li>
-    <li class="dropdown-item">
-      <!---->
-      <a class="nav-link">Config Reference</a>
-    </li>
-  </ul>
-</div>
-`;
-
-exports[`DropdownLink $docs-simple - renders dropdown link. 1`] = `
-<div class="dropdown-wrapper">
-  <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
-  <ul class="nav-dropdown" style="display: none;" name="dropdown">
-    <li class="dropdown-item">
-      <!---->
-      <a class="nav-link">Guide</a>
-    </li>
-    <li class="dropdown-item">
-      <!---->
-      <a class="nav-link">Config Reference</a>
-    </li>
-  </ul>
-</div>
-`;
-
-exports[`DropdownLink $docs-simple-config - renders dropdown link. 1`] = `
+exports[`DropdownLink renders dropdown link. 1`] = `
 <div class="dropdown-wrapper">
   <a class="dropdown-title"><span class="title">VuePress</span> <span class="arrow right"></span></a>
   <ul class="nav-dropdown" style="display: none;" name="dropdown">
diff --git a/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap b/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
index ccb1f78133..3b02765a3b 100644
--- a/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
+++ b/packages/@vuepress/theme-default/__test__/components/__snapshots__/NavLink.spec.js.snap
@@ -1,37 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`NavLink $docs-i18n - renders nav link with external link 1`] = `
+exports[`NavLink renders nav link with external link 1`] = `
 <a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
   Vue
   <p class="component outbound-link">outbound-link</p>
 </a>
 `;
 
-exports[`NavLink $docs-i18n - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
-
-exports[`NavLink $docs-local-theme - renders nav link with external link 1`] = `
-<a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
-  Vue
-  <p class="component outbound-link">outbound-link</p>
-</a>
-`;
-
-exports[`NavLink $docs-local-theme - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
-
-exports[`NavLink $docs-simple - renders nav link with external link 1`] = `
-<a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
-  Vue
-  <p class="component outbound-link">outbound-link</p>
-</a>
-`;
-
-exports[`NavLink $docs-simple - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
-
-exports[`NavLink $docs-simple-config - renders nav link with external link 1`] = `
-<a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer" class="nav-link external">
-  Vue
-  <p class="component outbound-link">outbound-link</p>
-</a>
-`;
-
-exports[`NavLink $docs-simple-config - renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
+exports[`NavLink renders nav link with internal link 1`] = `<a class="nav-link">VuePress</a>`;
diff --git a/scripts/jest.config.js b/scripts/jest.config.js
index a1f7bbd126..dcb002f565 100644
--- a/scripts/jest.config.js
+++ b/scripts/jest.config.js
@@ -7,5 +7,8 @@ module.exports = createJestConfig({
     '^@/(.*)$': '<rootDir>/$1',
     '^@core/(.*)$': '<rootDir>/packages/@vuepress/core/$1'
   },
-  globalSetup: '<rootDir>/packages/@vuepress/test-utils/prepare.js'
+  modulePathIgnorePatterns: [
+    '<rootDir>/packages/@vuepress/core/__test__/prepare/prepare.spec.js',
+    '<rootDir>/packages/@vuepress/core/__test__/plugin-api/AsyncOption.spec.js'
+  ]
 })

From f74ccddd90f7cf373485b0b4fe1d7f85a44a7077 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:40:50 +0800
Subject: [PATCH 218/242] test: clean Content.spec.js

---
 .../core/__test__/app/Content.spec.js         | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 packages/@vuepress/core/__test__/app/Content.spec.js

diff --git a/packages/@vuepress/core/__test__/app/Content.spec.js b/packages/@vuepress/core/__test__/app/Content.spec.js
deleted file mode 100644
index 65136a07bf..0000000000
--- a/packages/@vuepress/core/__test__/app/Content.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Content from '../../lib/app/components/Content'
-import { mount } from '@vue/test-utils'
-import modeTestRunner from '@vuepress/test-utils/modeTestRunner'
-import getRouter from '@vuepress/test-utils/getRouter'
-
-function test (mode, localVue) {
-  it(`${mode} - add custom class by default.`, () => {
-    const wrapper = mount(Content, {
-      localVue,
-      router: getRouter()
-    })
-    expect(wrapper.contains('.custom')).toBe(true)
-  })
-
-  it(`${mode} - remove custom when custom set to false.`, () => {
-    const wrapper = mount(Content, {
-      // https://vue-test-utils.vuejs.org/api/options.html#context
-      context: {
-        props: {
-          custom: false
-        }
-      },
-      localVue,
-      router: getRouter()
-    })
-    expect(wrapper.contains('.custom')).toBe(false)
-  })
-}
-
-modeTestRunner('Content', test)
-

From ade62c98686aafe9fca583d86e165060bdefb799 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:41:44 +0800
Subject: [PATCH 219/242] fix($core): null check for Layout components

---
 packages/@vuepress/core/lib/prepare/loadTheme.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
index da958e74d6..9de3fb745e 100644
--- a/packages/@vuepress/core/lib/prepare/loadTheme.js
+++ b/packages/@vuepress/core/lib/prepare/loadTheme.js
@@ -74,12 +74,18 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
       return map
     }, {})
 
-  if (!fs.existsSync(layoutComponentMap.Layout.path)) {
+  if (!layoutComponentMap.Layout && !fs.existsSync(layoutComponentMap.Layout.path)) {
     throw new Error(`[vuepress] Cannot resolve Layout.vue file in \n ${layoutComponentMap.Layout.path}`)
   }
 
-  if (!fs.existsSync(layoutComponentMap.NotFound.path)) {
-    layoutComponentMap['404'].path = path.resolve(__dirname, '../app/components/NotFound.vue')
+  // use default 404 component.
+  if (!layoutComponentMap.NotFound || !fs.existsSync(layoutComponentMap.NotFound.path)) {
+    layoutComponentMap['404'] = {
+      filename: 'Layout.vue',
+      componentName: 'NotFound',
+      path: path.resolve(__dirname, '../app/components/NotFound.vue'),
+      isInternal: true
+    }
   }
 
   return {

From e4f2f1810968ce3873f348c88cb3d3531f1d7488 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:42:53 +0800
Subject: [PATCH 220/242] refactor($pwa): using define API.

---
 packages/@vuepress/plugin-pwa/index.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/@vuepress/plugin-pwa/index.js b/packages/@vuepress/plugin-pwa/index.js
index 1eb8394daa..a7d17140b7 100644
--- a/packages/@vuepress/plugin-pwa/index.js
+++ b/packages/@vuepress/plugin-pwa/index.js
@@ -8,17 +8,14 @@ module.exports = (options, context) => ({
     }, options)
   },
 
-  chainWebpack (config) {
+  define () {
     const { serviceWorker, updatePopup } = options
     const base = context.base || '/'
-
-    config.plugin('injections').tap(([options]) => [
-      Object.assign(options, {
-        SW_BASE_URL: JSON.stringify(base),
-        SW_ENABLED: !!serviceWorker,
-        SW_UPDATE_POPUP: updatePopup ? JSON.stringify(updatePopup) : false
-      })
-    ])
+    return {
+      SW_BASE_URL: base,
+      SW_ENABLED: !!serviceWorker,
+      SW_UPDATE_POPUP: updatePopup || false
+    }
   },
 
   // TODO support components option

From a2f34f58118de6e2da0d2896a4a905afd9b75630 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:46:37 +0800
Subject: [PATCH 221/242] test: exclude default theme

---
 packages/@vuepress/shared-utils/lib/module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/shared-utils/lib/module.js b/packages/@vuepress/shared-utils/lib/module.js
index dfe646fb25..371c57758e 100644
--- a/packages/@vuepress/shared-utils/lib/module.js
+++ b/packages/@vuepress/shared-utils/lib/module.js
@@ -42,7 +42,7 @@ exports.resolveModule = function (request, context) {
   // TODO
   // Temporary workaround for jest cannot resolve module path from '__mocks__'
   // when using 'require.resolve'.
-  if (isTest()) {
+  if (isTest() && request !== '@vuepress/theme-default') {
     resolvedPath = path.resolve(__dirname, '../../../../__mocks__', request)
     if (!fs.existsSync(`${resolvedPath}.js`) && !fs.existsSync(`${resolvedPath}/index.js`)) {
       throw new Error(`Cannot find module '${request}'`)

From d910859add6238fa5f59e1933ea3e4de6240c374 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:49:49 +0800
Subject: [PATCH 222/242] refactor($ga): using define

---
 packages/@vuepress/plugin-google-analytics/index.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/@vuepress/plugin-google-analytics/index.js b/packages/@vuepress/plugin-google-analytics/index.js
index 714604f9e8..cb94b78ed8 100644
--- a/packages/@vuepress/plugin-google-analytics/index.js
+++ b/packages/@vuepress/plugin-google-analytics/index.js
@@ -1,18 +1,11 @@
 const path = require('path')
 
 module.exports = (options = {}, context) => ({
-  ready () {
+  define () {
     const { siteConfig = {}} = context
     const ga = options.ga || siteConfig.ga
-    context.GA_ID = ga ? JSON.stringify(ga) : false
-  },
-
-  chainWebpack (config) {
-    config.plugin('injections').tap(([options]) => [
-      Object.assign(options, {
-        GA_ID: context.GA_ID
-      })
-    ])
+    const GA_ID = ga || false
+    return { GA_ID }
   },
 
   enhanceAppFiles: [

From a5f58f78e8e129effd0108195835792f80754d46 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 14:59:33 +0800
Subject: [PATCH 223/242] feat($core): alias - plugin API

---
 .../core/lib/plugin-api/constants.js          |  3 ++-
 .../@vuepress/core/lib/plugin-api/index.js    |  4 +++-
 .../lib/plugin-api/override/AliasOption.js    | 23 +++++++++++++++++++
 .../plugin-api/override/instantiateOption.js  |  4 ++++
 .../core/lib/webpack/createBaseConfig.js      |  1 +
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/plugin-api/override/AliasOption.js

diff --git a/packages/@vuepress/core/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
index 3ed5051518..96577e6455 100644
--- a/packages/@vuepress/core/lib/plugin-api/constants.js
+++ b/packages/@vuepress/core/lib/plugin-api/constants.js
@@ -17,7 +17,8 @@ const PLUGIN_OPTION_META_MAP = {
   CLIENT_ROOT_MIXIN: { name: 'clientRootMixin', types: [String] },
   ADDITIONAL_PAGES: { name: 'additionalPages', types: [Function, Array] },
   GLOBAL_UI_COMPONENTS: { name: 'globalUIComponents', types: [String, Array] },
-  DEFINE: { name: 'define', types: [Function, Object] }
+  DEFINE: { name: 'define', types: [Function, Object] },
+  ALIAS: { name: 'alias', types: [Function, Object] }
 }
 
 const PLUGIN_OPTION_MAP = {}
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index f5199f1c26..40c17bdea0 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -156,7 +156,8 @@ module.exports = class PluginAPI {
     clientRootMixin,
     additionalPages,
     globalUIComponents,
-    define
+    define,
+    alias
   }) {
     const isInternalPlugin = pluginName.startsWith('@vuepress/internal-')
     if (shortcut) {
@@ -181,5 +182,6 @@ module.exports = class PluginAPI {
       .registerOption(PLUGIN_OPTION_MAP.ADDITIONAL_PAGES.key, additionalPages, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.GLOBAL_UI_COMPONENTS.key, globalUIComponents, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.DEFINE.key, define, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.ALIAS.key, alias, pluginName)
   }
 }
diff --git a/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js b/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js
new file mode 100644
index 0000000000..20d25ff813
--- /dev/null
+++ b/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js
@@ -0,0 +1,23 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const Option = require('../abstract/Option')
+
+/**
+ * define option.
+ */
+
+module.exports = class DefineOption extends Option {
+  apply (config) {
+    super.syncApply()
+    const aliases = this.appliedValues
+    aliases.forEach((alias) => {
+      Object.keys(alias).forEach(key => {
+        config.resolve.alias.set('key', alias[key])
+      })
+    })
+  }
+}
diff --git a/packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js b/packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js
index 6d43f8b653..ad0fac2c7a 100644
--- a/packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js
@@ -2,6 +2,7 @@ const EnhanceAppFilesOption = require('./EnhanceAppFilesOption')
 const ClientDynamicModulesOption = require('./ClientDynamicModulesOption')
 const GlobalUIComponentsOption = require('./GlobalUIComponentsOption')
 const DefineOption = require('./DefineOption')
+const AliasOption = require('./AliasOption')
 const Option = require('../abstract/Option')
 const { PLUGIN_OPTION_MAP } = require('../constants')
 
@@ -19,6 +20,9 @@ module.exports = function instantiateOption (name) {
   case PLUGIN_OPTION_MAP.DEFINE.name:
     return new DefineOption(name)
 
+  case PLUGIN_OPTION_MAP.ALIAS.name:
+    return new AliasOption(name)
+
   default: return new Option(name)
   }
 }
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index c300c307a7..0ae51ae589 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -295,6 +295,7 @@ module.exports = function createBaseConfig ({
     }])
 
   pluginAPI.options.define.apply(config)
+  pluginAPI.options.alias.apply(config)
 
   return config
 }

From 3125fc7b05185cb5a0424955a2975aaf8adc343a Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 15:16:34 +0800
Subject: [PATCH 224/242] chore: move config.styl to core

---
 .../{theme-default/styles => core/lib/app/style}/config.styl    | 2 +-
 .../@vuepress/theme-default/components/AlgoliaSearchBox.vue     | 2 +-
 packages/@vuepress/theme-default/components/Badge.vue           | 2 +-
 packages/@vuepress/theme-default/components/DropdownLink.vue    | 2 +-
 packages/@vuepress/theme-default/components/Home.vue            | 2 +-
 packages/@vuepress/theme-default/components/NavLinks.vue        | 2 +-
 packages/@vuepress/theme-default/components/Navbar.vue          | 2 +-
 packages/@vuepress/theme-default/components/Page.vue            | 2 +-
 packages/@vuepress/theme-default/components/SearchBox.vue       | 2 +-
 packages/@vuepress/theme-default/components/Sidebar.vue         | 2 +-
 packages/@vuepress/theme-default/components/SidebarButton.vue   | 2 +-
 packages/@vuepress/theme-default/components/SidebarLink.vue     | 2 +-
 packages/@vuepress/theme-default/styles/code.styl               | 2 +-
 packages/@vuepress/theme-default/styles/theme.styl              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/@vuepress/{theme-default/styles => core/lib/app/style}/config.styl (94%)

diff --git a/packages/@vuepress/theme-default/styles/config.styl b/packages/@vuepress/core/lib/app/style/config.styl
similarity index 94%
rename from packages/@vuepress/theme-default/styles/config.styl
rename to packages/@vuepress/core/lib/app/style/config.styl
index a57d4484de..5c7296f615 100644
--- a/packages/@vuepress/theme-default/styles/config.styl
+++ b/packages/@vuepress/core/lib/app/style/config.styl
@@ -1,5 +1,5 @@
 // colors
-$accentColor = #3eaf7c
+$accentColor = #3eaf73
 $textColor = #2c3e50
 $borderColor = #eaecef
 $codeBgColor = #282c34
diff --git a/packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue b/packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue
index fdd703dc6e..1ccb26bf9a 100644
--- a/packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue
+++ b/packages/@vuepress/theme-default/components/AlgoliaSearchBox.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .algolia-search-wrapper
   & > span
diff --git a/packages/@vuepress/theme-default/components/Badge.vue b/packages/@vuepress/theme-default/components/Badge.vue
index e5701b5f7f..d0425c153a 100644
--- a/packages/@vuepress/theme-default/components/Badge.vue
+++ b/packages/@vuepress/theme-default/components/Badge.vue
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .badge
   display inline-block
diff --git a/packages/@vuepress/theme-default/components/DropdownLink.vue b/packages/@vuepress/theme-default/components/DropdownLink.vue
index 72642448df..e2d7d025bd 100644
--- a/packages/@vuepress/theme-default/components/DropdownLink.vue
+++ b/packages/@vuepress/theme-default/components/DropdownLink.vue
@@ -77,7 +77,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+  @import '~@app/style/config'
 
 .dropdown-wrapper
   cursor pointer
diff --git a/packages/@vuepress/theme-default/components/Home.vue b/packages/@vuepress/theme-default/components/Home.vue
index e9f4275b5f..d404afb278 100644
--- a/packages/@vuepress/theme-default/components/Home.vue
+++ b/packages/@vuepress/theme-default/components/Home.vue
@@ -70,7 +70,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .home
   padding $navbarHeight 2rem 0
diff --git a/packages/@vuepress/theme-default/components/NavLinks.vue b/packages/@vuepress/theme-default/components/NavLinks.vue
index 5ab10f68ab..07df97a3a5 100644
--- a/packages/@vuepress/theme-default/components/NavLinks.vue
+++ b/packages/@vuepress/theme-default/components/NavLinks.vue
@@ -116,7 +116,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .nav-links
   display inline-block
diff --git a/packages/@vuepress/theme-default/components/Navbar.vue b/packages/@vuepress/theme-default/components/Navbar.vue
index 55a844bb1a..4eace13eb0 100644
--- a/packages/@vuepress/theme-default/components/Navbar.vue
+++ b/packages/@vuepress/theme-default/components/Navbar.vue
@@ -86,7 +86,7 @@ function css (el, property) {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 $navbar-vertical-padding = 0.7rem
 $navbar-horizontal-padding = 1.5rem
diff --git a/packages/@vuepress/theme-default/components/Page.vue b/packages/@vuepress/theme-default/components/Page.vue
index ba733824c2..376387d40a 100644
--- a/packages/@vuepress/theme-default/components/Page.vue
+++ b/packages/@vuepress/theme-default/components/Page.vue
@@ -195,7 +195,7 @@ function find (page, items, offset) {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 @require '../styles/wrapper.styl'
 
 .page
diff --git a/packages/@vuepress/theme-default/components/SearchBox.vue b/packages/@vuepress/theme-default/components/SearchBox.vue
index 5923f1d93e..abaedf1ca5 100644
--- a/packages/@vuepress/theme-default/components/SearchBox.vue
+++ b/packages/@vuepress/theme-default/components/SearchBox.vue
@@ -152,7 +152,7 @@ export default {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .search-box
   display inline-block
diff --git a/packages/@vuepress/theme-default/components/Sidebar.vue b/packages/@vuepress/theme-default/components/Sidebar.vue
index b8ce6c6edc..0e93466676 100644
--- a/packages/@vuepress/theme-default/components/Sidebar.vue
+++ b/packages/@vuepress/theme-default/components/Sidebar.vue
@@ -79,7 +79,7 @@ function resolveOpenGroupIndex (route, items) {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .sidebar
   ul
diff --git a/packages/@vuepress/theme-default/components/SidebarButton.vue b/packages/@vuepress/theme-default/components/SidebarButton.vue
index 0f1c21fc33..2113464f0e 100644
--- a/packages/@vuepress/theme-default/components/SidebarButton.vue
+++ b/packages/@vuepress/theme-default/components/SidebarButton.vue
@@ -7,7 +7,7 @@
 </template>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .sidebar-button
   display none
diff --git a/packages/@vuepress/theme-default/components/SidebarLink.vue b/packages/@vuepress/theme-default/components/SidebarLink.vue
index dd2393ade5..5330ba3a3c 100644
--- a/packages/@vuepress/theme-default/components/SidebarLink.vue
+++ b/packages/@vuepress/theme-default/components/SidebarLink.vue
@@ -59,7 +59,7 @@ function renderChildren (h, children, path, route, maxDepth, depth = 1) {
 </script>
 
 <style lang="stylus">
-@import '../styles/config.styl'
+@import '~@app/style/config'
 
 .sidebar .sidebar-sub-headers
   padding-left 1rem
diff --git a/packages/@vuepress/theme-default/styles/code.styl b/packages/@vuepress/theme-default/styles/code.styl
index 8383c6e3d7..c3b2e2230e 100644
--- a/packages/@vuepress/theme-default/styles/code.styl
+++ b/packages/@vuepress/theme-default/styles/code.styl
@@ -1,4 +1,4 @@
-@require './config'
+@import '~@temp/override.styl'
 
 .content
   code
diff --git a/packages/@vuepress/theme-default/styles/theme.styl b/packages/@vuepress/theme-default/styles/theme.styl
index 5b2243db68..dfc58636db 100644
--- a/packages/@vuepress/theme-default/styles/theme.styl
+++ b/packages/@vuepress/theme-default/styles/theme.styl
@@ -1,4 +1,4 @@
-@require './config'
+@require '~@app/style/config'
 @require './nprogress'
 @require './code'
 @require './custom-blocks'

From c4e27a8739520c213159c9a748cb4894848fe1d1 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 15:23:42 +0800
Subject: [PATCH 225/242] chore: fix typo

---
 packages/@vuepress/core/lib/plugin-api/override/AliasOption.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js b/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js
index 20d25ff813..fd3c2f555b 100644
--- a/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/override/AliasOption.js
@@ -16,7 +16,7 @@ module.exports = class DefineOption extends Option {
     const aliases = this.appliedValues
     aliases.forEach((alias) => {
       Object.keys(alias).forEach(key => {
-        config.resolve.alias.set('key', alias[key])
+        config.resolve.alias.set(key, alias[key])
       })
     })
   }

From 7b42984fd8e20948e5e9896e2484a61c99d3ed70 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 23 Sep 2018 15:46:56 +0800
Subject: [PATCH 226/242] feat($core): flatten return array of functional
 option

---
 .../lib/plugin-api/abstract/AsyncOption.js    | 32 ++++++++++++-------
 .../core/lib/plugin-api/abstract/Option.js    | 16 ++++++----
 .../override/ClientDynamicModulesOption.js    | 18 +++--------
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
index b3ea711d6c..c23ed3bdac 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
@@ -19,21 +19,25 @@ class AsyncOption extends Option {
    */
 
   async asyncApply (...args) {
-    const items = []
-    for (const { name, value } of this.items) {
+    const rawItems = this.items
+    this.items = []
+    this.appliedItems = this.items
+
+    for (const { name, value } of rawItems) {
       try {
-        items.push({
+        this.add(
           name,
-          value: isFunction(value)
+          isFunction(value)
             ? await value(...args)
             : value
-        })
+        )
       } catch (error) {
         logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
         throw error
       }
     }
-    this.appliedItems = items
+
+    this.items = rawItems
   }
 
   /**
@@ -43,15 +47,18 @@ class AsyncOption extends Option {
    */
 
   async parallelApply (...args) {
-    const items = []
-    await Promise.all(this.items.map(async ({ name, value }) => {
+    const rawItems = this.items
+    this.items = []
+    this.appliedItems = this.items
+
+    await Promise.all(rawItems.map(async ({ name, value }) => {
       try {
-        items.push({
+        this.add(
           name,
-          value: isFunction(value)
+          isFunction(value)
             ? await value(...args)
             : value
-        })
+        )
       } catch (error) {
         logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
         throw error
@@ -59,7 +66,8 @@ class AsyncOption extends Option {
     })).catch(error => {
       throw error
     })
-    return items
+
+    this.items = rawItems
   }
 
   /**
diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
index e2dd496f75..ad215cbd18 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
@@ -84,21 +84,25 @@ class Option {
    */
 
   syncApply (...args) {
-    const items = []
-    for (const { name, value } of this.items) {
+    const rawItems = this.items
+    this.items = []
+    this.appliedItems = this.items
+
+    for (const { name, value } of rawItems) {
       try {
-        items.push({
+        this.add(
           name,
-          value: isFunction(value)
+          isFunction(value)
             ? value(...args)
             : value
-        })
+        )
       } catch (error) {
         logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
         throw error
       }
     }
-    this.appliedItems = items
+
+    this.items = rawItems
   }
 
   /**
diff --git a/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js b/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js
index 8af74fc14e..7dae23d628 100644
--- a/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js
@@ -14,24 +14,16 @@ module.exports = class ClientDynamicModulesOption extends AsyncOption {
   async apply (ctx) {
     await super.asyncApply()
 
-    for (const item of this.appliedItems) {
-      let { value: modules } = item
-      const { name: pluginName } = item
-
-      if (!Array.isArray(modules)) {
-        modules = [modules]
-      }
-
-      await Promise.all(modules.map(async ({ name, content, dirname = 'dynamic' }) => {
-        await ctx.writeTemp(
-          `${dirname}/${name}`,
-          `
+    for (const { value, name: pluginName } of this.appliedItems) {
+      const { name, content, dirname = 'dynamic' } = value
+      await ctx.writeTemp(
+        `${dirname}/${name}`,
+        `
 /**
  * Generated by "${pluginName}"
  */
 ${content}\n\n
         `.trim())
-      }))
     }
   }
 }

From b0e32093103ca08dbf1622a3fecefb2e82a10d2c Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 24 Sep 2018 01:16:13 +0800
Subject: [PATCH 227/242] feat: plugin-search

---
 packages/@vuepress/plugin-search/.npmignore   |  2 +
 packages/@vuepress/plugin-search/README.md    | 42 +++++++++++++++++++
 .../SearchBox.vue                             |  5 ++-
 packages/@vuepress/plugin-search/index.js     | 11 +++++
 packages/@vuepress/plugin-search/package.json | 25 +++++++++++
 .../components => plugin-search}/search.svg   |  0
 .../theme-default/components/Navbar.vue       |  2 +-
 7 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 packages/@vuepress/plugin-search/.npmignore
 create mode 100644 packages/@vuepress/plugin-search/README.md
 rename packages/@vuepress/{theme-default/components => plugin-search}/SearchBox.vue (97%)
 create mode 100644 packages/@vuepress/plugin-search/index.js
 create mode 100644 packages/@vuepress/plugin-search/package.json
 rename packages/@vuepress/{theme-default/components => plugin-search}/search.svg (100%)

diff --git a/packages/@vuepress/plugin-search/.npmignore b/packages/@vuepress/plugin-search/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/plugin-search/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/plugin-search/README.md b/packages/@vuepress/plugin-search/README.md
new file mode 100644
index 0000000000..98f77fcfb5
--- /dev/null
+++ b/packages/@vuepress/plugin-search/README.md
@@ -0,0 +1,42 @@
+# @vuepress/plugin-search
+
+> header-based search plugin for vuepress
+
+## Usage
+
+1. Enable this plugin:
+
+```js
+// .vuepress/config.js or themedir/index.js
+
+module.exports = {
+  plugins: [
+    ['@vuepress/search', {
+      searchMaxSuggestions: 10
+    }]
+  ],
+  // Tweak the default color via palette.
+  palette: {
+    $accentColor: '#b58900',
+    $textColor: '#586e75',
+    $borderColor: '#eaecef',
+    $codeBgColor: '#282c34',
+    $arrowBgColor: '#ccc'
+  }
+}
+```
+
+2. Using search component:
+
+```vue
+import SearchBox from '@SearchBox'
+```
+
+## Options
+
+### searchMaxSuggestions
+
+- Type: `number`
+- Default: `true`
+
+Set the maximum number of results for search
diff --git a/packages/@vuepress/theme-default/components/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
similarity index 97%
rename from packages/@vuepress/theme-default/components/SearchBox.vue
rename to packages/@vuepress/plugin-search/SearchBox.vue
index abaedf1ca5..76016dd96a 100644
--- a/packages/@vuepress/theme-default/components/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -36,6 +36,7 @@
 </template>
 
 <script>
+/* global SEARCH_MAX_SUGGESTIONS */
 export default {
   data () {
     return {
@@ -60,8 +61,8 @@ export default {
         return
       }
 
-      const { pages, themeConfig } = this.$site
-      const max = themeConfig.searchMaxSuggestions || 5
+      const { pages } = this.$site
+      const max = SEARCH_MAX_SUGGESTIONS
       const localePath = this.$localePath
       const matches = item => (
         item.title &&
diff --git a/packages/@vuepress/plugin-search/index.js b/packages/@vuepress/plugin-search/index.js
new file mode 100644
index 0000000000..7c7bf52852
--- /dev/null
+++ b/packages/@vuepress/plugin-search/index.js
@@ -0,0 +1,11 @@
+const path = require('path')
+
+module.exports = (options) => ({
+  alias: {
+    '@SearchBox':
+      path.resolve(__dirname, 'SearchBox.vue')
+  },
+  define: {
+    SEARCH_MAX_SUGGESTIONS: options.searchMaxSuggestions || 5
+  }
+})
diff --git a/packages/@vuepress/plugin-search/package.json b/packages/@vuepress/plugin-search/package.json
new file mode 100644
index 0000000000..240ae40f1c
--- /dev/null
+++ b/packages/@vuepress/plugin-search/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@vuepress/plugin-search",
+  "version": "1.0.0",
+  "description": "search plugin for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-search#readme"
+}
\ No newline at end of file
diff --git a/packages/@vuepress/theme-default/components/search.svg b/packages/@vuepress/plugin-search/search.svg
similarity index 100%
rename from packages/@vuepress/theme-default/components/search.svg
rename to packages/@vuepress/plugin-search/search.svg
diff --git a/packages/@vuepress/theme-default/components/Navbar.vue b/packages/@vuepress/theme-default/components/Navbar.vue
index 4eace13eb0..e1db34a983 100644
--- a/packages/@vuepress/theme-default/components/Navbar.vue
+++ b/packages/@vuepress/theme-default/components/Navbar.vue
@@ -39,7 +39,7 @@
 <script>
 import SidebarButton from './SidebarButton.vue'
 import AlgoliaSearchBox from '@AlgoliaSearchBox'
-import SearchBox from './SearchBox.vue'
+import SearchBox from '@SearchBox'
 import NavLinks from './NavLinks.vue'
 
 export default {

From 63555c0db9756943f8a60ddef2877ed2ec5ba0cf Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 24 Sep 2018 01:19:18 +0800
Subject: [PATCH 228/242] feat($core): support 'palette' API, deprecate
 override.styl

---
 .../@vuepress/core/lib/app/style/config.styl  |  4 +-
 .../core/lib/internal-plugins/overrideCSS.js  | 49 +++++++++++++++++--
 .../@vuepress/core/lib/prepare/loadTheme.js   | 47 ++++++++++++++----
 3 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/style/config.styl b/packages/@vuepress/core/lib/app/style/config.styl
index 5c7296f615..1653b37cfd 100644
--- a/packages/@vuepress/core/lib/app/style/config.styl
+++ b/packages/@vuepress/core/lib/app/style/config.styl
@@ -1,5 +1,5 @@
 // colors
-$accentColor = #3eaf73
+$accentColor = #3eaf7c
 $textColor = #2c3e50
 $borderColor = #eaecef
 $codeBgColor = #282c34
@@ -19,4 +19,4 @@ $MQMobileNarrow = 419px
 $lineNumbersWrapperWidth = 3.5rem
 $codeLang = js ts html md vue css sass scss less stylus go java c sh yaml py
 
-@import '~@temp/override.styl'
+@import '~@temp/palette.styl'
diff --git a/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js b/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
index 9ba5beb449..597e74710e 100644
--- a/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
+++ b/packages/@vuepress/core/lib/internal-plugins/overrideCSS.js
@@ -1,5 +1,12 @@
 const path = require('path')
-const { fs, logger, chalk } = require('@vuepress/shared-utils')
+const {
+  fs, logger, chalk,
+  datatypes: {
+    isPlainObject,
+    assertTypes,
+    isString
+  }
+} = require('@vuepress/shared-utils')
 
 module.exports = (options, context) => ({
   name: '@vuepress/internal-override-css',
@@ -7,10 +14,23 @@ module.exports = (options, context) => ({
   async ready () {
     const { sourceDir, writeTemp } = context
 
-    const overridePath = path.resolve(sourceDir, '.vuepress/override.styl').replace(/[\\]+/g, '/')
+    const overridePath = path.resolve(sourceDir, '.vuepress/override.styl')
     const hasUserOverride = fs.existsSync(overridePath)
-    await writeTemp('override.styl', hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
 
+    if (hasUserOverride) {
+      logger.tip(`${chalk.magenta('override.styl')} has been deprecated from v1.0.0, using ${chalk.cyan('config.palette')} instead.\n`)
+    }
+
+    // palette API.
+    const themePalette = context.themePalette
+    const { palette: userPalette } = context.siteConfig
+    const themePaletteContent = resolvePaletteContent(themePalette)
+    const userPaletteContent = resolvePaletteContent(userPalette)
+    // user's palette can override theme's palette.
+    const paletteContent = themePaletteContent + userPaletteContent
+    await writeTemp('palette.styl', paletteContent)
+
+    // style.styl API.
     const stylePath = path.resolve(sourceDir, '.vuepress/style.styl').replace(/[\\]+/g, '/')
     const hasUserStyle = fs.existsSync(stylePath)
     await writeTemp('style.styl', hasUserStyle ? `@import(${JSON.stringify(stylePath)})` : ``)
@@ -24,3 +44,26 @@ module.exports = (options, context) => ({
     }
   }
 })
+
+function resolvePaletteContent (palette) {
+  const { valid, warnMsg } = assertTypes(palette, [String, Object])
+  if (!valid) {
+    if (palette !== undefined) {
+      logger.warn(
+        `[vuepress] Invalid value for "palette": ${warnMsg}`
+      )
+    }
+    return ''
+  }
+
+  if (isString(palette)) {
+    if (fs.existsSync(palette)) {
+      return `@import(${JSON.stringify(palette)})\n`
+    }
+    return ''
+  } else if (isPlainObject(palette)) {
+    return Object.keys(palette).map(variableName => {
+      return `${variableName} = ${palette[variableName]}`
+    }).join('\n') + '\n'
+  }
+}
diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
index 9de3fb745e..3a8eedec21 100644
--- a/packages/@vuepress/core/lib/prepare/loadTheme.js
+++ b/packages/@vuepress/core/lib/prepare/loadTheme.js
@@ -1,29 +1,50 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const path = require('path')
 const fs = require('fs')
 const {
-  logger, chalk,
+  shortcutPackageResolver: { resolveTheme },
   datatypes: { isString },
-  shortcutPackageResolver: { resolveTheme }
+  logger, chalk
 } = require('@vuepress/shared-utils')
 
+/**
+ * Resolve theme.
+ *
+ *   Resolving Priority:
+ *
+ *   1. If the theme was a absolute path and that path exists, respect it
+ *      as the theme directory.
+ *   2. If 'theme' directory located at vuepressDir exists, respect it as
+ *      the theme directory.
+ *   3. If 'theme' was a shortcut string, resolve it from deps.
+ *
+ * @param {string} theme
+ * @param {string} sourceDir
+ * @param {string} vuepressDir
+ * @returns {Promise}
+ */
+
 module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
-  // resolve theme
   const localThemePath = path.resolve(vuepressDir, 'theme')
   const useLocalTheme =
-    fs.existsSync(localThemePath) && (fs.readdirSync(localThemePath)).length > 0
+    !fs.existsSync(theme) &&
+    fs.existsSync(localThemePath) &&
+    (fs.readdirSync(localThemePath)).length > 0
 
   let themePath = null         // Mandatory
   let themeIndexFile = null    // Optional
-  let themePlugins = []        // Optional
   let themeName
   let themeShortcut
 
   if (useLocalTheme) {
-    // use local custom theme
     themePath = localThemePath
-    logger.tip(`\nApply theme located at ${themePath}...`)
+    logger.tip(`\nApply theme located at ${chalk.gray(themePath)}...`)
   } else if (isString(theme)) {
-    // use external theme
     const { module: modulePath, name, shortcut } = resolveTheme(theme, sourceDir)
     if (modulePath.endsWith('.js') || modulePath.endsWith('.vue')) {
       themePath = path.parse(modulePath).dir
@@ -44,8 +65,13 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
   }
 
   // handle theme api
-  const { plugins, layoutDir = useLocalTheme ? '.' : 'layouts' } = themeIndexFile
-  themePlugins = plugins
+  const {
+    plugins: themePlugins,
+    palette: themePalette,
+    layoutDir = useLocalTheme
+      ? '.'
+      : 'layouts'
+  } = themeIndexFile
 
   const layoutDirPath = path.resolve(themePath, layoutDir)
 
@@ -93,6 +119,7 @@ module.exports = async function loadTheme (theme, sourceDir, vuepressDir) {
     layoutComponentMap,
     themeIndexFile,
     themePlugins,
+    themePalette,
     themeName,
     themeShortcut
   }

From 01fa9af06ee51a2d0b7f0c6abe623a901b999435 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 24 Sep 2018 01:20:54 +0800
Subject: [PATCH 229/242] chore($theme-default): using search plugin

---
 packages/@vuepress/theme-default/index.js     | 3 ++-
 packages/@vuepress/theme-default/package.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js
index d1463ed79a..eaafc9e8ca 100644
--- a/packages/@vuepress/theme-default/index.js
+++ b/packages/@vuepress/theme-default/index.js
@@ -4,6 +4,7 @@ const themePlugin = require('./plugin')
 module.exports = {
   plugins: [
     themePlugin,
-    '@vuepress/active-header-links'
+    '@vuepress/active-header-links',
+    '@vuepress/search'
   ]
 }
diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json
index fe43290022..f5676fa02d 100644
--- a/packages/@vuepress/theme-default/package.json
+++ b/packages/@vuepress/theme-default/package.json
@@ -24,9 +24,10 @@
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme",
   "dependencies": {
     "@vuepress/plugin-active-header-links": "1.0.0",
+    "@vuepress/plugin-search": "1.0.0",
     "docsearch.js": "^2.5.2",
     "nprogress": "^0.2.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2"
   }
-}
\ No newline at end of file
+}

From 658ea759610eb1b32e068af2fc58951c285849cc Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 24 Sep 2018 01:56:40 +0800
Subject: [PATCH 230/242] refactor: unify code style.

---
 packages/@vuepress/core/lib/build.js          |   2 +
 packages/@vuepress/core/lib/dev.js            |   2 +
 packages/@vuepress/core/lib/eject.js          |   2 +
 packages/@vuepress/core/lib/index.js          |   2 +
 .../lib/plugin-api/abstract/AsyncOption.js    |  10 +-
 .../core/lib/plugin-api/abstract/Option.js    |  18 ++-
 .../@vuepress/core/lib/plugin-api/index.js    |  20 ++-
 .../override/EnhanceAppFilesOption.js         |   1 -
 .../@vuepress/core/lib/prepare/AppContext.js  |  43 ++++++-
 packages/@vuepress/core/lib/prepare/I18n.js   |  18 +++
 packages/@vuepress/core/lib/prepare/Page.js   | 114 +++++++++++++-----
 packages/@vuepress/core/lib/prepare/index.js  |  10 ++
 .../@vuepress/core/lib/prepare/loadConfig.js  |  10 ++
 packages/@vuepress/core/lib/util/index.js     |  39 ++++++
 .../core/lib/webpack/ClientPlugin.js          |   2 +
 .../core/lib/webpack/DevLogPlugin.js          |  10 ++
 .../@vuepress/core/lib/webpack/HeadPlugin.js  |  12 +-
 .../core/lib/webpack/createBaseConfig.js      |  10 ++
 .../core/lib/webpack/createClientConfig.js    |   6 +
 .../core/lib/webpack/createServerConfig.js    |   6 +
 .../core/lib/webpack/markdownLoader.js        |  10 ++
 21 files changed, 308 insertions(+), 39 deletions(-)

diff --git a/packages/@vuepress/core/lib/build.js b/packages/@vuepress/core/lib/build.js
index 402e7fec66..5c4fe16929 100644
--- a/packages/@vuepress/core/lib/build.js
+++ b/packages/@vuepress/core/lib/build.js
@@ -1,3 +1,5 @@
+'use strict'
+
 module.exports = async function build (sourceDir, cliOptions = {}) {
   process.env.NODE_ENV = 'production'
 
diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index d7606e1331..5383efb893 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -1,3 +1,5 @@
+'use strict'
+
 module.exports = async function dev (sourceDir, cliOptions = {}) {
   const path = require('path')
   const webpack = require('webpack')
diff --git a/packages/@vuepress/core/lib/eject.js b/packages/@vuepress/core/lib/eject.js
index f365df354f..f3cfa5df6b 100644
--- a/packages/@vuepress/core/lib/eject.js
+++ b/packages/@vuepress/core/lib/eject.js
@@ -1,3 +1,5 @@
+'use strict'
+
 const path = require('path')
 const { chalk, fs, logger } = require('@vuepress/shared-utils')
 
diff --git a/packages/@vuepress/core/lib/index.js b/packages/@vuepress/core/lib/index.js
index 77b22e74fd..43a6d0124b 100644
--- a/packages/@vuepress/core/lib/index.js
+++ b/packages/@vuepress/core/lib/index.js
@@ -1,3 +1,5 @@
+'use strict'
+
 exports.dev = require('./dev')
 exports.build = require('./build')
 exports.eject = require('./eject')
diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
index c23ed3bdac..2685ef09af 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js
@@ -8,14 +8,16 @@ const { logger, chalk, datatypes: { isFunction }} = require('@vuepress/shared-ut
 const Option = require('./Option')
 
 /**
- * Expose Asynchronous Option.
+ * Expose asynchronous option class.
  */
 
 class AsyncOption extends Option {
   /**
    * Asynchronous serial running
+   *
    * @param args
    * @param {Array<AsyncFunction>} args
+   * @api public
    */
 
   async asyncApply (...args) {
@@ -42,8 +44,10 @@ class AsyncOption extends Option {
 
   /**
    * Asynchronous serial running
+   *
    * @param args
    * @param {Array<AsyncFunction>} args
+   * @api public
    */
 
   async parallelApply (...args) {
@@ -72,8 +76,10 @@ class AsyncOption extends Option {
 
   /**
    * Process a value via a pipeline.
+   *
    * @param input
-   * @returns {*}
+   * @returns {any}
+   * @api public
    */
 
   async pipeline (input) {
diff --git a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
index ad215cbd18..6ffd7d48f6 100644
--- a/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
+++ b/packages/@vuepress/core/lib/plugin-api/abstract/Option.js
@@ -7,7 +7,7 @@
 const { logger, chalk, compose, datatypes: { isFunction }} = require('@vuepress/shared-utils')
 
 /**
- * Expose Option.
+ * Expose synchronous option class.
  */
 
 class Option {
@@ -18,8 +18,10 @@ class Option {
 
   /**
    * Set value with name.
+   *
    * @param {string} name
    * @param {T} value
+   * @api public
    */
 
   add (name, value) {
@@ -31,7 +33,9 @@ class Option {
 
   /**
    * Delete value with name.
+   *
    * @param {string} name
+   * @api public
    */
 
   delete (name) {
@@ -44,7 +48,9 @@ class Option {
 
   /**
    * Clean option store
+   *
    * @param {string} name
+   * @api public
    */
 
   clear (name) {
@@ -53,7 +59,9 @@ class Option {
 
   /**
    * Get values.
+   *
    * @returns {any<T>}
+   * @api public
    */
 
   get values () {
@@ -61,8 +69,10 @@ class Option {
   }
 
   /**
+   * Get applied values
    *
    * @returns {Array|*|any[]}
+   * @api public
    */
 
   get appliedValues () {
@@ -70,8 +80,10 @@ class Option {
   }
 
   /**
-   * Get values.
+   * Get entries.
+   *
    * @returns {any<T>}
+   * @api public
    */
 
   get entries () {
@@ -80,7 +92,9 @@ class Option {
 
   /**
    * Synchronous running
+   *
    * @param {Array<Function>} args
+   * @api public
    */
 
   syncApply (...args) {
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index 40c17bdea0..cc04e2d70a 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -23,12 +23,14 @@ module.exports = class PluginAPI {
     this.options = {}
     this._pluginContext = context
     this._pluginQueue = []
-    this._initializeOptions(PLUGIN_OPTION_MAP)
+    this.initializeOptions(PLUGIN_OPTION_MAP)
   }
 
   /**
    * Get enabled plugins
+   *
    * @returns {array}
+   * @api public
    */
 
   get enabledPlugins () {
@@ -37,7 +39,9 @@ module.exports = class PluginAPI {
 
   /**
    * Get disabled plugins
+   *
    * @returns {array}
+   * @api public
    */
 
   get disabledPlugins () {
@@ -46,6 +50,8 @@ module.exports = class PluginAPI {
 
   /**
    * apply plugin.
+   *
+   * @api public
    */
 
   apply () {
@@ -60,9 +66,11 @@ module.exports = class PluginAPI {
 
   /**
    * Normalize plugin and push it to the plugin queue.
+   *
    * @param {object} pluginRaw
    * @param {object} pluginOptions
    * @returns {module.PluginAPI}
+   * @api public
    */
 
   use (pluginRaw, pluginOptions = {}) {
@@ -84,8 +92,10 @@ module.exports = class PluginAPI {
 
   /**
    * Use plugin by config.
+   *
    * @param pluginsConfig
    * @returns {module.PluginAPI}
+   * @api public
    */
 
   useByPluginsConfig (pluginsConfig) {
@@ -98,9 +108,11 @@ module.exports = class PluginAPI {
 
   /**
    * initialize plugin options.
+   *
+   * @api private
    */
 
-  _initializeOptions () {
+  initializeOptions () {
     Object.keys(PLUGIN_OPTION_MAP).forEach(key => {
       const option = PLUGIN_OPTION_MAP[key]
       this.options[option.name] = instantiateOption(option.name)
@@ -109,10 +121,12 @@ module.exports = class PluginAPI {
 
   /**
    * Register plugin option.
+   *
    * @param {string} key
    * @param {any} value
    * @param {string} pluginName
    * @returns {module.PluginAPI}
+   * @api private
    */
 
   registerOption (key, value, pluginName) {
@@ -132,6 +146,8 @@ module.exports = class PluginAPI {
 
   /**
    * apply plugin.
+   *
+   * @api private
    */
 
   applyPlugin ({
diff --git a/packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js b/packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js
index b96ab515bb..9e5b3f5ac5 100644
--- a/packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js
+++ b/packages/@vuepress/core/lib/plugin-api/override/EnhanceAppFilesOption.js
@@ -1,4 +1,3 @@
-
 'use strict'
 
 /**
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 89d17a0034..fc00e69d10 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -1,3 +1,9 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const path = require('path')
 const createMarkdown = require('../markdown/index')
 const loadConfig = require('./loadConfig')
@@ -8,10 +14,15 @@ const Page = require('./Page')
 const I18n = require('./I18n')
 const PluginAPI = require('../plugin-api/index')
 
+/**
+ * Expose AppContext.
+ */
+
 module.exports = class AppContext {
   /**
    * Instantiate the app context with a new API
-   * @param { string } sourceDir
+   *
+   * @param {string} sourceDir
    * @param {{
    *  isProd: boolean,
    *  plugins: pluginsConfig,
@@ -19,6 +30,7 @@ module.exports = class AppContext {
    *  temp: string
    * }} options
    */
+
   constructor (sourceDir, cliOptions = {}, isProd) {
     this.sourceDir = sourceDir
     this.cliOptions = cliOptions
@@ -47,8 +59,11 @@ module.exports = class AppContext {
 
   /**
    * Load pages, load plugins, apply plugins / plugin options, etc.
+   *
    * @returns {Promise<void>}
+   * @api private
    */
+
   async process () {
     this.normalizeHeadTagUrls()
     this.markdown = createMarkdown(this.siteConfig)
@@ -72,7 +87,10 @@ module.exports = class AppContext {
 
   /**
    * Apply internal and user plugins
+   *
+   * @api private
    */
+
   resolvePlugins () {
     const themeConfig = this.themeConfig
     const siteConfig = this.siteConfig
@@ -111,7 +129,10 @@ module.exports = class AppContext {
 
   /**
    * normalize head tag urls for base
+   *
+   * @api private
    */
+
   normalizeHeadTagUrls () {
     if (this.base !== '/' && this.siteConfig.head) {
       this.siteConfig.head.forEach(tag => {
@@ -132,7 +153,10 @@ module.exports = class AppContext {
 
   /**
    * Make template configurable
+   *
+   * @api private
    */
+
   resolveTemplates () {
     let { ssrTemplate, devTemplate } = this.siteConfig
     const templateDir = path.resolve(this.vuepressDir, 'templates')
@@ -156,8 +180,11 @@ module.exports = class AppContext {
 
   /**
    * Find all page source files located in sourceDir
+   *
    * @returns {Promise<void>}
+   * @api private
    */
+
   async resolvePages () {
     // resolve pageFiles
     const patterns = ['**/*.md', '!.vuepress', '!node_modules']
@@ -179,8 +206,11 @@ module.exports = class AppContext {
 
   /**
    * Add a page
-   * @returns { Promise<void> }
+   *
+   * @returns {Promise<void>}
+   * @api public
    */
+
   async addPage (options) {
     options.permalinkPattern = this.siteConfig.permalink
     const page = new Page(options)
@@ -194,8 +224,11 @@ module.exports = class AppContext {
 
   /**
    * Resolve theme
-   * @returns { Promise<void> }
+   *
+   * @returns {Promise<void>}
+   * @api private
    */
+
   async resolveTheme () {
     const theme = this.siteConfig.theme || this.cliOptions.theme
     Object.assign(this, (await loadTheme(theme, this.sourceDir, this.vuepressDir)))
@@ -203,6 +236,7 @@ module.exports = class AppContext {
 
   /**
    * Get the data to be delivered to the client.
+   *
    * @returns {{
    *  title: string,
    *  description: string,
@@ -211,7 +245,9 @@ module.exports = class AppContext {
    *  themeConfig: ThemeConfig,
    *  locales: Locales
    * }}
+   * @api public
    */
+
   getSiteData () {
     return {
       title: this.siteConfig.title || '',
@@ -233,6 +269,7 @@ module.exports = class AppContext {
  *  tempPath: string
  * }}
  */
+
 function createTemp (tempPath) {
   if (!tempPath) {
     tempPath = path.resolve(__dirname, '../../.temp')
diff --git a/packages/@vuepress/core/lib/prepare/I18n.js b/packages/@vuepress/core/lib/prepare/I18n.js
index 3606337897..8176c592b8 100644
--- a/packages/@vuepress/core/lib/prepare/I18n.js
+++ b/packages/@vuepress/core/lib/prepare/I18n.js
@@ -1,3 +1,13 @@
+'use strict'
+
+/**
+ * Get page data via path (permalink).
+ *
+ * @param {array} pages
+ * @param {string} path
+ * @returns {object}
+ */
+
 function findPageForPath (pages, path) {
   for (let i = 0; i < pages.length; i++) {
     const page = pages[i]
@@ -11,6 +21,14 @@ function findPageForPath (pages, path) {
   }
 }
 
+/**
+ * Expose I18n constructor.Note that this file will
+ * be run in both server and client side.
+ *
+ * @param store
+ * @returns {{new(*): I18n, prototype: I18n}}
+ */
+
 module.exports = (store /* null in server side */) => class I18n {
   constructor (dataProvider) {
     this.__ssrContext = true
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 40fae91041..5f30d0de24 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -1,17 +1,28 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const path = require('path')
 const slugify = require('../markdown/slugify')
 const { inferTitle, extractHeaders } = require('../util/index')
 const { fs, fileToPath, parseFrontmatter, getPermalink } = require('@vuepress/shared-utils')
 
+/**
+ * Expose Page class.
+ */
+
 module.exports = class Page {
   /**
-   * @param { string } title markdown title
-   * @param { string } content markdown file content
-   * @param { string } filePath absolute file path of source markdown file.
-   * @param { string } relative relative file path of source markdown file.
-   * @param { string } permalink the URL (excluding the domain name) for your pages, posts.
-   * @param { object } frontmatter
-   * @param { string } permalinkPattern
+   * @param {string} path the URL (excluding the domain name) for your page/post.
+   * @param {string} title markdown title
+   * @param {string} content markdown file content
+   * @param {string} filePath absolute file path of source markdown file.
+   * @param {string} relative relative file path of source markdown file.
+   * @param {string} permalink same to path, the URL (excluding the domain name) for your page/post.
+   * @param {object} frontmatter
+   * @param {string} permalinkPattern
    */
   constructor ({
     path,
@@ -44,6 +55,16 @@ module.exports = class Page {
     this._permalinkPattern = permalinkPattern
   }
 
+  /**
+   * Process a page.
+   *
+   *   1. If it's a page pointing to a md file, this method will try
+   *      to resolve the page's title / headers from the content.
+   *   2. If it's a pure route. this method will only enhance it.
+   *
+   * @api public
+   */
+
   async process ({
     i18n,
     markdown,
@@ -85,10 +106,57 @@ module.exports = class Page {
     this._i18n = i18n
     this._localePath = i18n.$localePath
 
-    this._enhance(enhancers)
+    this.enhance(enhancers)
     this.buildPermalink()
   }
 
+  /**
+   * file name of page's source markdown file, or the last cut of regularPath.
+   *
+   * @returns {string}
+   * @api public
+   */
+
+  get filename () {
+    return path.parse(this._filePath || this.regularPath).name
+  }
+
+  /**
+   * slugified file name.
+   *
+   * @returns {string}
+   * @api public
+   */
+
+  get slug () {
+    return slugify(this.filename)
+  }
+
+  /**
+   * Convert page's metadata to JSON, note that all fields beginning
+   * with an underscore will not be serialized.
+   *
+   * @returns {object}
+   * @api public
+   */
+
+  toJson () {
+    const json = {}
+    Object.keys(this).reduce((json, key) => {
+      if (!key.startsWith('_')) {
+        json[key] = this[key]
+      }
+      return json
+    }, json)
+    return json
+  }
+
+  /**
+   * Build permalink via permalink pattern and page's metadata.
+   *
+   * @api private
+   */
+
   buildPermalink () {
     if (!this._permalink) {
       this._permalink = getPermalink({
@@ -105,7 +173,16 @@ module.exports = class Page {
     }
   }
 
-  _enhance (enhancers) {
+  /**
+   * Execute the page enhancers. A enhancer could do following things:
+   *
+   *   1. Modify page's frontmetter.
+   *   2. Add extra field to the page.
+   *
+   * @api private
+   */
+
+  enhance (enhancers) {
     for (const { name: pluginName, value: enhancer } of enhancers) {
       try {
         enhancer(this)
@@ -115,23 +192,4 @@ module.exports = class Page {
       }
     }
   }
-
-  get filename () {
-    return path.parse(this._filePath || this.regularPath).name
-  }
-
-  get slug () {
-    return slugify(this.filename)
-  }
-
-  toJson () {
-    const json = {}
-    Object.keys(this).reduce((json, key) => {
-      if (!key.startsWith('_')) {
-        json[key] = this[key]
-      }
-      return json
-    }, json)
-    return json
-  }
 }
diff --git a/packages/@vuepress/core/lib/prepare/index.js b/packages/@vuepress/core/lib/prepare/index.js
index 73bfa46905..06bd77ed83 100644
--- a/packages/@vuepress/core/lib/prepare/index.js
+++ b/packages/@vuepress/core/lib/prepare/index.js
@@ -1,5 +1,15 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const AppContext = require('./AppContext')
 
+/**
+ * Expose prepare.
+ */
+
 module.exports = async function prepare (sourceDir, cliOptions, isProd) {
   const appContext = new AppContext(sourceDir, cliOptions, isProd)
   await appContext.process()
diff --git a/packages/@vuepress/core/lib/prepare/loadConfig.js b/packages/@vuepress/core/lib/prepare/loadConfig.js
index 949e4c6efa..a6f264bf7e 100644
--- a/packages/@vuepress/core/lib/prepare/loadConfig.js
+++ b/packages/@vuepress/core/lib/prepare/loadConfig.js
@@ -1,8 +1,18 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const { fs } = require('@vuepress/shared-utils')
 const path = require('path')
 const yamlParser = require('js-yaml')
 const tomlParser = require('toml')
 
+/**
+ * Expose loadConfig.
+ */
+
 module.exports = function loadConfig (vuepressDir, bustCache = true) {
   const configPath = path.resolve(vuepressDir, 'config.js')
   const configYmlPath = path.resolve(vuepressDir, 'config.yml')
diff --git a/packages/@vuepress/core/lib/util/index.js b/packages/@vuepress/core/lib/util/index.js
index b57c36003d..4d682728f9 100644
--- a/packages/@vuepress/core/lib/util/index.js
+++ b/packages/@vuepress/core/lib/util/index.js
@@ -1,5 +1,18 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const { deeplyParseHeaders } = require('@vuepress/shared-utils')
 
+/**
+ * Normalize head tag config.
+ *
+ * @param {string|array} tag
+ * @returns {object}
+ */
+
 exports.normalizeHeadTag = function (tag) {
   if (typeof tag === 'string') {
     tag = [tag]
@@ -13,6 +26,15 @@ exports.normalizeHeadTag = function (tag) {
   }
 }
 
+/**
+ * Use webpack-merge to merge user's config into default config.
+ *
+ * @param {object} userConfig
+ * @param {object} config
+ * @param {boolean} isServer
+ * @returns {object}
+ */
+
 exports.applyUserWebpackConfig = function (userConfig, config, isServer) {
   const merge = require('webpack-merge')
   if (typeof userConfig === 'object') {
@@ -27,6 +49,14 @@ exports.applyUserWebpackConfig = function (userConfig, config, isServer) {
   return config
 }
 
+/**
+ * Infer a page's title via frontmatter and content.
+ *
+ * @param frontmatter
+ * @param strippedContent
+ * @returns {*}
+ */
+
 exports.inferTitle = function (frontmatter, strippedContent) {
   if (frontmatter.home) {
     return 'Home'
@@ -43,6 +73,15 @@ exports.inferTitle = function (frontmatter, strippedContent) {
 const LRU = require('lru-cache')
 const cache = LRU({ max: 1000 })
 
+/**
+ * Extract heeaders from markdown source content.
+ *
+ * @param {string} content
+ * @param {array} include
+ * @param {object} md
+ * @returns {array}
+ */
+
 exports.extractHeaders = function (content, include = [], md) {
   const key = content + include.join(',')
   const hit = cache.get(key)
diff --git a/packages/@vuepress/core/lib/webpack/ClientPlugin.js b/packages/@vuepress/core/lib/webpack/ClientPlugin.js
index 82028475bb..80aeb8927d 100644
--- a/packages/@vuepress/core/lib/webpack/ClientPlugin.js
+++ b/packages/@vuepress/core/lib/webpack/ClientPlugin.js
@@ -1,3 +1,5 @@
+'use strict'
+
 // Temporarily hacked dev build
 
 var isJS = function (file) { return /\.js(\?[^.]+)?$/.test(file) }
diff --git a/packages/@vuepress/core/lib/webpack/DevLogPlugin.js b/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
index 79dd5e0086..254f0bd4dd 100644
--- a/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
+++ b/packages/@vuepress/core/lib/webpack/DevLogPlugin.js
@@ -1,5 +1,15 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const { chalk, logger } = require('@vuepress/shared-utils')
 
+/**
+ * Expose DevLogPlugin class.
+ */
+
 module.exports = class DevLogPlugin {
   constructor (options) {
     this.options = options
diff --git a/packages/@vuepress/core/lib/webpack/HeadPlugin.js b/packages/@vuepress/core/lib/webpack/HeadPlugin.js
index b8a96845f7..828c2f2212 100644
--- a/packages/@vuepress/core/lib/webpack/HeadPlugin.js
+++ b/packages/@vuepress/core/lib/webpack/HeadPlugin.js
@@ -1,6 +1,16 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const { normalizeHeadTag } = require('../util/index')
 
-module.exports = class SiteDataPlugin {
+/**
+ * Expose HeadPlugin class.
+ */
+
+module.exports = class HeadPlugin {
   constructor ({ tags }) {
     this.tags = tags
   }
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index 0ae51ae589..c153646661 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -1,6 +1,16 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const path = require('path')
 const { fs, logger, chalk } = require('@vuepress/shared-utils')
 
+/**
+ * Expose createBaseConfig method.
+ */
+
 module.exports = function createBaseConfig ({
   siteConfig,
   sourceDir,
diff --git a/packages/@vuepress/core/lib/webpack/createClientConfig.js b/packages/@vuepress/core/lib/webpack/createClientConfig.js
index 592d29df34..c818c29310 100644
--- a/packages/@vuepress/core/lib/webpack/createClientConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createClientConfig.js
@@ -1,3 +1,9 @@
+'use strict'
+
+/**
+ * Expose createClientConfig method.
+ */
+
 module.exports = function createClientConfig (ctx) {
   const path = require('path')
   const WebpackBar = require('webpackbar')
diff --git a/packages/@vuepress/core/lib/webpack/createServerConfig.js b/packages/@vuepress/core/lib/webpack/createServerConfig.js
index 764923d5ac..b8592a98fa 100644
--- a/packages/@vuepress/core/lib/webpack/createServerConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createServerConfig.js
@@ -1,3 +1,9 @@
+'use strict'
+
+/**
+ * Expose createServerConfig method.
+ */
+
 module.exports = function createServerConfig (ctx) {
   const fs = require('fs')
   const path = require('path')
diff --git a/packages/@vuepress/core/lib/webpack/markdownLoader.js b/packages/@vuepress/core/lib/webpack/markdownLoader.js
index 126c16d826..1f4e4d84dd 100644
--- a/packages/@vuepress/core/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/core/lib/webpack/markdownLoader.js
@@ -1,3 +1,9 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
 const fs = require('fs')
 const path = require('path')
 const hash = require('hash-sum')
@@ -10,6 +16,10 @@ const LRU = require('lru-cache')
 const cache = LRU({ max: 1000 })
 const devCache = LRU({ max: 1000 })
 
+/**
+ * Expose markdown loader.
+ */
+
 module.exports = function (src) {
   const isProd = process.env.NODE_ENV === 'production'
   const isServer = this.target === 'node'

From 1b234b3e753a1a76aec107f39f8ea6472c85edd3 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 24 Sep 2018 02:04:43 +0800
Subject: [PATCH 231/242] fix: build failed - wrong import

---
 packages/@vuepress/theme-default/styles/code.styl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/theme-default/styles/code.styl b/packages/@vuepress/theme-default/styles/code.styl
index c3b2e2230e..f032225e5f 100644
--- a/packages/@vuepress/theme-default/styles/code.styl
+++ b/packages/@vuepress/theme-default/styles/code.styl
@@ -1,4 +1,4 @@
-@import '~@temp/override.styl'
+@import '~@app/style/config'
 
 .content
   code

From 91ebd10913fc1ae4a170d99af87679ff1c06fd44 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 24 Sep 2018 13:47:40 +0800
Subject: [PATCH 232/242] feat($pagination): correct meta title.

---
 packages/@vuepress/plugin-pagination/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/plugin-pagination/index.js b/packages/@vuepress/plugin-pagination/index.js
index 7b9315a445..407ff4a904 100644
--- a/packages/@vuepress/plugin-pagination/index.js
+++ b/packages/@vuepress/plugin-pagination/index.js
@@ -46,13 +46,16 @@ module.exports = (options, ctx) => ({
     }
 
     ctx.pagination = pagination
-    pagination.paginationPages.forEach(({ path }) => {
+    pagination.paginationPages.forEach(({ path }, index) => {
       if (path === '/') {
         return
       }
       ctx.addPage({
         permalink: path,
-        frontmatter: { layout }
+        frontmatter: {
+          layout,
+          title: `Page ${index + 1}`
+        }
       })
     })
   },

From 0d5766671fc2142a0f8b06133cf388c314667767 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 25 Sep 2018 02:44:18 +0800
Subject: [PATCH 233/242] refactor($i18n-ui): simplify

---
 packages/@vuepress/plugin-i18n-ui/client.js |  4 +++-
 packages/@vuepress/plugin-i18n-ui/index.js  |  6 ++++--
 packages/@vuepress/plugin-i18n-ui/index.md  |  3 ---
 packages/@vuepress/plugin-i18n-ui/index.vue | 19 ++++---------------
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 packages/@vuepress/plugin-i18n-ui/index.md

diff --git a/packages/@vuepress/plugin-i18n-ui/client.js b/packages/@vuepress/plugin-i18n-ui/client.js
index de396cb1c6..41651afa7a 100644
--- a/packages/@vuepress/plugin-i18n-ui/client.js
+++ b/packages/@vuepress/plugin-i18n-ui/client.js
@@ -1,5 +1,7 @@
 import Layout from './index.vue'
+// TODO move default theme styl to core.
+import '@theme/styles/theme.styl'
 
 export default ({ Vue }) => {
-  Vue.component('I18nUI', Layout)
+  Vue.component('I18nUILayout', Layout)
 }
diff --git a/packages/@vuepress/plugin-i18n-ui/index.js b/packages/@vuepress/plugin-i18n-ui/index.js
index 318c535ae9..2639f197db 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.js
+++ b/packages/@vuepress/plugin-i18n-ui/index.js
@@ -12,8 +12,10 @@ module.exports = (pluginOptions = {}, context) => ({
 
   additionalPages: [
     {
-      filePath: path.resolve(__dirname, 'index.md'),
-      permalink: pluginOptions.permalink || '/i18n/'
+      permalink: pluginOptions.permalink || '/i18n/',
+      frontmatter: {
+        'layout': 'I18nUILayout'
+      }
     }
   ]
 })
diff --git a/packages/@vuepress/plugin-i18n-ui/index.md b/packages/@vuepress/plugin-i18n-ui/index.md
deleted file mode 100644
index 59204d7226..0000000000
--- a/packages/@vuepress/plugin-i18n-ui/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-layout: I18nUI
----
diff --git a/packages/@vuepress/plugin-i18n-ui/index.vue b/packages/@vuepress/plugin-i18n-ui/index.vue
index a9a2769e38..185c00e8b2 100644
--- a/packages/@vuepress/plugin-i18n-ui/index.vue
+++ b/packages/@vuepress/plugin-i18n-ui/index.vue
@@ -1,6 +1,5 @@
 <template>
-  <div id="vuepress-plugin-i18n-ui">
-
+  <div class="theme-container" id="vuepress-plugin-i18n-ui">
     <div class="tool-box">
       <span class="select-lang">Language:&nbsp;</span>
       <select>
@@ -17,18 +16,12 @@
     <div class="helper-content">
       <div id="left">
         <transition name="slide-left">
-          <Content
-            v-if="currentPageComponent"
-            :page-key="key"
-          />
+          <Content :page-key="key"/>
         </transition>
       </div>
       <div id="right">
         <transition name="slide-left">
-          <Content
-            v-if="rightPageComponent"
-            :page-key="rightKey"
-          />
+          <Content :page-key="rightKey"/>
         </transition>
       </div>
     </div>
@@ -41,16 +34,12 @@ import { findPageForPath } from '@app/util'
 export default {
   data () {
     return {
-      currentPagePath: '/',
-      currentPageComponent: null,
-      rightPageComponent: null
+      currentPagePath: '/'
     }
   },
 
   mounted () {
     syncScroll()
-    this.loadComponent(this.key, 'currentPageComponent')
-    this.loadComponent(this.rightKey, 'rightPageComponent')
   },
 
   computed: {

From fb6e8d4e2d00cb222997ccf35655043504237e5d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 25 Sep 2018 02:46:48 +0800
Subject: [PATCH 234/242] refactor: some enhancement:

1. Strip date from slug,
2. Rename I18n to ClientComputedMixin,
3. Clean internal I18nTemp plugin
---
 packages/@vuepress/core/lib/app/Store.js      |  19 +++
 packages/@vuepress/core/lib/app/app.js        |  10 +-
 packages/@vuepress/core/lib/app/dataMixin.js  |  12 +-
 .../core/lib/internal-plugins/i18nTemp.js     |  18 ---
 .../@vuepress/core/lib/prepare/AppContext.js  |  22 +--
 .../core/lib/prepare/ClientComputedMixin.js   | 128 ++++++++++++++++++
 packages/@vuepress/core/lib/prepare/I18n.js   | 121 -----------------
 packages/@vuepress/core/lib/prepare/Page.js   |  54 ++++++--
 packages/@vuepress/core/lib/util/index.js     |  28 +++-
 .../plugin-active-header-links/mixin.js       |   4 +-
 10 files changed, 239 insertions(+), 177 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/app/Store.js
 delete mode 100644 packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
 create mode 100644 packages/@vuepress/core/lib/prepare/ClientComputedMixin.js
 delete mode 100644 packages/@vuepress/core/lib/prepare/I18n.js

diff --git a/packages/@vuepress/core/lib/app/Store.js b/packages/@vuepress/core/lib/app/Store.js
new file mode 100644
index 0000000000..cf3e5b60b9
--- /dev/null
+++ b/packages/@vuepress/core/lib/app/Store.js
@@ -0,0 +1,19 @@
+import Vue from 'vue'
+
+export default class Store {
+  constructor () {
+    this.store = new Vue({
+      data: {
+        ob: {}
+      }
+    })
+  }
+
+  get (key) {
+    return this.store.ob[key]
+  }
+
+  set (key, value) {
+    Vue.set(this.store.ob, key, value)
+  }
+}
diff --git a/packages/@vuepress/core/lib/app/app.js b/packages/@vuepress/core/lib/app/app.js
index 37afbdfee4..171cfd2929 100644
--- a/packages/@vuepress/core/lib/app/app.js
+++ b/packages/@vuepress/core/lib/app/app.js
@@ -6,7 +6,8 @@ import { routes } from '@internal/routes'
 import { siteData } from '@internal/siteData'
 import appEnhancers from '@internal/app-enhancers'
 import globalUIComponents from '@internal/global-ui'
-import I18n from '@internal/i18n'
+import ClientComputedMixin from '../prepare/ClientComputedMixin'
+import Store from './Store'
 
 // generated from user config
 import('@temp/style.styl')
@@ -30,9 +31,12 @@ if (module.hot) {
 }
 
 Vue.config.productionTip = false
+
+Vue.$store = new Store()
+
 Vue.use(Router)
 // mixin for exposing $site and $page
-Vue.mixin(dataMixin(I18n, siteData))
+Vue.mixin(dataMixin(ClientComputedMixin, siteData))
 // component for rendering markdown content and setting title etc.
 Vue.component('Content', Content)
 Vue.component('OutboundLink', OutboundLink)
@@ -59,7 +63,7 @@ export function createApp (isServer) {
       if (saved) {
         return saved
       } else if (to.hash) {
-        if (Vue.$store.disableScrollBehavior) {
+        if (Vue.$store.get('disableScrollBehavior')) {
           return false
         }
         return {
diff --git a/packages/@vuepress/core/lib/app/dataMixin.js b/packages/@vuepress/core/lib/app/dataMixin.js
index d52115fc2a..1f0b2dfa18 100644
--- a/packages/@vuepress/core/lib/app/dataMixin.js
+++ b/packages/@vuepress/core/lib/app/dataMixin.js
@@ -4,22 +4,16 @@ import Vue from 'vue'
 
 export default function dataMixin (I18n, siteData) {
   prepare(siteData)
-  const store = new Vue({
-    data: {
-      siteData,
-      disableScrollBehavior: false
-    }
-  })
-  Vue.$store = store
+  Vue.$store.set('siteData', siteData)
 
   if (module.hot) {
     module.hot.accept(VUEPRESS_TEMP_PATH + '/internal/siteData.js', () => {
       prepare(siteData)
-      store.siteData = siteData
+      Vue.$store.set('siteData', siteData)
     })
   }
 
-  const I18nConstructor = I18n(store)
+  const I18nConstructor = I18n(Vue.$store.get('siteData'))
   const i18n = new I18nConstructor()
   const descriptors = Object.getOwnPropertyDescriptors(Object.getPrototypeOf(i18n))
   const computed = {}
diff --git a/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js b/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
deleted file mode 100644
index 52209b0c9c..0000000000
--- a/packages/@vuepress/core/lib/internal-plugins/i18nTemp.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const path = require('path')
-const { fs } = require('@vuepress/shared-utils')
-
-// This plugin generate a mirror es module of 'lib/prepare/I18n.js'
-// Since for now Webpack doesn't allow 'ES6 import' to import a a commonjs
-// module.
-//
-// Ref: https://github.com/webpack/webpack/issues/4039
-module.exports = () => ({
-  name: '@vuepress/internal-i18n-temp',
-
-  // @internal/i18n
-  async clientDynamicModules () {
-    const i18nCommonjsModule = await fs.readFile(path.resolve(__dirname, '../prepare/I18n.js'), 'utf-8')
-    const i18nEsModule = i18nCommonjsModule.replace('module.exports =', 'export default')
-    return { name: 'i18n.js', content: i18nEsModule, dirname: 'internal' }
-  }
-})
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index fc00e69d10..c5be48465c 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -11,7 +11,7 @@ const loadTheme = require('./loadTheme')
 const { fs, logger, chalk, globby, sort, datatypes: { isFunction }} = require('@vuepress/shared-utils')
 
 const Page = require('./Page')
-const I18n = require('./I18n')
+const ClientComputedMixin = require('./ClientComputedMixin')
 const PluginAPI = require('../plugin-api/index')
 
 /**
@@ -54,7 +54,7 @@ module.exports = class AppContext {
 
     this.pluginAPI = new PluginAPI(this)
     this.pages = [] // Array<Page>
-    this.I18nConstructor = I18n(null)
+    this.ClientComputedMixinConstructor = ClientComputedMixin(this.getSiteData())
   }
 
   /**
@@ -73,8 +73,8 @@ module.exports = class AppContext {
 
     await this.resolvePages()
     await Promise.all(
-      this.pluginAPI.options.additionalPages.values.map(async ({ path, permalink }) => {
-        await this.addPage({ filePath: path, permalink })
+      this.pluginAPI.options.additionalPages.values.map(async (options) => {
+        await this.addPage(options)
       })
     )
 
@@ -109,7 +109,6 @@ module.exports = class AppContext {
       .use(require('../internal-plugins/rootMixins'))
       .use(require('../internal-plugins/enhanceApp'))
       .use(require('../internal-plugins/overrideCSS'))
-      .use(require('../internal-plugins/i18nTemp'))
       .use(require('../internal-plugins/layoutComponents'))
       .use(require('../internal-plugins/pageComponents'))
       // user plugin
@@ -213,10 +212,10 @@ module.exports = class AppContext {
 
   async addPage (options) {
     options.permalinkPattern = this.siteConfig.permalink
-    const page = new Page(options)
+    const page = new Page(options, this)
     await page.process({
       markdown: this.markdown,
-      i18n: new this.I18nConstructor((this.getSiteData.bind(this))),
+      computed: new this.ClientComputedMixinConstructor(),
       enhancers: this.pluginAPI.options.extendPageData.items
     })
     this.pages.push(page)
@@ -249,13 +248,20 @@ module.exports = class AppContext {
    */
 
   getSiteData () {
+    const { locales } = this.siteConfig
+    if (locales) {
+      Object.keys(locales).forEach(path => {
+        locales[path].path = path
+      })
+    }
+
     return {
       title: this.siteConfig.title || '',
       description: this.siteConfig.description || '',
       base: this.base,
       pages: this.pages.map(page => page.toJson()),
       themeConfig: this.siteConfig.themeConfig || {},
-      locales: this.siteConfig.locales
+      locales
     }
   }
 }
diff --git a/packages/@vuepress/core/lib/prepare/ClientComputedMixin.js b/packages/@vuepress/core/lib/prepare/ClientComputedMixin.js
new file mode 100644
index 0000000000..5922819432
--- /dev/null
+++ b/packages/@vuepress/core/lib/prepare/ClientComputedMixin.js
@@ -0,0 +1,128 @@
+'use strict'
+
+/**
+ * Get page data via path (permalink).
+ *
+ * @param {array} pages
+ * @param {string} path
+ * @returns {object}
+ */
+
+function findPageForPath (pages, path) {
+  for (let i = 0; i < pages.length; i++) {
+    const page = pages[i]
+    if (page.path === path) {
+      return page
+    }
+  }
+  return {
+    path: '',
+    frontmatter: {}
+  }
+}
+
+/**
+ * Expose a function to get ClientComputedMixin constructor.
+ * Note that this file will run in both server and client side.
+ *
+ * @param {object} siteData
+ * @returns {ClientComputedMixin}
+ */
+
+module.exports = siteData => {
+  // We cannot use class here. webpack will throw error.
+  function ClientComputedMixin () {}
+
+  ClientComputedMixin.prototype = {
+    setPage (page) {
+      this.__page = page
+    },
+
+    get $site () {
+      return siteData
+    },
+
+    get $themeConfig () {
+      return this.$site.themeConfig
+    },
+
+    get $localeConfig () {
+      const { locales = {}} = this.$site
+      let targetLang
+      let defaultLang
+      for (const path in locales) {
+        if (path === '/') {
+          defaultLang = locales[path]
+        } else if (this.$page.path.indexOf(path) === 0) {
+          targetLang = locales[path]
+        }
+      }
+      return targetLang || defaultLang || {}
+    },
+
+    get $siteTitle () {
+      return this.$localeConfig.title || this.$site.title || ''
+    },
+
+    get $title () {
+      const page = this.$page
+      const siteTitle = this.$siteTitle
+      const selfTitle = page.frontmatter.home ? null : (
+        page.frontmatter.title || // explicit title
+        page.title // inferred title
+      )
+      return siteTitle
+        ? selfTitle
+          ? (selfTitle + ' | ' + siteTitle)
+          : siteTitle
+        : selfTitle || 'VuePress'
+    },
+
+    get $description () {
+      // #565 hoist description from meta
+      const description = getMetaDescription(this.$page.frontmatter.meta)
+      if (description) {
+        return description
+      }
+      // if (this.$page.frontmatter.meta) {
+      //   const descriptionMeta = this.$page.frontmatter.meta.filter(item => item.name === 'description')[0]
+      //   if (descriptionMeta) return descriptionMeta.content
+      // }
+      return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''
+    },
+
+    get $lang () {
+      return this.$page.frontmatter.lang || this.$localeConfig.lang || 'en-US'
+    },
+
+    get $localePath () {
+      return this.$localeConfig.path || '/'
+    },
+
+    get $themeLocaleConfig () {
+      return (this.$site.themeConfig.locales || {})[this.$localePath] || {}
+    },
+
+    get $page () {
+      if (this.__page) {
+        return this.__page
+      }
+      return findPageForPath(
+        this.$site.pages,
+        this.$route.path
+      )
+    }
+  }
+
+  return ClientComputedMixin
+}
+
+function getMetaDescription (meta) {
+  if (meta) {
+    // Why '(() => 'name')()' ?
+    // You can use item.name directly and see what happened.
+    // "How many pits did webpack bury?"
+    const descriptionMeta = meta.filter(item => item[(() => 'name')()] === 'description')[0]
+    if (descriptionMeta) return descriptionMeta.content
+  }
+}
diff --git a/packages/@vuepress/core/lib/prepare/I18n.js b/packages/@vuepress/core/lib/prepare/I18n.js
deleted file mode 100644
index 8176c592b8..0000000000
--- a/packages/@vuepress/core/lib/prepare/I18n.js
+++ /dev/null
@@ -1,121 +0,0 @@
-'use strict'
-
-/**
- * Get page data via path (permalink).
- *
- * @param {array} pages
- * @param {string} path
- * @returns {object}
- */
-
-function findPageForPath (pages, path) {
-  for (let i = 0; i < pages.length; i++) {
-    const page = pages[i]
-    if (page.path === path) {
-      return page
-    }
-  }
-  return {
-    path: '',
-    frontmatter: {}
-  }
-}
-
-/**
- * Expose I18n constructor.Note that this file will
- * be run in both server and client side.
- *
- * @param store
- * @returns {{new(*): I18n, prototype: I18n}}
- */
-
-module.exports = (store /* null in server side */) => class I18n {
-  constructor (dataProvider) {
-    this.__ssrContext = true
-    this.__dataProvider = dataProvider
-  }
-
-  setSSRContext (context) {
-    this.__ssrContext = context
-  }
-
-  get $site () {
-    if (this.__ssrContext) {
-      const siteData = this.__dataProvider()
-      if (siteData.locales) {
-        Object.keys(siteData.locales).forEach(path => {
-          siteData.locales[path].path = path
-        })
-      }
-      return siteData
-    }
-    return store.siteData
-  }
-
-  get $themeConfig () {
-    return this.$site.themeConfig
-  }
-
-  get $localeConfig () {
-    const { locales = {}} = this.$site
-    let targetLang
-    let defaultLang
-    for (const path in locales) {
-      if (path === '/') {
-        defaultLang = locales[path]
-      } else if (this.$page.path.indexOf(path) === 0) {
-        targetLang = locales[path]
-      }
-    }
-    return targetLang || defaultLang || {}
-  }
-
-  get $siteTitle () {
-    return this.$localeConfig.title || this.$site.title || ''
-  }
-
-  get $title () {
-    const page = this.$page
-    const siteTitle = this.$siteTitle
-    const selfTitle = page.frontmatter.home ? null : (
-      page.frontmatter.title || // explicit title
-      page.title // inferred title
-    )
-    return siteTitle
-      ? selfTitle
-        ? (selfTitle + ' | ' + siteTitle)
-        : siteTitle
-      : selfTitle || 'VuePress'
-  }
-
-  get $description () {
-    // #565 hoist description from meta
-    if (this.$page.frontmatter.meta) {
-      const descriptionMeta = this.$page.frontmatter.meta.filter(item => item.name === 'description')[0]
-      if (descriptionMeta) return descriptionMeta.content
-    }
-    return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''
-  }
-
-  get $lang () {
-    return this.$page.frontmatter.lang || this.$localeConfig.lang || 'en-US'
-  }
-
-  get $localePath () {
-    return this.$localeConfig.path || '/'
-  }
-
-  get $themeLocaleConfig () {
-    return (this.$site.themeConfig.locales || {})[this.$localePath] || {}
-  }
-
-  get $page () {
-    if (this.__ssrContext) {
-      return this.__ssrContext
-    }
-    return findPageForPath(
-      this.$site.pages,
-      this.$route.path
-    )
-  }
-}
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index 5f30d0de24..ed72e94256 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -6,7 +6,7 @@
 
 const path = require('path')
 const slugify = require('../markdown/slugify')
-const { inferTitle, extractHeaders } = require('../util/index')
+const { inferTitle, inferDate, extractHeaders, DATE_RE } = require('../util/index')
 const { fs, fileToPath, parseFrontmatter, getPermalink } = require('@vuepress/shared-utils')
 
 /**
@@ -24,6 +24,7 @@ module.exports = class Page {
    * @param {object} frontmatter
    * @param {string} permalinkPattern
    */
+
   constructor ({
     path,
     meta,
@@ -41,18 +42,19 @@ module.exports = class Page {
     this._content = content
     this._permalink = permalink
     this.frontmatter = frontmatter
+    this._permalinkPattern = permalinkPattern
 
     if (relative) {
-      this._routePath = encodeURI(fileToPath(relative))
+      this.regularPath = encodeURI(fileToPath(relative))
     } else if (path) {
-      this._routePath = encodeURI(path)
+      this.regularPath = encodeURI(path)
     } else if (permalink) {
-      this._routePath = encodeURI(permalink)
+      this.regularPath = encodeURI(permalink)
     }
 
     this.key = 'v-' + Math.random().toString(16).slice(2)
-    this.regularPath = this.path = this._routePath
-    this._permalinkPattern = permalinkPattern
+    // Using regularPath first, would be override by permalink later.
+    this.path = this.regularPath
   }
 
   /**
@@ -66,9 +68,9 @@ module.exports = class Page {
    */
 
   async process ({
-    i18n,
+    computed,
     markdown,
-    enhancers
+    enhancers = []
   }) {
     if (this._filePath) {
       this._content = await fs.readFile(this._filePath, 'utf-8')
@@ -102,9 +104,9 @@ module.exports = class Page {
     }
 
     // resolve i18n
-    i18n.setSSRContext(this)
-    this._i18n = i18n
-    this._localePath = i18n.$localePath
+    computed.setPage(this)
+    this._computed = computed
+    this._localePath = computed.$localePath
 
     this.enhance(enhancers)
     this.buildPermalink()
@@ -129,7 +131,33 @@ module.exports = class Page {
    */
 
   get slug () {
-    return slugify(this.filename)
+    return slugify(this.strippedFilename)
+  }
+
+  /**
+   * stripped file name.
+   *
+   * If filename was yyyy-MM-dd-[title], the date prefix will be stripped.
+   * If filename was yyyy-MM-[title], the date prefix will be stripped.
+   *
+   * @returns {string}
+   * @api public
+   */
+
+  get strippedFilename () {
+    const match = this.filename.match(DATE_RE)
+    return match ? match[3] : this.filename
+  }
+
+  /**
+   * get date of a page.
+   *
+   * @returns {null|string}
+   * @api public
+   */
+
+  get date () {
+    return inferDate(this.frontmatter, this.filename)
   }
 
   /**
@@ -162,7 +190,7 @@ module.exports = class Page {
       this._permalink = getPermalink({
         pattern: this.frontmatter.permalink || this._permalinkPattern,
         slug: this.slug,
-        date: this.frontmatter.date,
+        date: this.date,
         localePath: this._localePath,
         regularPath: this.regularPath
       })
diff --git a/packages/@vuepress/core/lib/util/index.js b/packages/@vuepress/core/lib/util/index.js
index 4d682728f9..04f70eaacb 100644
--- a/packages/@vuepress/core/lib/util/index.js
+++ b/packages/@vuepress/core/lib/util/index.js
@@ -70,9 +70,6 @@ exports.inferTitle = function (frontmatter, strippedContent) {
   }
 }
 
-const LRU = require('lru-cache')
-const cache = LRU({ max: 1000 })
-
 /**
  * Extract heeaders from markdown source content.
  *
@@ -82,6 +79,9 @@ const cache = LRU({ max: 1000 })
  * @returns {array}
  */
 
+const LRU = require('lru-cache')
+const cache = LRU({ max: 1000 })
+
 exports.extractHeaders = function (content, include = [], md) {
   const key = content + include.join(',')
   const hit = cache.get(key)
@@ -107,3 +107,25 @@ exports.extractHeaders = function (content, include = [], md) {
   cache.set(key, res)
   return res
 }
+
+/**
+ * Infer date.
+ *
+ * @param {object} frontmatter
+ * @param {string} filename
+ * @returns {null|string}
+ */
+
+const DATE_RE = /(\d{4}-\d{1,2}(-\d{1,2})?)-(.*)/
+exports.DATE_RE = DATE_RE
+
+exports.inferDate = function (frontmatter = {}, filename) {
+  if (frontmatter.date) {
+    return frontmatter.date
+  }
+  const match = filename.match(DATE_RE)
+  if (match) {
+    return match[1]
+  }
+  return null
+}
diff --git a/packages/@vuepress/plugin-active-header-links/mixin.js b/packages/@vuepress/plugin-active-header-links/mixin.js
index 50658fa65c..4692f76afe 100644
--- a/packages/@vuepress/plugin-active-header-links/mixin.js
+++ b/packages/@vuepress/plugin-active-header-links/mixin.js
@@ -31,11 +31,11 @@ export default {
           (!nextAnchor || scrollTop < nextAnchor.parentElement.offsetTop - 10))
 
         if (isActive && decodeURIComponent(this.$route.hash) !== decodeURIComponent(anchor.hash)) {
-          Vue.$store.disableScrollBehavior = true
+          Vue.$store.set('disableScrollBehavior', true)
           this.$router.replace(decodeURIComponent(anchor.hash), () => {
             // execute after scrollBehavior handler.
             this.$nextTick(() => {
-              Vue.$store.disableScrollBehavior = false
+              Vue.$store.set('disableScrollBehavior', false)
             })
           })
           return

From af950372d48e6cc148a3d7617552b0dcbf66a44e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 26 Sep 2018 01:06:55 +0800
Subject: [PATCH 235/242] ci: set up release script

---
 package.json            |   8 ++--
 scripts/genChangelog.js |  27 +++++++++++
 scripts/release.js      | 104 ++++++++++++++++++++++++++++++++++++++++
 scripts/release.sh      |  52 --------------------
 yarn.lock               |  50 ++++++++++++++++++-
 5 files changed, 185 insertions(+), 56 deletions(-)
 create mode 100644 scripts/genChangelog.js
 create mode 100644 scripts/release.js
 delete mode 100755 scripts/release.sh

diff --git a/package.json b/package.json
index 577567bc31..1aff8eb7b0 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "dev": "lerna exec --scope docs -- yarn dev",
     "build": "lerna exec --scope docs -- yarn build",
     "lint": "eslint --fix packages/**/*.js packages/**/*.vue packages/**/bin/*",
-    "prepublishOnly": "conventional-changelog -p angular -r 2 -i CHANGELOG.md -s",
-    "release": "/bin/bash scripts/release.sh",
+    "release": "yarn --pure-lockfile && node scripts/release.js",
+    "changelog": "node scripts/genChangelog.js run",
     "test": "node scripts/test.js"
   },
   "repository": {
@@ -47,7 +47,9 @@
     "lerna": "^2.11.0",
     "lint-staged": "^7.0.4",
     "minimist": "^1.2.0",
-    "yorkie": "^1.0.3"
+    "yorkie": "^1.0.3",
+    "inquirer": "^6.2.0",
+    "@vue/conventional-changelog": "^0.1.1"
   },
   "engines": {
     "node": ">=8"
diff --git a/scripts/genChangelog.js b/scripts/genChangelog.js
new file mode 100644
index 0000000000..544ab5cd82
--- /dev/null
+++ b/scripts/genChangelog.js
@@ -0,0 +1,27 @@
+const execa = require('execa')
+const cc = require('conventional-changelog')
+const config = require('@vue/conventional-changelog')
+
+const gen = module.exports = version => {
+  const fileStream = require('fs').createWriteStream(`CHANGELOG.md`)
+
+  cc({
+    config,
+    releaseCount: 0,
+    pkg: {
+      transform (pkg) {
+        pkg.version = `v${version}`
+        return pkg
+      }
+    }
+  }).pipe(fileStream).on('close', async () => {
+    delete process.env.PREFIX
+    await execa('git', ['add', '-A'], { stdio: 'inherit' })
+    await execa('git', ['commit', '-m', `chore: ${version} changelog`], { stdio: 'inherit' })
+  })
+}
+
+if (process.argv[2] === 'run') {
+  const version = require('../lerna.json').version
+  gen(version)
+}
diff --git a/scripts/release.js b/scripts/release.js
new file mode 100644
index 0000000000..96fd96b55a
--- /dev/null
+++ b/scripts/release.js
@@ -0,0 +1,104 @@
+/**
+
+ How to do a release:
+
+ 1. Make sure you have publish access for all packages:
+ - You must be in the VuePress team in the npm @vuepress organization
+ - Make sure you DO NOT have npm per-publish 2-factor / OTP enabled, as it
+ does not work with Lerna (which we use for batch publishing).
+
+ 2. Run `yarn release`, follow prompts
+
+ 3A. If everything works properly, the tag should have been auto-pushed and a
+ local changelog commit should have been generated. Go to 4.
+
+ 3B. If the publish fails half-way, things have gotten hairy. Now you need to
+ go to npm to check which packages have been published and manually publish
+ the ones that have not been published yet. After all have been published:
+
+ 3B.1. Push the release git tag to GitHub.
+ 3B.2. Run `yarn changelog` to generate changelog commit.
+
+ 4. Push the changelog commit to `next` branch.
+
+ 5. Go to GitHub and verify that the changelog is live.
+
+ 6. Go to GitHub releases page and publish the release.
+
+ */
+
+process.env.VUE_CLI_RELEASE = true
+
+const execa = require('execa')
+const semver = require('semver')
+const inquirer = require('inquirer')
+
+const curVersion = require('../lerna.json').version
+
+const release = async () => {
+  console.log(`Current version: ${curVersion}`)
+
+  const bumps = ['patch', 'minor', 'major', 'prerelease', 'premajor']
+  const versions = {}
+  bumps.forEach(b => {
+    versions[b] = semver.inc(curVersion, b)
+  })
+  const bumpChoices = bumps.map(b => ({ name: `${b} (${versions[b]})`, value: b }))
+
+  const { bump, customVersion } = await inquirer.prompt([
+    {
+      name: 'bump',
+      message: 'Select release type:',
+      type: 'list',
+      choices: [
+        ...bumpChoices,
+        { name: 'custom', value: 'custom' }
+      ]
+    },
+    {
+      name: 'customVersion',
+      message: 'Input version:',
+      type: 'input',
+      when: answers => answers.bump === 'custom'
+    }
+  ])
+
+  const version = customVersion || versions[bump]
+
+  const { yes } = await inquirer.prompt([{
+    name: 'yes',
+    message: `Confirm releasing ${version}?`,
+    type: 'list',
+    choices: ['N', 'Y']
+  }])
+
+  if (yes === 'N') {
+    console.log('[release] cancelled.')
+    return
+  }
+
+  const releaseArguments = [
+    'publish',
+    '--repo-version',
+    version,
+    '--force-publish',
+    '*'
+  ]
+
+  console.log(`lerna ${releaseArguments.join(' ')}`)
+
+  await execa(require.resolve('lerna/bin/lerna'), [
+    'publish',
+    '--repo-version',
+    version,
+    '--force-publish',
+    '*'
+  ], { stdio: 'inherit' })
+
+  require('./genChangelog')(version)
+}
+
+release().catch(err => {
+  console.error(err)
+  process.exit(1)
+})
diff --git a/scripts/release.sh b/scripts/release.sh
deleted file mode 100755
index 13cc002e9c..0000000000
--- a/scripts/release.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-echo "Select a option to release (input a serial number)："
-echo
-
-select VERSION in patch minor major "Specific Version"
-  do
-    echo
-    if [[ $REPLY =~ ^[1-4]$ ]]; then
-      if [[ $REPLY == 4 ]]; then
-        read -p "Enter a specific version: " -r VERSION
-        echo
-        if [[ -z $REPLY ]]; then
-          VERSION=$REPLY
-        fi
-      fi
-
-      read -p "Release $VERSION - are you sure? (y/n) " -n 1 -r
-      echo
-
-      if [[ $REPLY =~ ^[Yy]$ || -z $REPLY ]]; then
-        # pre release task
-        npm run lint
-        npm run test
-
-        # bump version
-        npm version $VERSION
-        NEW_VERSION=$(node -p "require('./package.json').version")
-        echo Releasing ${NEW_VERSION} ...
-
-        # npm release
-        npm whoami
-        npm publish
-        echo "✅ Released to npm."
-
-        # github release
-        git add CHANGELOG.md
-        git commit -m "chore: changelog"
-        git push
-        git push origin refs/tags/v${NEW_VERSION}
-        echo "✅ Released to Github."
-      else
-        echo Cancelled
-      fi
-      break
-    else
-      echo Invalid \"${REPLY}\"
-      echo "To continue, please input a serial number(1-4) of an option."
-      echo
-    fi
-  done
-
diff --git a/yarn.lock b/yarn.lock
index 4c68320a22..2fe631ecf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1305,6 +1305,14 @@
     source-map "^0.5.6"
     vue-template-es2015-compiler "^1.6.0"
 
+"@vue/conventional-changelog@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@vue/conventional-changelog/-/conventional-changelog-0.1.1.tgz#48d2227ca65c354cba4be60754ea531afd0c3718"
+  dependencies:
+    compare-func "^1.3.2"
+    execa "^0.10.0"
+    q "^1.5.1"
+
 "@vue/test-utils@^1.0.0-beta.16":
   version "1.0.0-beta.21"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.21.tgz#fe1ee11ce16072da7ef29420df4aa5c11f4560ff"
@@ -2397,6 +2405,10 @@ chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+
 chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
@@ -2645,7 +2657,7 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-compare-func@^1.3.1:
+compare-func@^1.3.1, compare-func@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
   dependencies:
@@ -3872,6 +3884,14 @@ external-editor@^2.0.4:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
+external-editor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -4574,6 +4594,12 @@ iconv-lite@^0.4.17, iconv-lite@^0.4.4:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -4693,6 +4719,24 @@ inquirer@^3.0.6, inquirer@^3.2.2:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
+inquirer@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.17.10"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
 invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -6110,6 +6154,10 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
+medium-zoom@^0.4.0:
+  version "0.4.0"
+  resolved "http://registry.npmjs.org/medium-zoom/-/medium-zoom-0.4.0.tgz#8e13c9b754903c0c903220611af0d3cd373a4222"
+
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"

From 9a7f0cb8fbbae2c94c4b35fd8e52f2336105947f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 26 Sep 2018 01:13:24 +0800
Subject: [PATCH 236/242] chore: add mising version

---
 packages/docs/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/docs/package.json b/packages/docs/package.json
index 8922bbb461..411af4f07f 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -1,5 +1,6 @@
 {
   "private": true,
+  "version": "1.0.0",
   "name": "docs",
   "description": "docs of VuePress",
   "scripts": {

From e380de3828092694b80eb6c971db38966e96960b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 26 Sep 2018 01:48:35 +0800
Subject: [PATCH 237/242] feat($core): plugin option - chainMarkdown

---
 packages/@vuepress/core/lib/markdown/index.js       | 6 +++---
 packages/@vuepress/core/lib/plugin-api/constants.js | 1 +
 packages/@vuepress/core/lib/plugin-api/index.js     | 2 ++
 packages/@vuepress/core/lib/prepare/AppContext.js   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/core/lib/markdown/index.js b/packages/@vuepress/core/lib/markdown/index.js
index 01e5798390..9b7e85e4f0 100644
--- a/packages/@vuepress/core/lib/markdown/index.js
+++ b/packages/@vuepress/core/lib/markdown/index.js
@@ -24,9 +24,7 @@ const { parseHeaders } = require('@vuepress/shared-utils')
  * Create markdown by config.
  */
 
-module.exports = ({
-  markdown = {}
-} = {}) => {
+module.exports = (markdown = {}, pluginAPI) => {
   // allow user config slugify
   const slugify = markdown.slugify || _slugify
   // using chainedAPI
@@ -96,6 +94,8 @@ module.exports = ({
         .use(lineNumbers)
   }
 
+  pluginAPI.options.chainMarkdown.syncApply(config)
+
   if (markdown.chainMarkdown) {
     markdown.chainMarkdown(config)
   }
diff --git a/packages/@vuepress/core/lib/plugin-api/constants.js b/packages/@vuepress/core/lib/plugin-api/constants.js
index 96577e6455..b7c1d66ace 100644
--- a/packages/@vuepress/core/lib/plugin-api/constants.js
+++ b/packages/@vuepress/core/lib/plugin-api/constants.js
@@ -13,6 +13,7 @@ const PLUGIN_OPTION_META_MAP = {
   OUT_FILES: { name: 'outFiles', types: [Object] },
   EXTEND_PAGE_DATA: { name: 'extendPageData', types: [Function] },
   EXTEND_MARKDOWN: { name: 'extendMarkdown', types: [Function] },
+  CHAIN_MARKDOWN: { name: 'chainMarkdown', types: [Function] },
   CLIENT_DYNAMIC_MODULES: { name: 'clientDynamicModules', types: [Function] },
   CLIENT_ROOT_MIXIN: { name: 'clientRootMixin', types: [String] },
   ADDITIONAL_PAGES: { name: 'additionalPages', types: [Function, Array] },
diff --git a/packages/@vuepress/core/lib/plugin-api/index.js b/packages/@vuepress/core/lib/plugin-api/index.js
index cc04e2d70a..bea3dd85ef 100644
--- a/packages/@vuepress/core/lib/plugin-api/index.js
+++ b/packages/@vuepress/core/lib/plugin-api/index.js
@@ -165,6 +165,7 @@ module.exports = class PluginAPI {
     chainWebpack,
     enhanceDevServer,
     extendMarkdown,
+    chainMarkdown,
     enhanceAppFiles,
     outFiles,
     extendPageData,
@@ -190,6 +191,7 @@ module.exports = class PluginAPI {
       .registerOption(PLUGIN_OPTION_MAP.CHAIN_WEBPACK.key, chainWebpack, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.ENHANCE_DEV_SERVER.key, enhanceDevServer, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.EXTEND_MARKDOWN.key, extendMarkdown, pluginName)
+      .registerOption(PLUGIN_OPTION_MAP.CHAIN_MARKDOWN.key, chainMarkdown, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.EXTEND_PAGE_DATA.key, extendPageData, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.ENHANCE_APP_FILES.key, enhanceAppFiles, pluginName)
       .registerOption(PLUGIN_OPTION_MAP.OUT_FILES.key, outFiles, pluginName)
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index c5be48465c..81ccbb1fa9 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -66,10 +66,10 @@ module.exports = class AppContext {
 
   async process () {
     this.normalizeHeadTagUrls()
-    this.markdown = createMarkdown(this.siteConfig)
     this.resolveTemplates()
     await this.resolveTheme()
     this.resolvePlugins()
+    this.markdown = createMarkdown(this.siteConfig.markdown, this.pluginAPI)
 
     await this.resolvePages()
     await Promise.all(

From c3cf73f08d65e86a284df0433d106cea83f12dd4 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 26 Sep 2018 02:21:16 +0800
Subject: [PATCH 238/242] docs: update plugin part

---
 packages/docs/docs/guide/README.md  |   9 -
 packages/docs/docs/plugin/README.md | 288 ++++++++++++++++++++--------
 2 files changed, 208 insertions(+), 89 deletions(-)

diff --git a/packages/docs/docs/guide/README.md b/packages/docs/docs/guide/README.md
index e5bba84ccc..5551339e04 100644
--- a/packages/docs/docs/guide/README.md
+++ b/packages/docs/docs/guide/README.md
@@ -44,15 +44,6 @@ It is worth noting that during the `prepare` phase, VuePress does the following:
   - Customizable [navbar](../default-theme-config/README.md#navbar) and [sidebar](../default-theme-config/README.md#sidebar)
   - [Auto-generated GitHub link and page edit links](../default-theme-config/README.md#git-repo-and-edit-links)
 
-## Todo
-
-VuePress is still a work in progress. There are a few things that it currently does not support but are planned:
-
-- Plugin support
-- Blogging support
-
-Contributions are welcome!
-
 ## Why Not ...?
 
 ### Nuxt
diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index a6f936182a..7aef4a4056 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -6,7 +6,7 @@ sidebar: auto
 
 ## Writing a Plugin
 
-Plugins usually add global-level functionality to VuePress. There is no strictly defined scope for a plugin - there are typically several types of plugins you can write:
+Plugins usually add global-level functionality to VuePress. There is no strictly defined scope for a plugin - there are typically several types of plugins:
 
 1. Extend the data generated at compile time. e.g. [@vuepress/plugin-last-updated](https://github.com/vuejs/vuepress/tree/next/packages/@vuepress/plugin-last-updated).
 2. Generate extra files before or after compilation. e.g. [@vuepress/plugin-pwa](https://github.com/vuejs/vuepress/tree/next/packages/%40vuepress/plugin-pwa)
@@ -24,7 +24,7 @@ module.exports = {
 
 ``` js
 // #2
-module.exports = (options, context) => {
+module.exports = (options, ctx) => {
    return {
       // ...
    }
@@ -32,7 +32,7 @@ module.exports = (options, context) => {
 ```
 
 ::: tip
-A VuePress plugin module should leverage `CommonJS` instead of `ES module` because VuePress plugins runs on the Node side.
+A VuePress plugin module should leverage `CommonJS Module` because VuePress plugins runs on the Node side.
 :::
 
 ## Using a plugin
@@ -127,7 +127,7 @@ module.exports = {
 ```
 
 ::: warning Note
-The plugin will be disabled when you explicitly pass a `false`.
+The plugin can be disabled when `false` is explicitly passed as option.
 
 - Babel style
 
@@ -160,13 +160,13 @@ module.exports = {
 
 The name of the plugin. 
 
-Internally, vuepress will use the plugin's package name as the plugin name. When your plugin is a local plugin (i.e. use a pure plugin function directly), please be sure to configure this option, that is good for debug tracking.
+Internally, vuepress will use the plugin's package name as the plugin name. When your plugin is a local plugin (i.e. using a pure plugin function directly), please be sure to configure this option, that is good for debug tracking.
 
 ```js
 module.exports = {
   plugins: [
     [
-      (pluginOptions, context) => ({
+      (pluginOptions, ctx) => ({
         name: 'my-xxx-plugin'
         // ... the rest of options
       })
@@ -183,9 +183,9 @@ module.exports = {
 Configure whether to enable this plugin. e.g. if you want to enable a plugin only in development mode:
 
 ```js
-module.exports = (options, context) => {
+module.exports = (options, ctx) => {
   return {
-    enabled: !context.isProd
+    enabled: !ctx.isProd
   }
 }
 ```
@@ -206,13 +206,82 @@ module.exports = {
 ```
 
 ::: tip
-Since VuePress is a Vue SSR based application, there will be two webpack configurations, `isServer` is used to determine whether the current webpack config is applied to the server or client. 
+Since VuePress is a Vue-SSR based application, there will be two webpack configurations, `isServer` is used to determine whether the current webpack config is applied to the server or client. 
 
 **Also see:** 
 
 - [Vue SSR > Build Configuration](https://ssr.vuejs.org/guide/build-config.html)
 :::
 
+### define
+
+- Type: `Object|Function`
+- Default: undefined
+
+Since using [DefinePlugin](https://webpack.js.org/plugins/define-plugin/) via [chainWebpack](chainwebpack) would be a little complicated:
+
+```js
+module.exports = {
+  chainWebpack (config) {
+    config.plugin('injections').tap(([options]) => [
+      Object.assign(options, {
+        SW_BASE_URL: JSON.stringify('/')
+      })
+    ])
+  }  
+}
+```
+
+VuePress specifically opened up a more concise `define` option, note that the values has been automatically processed by `JSON.stringify`.
+
+- Object Usage:
+
+```js
+module.exports = {
+  define: {
+    SW_BASE_URL: '/',
+  }
+}
+```
+
+- Function Usage:
+
+```js
+module.exports = (options, ctx) => ({
+  define () {
+    return {
+      SW_BASE_URL: ctx.base || '/',
+      SW_ENABLED: !!options.enabled,
+    }
+  }
+})
+```
+
+### alias
+
+- Type: `Object|Function`
+- Default: undefined
+
+We can set aliases via [chainWebpack](chainwebpack):
+
+```js
+module.exports = (options, ctx) => ({
+  chainWebpack (config) {
+    config.resolve.alias.set('@theme', ctx.themePath)
+  }  
+})
+```
+
+But `alias` option makes this process more like configuration:
+
+```js
+module.exports = (options, ctx) => ({
+  alias: {
+    '@theme': ctx.themePath
+  }
+})
+```
+
 ### enhanceDevServer
 
 - Type: `Function`
@@ -223,7 +292,7 @@ Enhance the underlying [Koa](https://github.com/koajs/koa) app.
 ``` js
 module.exports = {
   enhanceDevServer (app) {
-    // app: poa instance
+    // ...
   }
 }
 ```
@@ -233,22 +302,24 @@ A simple plugin to create a sub public directory is as follows:
 ```js
 const path = require('path')
 
-module.exports = (options, context) => ({
-  // For development
-  enhanceDevServer (app) {
-    const mount = require('koa-mount')
-    const serveStatic = require('koa-static')
-    // The context object can be used to pass information on different plugin options
-    context.imagesAssetsPath = path.resolve(context.sourceDir, '.vuepress/images')
-    app.use(mount(path.join(context.publicPath, 'images'), serveStatic(context.imagesAssetsPath)))
-  },
+module.exports = (options, ctx) => {
+  const imagesAssetsPath = path.resolve(ctx.sourceDir, '.vuepress/images')
   
-  // For productions
-  async generated () {
-    const { fs } = require('@vuepress/shared-utils')
-    await fs.copy(context.imagesAssetsPath, path.resolve(context.outDir, 'images'))
+  return {
+      // For development
+      enhanceDevServer (app) {
+        const mount = require('koa-mount')
+        const serveStatic = require('koa-static')
+        app.use(mount(path.join(ctx.publicPath, 'images'), serveStatic(imagesAssetsPath)))
+      },
+
+      // For production
+      async generated () {
+        const { fs } = require('@vuepress/shared-utils')
+        await fs.copy(imagesAssetsPath, path.resolve(ctx.outDir, 'images'))
+      }
   }
-})
+}
 ```
 
 ### extendMarkdown
@@ -267,15 +338,49 @@ module.exports = {
 }
 ```
 
-### enhanceAppFiles
+### chainMarkdown
 
-- Type: 
+- Type: `Function`
+- Default: `undefined`
+
+Modify the internal markdown config with [markdown-it-chain](https://github.com/ulivz/markdown-it-chain) —— A chaining API like [webpack-chain](https://github.com/mozilla-neutrino/webpack-chain) but for [markdown-it](https://github.com/markdown-it/markdown-it).
 
-``` typescript
-type enhanceAppFilesMeta = Array<string | { name: string, content: string }>
-type enhanceAppFiles = enhanceAppFilesMeta | (() => enhanceAppFilesMeta)
+```js
+module.exports = {
+  chainMarkdown (config) {
+    // Interact with 'options' in new MarkdownIt
+    // Ref: https://markdown-it.github.io/markdown-it/#MarkdownIt.new
+    config
+      .options
+        .link(true)
+        .breaks(true)
+
+    // Modify the arguments of internal plugin. 
+    config
+      .plugin('anchor')
+        .tap(([options]) => [
+          Object.assign(options, { permalinkSymbol: '#' })
+        ])
+        
+    // Add extra markdown-it plugin
+    config
+      .plugin('sup')
+        .add(require('markdown-it-sup'))
+      
+    // Remove internal plugin  
+    config.plugins.delete('snippet')
+  }
+}
 ```
 
+**Also see:** 
+
+- [Internal plugins in VuePress](https://github.com/vuejs/vuepress/blob/next/packages/%40vuepress/core/lib/markdown/index.js)
+- [Config plugins](https://github.com/neutrinojs/webpack-chain#config-plugins)
+
+### enhanceAppFiles
+
+- Type: `Array | AsyncFunction`
 - Default: `undefined`
 
 This option accepts an array containing the file paths, or a function that returns this array, which allows you to do some [App Level Enhancements](../guide/basic-config.md#theme-configuration).
@@ -303,6 +408,36 @@ module.exports = (option, context) => {
 }
 ```
 
+### clientDynamicModules
+
+- Type: `Function`
+- Default: `undefined`
+
+Sometimes, you may want to generate some client modules at compile time.
+
+``` js
+module.exports = (options, context) => ({
+  clientDynamicModules() {
+    return {
+      name: 'constans.js',
+      content: `export const SOURCE_DIR = '${context.sourceDir}'`
+    }
+  }
+})
+```
+
+Then you can use this module at client side code by:
+
+``` js
+import { SOURCE_DIR } from '@dynamic/constans'
+```
+
+::: tip Q & A
+**Q**: Both `clientDynamicModules` and `enhanceAppFiles` can generate dynamic javascript code during build time, so what is the difference between the two?
+
+**A**: The files generated by `clientDynamicModules` needs to be imported as `@dynamic/xxx` by the consumers themselves. But all the files generated by `enhanceAppFiles` will be loaded automatically when the APP is initialized on the client side.
+:::
+
 ### extendPageData
 
 - Type: `Function`
@@ -312,13 +447,15 @@ A function that exports a plain object which will be merged into each page's dat
 
 ``` js
 module.exports = {
-  extendPageData ({ 
-    _filePath,   // file's absolute path
-    _i18n,       // access the client global mixins at build time, e.g _i18n.$localePath.
-    content,     // file's raw content string
-    key,         // file's hash key
-    regularPath, // current page's default link (follow the file hierarchy)
-    path,        // current page's permalink
+  extendPageData ({
+    _filePath,           // file's absolute path
+    _i18n,               // access the client global mixins at build time, e.g _i18n.$localePath.
+    _content,            // file's raw content string
+    _strippedContent,    // file's content string without frontmatter
+    key,                 // page's unique hash key
+    frontmatter,         // page's frontmatter object
+    regularPath,         // current page's default link (follow the file hierarchy)
+    path,                // current page's permalink
   }) {
     return {
       // ...
@@ -345,37 +482,6 @@ module.exports = {
 
 Then you can use this value via `this.$page.size` in any Vue component.
 
-
-### clientDynamicModules
-
-- Type: `Function`
-- Default: `undefined`
-
-Sometimes, you may want to generate some client modules at compile time.
-
-``` js
-module.exports = (options, context) => ({
-  clientDynamicModules() {
-    return {
-      name: 'constans.js',
-      content: `export const SOURCE_DIR = '${context.sourceDir}'`
-    }
-  }
-})
-```
-
-Then you can use this module at client side code by:
-
-``` js
-import { SOURCE_DIR } from '@dynamic/constans'
-```
-
-::: tip Q & A
-**Q**: Both `clientDynamicModules` and `enhanceAppFiles` can generate dynamic javascript code during build time, so what is the difference between the two?
-
-**A**: The files generated by `clientDynamicModules` needs to be imported as `@dynamic/xxx` by the consumers themselves. But all the files generated by `enhanceAppFiles` will be loaded automatically when the APP is initialized on the client side.
-:::
-
 ### clientRootMixin
 
 - Type: `String`
@@ -405,34 +511,56 @@ export default {
 - Type: `Array|Function`
 - Default: `undefined`
 
-``` js
+Add a page pointing to a markdown file:
+
+```js
 const path = require('path')
 
 module.exports = {
-  additionalPages () {
-    return [
-      {
-        route: '/readme/',
-        path: path.resolve(__dirname, '../../README.md')
-      }
-    ]
-  }
+  additionalPages: [
+    {
+     path: '/readme/',
+     filePath: path.resolve(__dirname, '../../README.md')
+    }
+  ]
 }
 ```
 
-``` js
+Add a page with explicit content:
+
+```js
 module.exports = {
-  additionalPages () {
+  async additionalPages () {
+    const rp = require('request-promise'); 
+
+    // VuePress doesn't have request library built-in
+    // you need to install it yourself.
+    const content = await rp('https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md');
     return [
       {
-        route: '/readme/',
-        path: 'https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md'
+        path: '/readme/',
+        content
       }
     ]
   }
 }
 ```
 
+Add a pure route:
+
+```js
+module.exports = {
+  additionalPages: [
+    {
+       path: '/alpha/',
+       frontmatter: {
+          layout: 'MyLayout'
+       }
+    }
+  ]
+}
+```
+
 ### globalUIComponents
 
 - Type: `Array|String`

From 53c84b39724b31ddd76fbe6a9327a6fca922cca0 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 27 Sep 2018 01:14:51 +0800
Subject: [PATCH 239/242] refactor($core): separate markdown and
 markdown-loader from core

---
 packages/@vuepress/core/lib/dev.js            |  2 +-
 .../@vuepress/core/lib/prepare/AppContext.js  |  5 +-
 packages/@vuepress/core/lib/prepare/Page.js   |  6 +-
 .../core/lib/prepare/createMarkdown.js        | 33 ++++++++
 packages/@vuepress/core/lib/util/index.js     | 65 ----------------
 .../core/lib/webpack/createBaseConfig.js      |  2 +-
 packages/@vuepress/core/package.json          | 14 +---
 packages/@vuepress/markdown-loader/.npmignore |  2 +
 packages/@vuepress/markdown-loader/README.md  | 24 ++++++
 .../index.js}                                 | 19 +++--
 .../@vuepress/markdown-loader/package.json    | 29 +++++++
 packages/@vuepress/markdown/.npmignore        |  2 +
 packages/@vuepress/markdown/README.md         |  3 +
 .../__snapshots__/containers.spec.js.snap     |  0
 .../__snapshots__/highlight.spec.js.snap      |  0
 .../__snapshots__/highlightLines.spec.js.snap |  0
 .../__snapshots__/hoist.spec.js.snap          |  0
 .../__snapshots__/lineNumers.spec.js.snap     |  0
 .../__snapshots__/link.spec.js.snap           |  0
 .../__snapshots__/snippet.spec.js.snap        |  0
 .../__tests__}/containers.spec.js             |  2 +-
 .../fragments/code-highlightLines-multiple.md |  0
 .../fragments/code-highlightLines-single.md   |  0
 .../code-snippet-highlightLines-multiple.md   |  0
 .../code-snippet-highlightLines-single.md     |  0
 .../__tests__}/fragments/code-snippet.md      |  0
 .../__tests__}/fragments/code.md              |  0
 .../__tests__}/fragments/container-danger.md  |  0
 .../fragments/container-tip-override.md       |  0
 .../__tests__}/fragments/container-tip.md     |  0
 .../__tests__}/fragments/container-v-pre.md   |  0
 .../__tests__}/fragments/container-warning.md |  0
 .../__tests__}/fragments/hoist.md             |  0
 .../__tests__}/fragments/snippet.js           |  0
 .../__tests__}/highlight.spec.js              |  2 +-
 .../__tests__}/highlightLines.spec.js         |  2 +-
 .../__tests__}/hoist.spec.js                  |  4 +-
 .../__tests__}/lineNumers.spec.js             |  6 +-
 .../__tests__}/link.spec.js                   |  4 +-
 .../__tests__}/slugify.spec.js                |  2 +-
 .../__tests__}/snippet.spec.js                |  4 +-
 .../markdown => markdown/__tests__}/util.js   |  0
 .../markdown => markdown/lib}/component.js    |  0
 .../markdown => markdown/lib}/containers.js   |  0
 .../markdown => markdown/lib}/highlight.js    |  3 +-
 .../lib}/highlightLines.js                    |  0
 .../lib/markdown => markdown/lib}/hoist.js    |  0
 .../lib/markdown => markdown/lib}/index.js    | 76 ++++++++++---------
 .../markdown => markdown/lib}/lineNumbers.js  |  0
 .../lib/markdown => markdown/lib}/link.js     |  0
 .../markdown => markdown/lib}/preWrapper.js   |  0
 .../lib/markdown => markdown/lib}/slugify.js  |  0
 .../lib/markdown => markdown/lib}/snippet.js  |  2 +-
 packages/@vuepress/markdown/package.json      | 37 +++++++++
 packages/@vuepress/shared-utils/index.js      | 10 +++
 .../shared-utils/lib/extractHeaders.js        | 39 ++++++++++
 packages/@vuepress/shared-utils/lib/hash.js   |  1 +
 .../@vuepress/shared-utils/lib/inferTitle.js  | 22 ++++++
 packages/@vuepress/shared-utils/package.json  |  6 +-
 59 files changed, 283 insertions(+), 145 deletions(-)
 create mode 100644 packages/@vuepress/core/lib/prepare/createMarkdown.js
 create mode 100644 packages/@vuepress/markdown-loader/.npmignore
 create mode 100644 packages/@vuepress/markdown-loader/README.md
 rename packages/@vuepress/{core/lib/webpack/markdownLoader.js => markdown-loader/index.js} (91%)
 create mode 100644 packages/@vuepress/markdown-loader/package.json
 create mode 100644 packages/@vuepress/markdown/.npmignore
 create mode 100644 packages/@vuepress/markdown/README.md
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/containers.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/highlight.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/highlightLines.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/hoist.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/lineNumers.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/link.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/__snapshots__/snippet.spec.js.snap (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/containers.spec.js (87%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/code-highlightLines-multiple.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/code-highlightLines-single.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/code-snippet-highlightLines-multiple.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/code-snippet-highlightLines-single.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/code-snippet.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/code.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/container-danger.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/container-tip-override.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/container-tip.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/container-v-pre.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/container-warning.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/hoist.md (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/fragments/snippet.js (100%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/highlight.spec.js (87%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/highlightLines.spec.js (92%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/hoist.spec.js (84%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/lineNumers.spec.js (79%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/link.spec.js (94%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/slugify.spec.js (92%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/snippet.spec.js (86%)
 rename packages/@vuepress/{core/__test__/markdown => markdown/__tests__}/util.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/component.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/containers.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/highlight.js (91%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/highlightLines.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/hoist.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/index.js (55%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/lineNumbers.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/link.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/preWrapper.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/slugify.js (100%)
 rename packages/@vuepress/{core/lib/markdown => markdown/lib}/snippet.js (96%)
 create mode 100644 packages/@vuepress/markdown/package.json
 create mode 100644 packages/@vuepress/shared-utils/lib/extractHeaders.js
 create mode 100644 packages/@vuepress/shared-utils/lib/hash.js
 create mode 100644 packages/@vuepress/shared-utils/lib/inferTitle.js

diff --git a/packages/@vuepress/core/lib/dev.js b/packages/@vuepress/core/lib/dev.js
index 5383efb893..a55667412c 100644
--- a/packages/@vuepress/core/lib/dev.js
+++ b/packages/@vuepress/core/lib/dev.js
@@ -17,7 +17,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const DevLogPlugin = require('./webpack/DevLogPlugin')
   const createClientConfig = require('./webpack/createClientConfig')
   const { applyUserWebpackConfig } = require('./util/index')
-  const { frontmatterEmitter } = require('./webpack/markdownLoader')
+  const { frontmatterEmitter } = require('@vuepress/markdown-loader')
 
   logger.wait('\nExtracting site metadata...')
   const options = await prepare(sourceDir, cliOptions, false /* isProd */)
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
index 81ccbb1fa9..6b1d945899 100644
--- a/packages/@vuepress/core/lib/prepare/AppContext.js
+++ b/packages/@vuepress/core/lib/prepare/AppContext.js
@@ -5,7 +5,7 @@
  */
 
 const path = require('path')
-const createMarkdown = require('../markdown/index')
+const createMarkdown = require('./createMarkdown')
 const loadConfig = require('./loadConfig')
 const loadTheme = require('./loadTheme')
 const { fs, logger, chalk, globby, sort, datatypes: { isFunction }} = require('@vuepress/shared-utils')
@@ -69,7 +69,7 @@ module.exports = class AppContext {
     this.resolveTemplates()
     await this.resolveTheme()
     this.resolvePlugins()
-    this.markdown = createMarkdown(this.siteConfig.markdown, this.pluginAPI)
+    this.markdown = createMarkdown(this)
 
     await this.resolvePages()
     await Promise.all(
@@ -79,7 +79,6 @@ module.exports = class AppContext {
     )
 
     await this.pluginAPI.options.ready.apply()
-    this.pluginAPI.options.extendMarkdown.syncApply(this.markdown)
     await this.pluginAPI.options.clientDynamicModules.apply(this)
     await this.pluginAPI.options.globalUIComponents.apply(this)
     await this.pluginAPI.options.enhanceAppFiles.apply(this)
diff --git a/packages/@vuepress/core/lib/prepare/Page.js b/packages/@vuepress/core/lib/prepare/Page.js
index ed72e94256..af4cdba7f5 100644
--- a/packages/@vuepress/core/lib/prepare/Page.js
+++ b/packages/@vuepress/core/lib/prepare/Page.js
@@ -5,9 +5,9 @@
  */
 
 const path = require('path')
-const slugify = require('../markdown/slugify')
-const { inferTitle, inferDate, extractHeaders, DATE_RE } = require('../util/index')
-const { fs, fileToPath, parseFrontmatter, getPermalink } = require('@vuepress/shared-utils')
+const slugify = require('../../../markdown/lib/slugify')
+const { inferDate, DATE_RE } = require('../util/index')
+const { extractHeaders, fs, fileToPath, parseFrontmatter, getPermalink, inferTitle } = require('@vuepress/shared-utils')
 
 /**
  * Expose Page class.
diff --git a/packages/@vuepress/core/lib/prepare/createMarkdown.js b/packages/@vuepress/core/lib/prepare/createMarkdown.js
new file mode 100644
index 0000000000..6f399f66d4
--- /dev/null
+++ b/packages/@vuepress/core/lib/prepare/createMarkdown.js
@@ -0,0 +1,33 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+const createMarkdown = require('@vuepress/markdown')
+
+/**
+ * Expose createMarkdown.
+ */
+
+module.exports = function (ctx) {
+  const { markdown: markdownConfig = {}} = ctx.siteConfig
+  const { chainMarkdown, extendMarkdown } = markdownConfig
+
+  const beforeInstantiate = config => {
+    chainMarkdown && chainMarkdown(config)
+    ctx.pluginAPI.options.chainMarkdown.syncApply(config)
+  }
+
+  const afterInstantiate = md => {
+    extendMarkdown && extendMarkdown(md)
+    ctx.pluginAPI.options.extendMarkdown.syncApply(md)
+  }
+
+  return createMarkdown(
+    Object.assign(markdownConfig, {
+      beforeInstantiate,
+      afterInstantiate
+    })
+  )
+}
diff --git a/packages/@vuepress/core/lib/util/index.js b/packages/@vuepress/core/lib/util/index.js
index 04f70eaacb..20b97a5154 100644
--- a/packages/@vuepress/core/lib/util/index.js
+++ b/packages/@vuepress/core/lib/util/index.js
@@ -1,11 +1,5 @@
 'use strict'
 
-/**
- * Module dependencies.
- */
-
-const { deeplyParseHeaders } = require('@vuepress/shared-utils')
-
 /**
  * Normalize head tag config.
  *
@@ -49,65 +43,6 @@ exports.applyUserWebpackConfig = function (userConfig, config, isServer) {
   return config
 }
 
-/**
- * Infer a page's title via frontmatter and content.
- *
- * @param frontmatter
- * @param strippedContent
- * @returns {*}
- */
-
-exports.inferTitle = function (frontmatter, strippedContent) {
-  if (frontmatter.home) {
-    return 'Home'
-  }
-  if (frontmatter.title) {
-    return deeplyParseHeaders(frontmatter.title)
-  }
-  const match = strippedContent.trim().match(/^#+\s+(.*)/)
-  if (match) {
-    return deeplyParseHeaders(match[1])
-  }
-}
-
-/**
- * Extract heeaders from markdown source content.
- *
- * @param {string} content
- * @param {array} include
- * @param {object} md
- * @returns {array}
- */
-
-const LRU = require('lru-cache')
-const cache = LRU({ max: 1000 })
-
-exports.extractHeaders = function (content, include = [], md) {
-  const key = content + include.join(',')
-  const hit = cache.get(key)
-  if (hit) {
-    return hit
-  }
-
-  const tokens = md.parse(content, {})
-
-  const res = []
-  tokens.forEach((t, i) => {
-    if (t.type === 'heading_open' && include.includes(t.tag)) {
-      const title = tokens[i + 1].content
-      const slug = t.attrs.find(([name]) => name === 'id')[1]
-      res.push({
-        level: parseInt(t.tag.slice(1), 10),
-        title: deeplyParseHeaders(title),
-        slug: slug || md.slugify(title)
-      })
-    }
-  })
-
-  cache.set(key, res)
-  return res
-}
-
 /**
  * Infer date.
  *
diff --git a/packages/@vuepress/core/lib/webpack/createBaseConfig.js b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
index c153646661..c2788ff5b6 100644
--- a/packages/@vuepress/core/lib/webpack/createBaseConfig.js
+++ b/packages/@vuepress/core/lib/webpack/createBaseConfig.js
@@ -136,7 +136,7 @@ module.exports = function createBaseConfig ({
 
   mdRule
     .use('markdown-loader')
-      .loader(require.resolve('./markdownLoader'))
+      .loader(require.resolve('@vuepress/markdown-loader'))
       .options({ sourceDir, markdown })
 
   config.module
diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index 2d7a33bb9c..e88364f6fb 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -21,6 +21,8 @@
   "dependencies": {
     "@babel/core": "7.0.0-beta.47",
     "@vue/babel-preset-app": "3.0.0-beta.11",
+    "@vuepress/markdown": "^1.0.0",
+    "@vuepress/markdown-loader": "^1.0.0",
     "@vuepress/shared-utils": "^1.0.0",
     "@vuepress/plugin-last-updated": "^1.0.0",
     "@vuepress/plugin-register-components": "^1.0.0",
@@ -33,8 +35,6 @@
     "copy-webpack-plugin": "^4.5.1",
     "cross-spawn": "^6.0.5",
     "css-loader": "^0.28.11",
-    "diacritics": "^1.3.0",
-    "escape-html": "^1.0.3",
     "file-loader": "^1.1.11",
     "globby": "^8.0.1",
     "gray-matter": "^4.0.1",
@@ -43,18 +43,11 @@
     "koa-mount": "^3.0.0",
     "koa-range": "^0.3.0",
     "koa-static": "^4.0.2",
-    "loader-utils": "^1.1.0",
     "lru-cache": "^4.1.2",
-    "markdown-it": "^8.4.1",
-    "markdown-it-anchor": "^5.0.2",
-    "markdown-it-container": "^2.0.0",
-    "markdown-it-emoji": "^1.4.0",
-    "markdown-it-table-of-contents": "^0.4.0",
     "mini-css-extract-plugin": "^0.4.1",
     "optimize-css-assets-webpack-plugin": "^4.0.0",
     "portfinder": "^1.0.13",
     "postcss-loader": "^2.1.5",
-    "prismjs": "^1.13.0",
     "toml": "^2.3.3",
     "url-loader": "^1.0.1",
     "vue": "^2.5.16",
@@ -67,8 +60,7 @@
     "webpack-chain": "^4.6.0",
     "webpack-merge": "^4.1.2",
     "webpack-serve": "^1.0.2",
-    "webpackbar": "^2.6.1",
-    "markdown-it-chain": "^1.2.0"
+    "webpackbar": "^2.6.1"
   },
   "engines": {
     "node": ">=8"
diff --git a/packages/@vuepress/markdown-loader/.npmignore b/packages/@vuepress/markdown-loader/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/markdown-loader/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/markdown-loader/README.md b/packages/@vuepress/markdown-loader/README.md
new file mode 100644
index 0000000000..90ad547ca5
--- /dev/null
+++ b/packages/@vuepress/markdown-loader/README.md
@@ -0,0 +1,24 @@
+# @vuepress/markdown-loader
+
+> markdown-loader for vuepress
+
+## Usage
+
+```js
+const rule = config.module
+    .rule('markdown')
+      .test(/\.md$/)
+
+rule
+  .use('vue-loader')
+    .loader('vue-loader')
+    .options({ /* ... */ })
+
+rule
+  .use('markdown-loader')
+    .loader(require.resolve('@vuepress/markdown-loader'))
+    .options({
+       markdown: /* instance created by @vuepress/markdown */,
+       sourceDir: /* root source directory of your docs */,
+    })
+```
diff --git a/packages/@vuepress/core/lib/webpack/markdownLoader.js b/packages/@vuepress/markdown-loader/index.js
similarity index 91%
rename from packages/@vuepress/core/lib/webpack/markdownLoader.js
rename to packages/@vuepress/markdown-loader/index.js
index 1f4e4d84dd..fd35030157 100644
--- a/packages/@vuepress/core/lib/webpack/markdownLoader.js
+++ b/packages/@vuepress/markdown-loader/index.js
@@ -4,14 +4,12 @@
  * Module dependencies.
  */
 
-const fs = require('fs')
 const path = require('path')
-const hash = require('hash-sum')
 const { EventEmitter } = require('events')
 const { getOptions } = require('loader-utils')
-const { inferTitle, extractHeaders } = require('../util/index')
-const { parseFrontmatter } = require('@vuepress/shared-utils')
+const { fs, hash, parseFrontmatter, inferTitle, extractHeaders } = require('@vuepress/shared-utils')
 const LRU = require('lru-cache')
+const md = require('@vuepress/markdown')
 
 const cache = LRU({ max: 1000 })
 const devCache = LRU({ max: 1000 })
@@ -23,7 +21,12 @@ const devCache = LRU({ max: 1000 })
 module.exports = function (src) {
   const isProd = process.env.NODE_ENV === 'production'
   const isServer = this.target === 'node'
-  const { markdown, sourceDir } = getOptions(this)
+  const options = getOptions(this)
+  const { sourceDir } = options
+  let { markdown } = options
+  if (!markdown) {
+    markdown = md()
+  }
 
   // we implement a manual cache here because this loader is chained before
   // vue-loader, and will be applied on the same file multiple times when
@@ -69,18 +72,23 @@ module.exports = function (src) {
   // check if relative links are valid
   links && links.forEach(link => {
     link = decodeURIComponent(link)
+
     const shortname = link
       .replace(/#.*$/, '')
       .replace(/\.html$/, '.md')
+
     const filename = shortname
       .replace(/\/$/, '/README.md')
       .replace(/^\//, sourceDir + '/')
+
     const altname = shortname
       .replace(/\/$/, '/index.md')
       .replace(/^\//, sourceDir + '/')
+
     const dir = path.dirname(this.resourcePath)
     const file = path.resolve(dir, filename)
     const altfile = altname !== filename ? path.resolve(dir, altname) : null
+
     if (!fs.existsSync(file) && (!altfile || !fs.existsSync(altfile))) {
       this.emitWarning(
         new Error(
@@ -95,7 +103,6 @@ module.exports = function (src) {
     `<template>\n` +
       `<div class="content">${html}</div>\n` +
     `</template>\n` +
-    `<script>export default { props: ['target'] }</script>` +
     (hoistedTags || []).join('\n')
   )
   cache.set(key, res)
diff --git a/packages/@vuepress/markdown-loader/package.json b/packages/@vuepress/markdown-loader/package.json
new file mode 100644
index 0000000000..7aaa5bafc8
--- /dev/null
+++ b/packages/@vuepress/markdown-loader/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "@vuepress/markdown-loader",
+  "version": "1.0.0",
+  "description": "markdown-loader for vuepress",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator"
+  ],
+  "dependencies": {
+    "@vuepress/markdown": "1.0.0",
+    "loader-utils": "^1.1.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/markdown-loader#readme"
+}
diff --git a/packages/@vuepress/markdown/.npmignore b/packages/@vuepress/markdown/.npmignore
new file mode 100644
index 0000000000..18f0a334a4
--- /dev/null
+++ b/packages/@vuepress/markdown/.npmignore
@@ -0,0 +1,2 @@
+__tests__
+__mocks__
\ No newline at end of file
diff --git a/packages/@vuepress/markdown/README.md b/packages/@vuepress/markdown/README.md
new file mode 100644
index 0000000000..5be9b185d7
--- /dev/null
+++ b/packages/@vuepress/markdown/README.md
@@ -0,0 +1,3 @@
+# @vuepress/markdown
+
+> markdown for vuepress
\ No newline at end of file
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/containers.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/containers.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/containers.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/containers.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/highlight.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/highlight.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/highlight.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/highlight.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/highlightLines.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/highlightLines.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/highlightLines.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/highlightLines.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/hoist.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/hoist.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/hoist.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/hoist.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/lineNumers.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/lineNumers.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/lineNumers.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/lineNumers.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/link.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/link.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/link.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/link.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/__snapshots__/snippet.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/__snapshots__/snippet.spec.js.snap
rename to packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap
diff --git a/packages/@vuepress/core/__test__/markdown/containers.spec.js b/packages/@vuepress/markdown/__tests__/containers.spec.js
similarity index 87%
rename from packages/@vuepress/core/__test__/markdown/containers.spec.js
rename to packages/@vuepress/markdown/__tests__/containers.spec.js
index b21523811a..e2c0071a31 100644
--- a/packages/@vuepress/core/__test__/markdown/containers.spec.js
+++ b/packages/@vuepress/markdown/__tests__/containers.spec.js
@@ -1,5 +1,5 @@
 import { Md, getFragment } from './util'
-import containers from '../../lib/markdown/containers.js'
+import containers from '../lib/containers.js'
 
 const mdC = Md().use(containers)
 
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-multiple.md b/packages/@vuepress/markdown/__tests__/fragments/code-highlightLines-multiple.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-multiple.md
rename to packages/@vuepress/markdown/__tests__/fragments/code-highlightLines-multiple.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-single.md b/packages/@vuepress/markdown/__tests__/fragments/code-highlightLines-single.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/code-highlightLines-single.md
rename to packages/@vuepress/markdown/__tests__/fragments/code-highlightLines-single.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-multiple.md b/packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-multiple.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-multiple.md
rename to packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-multiple.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-single.md b/packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-single.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/code-snippet-highlightLines-single.md
rename to packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-single.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code-snippet.md b/packages/@vuepress/markdown/__tests__/fragments/code-snippet.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/code-snippet.md
rename to packages/@vuepress/markdown/__tests__/fragments/code-snippet.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/code.md b/packages/@vuepress/markdown/__tests__/fragments/code.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/code.md
rename to packages/@vuepress/markdown/__tests__/fragments/code.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/container-danger.md b/packages/@vuepress/markdown/__tests__/fragments/container-danger.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/container-danger.md
rename to packages/@vuepress/markdown/__tests__/fragments/container-danger.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/container-tip-override.md b/packages/@vuepress/markdown/__tests__/fragments/container-tip-override.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/container-tip-override.md
rename to packages/@vuepress/markdown/__tests__/fragments/container-tip-override.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/container-tip.md b/packages/@vuepress/markdown/__tests__/fragments/container-tip.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/container-tip.md
rename to packages/@vuepress/markdown/__tests__/fragments/container-tip.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/container-v-pre.md b/packages/@vuepress/markdown/__tests__/fragments/container-v-pre.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/container-v-pre.md
rename to packages/@vuepress/markdown/__tests__/fragments/container-v-pre.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/container-warning.md b/packages/@vuepress/markdown/__tests__/fragments/container-warning.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/container-warning.md
rename to packages/@vuepress/markdown/__tests__/fragments/container-warning.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/hoist.md b/packages/@vuepress/markdown/__tests__/fragments/hoist.md
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/hoist.md
rename to packages/@vuepress/markdown/__tests__/fragments/hoist.md
diff --git a/packages/@vuepress/core/__test__/markdown/fragments/snippet.js b/packages/@vuepress/markdown/__tests__/fragments/snippet.js
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/fragments/snippet.js
rename to packages/@vuepress/markdown/__tests__/fragments/snippet.js
diff --git a/packages/@vuepress/core/__test__/markdown/highlight.spec.js b/packages/@vuepress/markdown/__tests__/highlight.spec.js
similarity index 87%
rename from packages/@vuepress/core/__test__/markdown/highlight.spec.js
rename to packages/@vuepress/markdown/__tests__/highlight.spec.js
index 6870dcc370..0ca9cb3cd3 100644
--- a/packages/@vuepress/core/__test__/markdown/highlight.spec.js
+++ b/packages/@vuepress/markdown/__tests__/highlight.spec.js
@@ -1,5 +1,5 @@
 import { Md, getFragment } from './util'
-import highlight from '../../lib/markdown/highlight.js'
+import highlight from '../lib/highlight.js'
 
 const md = Md()
 const mdH = Md().set({ highlight })
diff --git a/packages/@vuepress/core/__test__/markdown/highlightLines.spec.js b/packages/@vuepress/markdown/__tests__/highlightLines.spec.js
similarity index 92%
rename from packages/@vuepress/core/__test__/markdown/highlightLines.spec.js
rename to packages/@vuepress/markdown/__tests__/highlightLines.spec.js
index 06f1394b7c..d242c9a4bb 100644
--- a/packages/@vuepress/core/__test__/markdown/highlightLines.spec.js
+++ b/packages/@vuepress/markdown/__tests__/highlightLines.spec.js
@@ -1,5 +1,5 @@
 import { Md, getFragment } from './util'
-import highlightLines from '../../lib/markdown/highlightLines.js'
+import highlightLines from '../lib/highlightLines.js'
 
 const md = Md()
 const mdH = Md().use(highlightLines)
diff --git a/packages/@vuepress/core/__test__/markdown/hoist.spec.js b/packages/@vuepress/markdown/__tests__/hoist.spec.js
similarity index 84%
rename from packages/@vuepress/core/__test__/markdown/hoist.spec.js
rename to packages/@vuepress/markdown/__tests__/hoist.spec.js
index a625a39c29..ae89a6f452 100644
--- a/packages/@vuepress/core/__test__/markdown/hoist.spec.js
+++ b/packages/@vuepress/markdown/__tests__/hoist.spec.js
@@ -1,6 +1,6 @@
 import { Md, getFragment } from './util'
-import hoist from '../../lib/markdown/hoist.js'
-import { dataReturnable } from '../../lib/markdown/index.js'
+import hoist from '../lib/hoist.js'
+import { dataReturnable } from '../lib/index.js'
 
 const md = Md().set({ html: true })
 const mdH = Md().set({ html: true }).use(hoist)
diff --git a/packages/@vuepress/core/__test__/markdown/lineNumers.spec.js b/packages/@vuepress/markdown/__tests__/lineNumers.spec.js
similarity index 79%
rename from packages/@vuepress/core/__test__/markdown/lineNumers.spec.js
rename to packages/@vuepress/markdown/__tests__/lineNumers.spec.js
index 8f3510659b..0f3f013525 100644
--- a/packages/@vuepress/core/__test__/markdown/lineNumers.spec.js
+++ b/packages/@vuepress/markdown/__tests__/lineNumers.spec.js
@@ -1,7 +1,7 @@
 import { Md, getFragment } from './util'
-import preWrapper from '../../lib/markdown/preWrapper.js'
-import lineNumbers from '../../lib/markdown/lineNumbers.js'
-import highlightLines from '../../lib/markdown/highlightLines.js'
+import preWrapper from '../lib/preWrapper.js'
+import lineNumbers from '../lib/lineNumbers.js'
+import highlightLines from '../lib/highlightLines.js'
 
 // lineNumbers must be chained after preWrapper.
 // since lineNumbers needs to add extra stateful class to its block wrapper.
diff --git a/packages/@vuepress/core/__test__/markdown/link.spec.js b/packages/@vuepress/markdown/__tests__/link.spec.js
similarity index 94%
rename from packages/@vuepress/core/__test__/markdown/link.spec.js
rename to packages/@vuepress/markdown/__tests__/link.spec.js
index 78274b6f3f..87f56f1029 100644
--- a/packages/@vuepress/core/__test__/markdown/link.spec.js
+++ b/packages/@vuepress/markdown/__tests__/link.spec.js
@@ -1,6 +1,6 @@
 import { Md } from './util'
-import link from '../../lib/markdown/link.js'
-import { dataReturnable } from '../../lib/markdown/index.js'
+import link from '../lib/link.js'
+import { dataReturnable } from '../lib/index.js'
 
 const mdL = Md().use(link, {
   target: '_blank',
diff --git a/packages/@vuepress/core/__test__/markdown/slugify.spec.js b/packages/@vuepress/markdown/__tests__/slugify.spec.js
similarity index 92%
rename from packages/@vuepress/core/__test__/markdown/slugify.spec.js
rename to packages/@vuepress/markdown/__tests__/slugify.spec.js
index 3247e590e3..2c6a77b6c5 100644
--- a/packages/@vuepress/core/__test__/markdown/slugify.spec.js
+++ b/packages/@vuepress/markdown/__tests__/slugify.spec.js
@@ -1,6 +1,6 @@
 import { Md } from './util'
 import anchor from 'markdown-it-anchor'
-import slugify from '../../lib/markdown/slugify.js'
+import slugify from '../lib/slugify.js'
 
 const mdS = Md().use(anchor, {
   slugify,
diff --git a/packages/@vuepress/core/__test__/markdown/snippet.spec.js b/packages/@vuepress/markdown/__tests__/snippet.spec.js
similarity index 86%
rename from packages/@vuepress/core/__test__/markdown/snippet.spec.js
rename to packages/@vuepress/markdown/__tests__/snippet.spec.js
index 140b68cd64..5e05b481ed 100644
--- a/packages/@vuepress/core/__test__/markdown/snippet.spec.js
+++ b/packages/@vuepress/markdown/__tests__/snippet.spec.js
@@ -1,6 +1,6 @@
 import { Md, getFragment } from './util'
-import snippet from '../../lib/markdown/snippet.js'
-import highlightLines from '../../lib/markdown/highlightLines.js'
+import snippet from '../lib/snippet.js'
+import highlightLines from '../lib/highlightLines.js'
 
 const md = Md().use(snippet)
 const mdH = Md().use(snippet).use(highlightLines)
diff --git a/packages/@vuepress/core/__test__/markdown/util.js b/packages/@vuepress/markdown/__tests__/util.js
similarity index 100%
rename from packages/@vuepress/core/__test__/markdown/util.js
rename to packages/@vuepress/markdown/__tests__/util.js
diff --git a/packages/@vuepress/core/lib/markdown/component.js b/packages/@vuepress/markdown/lib/component.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/component.js
rename to packages/@vuepress/markdown/lib/component.js
diff --git a/packages/@vuepress/core/lib/markdown/containers.js b/packages/@vuepress/markdown/lib/containers.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/containers.js
rename to packages/@vuepress/markdown/lib/containers.js
diff --git a/packages/@vuepress/core/lib/markdown/highlight.js b/packages/@vuepress/markdown/lib/highlight.js
similarity index 91%
rename from packages/@vuepress/core/lib/markdown/highlight.js
rename to packages/@vuepress/markdown/lib/highlight.js
index 39a019ba94..dbb6437206 100644
--- a/packages/@vuepress/core/lib/markdown/highlight.js
+++ b/packages/@vuepress/markdown/lib/highlight.js
@@ -1,7 +1,6 @@
 const prism = require('prismjs')
 const loadLanguages = require('prismjs/components/index')
-const escapeHtml = require('escape-html')
-const { logger, chalk } = require('@vuepress/shared-utils')
+const { logger, chalk, escapeHtml } = require('@vuepress/shared-utils')
 
 // required to make embedded highlighting work...
 loadLanguages(['markup', 'css', 'javascript'])
diff --git a/packages/@vuepress/core/lib/markdown/highlightLines.js b/packages/@vuepress/markdown/lib/highlightLines.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/highlightLines.js
rename to packages/@vuepress/markdown/lib/highlightLines.js
diff --git a/packages/@vuepress/core/lib/markdown/hoist.js b/packages/@vuepress/markdown/lib/hoist.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/hoist.js
rename to packages/@vuepress/markdown/lib/hoist.js
diff --git a/packages/@vuepress/core/lib/markdown/index.js b/packages/@vuepress/markdown/lib/index.js
similarity index 55%
rename from packages/@vuepress/core/lib/markdown/index.js
rename to packages/@vuepress/markdown/lib/index.js
index 9b7e85e4f0..728aacbe9c 100644
--- a/packages/@vuepress/core/lib/markdown/index.js
+++ b/packages/@vuepress/markdown/lib/index.js
@@ -6,17 +6,17 @@
 
 const Config = require('markdown-it-chain')
 const highlight = require('./highlight')
-const highlightLines = require('./highlightLines')
-const preWrapper = require('./preWrapper')
-const lineNumbers = require('./lineNumbers')
-const component = require('./component')
-const hoistScriptStyle = require('./hoist')
-const convertRouterLink = require('./link')
-const containers = require('./containers')
-const snippet = require('./snippet')
-const emoji = require('markdown-it-emoji')
-const anchor = require('markdown-it-anchor')
-const toc = require('markdown-it-table-of-contents')
+const highlightLinesPlugin = require('./highlightLines')
+const preWrapperPlugin = require('./preWrapper')
+const lineNumbersPlugin = require('./lineNumbers')
+const componentPlugin = require('./component')
+const hoistScriptStylePlugin = require('./hoist')
+const convertRouterLinkPlugin = require('./link')
+const containersPlugin = require('./containers')
+const snippetPlugin = require('./snippet')
+const emojiPlugin = require('markdown-it-emoji')
+const anchorPlugin = require('markdown-it-anchor')
+const tocPlugin = require('markdown-it-table-of-contents')
 const _slugify = require('./slugify')
 const { parseHeaders } = require('@vuepress/shared-utils')
 
@@ -24,9 +24,18 @@ const { parseHeaders } = require('@vuepress/shared-utils')
  * Create markdown by config.
  */
 
-module.exports = (markdown = {}, pluginAPI) => {
+module.exports = ({
+  slugify,
+  externalLinks,
+  anchor,
+  toc,
+  lineNumbers,
+  beforeInstantiate,
+  afterInstantiate
+} = {}) => {
   // allow user config slugify
-  const slugify = markdown.slugify || _slugify
+  slugify = slugify || _slugify
+
   // using chainedAPI
   const config = new Config()
 
@@ -37,75 +46,68 @@ module.exports = (markdown = {}, pluginAPI) => {
       .end()
 
     .plugin('component')
-      .use(component)
+      .use(componentPlugin)
       .end()
 
     .plugin('highlight-lines')
-      .use(highlightLines)
+      .use(highlightLinesPlugin)
       .end()
 
     .plugin('pre-wrapper')
-      .use(preWrapper)
+      .use(preWrapperPlugin)
       .end()
 
     .plugin('snippet')
-      .use(snippet)
+      .use(snippetPlugin)
       .end()
 
     .plugin('convert-router-link')
-      .use(convertRouterLink, [Object.assign({
+      .use(convertRouterLinkPlugin, [Object.assign({
         target: '_blank',
         rel: 'noopener noreferrer'
-      }, markdown.externalLinks)])
+      }, externalLinks)])
       .end()
 
     .plugin('hoist-script-style')
-      .use(hoistScriptStyle)
+      .use(hoistScriptStylePlugin)
       .end()
 
     .plugin('containers')
-      .use(containers)
+      .use(containersPlugin)
       .end()
 
     .plugin('emoji')
-      .use(emoji)
+      .use(emojiPlugin)
       .end()
 
     .plugin('anchor')
-      .use(anchor, [Object.assign({
+      .use(anchorPlugin, [Object.assign({
         slugify,
         permalink: true,
         permalinkBefore: true,
         permalinkSymbol: '#'
-      }, markdown.anchor)])
+      }, anchor)])
       .end()
 
     .plugin('toc')
-      .use(toc, [Object.assign({
+      .use(tocPlugin, [Object.assign({
         slugify,
         includeLevel: [2, 3],
         format: parseHeaders
-      }, markdown.toc)])
+      }, toc)])
       .end()
 
-  if (markdown.lineNumbers) {
+  if (lineNumbers) {
     config
       .plugin('line-numbers')
-        .use(lineNumbers)
+        .use(lineNumbersPlugin)
   }
 
-  pluginAPI.options.chainMarkdown.syncApply(config)
-
-  if (markdown.chainMarkdown) {
-    markdown.chainMarkdown(config)
-  }
+  beforeInstantiate && beforeInstantiate(config)
 
   const md = config.toMd()
 
-  // apply user config
-  if (markdown.config) {
-    markdown.config(md)
-  }
+  afterInstantiate && afterInstantiate(md)
 
   module.exports.dataReturnable(md)
 
diff --git a/packages/@vuepress/core/lib/markdown/lineNumbers.js b/packages/@vuepress/markdown/lib/lineNumbers.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/lineNumbers.js
rename to packages/@vuepress/markdown/lib/lineNumbers.js
diff --git a/packages/@vuepress/core/lib/markdown/link.js b/packages/@vuepress/markdown/lib/link.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/link.js
rename to packages/@vuepress/markdown/lib/link.js
diff --git a/packages/@vuepress/core/lib/markdown/preWrapper.js b/packages/@vuepress/markdown/lib/preWrapper.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/preWrapper.js
rename to packages/@vuepress/markdown/lib/preWrapper.js
diff --git a/packages/@vuepress/core/lib/markdown/slugify.js b/packages/@vuepress/markdown/lib/slugify.js
similarity index 100%
rename from packages/@vuepress/core/lib/markdown/slugify.js
rename to packages/@vuepress/markdown/lib/slugify.js
diff --git a/packages/@vuepress/core/lib/markdown/snippet.js b/packages/@vuepress/markdown/lib/snippet.js
similarity index 96%
rename from packages/@vuepress/core/lib/markdown/snippet.js
rename to packages/@vuepress/markdown/lib/snippet.js
index a677e12f77..834ff496a1 100644
--- a/packages/@vuepress/core/lib/markdown/snippet.js
+++ b/packages/@vuepress/markdown/lib/snippet.js
@@ -1,4 +1,4 @@
-const fs = require('fs')
+const { fs } = require('@vuepress/shared-utils')
 
 module.exports = function snippet (md, options = {}) {
   const root = options.root || process.cwd()
diff --git a/packages/@vuepress/markdown/package.json b/packages/@vuepress/markdown/package.json
new file mode 100644
index 0000000000..5e9ff0d41c
--- /dev/null
+++ b/packages/@vuepress/markdown/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@vuepress/markdown",
+  "version": "1.0.0",
+  "description": "markdown for vuepress",
+  "main": "lib/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuepress.git"
+  },
+  "keywords": [
+    "documentation",
+    "vue",
+    "vuepress",
+    "generator",
+    "markdown"
+  ],
+  "dependencies": {
+    "@vuepress/shared-utils": "^1.0.0",
+    "markdown-it": "^8.4.1",
+    "markdown-it-anchor": "^5.0.2",
+    "markdown-it-container": "^2.0.0",
+    "markdown-it-emoji": "^1.4.0",
+    "markdown-it-table-of-contents": "^0.4.0",
+    "markdown-it-chain": "^1.2.0",
+    "prismjs": "^1.13.0",
+    "diacritics": "^1.3.0"
+  },
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/vuepress/issues"
+  },
+  "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/markdown#readme"
+}
diff --git a/packages/@vuepress/shared-utils/index.js b/packages/@vuepress/shared-utils/index.js
index a1a49bd434..4b1b37c9ca 100644
--- a/packages/@vuepress/shared-utils/index.js
+++ b/packages/@vuepress/shared-utils/index.js
@@ -4,17 +4,27 @@ exports.codegen = require('./lib/codegen')
 exports.compose = require('./lib/compose')
 exports.datatypes = require('./lib/datatypes')
 exports.parseFrontmatter = require('./lib/parseFrontmatter')
+
 exports.unescapeHtml = require('./lib/unescapeHtml')
+exports.escapeHtml = require('escape-html')
+
 exports.parseEmojis = require('./lib/parseEmojis')
 exports.parseHeaders = require('./lib/parseHeaders')
 exports.deeplyParseHeaders = require('./lib/deeplyParseHeaders')
 exports.fileToPath = require('./lib/fileToPath')
 exports.sort = require('./lib/sort')
+
 exports.ensureLeadingSlash = require('./lib/ensureLeadingSlash')
 exports.ensureEndingSlash = require('./lib/ensureEndingSlash')
+
 exports.getPermalink = require('./lib/getPermalink')
 exports.shortcutPackageResolver = require('./lib/shortcutPackageResolver')
+exports.inferTitle = require('./lib/inferTitle')
+
+exports.extractHeaders = require('./lib/extractHeaders')
 
 exports.chalk = require('chalk')
 exports.fs = require('fs-extra')
 exports.globby = require('globby')
+
+exports.hash = require('hash-sum')
diff --git a/packages/@vuepress/shared-utils/lib/extractHeaders.js b/packages/@vuepress/shared-utils/lib/extractHeaders.js
new file mode 100644
index 0000000000..c2fb484a79
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/extractHeaders.js
@@ -0,0 +1,39 @@
+const deeplyParseHeaders = require('./deeplyParseHeaders')
+
+/**
+ * Extract heeaders from markdown source content.
+ *
+ * @param {string} content
+ * @param {array} include
+ * @param {object} md
+ * @returns {array}
+ */
+
+const LRU = require('lru-cache')
+const cache = LRU({ max: 1000 })
+
+module.exports = function (content, include = [], md) {
+  const key = content + include.join(',')
+  const hit = cache.get(key)
+  if (hit) {
+    return hit
+  }
+
+  const tokens = md.parse(content, {})
+
+  const res = []
+  tokens.forEach((t, i) => {
+    if (t.type === 'heading_open' && include.includes(t.tag)) {
+      const title = tokens[i + 1].content
+      const slug = t.attrs.find(([name]) => name === 'id')[1]
+      res.push({
+        level: parseInt(t.tag.slice(1), 10),
+        title: deeplyParseHeaders(title),
+        slug: slug || md.slugify(title)
+      })
+    }
+  })
+
+  cache.set(key, res)
+  return res
+}
diff --git a/packages/@vuepress/shared-utils/lib/hash.js b/packages/@vuepress/shared-utils/lib/hash.js
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/hash.js
@@ -0,0 +1 @@
+
diff --git a/packages/@vuepress/shared-utils/lib/inferTitle.js b/packages/@vuepress/shared-utils/lib/inferTitle.js
new file mode 100644
index 0000000000..d71243979a
--- /dev/null
+++ b/packages/@vuepress/shared-utils/lib/inferTitle.js
@@ -0,0 +1,22 @@
+const deeplyParseHeaders = require('./deeplyParseHeaders')
+
+/**
+ * Infer a page's title via frontmatter and content.
+ *
+ * @param {object} frontmatter
+ * @param {string} strippedContent
+ * @returns {*}
+ */
+
+module.exports = function (frontmatter, strippedContent) {
+  if (frontmatter.home) {
+    return 'Home'
+  }
+  if (frontmatter.title) {
+    return deeplyParseHeaders(frontmatter.title)
+  }
+  const match = strippedContent.trim().match(/^#+\s+(.*)/)
+  if (match) {
+    return deeplyParseHeaders(match[1])
+  }
+}
diff --git a/packages/@vuepress/shared-utils/package.json b/packages/@vuepress/shared-utils/package.json
index 598b11367f..4110a451e9 100644
--- a/packages/@vuepress/shared-utils/package.json
+++ b/packages/@vuepress/shared-utils/package.json
@@ -19,7 +19,9 @@
   "dependencies": {
     "chalk": "^2.3.2",
     "fs-extra": "^5.0.0",
-    "globby": "^8.0.1"
+    "globby": "^8.0.1",
+    "escape-html": "^1.0.3",
+    "hash-sum": "^1.0.2"
   },
   "author": "Evan You",
   "license": "MIT",
@@ -27,4 +29,4 @@
     "url": "https://github.com/vuejs/vuepress/issues"
   },
   "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/shared-utils#readme"
-}
\ No newline at end of file
+}

From 239867f84378ba90f8ecc548de41ce9ae2e1c84f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 27 Sep 2018 01:17:58 +0800
Subject: [PATCH 240/242] chore: clean types

---
 packages/@vuepress/core/types/index.d.ts | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 packages/@vuepress/core/types/index.d.ts

diff --git a/packages/@vuepress/core/types/index.d.ts b/packages/@vuepress/core/types/index.d.ts
deleted file mode 100644
index 22ee557658..0000000000
--- a/packages/@vuepress/core/types/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-interface Plugin {
-	name: string;
-	enabled: boolean;
-	clientRootMixin: string;
-}
-
-interface Config extends Plugin {
-
-}
-
-interface Theme extends Plugin {
-
-}
\ No newline at end of file

From 037080d15fb534a6745b5ac058d2574c829b61b2 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 27 Sep 2018 01:23:06 +0800
Subject: [PATCH 241/242] test: Page class

---
 package.json                                  |  9 +-
 .../core/__test__/prepare/Page.spec.js        | 98 +++++++++++++++++++
 .../.vuepress/config.js                       |  0
 .../README.md                                 |  0
 .../prepare/fixtures/docs-simple/README.md    |  1 -
 .../__test__/prepare/fixtures/docs/README.md  |  1 +
 .../__test__/prepare/fixtures/docs/alpha.md   |  5 +
 .../@vuepress/core/__test__/prepare/util.js   | 34 +++++++
 packages/docs/docs/plugin/README.md           |  6 --
 yarn.lock                                     | 17 ++++
 10 files changed, 161 insertions(+), 10 deletions(-)
 create mode 100644 packages/@vuepress/core/__test__/prepare/Page.spec.js
 rename packages/@vuepress/core/__test__/prepare/fixtures/{docs-simple-config => docs-config}/.vuepress/config.js (100%)
 rename packages/@vuepress/core/__test__/prepare/fixtures/{docs-simple-config => docs-config}/README.md (100%)
 delete mode 100644 packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
 create mode 100644 packages/@vuepress/core/__test__/prepare/fixtures/docs/README.md
 create mode 100644 packages/@vuepress/core/__test__/prepare/fixtures/docs/alpha.md
 create mode 100644 packages/@vuepress/core/__test__/prepare/util.js

diff --git a/package.json b/package.json
index 1aff8eb7b0..5e2bc5b7e9 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,16 @@
   "workspaces": [
     "packages/@vuepress/*",
     "packages/vuepress",
-    "packages/docs"
+    "packages/docs",
+    "packages/blog-example"
   ],
   "description": "Minimalistic doc generator with Vue component based layout system",
   "scripts": {
     "boot": "node scripts/bootstrap.js",
-    "dev": "lerna exec --scope docs -- yarn dev",
-    "build": "lerna exec --scope docs -- yarn build",
+    "dev": "yarn workspace docs dev",
+    "build": "yarn workspace docs build",
+    "dev:blog-example": "yarn workspace blog-example dev",
+    "build:blog-example": "yarn workspace blog-example build",
     "lint": "eslint --fix packages/**/*.js packages/**/*.vue packages/**/bin/*",
     "release": "yarn --pure-lockfile && node scripts/release.js",
     "changelog": "node scripts/genChangelog.js run",
diff --git a/packages/@vuepress/core/__test__/prepare/Page.spec.js b/packages/@vuepress/core/__test__/prepare/Page.spec.js
new file mode 100644
index 0000000000..294ae9c790
--- /dev/null
+++ b/packages/@vuepress/core/__test__/prepare/Page.spec.js
@@ -0,0 +1,98 @@
+const Page = require('../../lib/prepare/Page')
+const {
+  getComputed,
+  getMarkdown,
+  getDocument,
+  readFile
+} = require('./util')
+
+describe('Page', () => {
+  test('pure route', async () => {
+    const page = new Page({ path: '/' })
+
+    expect(page.path).toBe('/')
+    expect(page.regularPath).toBe('/')
+
+    const computed = getComputed()
+    await page.process({ computed })
+
+    expect(page.path).toBe('/')
+    expect(page.regularPath).toBe('/')
+  })
+
+  test('pure route - encodeURI', async () => {
+    const path = '/尤/'
+    const page = new Page({ path })
+
+    expect(page.path).toBe(encodeURI(path))
+    expect(page.regularPath).toBe(encodeURI(path))
+  })
+
+  test('pure route - custom frontmatter', async () => {
+    const frontmatter = { title: 'alpha' }
+    const page = new Page({
+      path: '/',
+      frontmatter
+    })
+    expect(page.frontmatter).toBe(frontmatter)
+  })
+
+  test('pure route - enhancers', async () => {
+    const frontmatter = { title: 'alpha' }
+    const page = new Page({
+      path: '/',
+      frontmatter
+    })
+
+    expect(page.frontmatter.title).toBe('alpha')
+
+    const computed = getComputed()
+    const enhancers = [
+      {
+        name: 'plugin-a',
+        value: page => { page.frontmatter.title = 'beta' }
+      }
+    ]
+    await page.process({ computed, enhancers })
+
+    expect(page.frontmatter.title).toBe('beta')
+  })
+
+  test('markdown page - pointing to a markdown file', async () => {
+    const { relative, filePath } = getDocument('README.md')
+    const page = new Page({ filePath, relative })
+
+    expect(page._filePath).toBe(filePath)
+    expect(page.regularPath).toBe('/')
+    expect(page.path).toBe('/')
+    expect(page.frontmatter).toEqual({})
+
+    const computed = getComputed()
+    const markdown = getMarkdown()
+    await page.process({ computed, markdown })
+
+    expect(page.title).toBe('Home')
+    const content = await readFile(filePath)
+    expect(page._content).toBe(content)
+    expect(page._strippedContent).toBe(content)
+  })
+
+  test('markdown page - pointing to a markdown file with frontmatter', async () => {
+    const { relative, filePath } = getDocument('alpha.md')
+    const page = new Page({ filePath, relative })
+
+    expect(page._filePath).toBe(filePath)
+    expect(page.regularPath).toBe('/alpha.html')
+    expect(page.path).toBe('/alpha.html')
+    expect(page.frontmatter).toEqual({})
+
+    const computed = getComputed()
+    const markdown = getMarkdown()
+    await page.process({ computed, markdown })
+
+    expect(page.title).toBe(page.frontmatter.title)
+    expect(page._content.startsWith('---')).toBe(true)
+    expect(page._strippedContent.startsWith('---')).toBe(false)
+  })
+})
+
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js b/packages/@vuepress/core/__test__/prepare/fixtures/docs-config/.vuepress/config.js
similarity index 100%
rename from packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/.vuepress/config.js
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-config/.vuepress/config.js
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-config/README.md
similarity index 100%
rename from packages/@vuepress/core/__test__/prepare/fixtures/docs-simple-config/README.md
rename to packages/@vuepress/core/__test__/prepare/fixtures/docs-config/README.md
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
deleted file mode 100644
index aef89369f1..0000000000
--- a/packages/@vuepress/core/__test__/prepare/fixtures/docs-simple/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Hello, VuePress!
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs/README.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs/README.md
new file mode 100644
index 0000000000..291ca3867f
--- /dev/null
+++ b/packages/@vuepress/core/__test__/prepare/fixtures/docs/README.md
@@ -0,0 +1 @@
+# Home
diff --git a/packages/@vuepress/core/__test__/prepare/fixtures/docs/alpha.md b/packages/@vuepress/core/__test__/prepare/fixtures/docs/alpha.md
new file mode 100644
index 0000000000..67de3e0ace
--- /dev/null
+++ b/packages/@vuepress/core/__test__/prepare/fixtures/docs/alpha.md
@@ -0,0 +1,5 @@
+---
+title: VuePress Alpha
+---
+
+# Alpha
diff --git a/packages/@vuepress/core/__test__/prepare/util.js b/packages/@vuepress/core/__test__/prepare/util.js
new file mode 100644
index 0000000000..edb2bf37e3
--- /dev/null
+++ b/packages/@vuepress/core/__test__/prepare/util.js
@@ -0,0 +1,34 @@
+const path = require('path')
+const { fs } = require('@vuepress/shared-utils')
+const AppContext = require('../../lib/prepare/AppContext')
+const createMarkdown = require('../../../markdown/lib/index')
+
+function getAppContext () {
+  return new AppContext('.')
+}
+
+function getComputed () {
+  const context = getAppContext()
+  return new context.ClientComputedMixinConstructor()
+}
+
+const docsBaseDir = path.resolve(__dirname, 'fixtures/docs')
+
+function getDocument (relative) {
+  return {
+    filePath: path.join(docsBaseDir, relative),
+    relative
+  }
+}
+
+const getMarkdown = createMarkdown
+
+const readFile = async filePath => await fs.readFile(filePath, 'utf-8')
+
+module.exports = {
+  getAppContext,
+  getComputed,
+  getMarkdown,
+  getDocument,
+  readFile
+}
diff --git a/packages/docs/docs/plugin/README.md b/packages/docs/docs/plugin/README.md
index 7aef4a4056..b310662af1 100644
--- a/packages/docs/docs/plugin/README.md
+++ b/packages/docs/docs/plugin/README.md
@@ -644,9 +644,3 @@ See: [base](../config/README.md#base).
 - Type: `Function`
 
 A utility for writing temporary files to tempPath.
-
-
-
-
-
-
diff --git a/yarn.lock b/yarn.lock
index 2fe631ecf0..7a718c207d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6109,6 +6109,12 @@ markdown-it-anchor@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.0.2.tgz#cdd917a05b7bf92fb736a6dae3385c6d0d0fa552"
 
+markdown-it-chain@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-chain/-/markdown-it-chain-1.2.0.tgz#b11db6755a3d2ab3da89e9566fc3ac384f75fdac"
+  dependencies:
+    webpack-chain "^4.9.0"
+
 markdown-it-container@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-2.0.0.tgz#0019b43fd02eefece2f1960a2895fba81a404695"
@@ -8015,6 +8021,10 @@ schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
+scifi@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/scifi/-/scifi-0.1.4.tgz#4d514ea11e0b2a6a350a33c6c56addcc9c4e676e"
+
 section-matter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -9158,6 +9168,13 @@ webpack-chain@^4.6.0:
     deepmerge "^1.5.2"
     javascript-stringify "^1.6.0"
 
+webpack-chain@^4.9.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-4.11.0.tgz#41b57773d2dcdcbfd43c9df28a05b40705ae421c"
+  dependencies:
+    deepmerge "^1.5.2"
+    javascript-stringify "^1.6.0"
+
 webpack-dev-middleware@^3.0.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"

From 102852cd3532582130ae6629e82c8494010fb78f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 27 Sep 2018 01:33:02 +0800
Subject: [PATCH 242/242] chore: update status to alpha

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 6557c95746..2dedbe4f94 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@
   <a href="https://www.npmjs.com/package/vuepress"><img src="https://img.shields.io/npm/l/vuepress.svg" alt="License"></a>
 </p>
 
+> This is the branch for `VuePress 1.0`.
+
+## Status: alpha
+
+Certain combinations of plugins may not work properly, and things may change or break until we reach beta phase. Do not use in production yet unless you are adventurous.
+
 # VuePress
 
 > Minimalistic docs generator with Vue component based layout system