refactor: tweaks

Author: ulivz

packages/@vuepress/core/lib/build.js

@@ -16,23 +16,21 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util/index')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare(sourceDir, cliOptions, true /* isProd */)
-  if (cliOptions.outDir) {
-    options.outDir = cliOptions.outDir
-  }
+  const ctx = await prepare(sourceDir, cliOptions, true /* isProd */)
 
-  const { outDir } = options
-  if (process.cwd() === outDir) {
+  const { outDir, cwd } = ctx
+  if (cwd === outDir) {
     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(process.cwd(), outDir)))
+  logger.debug('Dist directory: ' + chalk.gray(outDir))
 
-  let clientConfig = createClientConfig(options, cliOptions).toConfig()
-  let serverConfig = createServerConfig(options, cliOptions).toConfig()
+  let clientConfig = createClientConfig(ctx, cliOptions).toConfig()
+  let serverConfig = createServerConfig(ctx, cliOptions).toConfig()
 
   // apply user config...
-  const userConfig = options.siteConfig.configureWebpack
+  const userConfig = ctx.siteConfig.configureWebpack
   if (userConfig) {
     clientConfig = applyUserWebpackConfig(userConfig, clientConfig, false)
     serverConfig = applyUserWebpackConfig(userConfig, serverConfig, true)
@@ -57,33 +55,33 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     clientManifest,
     runInNewContext: false,
     inject: false,
-    shouldPrefetch: options.siteConfig.shouldPrefetch || (() => true),
-    template: await fs.readFile(options.ssrTemplate, 'utf-8')
+    shouldPrefetch: ctx.siteConfig.shouldPrefetch || (() => true),
+    template: await fs.readFile(ctx.ssrTemplate, 'utf-8')
   })
 
   // pre-render head tags from user config
-  const userHeadTags = (options.siteConfig.head || [])
+  const userHeadTags = (ctx.siteConfig.head || [])
     .map(renderHeadTag)
     .join('\n  ')
 
   // render pages
   logger.wait('Rendering static HTML...')
-  for (const page of options.pages) {
+  for (const page of ctx.pages) {
     await renderPage(page)
   }
 
   // if the user does not have a custom 404.md, generate the theme's default
-  if (!options.pages.some(p => p.path === '/404.html')) {
+  if (!ctx.pages.some(p => p.path === '/404.html')) {
     await renderPage({ path: '/404.html' })
   }
 
   readline.clearLine(process.stdout, 0)
   readline.cursorTo(process.stdout, 0)
 
-  await options.pluginAPI.options.generated.apply()
+  await ctx.pluginAPI.options.generated.apply()
 
   // DONE.
-  const relativeDir = path.relative(process.cwd(), outDir)
+  const relativeDir = path.relative(cwd, outDir)
   logger.success(`\n${chalk.green('Success!')} Generated static files in ${chalk.cyan(relativeDir)}.\n`)
 
   // --- helpers ---

packages/@vuepress/core/lib/dev.js

@@ -20,12 +20,12 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { frontmatterEmitter } = require('@vuepress/markdown-loader')
 
   logger.wait('\nExtracting site metadata...')
-  const options = await prepare(sourceDir, cliOptions, false /* isProd */)
+  const ctx = await prepare(sourceDir, cliOptions, false /* isProd */)
 
   // setup watchers to update options and dynamically generated files
   const update = (reason) => {
     logger.debug(`Re-prepare due to ${chalk.cyan(reason)}`)
-    options.pluginAPI.options.updated.syncApply()
+    ctx.pluginAPI.options.updated.syncApply()
     prepare(sourceDir, cliOptions, false /* isProd */).catch(err => {
       console.error(logger.error(chalk.red(err.stack), false))
     })
@@ -60,35 +60,35 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   frontmatterEmitter.on('update', () => update('frontmatter or headers change'))
 
   // resolve webpack config
-  let config = createClientConfig(options)
+  let config = createClientConfig(ctx)
 
   config
     .plugin('html')
     // using a fork of html-webpack-plugin to avoid it requiring webpack
     // internals from an incompatible version.
     .use(require('vuepress-html-webpack-plugin'), [{
-      template: options.devTemplate
+      template: ctx.devTemplate
     }])
 
   config
     .plugin('site-data')
     .use(HeadPlugin, [{
-      tags: options.siteConfig.head || []
+      tags: ctx.siteConfig.head || []
     }])
 
-  const port = await resolvePort(cliOptions.port || options.siteConfig.port)
-  const { host, displayHost } = await resolveHost(cliOptions.host || options.siteConfig.host)
+  const port = await resolvePort(cliOptions.port || ctx.siteConfig.port)
+  const { host, displayHost } = await resolveHost(cliOptions.host || ctx.siteConfig.host)
 
   config
   .plugin('vuepress-log')
   .use(DevLogPlugin, [{
     port,
     displayHost,
-    publicPath: options.base
+    publicPath: ctx.base
   }])
 
   config = config.toConfig()
-  const userConfig = options.siteConfig.configureWebpack
+  const userConfig = ctx.siteConfig.configureWebpack
   if (userConfig) {
     config = applyUserWebpackConfig(userConfig, config, false /* isServer */)
   }
@@ -111,8 +111,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
     port,
     add: app => {
       // apply plugin options to extend dev server.
-      const { pluginAPI } = options
-      pluginAPI.options.enhanceDevServer.syncApply(app)
+      ctx.pluginAPI.options.enhanceDevServer.syncApply(app)
 
       const userPublic = path.resolve(sourceDir, '.vuepress/public')
 
@@ -121,7 +120,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
 
       // respect base when serving static files...
       if (fs.existsSync(userPublic)) {
-        app.use(mount(options.base, serveStatic(userPublic)))
+        app.use(mount(ctx.base, serveStatic(userPublic)))
       }
 
       app.use(convert(history({

packages/@vuepress/core/lib/prepare/AppContext.js

@@ -49,10 +49,15 @@ module.exports = class AppContext {
       this.siteConfig = this.siteConfig(this)
     }
 
+    // TODO custom cwd.
+    this.cwd = process.cwd()
+
     this.base = this.siteConfig.base || '/'
     this.themeConfig = this.siteConfig.themeConfig || {}
-    this.outDir = this.siteConfig.dest
-      ? require('path').resolve(process.cwd(), this.siteConfig.dest)
+
+    const rawOutDir = cliOptions.outDir || this.siteConfig.dest
+    this.outDir = rawOutDir
+      ? require('path').resolve(this.cwd, rawOutDir)
       : require('path').resolve(sourceDir, '.vuepress/dist')
 
     this.pluginAPI = new PluginAPI(this)