From 772f92156e5d3bf7c3e475a0ee194fb18d609b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20B=C3=A9ni=C3=A9?= <lucien.benie@gmail.com>
Date: Wed, 18 Apr 2018 13:19:55 -0400
Subject: [PATCH 1/3] feat: support toml config

---
 CHANGELOG.md                        | 21 +++++++++
 docs/.vuepress/config.toml          | 67 +++++++++++++++++++++++++++++
 lib/default-theme/DropdownLink.vue  |  5 ++-
 lib/default-theme/Layout.vue        |  1 +
 lib/default-theme/NavLinks.vue      |  8 ++--
 lib/default-theme/SearchBox.vue     | 16 ++++++-
 lib/default-theme/Sidebar.vue       |  7 +--
 lib/default-theme/styles/theme.styl | 28 +++++++++---
 lib/dev.js                          |  5 ++-
 lib/markdown/slugify.js             |  2 +
 lib/prepare.js                      | 31 ++++++++++++-
 lib/util/index.js                   |  3 +-
 lib/webpack/createBaseConfig.js     |  2 +-
 lib/webpack/createServerConfig.js   |  1 +
 package.json                        |  3 +-
 yarn.lock                           |  4 ++
 16 files changed, 181 insertions(+), 23 deletions(-)
 create mode 100644 docs/.vuepress/config.toml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3294b4ea04..1b83f9f4a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+<a name="0.6.1"></a>
+## [0.6.1](https://github.com/vuejs/vuepress/compare/v0.6.0...v0.6.1) (2018-04-18)
+
+
+### Bug Fixes
+
+* handle headers that start with numbers (fix [#121](https://github.com/vuejs/vuepress/issues/121)) ([ad83169](https://github.com/vuejs/vuepress/commit/ad83169))
+* make search locale-scoped (close [#128](https://github.com/vuejs/vuepress/issues/128)) ([846eb59](https://github.com/vuejs/vuepress/commit/846eb59))
+* **nav:** unepxected error when themeConfig.nav isn't given. (close: [#125](https://github.com/vuejs/vuepress/issues/125)) ([#127](https://github.com/vuejs/vuepress/issues/127)) ([f052472](https://github.com/vuejs/vuepress/commit/f052472))
+* service worker path ([51c6eb2](https://github.com/vuejs/vuepress/commit/51c6eb2))
+* use correct host in tip after the server has started ([#130](https://github.com/vuejs/vuepress/issues/130)) ([fd447ae](https://github.com/vuejs/vuepress/commit/fd447ae))
+* use header's slug as it is if possible ([#119](https://github.com/vuejs/vuepress/issues/119)) ([5f7e199](https://github.com/vuejs/vuepress/commit/5f7e199))
+
+
+### Features
+
+* enable source map in build error traces ([efff472](https://github.com/vuejs/vuepress/commit/efff472))
+* **sidebar:** support click the part outside sidebar to close the sidebar. ([#132](https://github.com/vuejs/vuepress/issues/132)) ([c6c71af](https://github.com/vuejs/vuepress/commit/c6c71af))
+
+
+
 <a name="0.6.0"></a>
 # [0.6.0](https://github.com/vuejs/vuepress/compare/v0.5.1...v0.6.0) (2018-04-18)
 
diff --git a/docs/.vuepress/config.toml b/docs/.vuepress/config.toml
new file mode 100644
index 0000000000..e7e317a484
--- /dev/null
+++ b/docs/.vuepress/config.toml
@@ -0,0 +1,67 @@
+dest = "vuepress"
+serviceWorker = true
+
+[title]
+  "/" = "VuePress"
+  "/zh/" = "VuePress"
+
+[description]
+  "/" = "Vue-powered Static Site Generator"
+  "/zh/" = "Vue 驱动的静态网站生成器"
+
+[[langs]]
+  lang = "en"
+  label = "English"
+  path = "/"
+  selectText = "Languages"
+[[langs]]
+  lang = "zh-CN"
+  label = "简体中文"
+  path = "/zh/"
+  selectText = "选择语言"
+
+[[head.link]]
+  rel = "icon"
+  href = "/logo.png"
+
+[themeConfig]
+  repo = "vuejs/vuepress"
+  editLinks = true
+  docsDir = 'docs'
+  [themeConfig.nav]
+    "/" = [
+      { text = "Guide", link = "/guide/" },
+      { text = "Config Reference", link = "/config/" },
+      { text = "Default Theme Config", link = "/default-theme-config/" }
+    ]
+    "/zh" = [
+      { text = "指南", link = "/zh/guide/" },
+      { text = "配置", link = "/zh/config/" },
+      { text = "默认主题", link = "/zh/default-theme-config/" }
+    ]
+  [themeConfig.sidebar]
+    "/guide/" =  [
+      { title = "Guide", collapsable = false, children = [
+        "",
+        "getting-started",
+        "basic-config",
+        "assets",
+        "markdown",
+        "using-vue",
+        "custom-themes",
+        "deploy"
+      ] }
+    ]
+    "/zh/guide/" = [
+      { title = "指南", collapsable = false, children = [
+        "",
+        "getting-started",
+        "basic-config",
+        "assets",
+        "markdown",
+        "using-vue",
+        "custom-themes",
+        "deploy"
+      ] }
+    ]
+    
diff --git a/lib/default-theme/DropdownLink.vue b/lib/default-theme/DropdownLink.vue
index 96e53df9ec..498f95ab1d 100644
--- a/lib/default-theme/DropdownLink.vue
+++ b/lib/default-theme/DropdownLink.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="dropdown-wrapper" :class="{ open }">
-    <div class="dropdown-title" @click="toggle">
+    <a class="dropdown-title" @click="toggle">
       <span class="title">{{ item.text }}</span>
       <span class="arrow"></span>
-    </div>
+    </a>
     <ul class="nav-dropdown">
       <li
         class="dropdown-item"
@@ -53,6 +53,7 @@ export default {
 
 .dropdown-wrapper
   .dropdown-title
+    display block
     .arrow
       display inline-block
       vertical-align middle
diff --git a/lib/default-theme/Layout.vue b/lib/default-theme/Layout.vue
index 91ecbfea86..5423e2f0b9 100644
--- a/lib/default-theme/Layout.vue
+++ b/lib/default-theme/Layout.vue
@@ -4,6 +4,7 @@
     @touchstart="onTouchStart"
     @touchend="onTouchEnd">
     <Navbar v-if="shouldShowNavbar" @toggle-sidebar="toggleSidebar"/>
+    <div class="sidebar-mask" @click="toggleSidebar(false)"></div>
     <Sidebar :items="sidebarItems" @toggle-sidebar="toggleSidebar"/>
     <div class="custom-layout" v-if="$page.frontmatter.layout">
       <component :is="$page.frontmatter.layout"/>
diff --git a/lib/default-theme/NavLinks.vue b/lib/default-theme/NavLinks.vue
index 74bc12c88a..b91d219c4f 100644
--- a/lib/default-theme/NavLinks.vue
+++ b/lib/default-theme/NavLinks.vue
@@ -30,10 +30,10 @@ export default {
   components: { OutboundLink, NavLink, DropdownLink },
   computed: {
     userNav () {
-      if (Array.isArray(this.$site.themeConfig.nav)) {
-        return this.$site.themeConfig.nav
-      }
-      return this.$site.themeConfig.nav[this.$basepath]
+      const { nav } = this.$site.themeConfig
+      if (Array.isArray(nav)) return nav
+      if (typeof nav === 'object') return nav[this.$basepath]
+      return []
     },
     nav () {
       if (this.$site.langs && this.$site.langs.length) {
diff --git a/lib/default-theme/SearchBox.vue b/lib/default-theme/SearchBox.vue
index cf5d9fb969..2263ceb891 100644
--- a/lib/default-theme/SearchBox.vue
+++ b/lib/default-theme/SearchBox.vue
@@ -53,6 +53,7 @@ export default {
 
       const max = 5
       const { pages } = this.$site
+      const localePath = this.$basepath
       const matches = item => (
         item.title &&
         item.title.toLowerCase().indexOf(query) > -1
@@ -61,6 +62,10 @@ export default {
       for (let i = 0; i < pages.length; i++) {
         if (res.length >= max) break
         const p = pages[i]
+        // filter out results that do not match current locale
+        if (this.getPageLocalePath(p) !== localePath) {
+          continue
+        }
         if (matches(p)) {
           res.push(p)
         } else if (p.headers) {
@@ -86,8 +91,15 @@ export default {
     }
   },
   methods: {
-    onClick () {
-      console.log('clicked')
+    getPageLocalePath (page) {
+      const { langs } = this.$site
+      for (let i = 0; i < langs.length; i++) {
+        const localePath = langs[i].path
+        if (localePath !== '/' && page.path.indexOf(localePath) === 0) {
+          return langs[i].path
+        }
+      }
+      return '/'
     },
     onUp () {
       if (this.showSuggestions) {
diff --git a/lib/default-theme/Sidebar.vue b/lib/default-theme/Sidebar.vue
index c7be0cfa86..0a0e65eca1 100644
--- a/lib/default-theme/Sidebar.vue
+++ b/lib/default-theme/Sidebar.vue
@@ -81,19 +81,20 @@ function resolveOpenGroupIndex (route, items) {
     display none
     border-bottom 1px solid $borderColor
     padding 0.5rem 0 0.75rem 0
+    a
+      font-weight 600
     .nav-item, .github-link
       display block
       line-height 1.25rem
-      font-weight 600
       font-size 1.1em
       padding 0.5rem 0 0.5rem 1.5rem
   .sidebar-links
-    margin-top 1.5rem
+    padding 1.5rem 0
 
 @media (max-width: $MQMobile)
   .sidebar
     .nav-links
       display block
     .sidebar-links
-      margin-top 1rem
+      padding 1rem 0
 </style>
diff --git a/lib/default-theme/styles/theme.styl b/lib/default-theme/styles/theme.styl
index 49ee40819e..1b6c2b9328 100644
--- a/lib/default-theme/styles/theme.styl
+++ b/lib/default-theme/styles/theme.styl
@@ -29,6 +29,15 @@ body
   box-sizing border-box
   border-bottom 1px solid $borderColor
 
+.sidebar-mask
+  position fixed
+  z-index 9
+  top 0
+  left 0
+  width 100vw
+  height 100vh
+  display none
+
 .sidebar
   font-size 15px
   background-color #fff
@@ -133,6 +142,10 @@ code, kbd
 p, ul, ol
   line-height 1.7
 
+hr
+  border 0
+  border-top 1px solid $borderColor
+
 table
   border-collapse collapse
   margin 1rem 0
@@ -149,11 +162,16 @@ th, td
 .custom-layout
   padding-top $navbarHeight
 
-.theme-container.no-navbar
-  .content:not(.custom)
-    h1, h2, h3, h4, h5, h6
-      margin-top 1.5rem
-      padding-top 0
+.theme-container
+  &.sidebar-open
+    .sidebar-mask
+      display: block
+  &.no-navbar
+    .content:not(.custom)
+      h1, h2, h3, h4, h5, h6
+        margin-top 1.5rem
+        padding-top 0
+
 
 @media (min-width: ($MQMobile + 1px))
   .theme-container.no-sidebar
diff --git a/lib/dev.js b/lib/dev.js
index 1b6d1b9297..e5dd3e7418 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -73,6 +73,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
   }
 
   const compiler = webpack(config)
+  const host = cliOptions.host || options.siteConfig.host || '0.0.0.0'
   portfinder.basePort = cliOptions.port || options.siteConfig.port || 8080
   const port = await portfinder.getPortPromise()
 
@@ -82,7 +83,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
       isFirst = false
       console.log(
         `\n  VuePress dev server listening at ${
-          chalk.cyan(`http://localhost:${port}${options.publicPath}`)
+          chalk.cyan(`http://${host}:${port}${options.publicPath}`)
         }\n`
       )
     } else {
@@ -97,7 +98,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
     // in cwd it would break the server
     content: [nonExistentDir],
     compiler,
-    host: cliOptions.host || options.siteConfig.host || '0.0.0.0',
+    host,
     dev: { logLevel: 'warn' },
     hot: { logLevel: 'error' },
     logLevel: 'error',
diff --git a/lib/markdown/slugify.js b/lib/markdown/slugify.js
index d4aa023412..47a9d6e9de 100644
--- a/lib/markdown/slugify.js
+++ b/lib/markdown/slugify.js
@@ -15,6 +15,8 @@ module.exports = function slugify (str) {
     .replace(/\-{2,}/g, '-')
     // Remove prefixing and trailing separtors
     .replace(/^\-+|\-+$/g, '')
+    // ensure it doesn't start with a number (#121)
+    .replace(/^(\d)/, '_$1')
     // lowercase
     .toLowerCase()
 }
diff --git a/lib/prepare.js b/lib/prepare.js
index a3b12d684e..34f9d0e8e6 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -2,6 +2,7 @@ const path = require('path')
 const fs = require('fs-extra')
 const globby = require('globby')
 const yamlParser = require('js-yaml')
+const tomlParser = require('toml')
 const yaml = require('yaml-front-matter')
 const createMarkdown = require('./markdown')
 const tempPath = path.resolve(__dirname, 'app/.temp')
@@ -69,12 +70,14 @@ async function resolveOptions (sourceDir) {
   const vuepressDir = path.resolve(sourceDir, '.vuepress')
   const configPath = path.resolve(vuepressDir, 'config.js')
   const configYmlPath = path.resolve(vuepressDir, 'config.yml')
+  const configTomlPath = path.resolve(vuepressDir, 'config.toml')
 
   delete require.cache[configPath]
   let siteConfig = {}
   if (fs.existsSync(configYmlPath)) {
-    const content = await fs.readFile(configYmlPath, 'utf-8')
-    siteConfig = yamlParser.safeLoad(content)
+    siteConfig = await parseConfig(configYmlPath)
+  } else if (fs.existsSync(configTomlPath)) {
+    siteConfig = await parseConfig(configTomlPath)
   } else if (fs.existsSync(configPath)) {
     siteConfig = require(configPath)
   }
@@ -283,3 +286,27 @@ function sort (arr) {
     return 0
   })
 }
+
+async function parseConfig (file) {
+  const content = await fs.readFile(file, 'utf-8')
+  const [extension] = /.\w+$/.exec(file)
+  let data
+
+  switch (extension) {
+  case '.yml':
+  case '.yaml':
+    data = yamlParser.safeLoad(content)
+    break
+
+  case '.toml':
+    data = tomlParser.parse(content)
+    // reformat to match config since TOML does not allow different data type
+    // https://github.com/toml-lang/toml#array
+    Object.keys(data.head).forEach(meta => {
+      data['head'] = [[meta, ...data.head[meta]]]
+    })
+    break
+  }
+
+  return data || {}
+}
diff --git a/lib/util/index.js b/lib/util/index.js
index 0545fe0fb2..bfa48e24cf 100644
--- a/lib/util/index.js
+++ b/lib/util/index.js
@@ -59,10 +59,11 @@ exports.extractHeaders = (content, include = [], md) => {
   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,
-        slug: md.slugify(title)
+        slug: slug || md.slugify(title)
       })
     }
   })
diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js
index 70cb6d5d60..efd9712c19 100644
--- a/lib/webpack/createBaseConfig.js
+++ b/lib/webpack/createBaseConfig.js
@@ -221,7 +221,7 @@ module.exports = function createBaseConfig ({
   config
     .plugin('injections')
     .use(require('webpack/lib/DefinePlugin'), [{
-      BASE_URL: JSON.stringify(siteConfig.base),
+      BASE_URL: JSON.stringify(siteConfig.base || '/'),
       GA_ID: siteConfig.ga ? JSON.stringify(siteConfig.ga) : false,
       SW_ENABLED: !!siteConfig.serviceWorker
     }])
diff --git a/lib/webpack/createServerConfig.js b/lib/webpack/createServerConfig.js
index 2c972c5153..e9f098354b 100644
--- a/lib/webpack/createServerConfig.js
+++ b/lib/webpack/createServerConfig.js
@@ -12,6 +12,7 @@ module.exports = function createServerConfig (options, cliOptions) {
   config
     .target('node')
     .externals([/^vue|vue-router$/])
+    .devtool('source-map')
 
   // no need to minimize server build
   config.optimization.minimize(false)
diff --git a/package.json b/package.json
index 1927b362d0..6fbc2553c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuepress",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
   "bin": {
@@ -78,6 +78,7 @@
     "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.0.0-rc.1",
diff --git a/yarn.lock b/yarn.lock
index a30b0c56a2..29be7b94a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6035,6 +6035,10 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toml@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-2.3.3.tgz#8d683d729577cb286231dfc7a8affe58d31728fb"
+
 topo@2.x.x:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"

From 5228094df2a2331c205edff21b9f10872b9a4c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20B=C3=A9ni=C3=A9?= <lucien.benie@gmail.com>
Date: Wed, 18 Apr 2018 15:51:59 -0400
Subject: [PATCH 2/3] remove config.toml

---
 docs/.vuepress/config.toml | 67 --------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 docs/.vuepress/config.toml

diff --git a/docs/.vuepress/config.toml b/docs/.vuepress/config.toml
deleted file mode 100644
index e7e317a484..0000000000
--- a/docs/.vuepress/config.toml
+++ /dev/null
@@ -1,67 +0,0 @@
-dest = "vuepress"
-serviceWorker = true
-
-[title]
-  "/" = "VuePress"
-  "/zh/" = "VuePress"
-
-[description]
-  "/" = "Vue-powered Static Site Generator"
-  "/zh/" = "Vue 驱动的静态网站生成器"
-
-[[langs]]
-  lang = "en"
-  label = "English"
-  path = "/"
-  selectText = "Languages"
-[[langs]]
-  lang = "zh-CN"
-  label = "简体中文"
-  path = "/zh/"
-  selectText = "选择语言"
-
-[[head.link]]
-  rel = "icon"
-  href = "/logo.png"
-
-[themeConfig]
-  repo = "vuejs/vuepress"
-  editLinks = true
-  docsDir = 'docs'
-  [themeConfig.nav]
-    "/" = [
-      { text = "Guide", link = "/guide/" },
-      { text = "Config Reference", link = "/config/" },
-      { text = "Default Theme Config", link = "/default-theme-config/" }
-    ]
-    "/zh" = [
-      { text = "指南", link = "/zh/guide/" },
-      { text = "配置", link = "/zh/config/" },
-      { text = "默认主题", link = "/zh/default-theme-config/" }
-    ]
-  [themeConfig.sidebar]
-    "/guide/" =  [
-      { title = "Guide", collapsable = false, children = [
-        "",
-        "getting-started",
-        "basic-config",
-        "assets",
-        "markdown",
-        "using-vue",
-        "custom-themes",
-        "deploy"
-      ] }
-    ]
-    "/zh/guide/" = [
-      { title = "指南", collapsable = false, children = [
-        "",
-        "getting-started",
-        "basic-config",
-        "assets",
-        "markdown",
-        "using-vue",
-        "custom-themes",
-        "deploy"
-      ] }
-    ]
-    

From 709543421b6ceb20cfc5c1975a8d65c44ed1630e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20B=C3=A9ni=C3=A9?= <lucien.benie@gmail.com>
Date: Wed, 18 Apr 2018 21:05:29 -0400
Subject: [PATCH 3/3] fix: proper iteration over meta tags

---
 lib/prepare.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/prepare.js b/lib/prepare.js
index 34f9d0e8e6..63a0dae7e1 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -302,9 +302,13 @@ async function parseConfig (file) {
     data = tomlParser.parse(content)
     // reformat to match config since TOML does not allow different data type
     // https://github.com/toml-lang/toml#array
+    const format = []
     Object.keys(data.head).forEach(meta => {
-      data['head'] = [[meta, ...data.head[meta]]]
+      data.head[meta].forEach(values => {
+        format.push([meta, values])
+      })
     })
+    data.head = format
     break
   }