From a076cea6049c232ef75db2a97e855f9bf728a4cd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 00:44:55 -0400
Subject: [PATCH 01/17] typo

---
 docs/guide/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/README.md b/docs/guide/README.md
index 89a2b197a5..663ddd9451 100644
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@@ -6,7 +6,7 @@ Each page generated by VuePress has its own pre-rendered static HTML, providing
 
 ## How It Works
 
-A VuePress site is in fact a  powered by [Vue](http://vuejs.org/), [Vue Router](https://github.com/vuejs/vue-router) and [webpack](http://webpack.js.org/). If you've used Vue before, you will notice the familiar development experience when you are writing or developing custom themes (you can even use Vue DevTools to debug your custom theme!).
+A VuePress site is in fact an SPA powered by [Vue](http://vuejs.org/), [Vue Router](https://github.com/vuejs/vue-router) and [webpack](http://webpack.js.org/). If you've used Vue before, you will notice the familiar development experience when you are writing or developing custom themes (you can even use Vue DevTools to debug your custom theme!).
 
 During the build, we create a server-rendered version of the app and render the corresponding HTML by virtually visiting each route. This approach is inspired by [Nuxt](https://nuxtjs.org/)'s `nuxt generate` command and other projects like [Gatsby](https://www.gatsbyjs.org/).
 

From 21f9a94c0db9bd02f097330e03bf5e206cdbefd5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 00:48:30 -0400
Subject: [PATCH 02/17] yaml highlight

---
 docs/guide/markdown.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/markdown.md b/docs/guide/markdown.md
index 27880ff026..372c4b1313 100644
--- a/docs/guide/markdown.md
+++ b/docs/guide/markdown.md
@@ -26,7 +26,7 @@ Headers automatically get anchor links applied. Rendering of anchors can be conf
 
 [YAML front matter](https://jekyllrb.com/docs/frontmatter/) is supported out of the box:
 
-```
+``` yaml
 ---
 title: Blogging Like a Hacker
 lang: en-US
@@ -37,7 +37,7 @@ The data will be available to the rest of the page, plus all custom and theming
 
 `title` and `lang` will be automatically set on the current page. In addition you can specify extra meta tags to be injected:
 
-```
+``` yaml
 ---
 meta:
   - name: description

From 641519d96914681355dd3219fbe2b4686a664757 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva@users.noreply.github.com>
Date: Sat, 14 Apr 2018 14:56:08 +0200
Subject: [PATCH 03/17] docs(typo): cases (#15)

---
 docs/guide/using-vue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/using-vue.md b/docs/guide/using-vue.md
index f7495f8479..52b474a8ae 100644
--- a/docs/guide/using-vue.md
+++ b/docs/guide/using-vue.md
@@ -123,7 +123,7 @@ Make sure a custom component's names either contains a hyphen or is in PascalCas
 
 ## Script & Style Hoisting
 
-Sometimes you may need to apply some JavaScript or CSS only to the current page. In those case you can directly write root-level `<script>` or `<style>` blocks in the markdown file, and they will be hoisted out of the compiled HTML and used as the `<script>` and `<style>` blocks for the resulting Vue single-file component.
+Sometimes you may need to apply some JavaScript or CSS only to the current page. In those cases you can directly write root-level `<script>` or `<style>` blocks in the markdown file, and they will be hoisted out of the compiled HTML and used as the `<script>` and `<style>` blocks for the resulting Vue single-file component.
 
 <p class="demo" :class="$style.example"></p>
 

From 85b1e09ab9900848becd1a726ad220de0c41959e Mon Sep 17 00:00:00 2001
From: Jay Linski <jaylinski@users.noreply.github.com>
Date: Sat, 14 Apr 2018 14:57:10 +0200
Subject: [PATCH 04/17] Don't include files from node_modules (#16)

If vuepress is run in the root of a node package
(eg. `vuepress build .`), it would include all markdown files from
the `node_modules` folder, which breaks the build process.
---
 lib/prepare.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/prepare.js b/lib/prepare.js
index 6965d6d35d..cf767937b1 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -99,7 +99,7 @@ async function resolveOptions (sourceDir) {
       ? path.resolve(siteConfig.dest)
       : path.resolve(sourceDir, '.vuepress/dist'),
     publicPath: base,
-    pageFiles: sort(await globby(['**/*.md', '!.vuepress'], { cwd: sourceDir })),
+    pageFiles: sort(await globby(['**/*.md', '!.vuepress', '!node_modules'], { cwd: sourceDir })),
     pagesData: null,
     themePath: null,
     notFoundPath: null,

From 361d80af465b5df3eee74e15909ca7c55f6a29f5 Mon Sep 17 00:00:00 2001
From: Filip Sobol <filipsobol@users.noreply.github.com>
Date: Sat, 14 Apr 2018 14:57:26 +0200
Subject: [PATCH 05/17] Fix broken link (#7)

---
 docs/guide/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/README.md b/docs/guide/README.md
index 663ddd9451..6c3cdeeccc 100644
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@@ -16,7 +16,7 @@ Each markdown file is compiled into HTML with [markdown-it](https://github.com/m
 
 - [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)
+- [Vue-powered custom theme system](./custom-themes.md)
 - PWA Support
 - Google Analytics Integration
 - A default theme with:

From adcbeb1af231fb31c53b1bcb827e92ed6d90291f Mon Sep 17 00:00:00 2001
From: wangyi7099 <wy564654798@126.com>
Date: Sat, 14 Apr 2018 20:57:44 +0800
Subject: [PATCH 06/17] Update getting-started.md (#17)

I find  when I use index.md,  the serve will return a status of 404, but when I change to readme.md, it works
---
 docs/guide/getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index 3021f6a69f..7430c5026d 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -9,7 +9,7 @@ If you just want to play around with VuePress, you can install it globally:
 npm install -g vuepress
 
 # create a markdown file
-echo "# Hello VuePress!" > index.md
+echo "# Hello VuePress!" > README.md
 
 # start writing
 vuepress dev .

From 809927bc15208edc56cbb1a32371d7eae1796b10 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 15:33:48 -0400
Subject: [PATCH 07/17] fix image syntax example (close #12)

---
 docs/guide/assets.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/guide/assets.md b/docs/guide/assets.md
index ddd09ed2ee..705c1465dd 100644
--- a/docs/guide/assets.md
+++ b/docs/guide/assets.md
@@ -5,7 +5,7 @@
 All markdown files are compiled into Vue components and processed by webpack, therefore you can and **should prefer** referencing any asset using relative URLs:
 
 ``` md
-![An image][./image.png]
+![An image](./image.png)
 ```
 
 This would work the same way as in `*.vue` file templates. The image will be processed with `url-loader` and `file-loader`, and copied to appropriate locations in the generated static build.
@@ -13,8 +13,22 @@ This would work the same way as in `*.vue` file templates. The image will be pro
 In addition, you can use the `~` prefix to explicitly indicate this is a webpack module request, allowing you to reference files with webpack aliases or from npm dependencies:
 
 ``` md
-![Image from alias][~@assets/image.png]
-![Image from dependency][~some-dependency/image.png]
+![Image from alias](~@alias/image.png)
+![Image from dependency](~some-dependency/image.png)
+```
+
+webpack aliases can be configured via [configureWebpack](/config/#configurewebpack) in `.vuepress/config.js`. Example:
+
+``` js
+module.exports = {
+  configurewebpack: {
+    resolve: {
+      alias: {
+        '@alias': 'path/to/some/dir'
+      }
+    }
+  }
+}
 ```
 
 ## Public Files

From cceb3d13c48ebb3cfd6b7e530f4a3513bfaa0a43 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 15:35:07 -0400
Subject: [PATCH 08/17] avoid using ! in example (close #6)

---
 docs/README.md                | 2 +-
 docs/guide/getting-started.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 2f5387de5f..f8fbc3e3c7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -20,7 +20,7 @@ footer: MIT Licensed | Copyright © 2018-present Evan You
 npm install -g vuepress
 
 # create a markdown file
-echo "# Hello VuePress!" > README.md
+echo "# Hello VuePress" > README.md
 
 # start writing
 vuepress dev .
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index 7430c5026d..264ea82691 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -9,7 +9,7 @@ If you just want to play around with VuePress, you can install it globally:
 npm install -g vuepress
 
 # create a markdown file
-echo "# Hello VuePress!" > README.md
+echo "# Hello VuePress" > README.md
 
 # start writing
 vuepress dev .

From 9cb481a5bd1333c68b074c600678026a37d783cd Mon Sep 17 00:00:00 2001
From: Jay Linski <jaylinski@users.noreply.github.com>
Date: Sat, 14 Apr 2018 21:36:14 +0200
Subject: [PATCH 09/17] Highlight every second table row (#22)

The CSS rule `&:nth-child(2)` only highlights the second table row.

This change will highlight every second table row, which improves
readability.
---
 lib/default-theme/styles/theme.styl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/default-theme/styles/theme.styl b/lib/default-theme/styles/theme.styl
index 882a5e40fa..b6ed4effb9 100644
--- a/lib/default-theme/styles/theme.styl
+++ b/lib/default-theme/styles/theme.styl
@@ -132,7 +132,7 @@ table
 
 tr
   border-top 1px solid #dfe2e5
-  &:nth-child(2)
+  &:nth-child(2n)
     background-color #f6f8fa
 
 th, td

From 49e0ee4baa7b051ba3123165a184d8b76018f4c3 Mon Sep 17 00:00:00 2001
From: Jay Linski <jaylinski@users.noreply.github.com>
Date: Sat, 14 Apr 2018 21:37:32 +0200
Subject: [PATCH 10/17] Allow index.md files as index pages (#23)

Until now, only `README.md` files got treated as a directory index.
This commit also allows `index.md` to be used as index files.
---
 lib/prepare.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/prepare.js b/lib/prepare.js
index cf767937b1..77a488f2b4 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -189,7 +189,7 @@ async function genComponentRegistrationFile ({ sourceDir }) {
   return `import Vue from 'vue'\n` + components.map(genImport).join('\n')
 }
 
-const indexRE = /\breadme\.md$/i
+const indexRE = /\b(index|readme)\.md$/i
 const extRE = /\.(vue|md)$/
 
 function fileToPath (file) {

From a3db4d202be9079ff8b7488f7b7aaf2fb49f3eba Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva@users.noreply.github.com>
Date: Sat, 14 Apr 2018 21:38:28 +0200
Subject: [PATCH 11/17] fix(style): prevent scrollbar in code (#18)

That margin was creating horizontal scroll when it wasn't necessary
---
 lib/default-theme/styles/code.styl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index c9be35b540..bd2e21d44d 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -34,7 +34,7 @@
   .highlighted-line
     background-color rgba(0, 0, 0, 66%)
     display block
-    margin 0.1rem -1.8rem 0
+    margin 0.1rem -1.5rem 0
     padding 0.1rem 1.8rem
 
 pre[class="language-js"], pre[class="language-javascript"]

From 9e591919ca4f5628a56c0f531d18e0c8fdb04ec1 Mon Sep 17 00:00:00 2001
From: Ginpei <ginpei@gmail.com>
Date: Sat, 14 Apr 2018 12:38:48 -0700
Subject: [PATCH 12/17] Missing link in document (#24)

* missing link

* prefer GitHub URL
---
 docs/guide/markdown.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/markdown.md b/docs/guide/markdown.md
index 372c4b1313..2639ddcb56 100644
--- a/docs/guide/markdown.md
+++ b/docs/guide/markdown.md
@@ -167,7 +167,7 @@ export default {
 
 ## Advanced Configuration
 
-VuePress uses [markdown-it]() as the markdown renderer. A lot of the extensions above are implemented via custom plugins. You can further customize the `markdown-it` instance using the `markdown` option in `.vuepress/config.js`:
+VuePress uses [markdown-it](https://github.com/markdown-it/markdown-it) as the markdown renderer. A lot of the extensions above are implemented via custom plugins. You can further customize the `markdown-it` instance using the `markdown` option in `.vuepress/config.js`:
 
 ``` js
 module.exports = {

From 22b794326bf36f338d49df00649719f8f45efcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=9Awierk?= <j.swirus@gmail.com>
Date: Sat, 14 Apr 2018 21:39:19 +0200
Subject: [PATCH 13/17] feat: commands now defaults targetDir to cwd. (#25)

close #8
---
 bin/vuepress.js               | 8 ++++----
 docs/README.md                | 4 ++--
 docs/guide/getting-started.md | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/vuepress.js b/bin/vuepress.js
index d948af7b37..cb5c9ca330 100755
--- a/bin/vuepress.js
+++ b/bin/vuepress.js
@@ -11,19 +11,19 @@ program
   .usage('<command> [options]')
 
 program
-  .command('dev <targetDir>')
+  .command('dev [targetDir]')
   .description('start development server')
   .option('-p, --port <port>', 'use specified port (default: 8080)')
-  .action((dir, { port }) => {
+  .action((dir = '.', { port }) => {
     wrapCommand(dev)(path.resolve(dir), { port })
   })
 
 program
-  .command('build <targetDir>')
+  .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, outDir }) => {
+  .action((dir = '.', { debug, outDir }) => {
     wrapCommand(build)(path.resolve(dir), { debug, outDir })
   })
 
diff --git a/docs/README.md b/docs/README.md
index f8fbc3e3c7..253efeed1b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -23,8 +23,8 @@ npm install -g vuepress
 echo "# Hello VuePress" > README.md
 
 # start writing
-vuepress dev .
+vuepress dev
 
 # build to static files
-vuepress build .
+vuepress build
 ```
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index 264ea82691..70298b81dc 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -12,10 +12,10 @@ npm install -g vuepress
 echo "# Hello VuePress" > README.md
 
 # start writing
-vuepress dev .
+vuepress dev
 
 # build
-vuepress build .
+vuepress build
 ```
 
 ## Inside an Existing Project

From e71e08601bf769605dbb2a5d811a8a8b378b3c4d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 15:44:33 -0400
Subject: [PATCH 14/17] add simple dev instruction

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

diff --git a/README.md b/README.md
index d8e6f5b6b9..fe410a94d9 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,13 @@ VuePress is still a work in progress. There are a few things that it currently d
 
 Contributions are welcome!
 
+## Development
+
+``` bash
+npm install
+npm run dev # serves VuePress' own docs with itself
+```
+
 ## License
 
 MIT

From 9719bc3246afcf77f69eaf94a34f0d6b2fa9c95b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 17:03:38 -0400
Subject: [PATCH 15/17] tweak cli output

---
 lib/build.js                  | 20 +++++++++++++++++---
 lib/dev.js                    |  1 +
 lib/prepare.js                | 21 ++++++++++++---------
 lib/util.js                   | 11 +++++++++++
 lib/webpack/markdownLoader.js | 15 ++++++++-------
 package.json                  |  1 +
 6 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index bd9b4d2223..80a5577abc 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -5,6 +5,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const path = require('path')
   const chalk = require('chalk')
   const webpack = require('webpack')
+  const readline = require('readline')
   const { promisify } = require('util')
   const rimraf = promisify(require('rimraf'))
   const mkdirp = promisify(require('mkdirp'))
@@ -17,6 +18,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const { createBundleRenderer } = require('vue-server-renderer')
   const { normalizeHeadTag, applyUserWebpackConfig } = require('./util')
 
+  process.stdout.write('Extracting site metadata...')
   const options = await prepare(sourceDir)
   if (cliOptions.outDir) {
     options.outDir = cliOptions.outDir
@@ -28,6 +30,9 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   let clientConfig = createClientConfig(options, cliOptions).toConfig()
   let serverConfig = createServerConfig(options, cliOptions).toConfig()
 
+  // disable uglify for server
+  serverConfig.optimization = { minimizer: [] }
+
   // apply user config...
   const userConfig = options.siteConfig.configureWebpack
   if (userConfig) {
@@ -53,7 +58,6 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
   const renderer = createBundleRenderer(serverBundle, {
     clientManifest,
     runInNewContext: false,
-    // shouldPrefetch: () => false,
     inject: false,
     template: fs.readFileSync(path.resolve(__dirname, 'app/index.ssr.html'), 'utf-8')
   })
@@ -64,14 +68,21 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
     .join('\n  ')
 
   // render pages
-  await Promise.all(options.siteData.pages.map(renderPage))
+  console.log('Rendering static HTML...')
+  for (const page of options.siteData.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')) {
     await renderPage({ path: '/404.html' })
   }
 
+  readline.clearLine(process.stdout, 0)
+  readline.cursorTo(process.stdout, 0)
+
   if (options.siteConfig.serviceWorker) {
+    console.log('Generating service worker...')
     const wbb = require('workbox-build')
     wbb.generateSW({
       swDest: path.resolve(outDir, 'service-worker.js'),
@@ -120,8 +131,11 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
 
   async function renderPage (page) {
     const pagePath = page.path
-    const pageMeta = renderPageMeta(page.frontmatter && page.frontmatter.meta)
+    readline.clearLine(process.stdout, 0)
+    readline.cursorTo(process.stdout, 0)
+    process.stdout.write(`Rendering page: ${pagePath}`)
 
+    const pageMeta = renderPageMeta(page.frontmatter && page.frontmatter.meta)
     const context = {
       url: pagePath,
       userHeadTags,
diff --git a/lib/dev.js b/lib/dev.js
index 57f196e09d..3b95a09680 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -17,6 +17,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   const { applyUserWebpackConfig } = require('./util')
   const { frontmatterEmitter } = require('./webpack/markdownLoader')
 
+  process.stdout.write('Extracting site metadata...')
   const options = await prepare(sourceDir)
 
   // setup watchers to update options and dynamically generated files
diff --git a/lib/prepare.js b/lib/prepare.js
index 77a488f2b4..5783c12333 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -2,6 +2,9 @@ const fs = require('fs')
 const path = require('path')
 const globby = require('globby')
 const mkdirp = require('mkdirp')
+const { promisify } = require('util')
+const readFile = promisify(fs.readFile)
+const writeFile = promisify(fs.writeFile)
 const yaml = require('yaml-front-matter')
 const tempPath = path.resolve(__dirname, 'app/.temp')
 const { inferTitle, extractHeaders } = require('./util')
@@ -9,11 +12,11 @@ const { inferTitle, extractHeaders } = require('./util')
 mkdirp(tempPath)
 
 const tempCache = new Map()
-function writeTemp (file, content) {
+async function writeTemp (file, content) {
   // cache write to avoid hitting the dist if it didn't change
   const cached = tempCache.get(file)
   if (cached !== content) {
-    fs.writeFileSync(path.join(tempPath, file), content)
+    await writeFile(path.join(tempPath, file), content)
     tempCache.set(file, content)
   }
 }
@@ -26,14 +29,14 @@ module.exports = async function prepare (sourceDir) {
   const routesCode = await genRoutesFile(options)
   const componentCode = await genComponentRegistrationFile(options)
 
-  writeTemp('routes.js', [
+  await writeTemp('routes.js', [
     componentCode,
     routesCode
   ].join('\n\n'))
 
   // 3. generate siteData
   const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
-  writeTemp('siteData.js', dataCode)
+  await writeTemp('siteData.js', dataCode)
 
   // 4. generate basic polyfill if need to support older browsers
   let polyfillCode = ``
@@ -42,13 +45,13 @@ module.exports = async function prepare (sourceDir) {
 `import 'es6-promise/auto'
 if (!Object.assign) Object.assign = require('object-assign')`
   }
-  writeTemp('polyfill.js', polyfillCode)
+  await writeTemp('polyfill.js', polyfillCode)
 
   // 5. handle user override
   if (options.useDefaultTheme) {
     const overridePath = path.resolve(sourceDir, '.vuepress/override.styl')
     const hasUserOverride = fs.existsSync(overridePath)
-    writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
+    await writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
   }
 
   return options
@@ -141,13 +144,13 @@ async function resolveOptions (sourceDir) {
   }
 
   // resolve pages
-  const pagesData = options.pageFiles.map(file => {
+  const pagesData = await Promise.all(options.pageFiles.map(async (file) => {
     const data = {
       path: fileToPath(file)
     }
 
     // extract yaml frontmatter
-    const content = fs.readFileSync(path.resolve(sourceDir, file), 'utf-8')
+    const content = await readFile(path.resolve(sourceDir, file), 'utf-8')
     const frontmatter = yaml.loadFront(content)
     // infer title
     const title = inferTitle(frontmatter)
@@ -163,7 +166,7 @@ async function resolveOptions (sourceDir) {
       data.frontmatter = frontmatter
     }
     return data
-  })
+  }))
 
   // resolve site data
   options.siteData = {
diff --git a/lib/util.js b/lib/util.js
index cf7d59e8e3..f2a5d609e7 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -43,7 +43,16 @@ exports.parseFrontmatter = content => {
   return yaml.loadFront(content)
 }
 
+const LRU = require('lru-cache')
+const cache = LRU({ max: 1000 })
+
 exports.extractHeaders = (content, include = []) => {
+  const key = content + include.join(',')
+  const hit = cache.get(key)
+  if (hit) {
+    return hit
+  }
+
   const md = require('./markdown')({})
   const S = require('string')
   const tokens = md.parse(content, {})
@@ -59,5 +68,7 @@ exports.extractHeaders = (content, include = []) => {
       })
     }
   })
+
+  cache.set(key, res)
   return res
 }
diff --git a/lib/webpack/markdownLoader.js b/lib/webpack/markdownLoader.js
index 6b86cfad93..76148e721b 100644
--- a/lib/webpack/markdownLoader.js
+++ b/lib/webpack/markdownLoader.js
@@ -5,25 +5,26 @@ const { EventEmitter } = require('events')
 const { getOptions } = require('loader-utils')
 const yaml = require('yaml-front-matter')
 const { inferTitle, extractHeaders } = require('../util')
+const LRU = require('lru-cache')
 
-const cache = new Map()
-const devCache = new Map()
+const cache = LRU({ max: 1000 })
+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)
+
   // 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
   // selecting the individual blocks.
   const file = this.resourcePath
   const key = hash(file + src)
   const cached = cache.get(key)
-  if (cached) {
+  if (cached && (isProd || /\?vue/.test(this.resourceQuery))) {
     return cached
   }
 
-  const isProd = process.env.NODE_ENV === 'production'
-  const isServer = this.target === 'node'
-  const { markdown, sourceDir } = getOptions(this)
-
   const frontmatter = yaml.loadFront(src)
   const content = frontmatter.__content
 
diff --git a/package.json b/package.json
index 4d8f0e7211..11dbe61ae2 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "koa-mount": "^3.0.0",
     "koa-static": "^4.0.2",
     "loader-utils": "^1.1.0",
+    "lru-cache": "^4.1.2",
     "markdown-it": "^8.4.1",
     "markdown-it-anchor": "^4.0.0",
     "markdown-it-container": "^2.0.0",

From 695440ff38fc10772c00fa33b3b6d9e814e3f483 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 17:07:16 -0400
Subject: [PATCH 16/17] fix: code margin on mobile

---
 lib/default-theme/styles/mobile.styl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/default-theme/styles/mobile.styl b/lib/default-theme/styles/mobile.styl
index 68e411ca2e..089f75b297 100644
--- a/lib/default-theme/styles/mobile.styl
+++ b/lib/default-theme/styles/mobile.styl
@@ -29,8 +29,9 @@ $mobileSidebarWidth = $sidebarWidth * 0.82
 @media (max-width: $MQMobileNarrow)
   h1
     font-size 1.9rem
-  pre, pre[class*="language-"]
-    margin 0.85rem -1.5rem
-    border-radius 0
   .content:not(.custom)
     padding 1.5rem
+  .content
+    pre, pre[class*="language-"]
+      margin 0.85rem -1.5rem
+      border-radius 0

From 6e904bb59ef7c5a9fbee990dd8ef91fe3e8d78bd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Apr 2018 17:08:09 -0400
Subject: [PATCH 17/17] 0.3.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11dbe61ae2..fc199cecc6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuepress",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
   "bin": {