From 631605877ce94e3631f84e916ed6e0c665522454 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 20:14:08 +0800
Subject: [PATCH 01/21] feat: support line number

---
 lib/default-theme/styles/code.styl | 14 ++++++
 lib/markdown/highlightLines.js     | 72 +++++++++++++++++++-----------
 lib/markdown/index.js              |  4 +-
 3 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index 7241afcbc2..e56bde9f85 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -85,3 +85,17 @@ pre[class="language-c"]:before
 
 pre[class="language-bash"]:before
   content "sh"
+
+.content pre[line-number-mode]
+  padding-left 3rem
+
+.line-wrapper
+  position  relative
+
+.line-number
+  user-select none
+  position  absolute
+  left -3rem
+  width 3rem
+  text-align center
+  color #888
diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index da5496a389..b6cd12eb6f 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -1,56 +1,78 @@
 // forked from https://github.com/egoist/markdown-it-highlight-lines
 
 const RE = /{([\d,-]+)}/
-const wrapperRE = /^<pre .*?><code>/
+const wrapperRE = /(^<pre .*?><code>)([^]*)(<\/code><\/pre>)/
 
-module.exports = md => {
+module.exports = (md, { showLineNumbers = false } = {}) => {
   const fence = md.renderer.rules.fence
   md.renderer.rules.fence = (...args) => {
     const [tokens, idx, options] = args
     const token = tokens[idx]
+    const highlightLine = RE.test(token.info)
 
-    if (!token.info || !RE.test(token.info)) {
+    if (!token.info || (!highlightLine && !showLineNumbers)) {
       return fence(...args)
     }
 
     const langName = token.info.replace(RE, '').trim()
-    const lineNumbers = RE.exec(token.info)[1]
-      .split(',')
-      .map(v => v.split('-').map(v => parseInt(v, 10)))
-
     const code = options.highlight
       ? options.highlight(token.content, langName)
       : token.content
 
-    const rawCode = code.replace(wrapperRE, '')
-    const leadingWrapper = code.match(wrapperRE)[0]
+    const codeMatch = code.match(wrapperRE)
+
+    const [, leadingWrapper, rawCode, endingWrapper] = codeMatch
+
+    let lineNumbers
+    if (highlightLine) {
+      lineNumbers = RE.exec(token.info)[1]
+      .split(',')
+      .map(v => v.split('-').map(v => parseInt(v, 10)))
+    }
 
     const codeSplits = rawCode.split('\n').map((split, index) => {
-      const lineNumber = index + 1
-      const inRange = lineNumbers.some(([start, end]) => {
-        if (start && end) {
-          return lineNumber >= start && lineNumber <= end
-        }
-        return lineNumber === start
-      })
-      if (inRange) {
-        return {
-          code: `<span class="highlighted-line">${split}</span>`,
-          highlighted: true
+      if (highlightLine) {
+        const lineNumber = index + 1
+        const inRange = lineNumbers.some(([start, end]) => {
+          if (start && end) {
+            return lineNumber >= start && lineNumber <= end
+          }
+          return lineNumber === start
+        })
+        if (inRange) {
+          return {
+            code: `<span class="highlighted-line">${split}</span>`,
+            highlighted: true
+          }
         }
       }
       return {
         code: split
       }
     })
-    let highlightedCode = leadingWrapper
-    codeSplits.forEach(split => {
+
+    let finalCode = leadingWrapper
+
+    if (showLineNumbers) {
+      finalCode = finalCode.slice(-0, -7) + ' line-number-mode><code>'
+    }
+    codeSplits.forEach((split, index) => {
+      if (showLineNumbers) {
+        if (index === codeSplits.length - 1) {
+          return
+        }
+        finalCode += `<div class="line-wrapper"><span class="line-number">${index + 1}</span>`
+      }
       if (split.highlighted) {
-        highlightedCode += split.code
+        finalCode += split.code
       } else {
-        highlightedCode += `${split.code}\n`
+        finalCode += `${split.code}\n`
+      }
+      if (showLineNumbers) {
+        finalCode += `</div>`
       }
     })
-    return highlightedCode
+    finalCode += endingWrapper
+    return finalCode
   }
 }
diff --git a/lib/markdown/index.js b/lib/markdown/index.js
index e945e550df..8cdcd59efb 100644
--- a/lib/markdown/index.js
+++ b/lib/markdown/index.js
@@ -19,7 +19,9 @@ module.exports = ({ markdown = {}} = {}) => {
   })
     // custom plugins
     .use(component)
-    .use(highlightLines)
+    .use(highlightLines, {
+      showLineNumbers: true
+    })
     .use(convertRouterLink, Object.assign({
       target: '_blank',
       rel: 'noopener noreferrer'

From 8c6f7c6996605effe2777eb2e3f0d076e1a25cca Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 20:19:38 +0800
Subject: [PATCH 02/21] style: tweaks

---
 lib/default-theme/styles/code.styl | 23 ++++++++++++-----------
 lib/markdown/highlightLines.js     |  1 +
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index e56bde9f85..decbc5f81a 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -88,14 +88,15 @@ pre[class="language-bash"]:before
 
 .content pre[line-number-mode]
   padding-left 3rem
-
-.line-wrapper
-  position  relative
-
-.line-number
-  user-select none
-  position  absolute
-  left -3rem
-  width 3rem
-  text-align center
-  color #888
+  .highlighted-line
+    margin 0 -1.5rem 0 -3rem
+    padding 0 1.5rem 0 3rem
+  .line-wrapper
+    position  relative
+  .line-number
+    user-select none
+    position  absolute
+    left -3rem
+    width 3rem
+    text-align center
+    color #888
diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index b6cd12eb6f..66fd77fa93 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -56,6 +56,7 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
     if (showLineNumbers) {
       finalCode = finalCode.slice(-0, -7) + ' line-number-mode><code>'
     }
+
     codeSplits.forEach((split, index) => {
       if (showLineNumbers) {
         if (index === codeSplits.length - 1) {

From d779750e8f94a2d4771368927d3b3b6bdb148258 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 20:48:06 +0800
Subject: [PATCH 03/21] refactor: simplify patch code

---
 lib/markdown/highlightLines.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index 66fd77fa93..2126b33a3f 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -62,18 +62,16 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
         if (index === codeSplits.length - 1) {
           return
         }
-        finalCode += `<div class="line-wrapper"><span class="line-number">${index + 1}</span>`
+        finalCode += `<span class="line-wrapper"><span class="line-number">${index + 1}</span></span>`
       }
       if (split.highlighted) {
         finalCode += split.code
       } else {
         finalCode += `${split.code}\n`
       }
-      if (showLineNumbers) {
-        finalCode += `</div>`
-      }
     })
     finalCode += endingWrapper
     return finalCode
   }
 }
+

From 37c66a569ae1b62ae3f1cc2ef9ec23e70c486158 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 21:01:44 +0800
Subject: [PATCH 04/21] chore: tweaks

---
 lib/markdown/highlightLines.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index 2126b33a3f..89629f626e 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -41,7 +41,7 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
         })
         if (inRange) {
           return {
-            code: `<span class="highlighted-line">${split}</span>`,
+            code: `<span class="highlighted-line">${split || '\n'}</span>`,
             highlighted: true
           }
         }

From 2b086d470f37de92e3b263f3ddad3a5c380dbc39 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 22:29:36 +0800
Subject: [PATCH 05/21] refactor: simplify code

---
 lib/markdown/highlightLines.js | 47 ++++++++++++++--------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index 89629f626e..d9f8ff8bd5 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -30,48 +30,39 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
       .map(v => v.split('-').map(v => parseInt(v, 10)))
     }
 
-    const codeSplits = rawCode.split('\n').map((split, index) => {
-      if (highlightLine) {
-        const lineNumber = index + 1
-        const inRange = lineNumbers.some(([start, end]) => {
-          if (start && end) {
-            return lineNumber >= start && lineNumber <= end
-          }
-          return lineNumber === start
-        })
-        if (inRange) {
-          return {
-            code: `<span class="highlighted-line">${split || '\n'}</span>`,
-            highlighted: true
-          }
-        }
-      }
-      return {
-        code: split
-      }
-    })
-
     let finalCode = leadingWrapper
-
     if (showLineNumbers) {
       finalCode = finalCode.slice(-0, -7) + ' line-number-mode><code>'
     }
 
+    const codeSplits = rawCode.split('\n')
+    const codeSplitsMaxIndex = codeSplits.length - 1
+
     codeSplits.forEach((split, index) => {
       if (showLineNumbers) {
-        if (index === codeSplits.length - 1) {
+        if (index === codeSplitsMaxIndex) {
           return
         }
         finalCode += `<span class="line-wrapper"><span class="line-number">${index + 1}</span></span>`
       }
-      if (split.highlighted) {
-        finalCode += split.code
-      } else {
-        finalCode += `${split.code}\n`
+
+      if (highlightLine) {
+        const lineNumber = index + 1
+        const inRange = lineNumbers.some(([start, end]) => {
+          if (start && end) {
+            return lineNumber >= start && lineNumber <= end
+          }
+          return lineNumber === start
+        })
+        if (inRange) {
+          finalCode += `<span class="highlighted-line">${split || '\n'}</span>`
+          return
+        }
       }
+      finalCode += index === codeSplitsMaxIndex ? split : `${split}\n`
     })
+
     finalCode += endingWrapper
     return finalCode
   }
 }
-

From 4b19b863bfce4fb9a41141407eecdb8ee92a53dc Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 23:23:54 +0800
Subject: [PATCH 06/21] refactor: hack line number middle align at all browsers

---
 lib/default-theme/styles/code.styl | 20 ++++++++++++--------
 lib/markdown/highlightLines.js     |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index decbc5f81a..270630d3c2 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -86,17 +86,21 @@ pre[class="language-c"]:before
 pre[class="language-bash"]:before
   content "sh"
 
+$lineNumberWrapperWidth = 3rem
+
 .content pre[line-number-mode]
-  padding-left 3rem
+  padding-left $lineNumberWrapperWidth
+  vertical-align middle
   .highlighted-line
-    margin 0 -1.5rem 0 -3rem
-    padding 0 1.5rem 0 3rem
+    margin 0 -1.5rem 0 $lineNumberWrapperWidth
+    padding 0 1.5rem 0 $lineNumberWrapperWidth
   .line-wrapper
+    user-select none
+    display inline-block
     position  relative
   .line-number
-    user-select none
-    position  absolute
-    left -3rem
-    width 3rem
+    position absolute
+    left - $lineNumberWrapperWidth
+    width $lineNumberWrapperWidth
     text-align center
-    color #888
+    color rgba(255, 255, 255, 0.4)
diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index d9f8ff8bd5..0829902291 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -43,7 +43,7 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
         if (index === codeSplitsMaxIndex) {
           return
         }
-        finalCode += `<span class="line-wrapper"><span class="line-number">${index + 1}</span></span>`
+        finalCode += `<span class="line-wrapper">&nbsp;<span class="line-number">&nbsp;${index + 1}</span></span>`
       }
 
       if (highlightLine) {

From 1e305e6ad1932878b9b8ba8c9550fb52e707dbab Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 23:33:42 +0800
Subject: [PATCH 07/21] chore: add some comments

---
 lib/markdown/highlightLines.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
index 0829902291..c488e32e63 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/highlightLines.js
@@ -43,6 +43,11 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
         if (index === codeSplitsMaxIndex) {
           return
         }
+        // Cannot apply all <span> to 'vertical-align: top' to align the line number and code.
+        // Since there are some annoying text nodes at code.
+        // This first space is to make 'line-wrapper' correctly display as a inline block.
+        // So the line number can have a correct relative position container.
+        // while the 2nd is to make 'line-wrapper' horizontal center.
         finalCode += `<span class="line-wrapper">&nbsp;<span class="line-number">&nbsp;${index + 1}</span></span>`
       }
 

From 1b0ad8e2bfe85b451094dedd3cd4803ceb793955 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Wed, 9 May 2018 23:38:12 +0800
Subject: [PATCH 08/21] chore: rename highlightLines to line

---
 lib/markdown/index.js                       | 4 ++--
 lib/markdown/{highlightLines.js => line.js} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/markdown/{highlightLines.js => line.js} (85%)

diff --git a/lib/markdown/index.js b/lib/markdown/index.js
index 8cdcd59efb..269e3a50a7 100644
--- a/lib/markdown/index.js
+++ b/lib/markdown/index.js
@@ -1,5 +1,5 @@
 const highlight = require('./highlight')
-const highlightLines = require('./highlightLines')
+const line = require('./line')
 const component = require('./component')
 const hoistScriptStyle = require('./hoist')
 const convertRouterLink = require('./link')
@@ -19,7 +19,7 @@ module.exports = ({ markdown = {}} = {}) => {
   })
     // custom plugins
     .use(component)
-    .use(highlightLines, {
+    .use(line, {
       showLineNumbers: true
     })
     .use(convertRouterLink, Object.assign({
diff --git a/lib/markdown/highlightLines.js b/lib/markdown/line.js
similarity index 85%
rename from lib/markdown/highlightLines.js
rename to lib/markdown/line.js
index c488e32e63..3a44d3aced 100644
--- a/lib/markdown/highlightLines.js
+++ b/lib/markdown/line.js
@@ -1,4 +1,4 @@
-// forked from https://github.com/egoist/markdown-it-highlight-lines
+// Modified from https://github.com/egoist/markdown-it-highlight-lines
 
 const RE = /{([\d,-]+)}/
 const wrapperRE = /(^<pre .*?><code>)([^]*)(<\/code><\/pre>)/
@@ -43,11 +43,11 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
         if (index === codeSplitsMaxIndex) {
           return
         }
-        // Cannot apply all <span> to 'vertical-align: top' to align the line number and code.
+        // Cannot apply all <span> to 'vertical-align: top' to make the line number(block) and code(inline) vertical align.
         // Since there are some annoying text nodes at code.
-        // This first space is to make 'line-wrapper' correctly display as a inline block.
+        // The first space is to make 'line-wrapper' correctly display as a inline block.
         // So the line number can have a correct relative position container.
-        // while the 2nd is to make 'line-wrapper' horizontal center.
+        // while the 2nd space is to make 'line-wrapper' horizontal center.
         finalCode += `<span class="line-wrapper">&nbsp;<span class="line-number">&nbsp;${index + 1}</span></span>`
       }
 

From eccf61ab4284961e03020bd1c93e67c246f64fe3 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Thu, 10 May 2018 00:39:35 +0800
Subject: [PATCH 09/21] chore: tweaks

---
 lib/markdown/index.js |  2 +-
 lib/markdown/line.js  | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/markdown/index.js b/lib/markdown/index.js
index 269e3a50a7..71df65757d 100644
--- a/lib/markdown/index.js
+++ b/lib/markdown/index.js
@@ -20,7 +20,7 @@ module.exports = ({ markdown = {}} = {}) => {
     // custom plugins
     .use(component)
     .use(line, {
-      showLineNumbers: true
+      lineNumbers: markdown.lineNumbers
     })
     .use(convertRouterLink, Object.assign({
       target: '_blank',
diff --git a/lib/markdown/line.js b/lib/markdown/line.js
index 3a44d3aced..0c2ec4ddad 100644
--- a/lib/markdown/line.js
+++ b/lib/markdown/line.js
@@ -3,14 +3,14 @@
 const RE = /{([\d,-]+)}/
 const wrapperRE = /(^<pre .*?><code>)([^]*)(<\/code><\/pre>)/
 
-module.exports = (md, { showLineNumbers = false } = {}) => {
+module.exports = (md, { lineNumbers = false } = {}) => {
   const fence = md.renderer.rules.fence
   md.renderer.rules.fence = (...args) => {
     const [tokens, idx, options] = args
     const token = tokens[idx]
     const highlightLine = RE.test(token.info)
 
-    if (!token.info || (!highlightLine && !showLineNumbers)) {
+    if (!token.info || (!highlightLine && !lineNumbers)) {
       return fence(...args)
     }
 
@@ -23,15 +23,15 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
 
     const [, leadingWrapper, rawCode, endingWrapper] = codeMatch
 
-    let lineNumbers
+    let highlightedLineNumbers
     if (highlightLine) {
-      lineNumbers = RE.exec(token.info)[1]
+      highlightedLineNumbers = RE.exec(token.info)[1]
       .split(',')
       .map(v => v.split('-').map(v => parseInt(v, 10)))
     }
 
     let finalCode = leadingWrapper
-    if (showLineNumbers) {
+    if (lineNumbers) {
       finalCode = finalCode.slice(-0, -7) + ' line-number-mode><code>'
     }
 
@@ -39,21 +39,21 @@ module.exports = (md, { showLineNumbers = false } = {}) => {
     const codeSplitsMaxIndex = codeSplits.length - 1
 
     codeSplits.forEach((split, index) => {
-      if (showLineNumbers) {
+      if (lineNumbers) {
         if (index === codeSplitsMaxIndex) {
           return
         }
-        // Cannot apply all <span> to 'vertical-align: top' to make the line number(block) and code(inline) vertical align.
-        // Since there are some annoying text nodes at code.
-        // The first space is to make 'line-wrapper' correctly display as a inline block.
-        // So the line number can have a correct relative position container.
-        // while the 2nd space is to make 'line-wrapper' horizontal center.
+        // Cannot apply all '<span>' to 'vertical-align: top' to make the line number(block)
+        // and code(inline) vertical align, because there are some annoying text nodes at code.
+        // The first space is to make 'line-wrapper' correctly display as a inline block, so
+        // the line number can have a correct relative position container, while the 2nd space
+        // is to make 'line-wrapper' horizontal center.
         finalCode += `<span class="line-wrapper">&nbsp;<span class="line-number">&nbsp;${index + 1}</span></span>`
       }
 
       if (highlightLine) {
         const lineNumber = index + 1
-        const inRange = lineNumbers.some(([start, end]) => {
+        const inRange = highlightedLineNumbers.some(([start, end]) => {
           if (start && end) {
             return lineNumber >= start && lineNumber <= end
           }

From ad58290603336658e94f6f786f2a658614e5f15e Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 11:50:17 +0800
Subject: [PATCH 10/21] merge master

---
 CHANGELOG.md                   | 58 +++++++++++++++++++++++++++
 docs/README.md                 | 64 ++++++++++++++++-------------
 lib/markdown/highlightLines.js | 58 +++++++++++++++++++++++++++
 lib/markdown/index.js          | 12 +++---
 lib/markdown/line.js           | 73 ----------------------------------
 package.json                   |  2 +-
 6 files changed, 160 insertions(+), 107 deletions(-)
 create mode 100644 lib/markdown/highlightLines.js
 delete mode 100644 lib/markdown/line.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de89e5788d..776636cbb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,61 @@
+<a name="0.9.0"></a>
+# [0.9.0](https://github.com/vuejs/vuepress/compare/v0.8.4...v0.9.0) (2018-05-11)
+
+
+### Bug Fixes
+
+* $page is missing at 404 page ([#388](https://github.com/vuejs/vuepress/issues/388)) ([cefc8c3](https://github.com/vuejs/vuepress/commit/cefc8c3))
+* avoid the searchbox exceeded out of screen in narrow screen ([#254](https://github.com/vuejs/vuepress/issues/254)) ([8f04081](https://github.com/vuejs/vuepress/commit/8f04081))
+* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([6514c8f](https://github.com/vuejs/vuepress/commit/6514c8f))
+* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([d0ef06f](https://github.com/vuejs/vuepress/commit/d0ef06f))
+* dropdown overlap due to word wrapping (close: [#359](https://github.com/vuejs/vuepress/issues/359)) ([#360](https://github.com/vuejs/vuepress/issues/360)) ([c65a8b7](https://github.com/vuejs/vuepress/commit/c65a8b7))
+* duplicate slash when docs dir is not set ([#361](https://github.com/vuejs/vuepress/issues/361)) ([0c59ed5](https://github.com/vuejs/vuepress/commit/0c59ed5))
+* ensure `<script>` blocks in SFCs in node_modules are transpiled ([4bf56d7](https://github.com/vuejs/vuepress/commit/4bf56d7))
+* glob patterns error on windows (close: [#348](https://github.com/vuejs/vuepress/issues/348)) ([#400](https://github.com/vuejs/vuepress/issues/400)) ([ab53998](https://github.com/vuejs/vuepress/commit/ab53998))
+* image overflow at custom content (close: [#381](https://github.com/vuejs/vuepress/issues/381)) ([#383](https://github.com/vuejs/vuepress/issues/383)) ([145cf4f](https://github.com/vuejs/vuepress/commit/145cf4f))
+* index file judgement bug (close: [#306](https://github.com/vuejs/vuepress/issues/306)) ([#308](https://github.com/vuejs/vuepress/issues/308)) ([fefa16c](https://github.com/vuejs/vuepress/commit/fefa16c))
+* missing title and desc in 404 and custom theme. ([fcaee80](https://github.com/vuejs/vuepress/commit/fcaee80))
+* postcss-loader warnings (close: [#278](https://github.com/vuejs/vuepress/issues/278)) ([34c7f99](https://github.com/vuejs/vuepress/commit/34c7f99))
+* potential duplicate iteration keys at dropdown ([#249](https://github.com/vuejs/vuepress/issues/249)) ([1417a35](https://github.com/vuejs/vuepress/commit/1417a35))
+* relative link checking ([31b8feb](https://github.com/vuejs/vuepress/commit/31b8feb))
+* remove style override limitation to custom theme (close: 404) ([#405](https://github.com/vuejs/vuepress/issues/405)) ([69bd59d](https://github.com/vuejs/vuepress/commit/69bd59d))
+* resolve custom theme from global cli (close: [#392](https://github.com/vuejs/vuepress/issues/392)) ([#399](https://github.com/vuejs/vuepress/issues/399)) ([01142df](https://github.com/vuejs/vuepress/commit/01142df))
+* title cannot be number at front matter ([#297](https://github.com/vuejs/vuepress/issues/297)) ([5023d19](https://github.com/vuejs/vuepress/commit/5023d19))
+* unexpected scroll behavior after clicking sidebar links ([#298](https://github.com/vuejs/vuepress/issues/298)) ([6081a3d](https://github.com/vuejs/vuepress/commit/6081a3d))
+* unexpected top blank space when navbar is disable ([#316](https://github.com/vuejs/vuepress/issues/316)) ([2bdc68e](https://github.com/vuejs/vuepress/commit/2bdc68e))
+
+
+### Features
+
+* bump up webpack to 4.8.1 (close: [#309](https://github.com/vuejs/vuepress/issues/309)) ([9e3f005](https://github.com/vuejs/vuepress/commit/9e3f005))
+* generate the timestamp of last updated for each doc (close [#258](https://github.com/vuejs/vuepress/issues/258)) ([#282](https://github.com/vuejs/vuepress/issues/282)) ([d9b290b](https://github.com/vuejs/vuepress/commit/d9b290b))
+* handle telephone links ([#325](https://github.com/vuejs/vuepress/issues/325)) ([087467a](https://github.com/vuejs/vuepress/commit/087467a))
+* header extraction improvement (close: [#238](https://github.com/vuejs/vuepress/issues/238)) ([#271](https://github.com/vuejs/vuepress/issues/271)) ([53c8489](https://github.com/vuejs/vuepress/commit/53c8489))
+* hide edit link by page (close: [#284](https://github.com/vuejs/vuepress/issues/284)) ([#286](https://github.com/vuejs/vuepress/issues/286)) ([d46819c](https://github.com/vuejs/vuepress/commit/d46819c))
+* highlight current region in sidebar ([#272](https://github.com/vuejs/vuepress/issues/272)) ([6b6d268](https://github.com/vuejs/vuepress/commit/6b6d268))
+* last updated UI in default theme. ([#338](https://github.com/vuejs/vuepress/issues/338)) ([272df57](https://github.com/vuejs/vuepress/commit/272df57))
+* make code type insensitive (close: [#347](https://github.com/vuejs/vuepress/issues/347)) ([5e87b65](https://github.com/vuejs/vuepress/commit/5e87b65))
+* support disable navbar globally ([#246](https://github.com/vuejs/vuepress/issues/246)) ([e725ad2](https://github.com/vuejs/vuepress/commit/e725ad2))
+* support global markdown config for attributes of external links ([#358](https://github.com/vuejs/vuepress/issues/358)) ([20e5bd8](https://github.com/vuejs/vuepress/commit/20e5bd8))
+* using babel and support JSX in vue. (close: [#318](https://github.com/vuejs/vuepress/issues/318)) ([#336](https://github.com/vuejs/vuepress/issues/336)) ([82cd8bd](https://github.com/vuejs/vuepress/commit/82cd8bd))
+
+
+
+<a name="0.8.4"></a>
+## [0.8.4](https://github.com/vuejs/vuepress/compare/v0.8.3...v0.8.4) (2018-04-24)
+
+
+### Bug Fixes
+
+* algolia regression - missing options (close [#234](https://github.com/vuejs/vuepress/issues/234)) ([b19bd89](https://github.com/vuejs/vuepress/commit/b19bd89))
+
+
+### Features
+
+* support disable navbar via front matter (close: [#187](https://github.com/vuejs/vuepress/issues/187)) ([#232](https://github.com/vuejs/vuepress/issues/232)) ([504268c](https://github.com/vuejs/vuepress/commit/504268c))
+
+
+
 <a name="0.8.4"></a>
 ## [0.8.4](https://github.com/vuejs/vuepress/compare/v0.8.3...v0.8.4) (2018-04-24)
 
diff --git a/docs/README.md b/docs/README.md
index 3cd3d75032..9edfdef5da 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,34 +1,42 @@
----
-home: true
-heroImage: /hero.png
-actionText: Get Started →
-actionLink: /guide/
-features:
-- title: Simplicity First
-  details: Minimal setup with markdown-centered project structure helps you focus on writing.
-- title: Vue-Powered
-  details: Enjoy the dev experience of Vue + webpack, use Vue components in markdown, and develop custom themes with Vue.
-- title: Performant
-  details: VuePress generates pre-rendered static HTML for each page, and runs as an SPA once a page is loaded.
-footer: MIT Licensed | Copyright © 2018-present Evan You
----
+**The exciting 0.9.0 is going to be released !** 🆙👏
 
-### As Easy as 1, 2, 3
+<a name="0.9.0"></a>
+# [0.9.0](https://github.com/vuejs/vuepress/compare/v0.8.4...v0.9.0) (2018-05-09)
 
-``` bash
-# install
-yarn global add vuepress # OR npm install -g vuepress
+This release 
 
-# create a markdown file
-echo '# Hello VuePress' > README.md
+### Features & Improvements
 
-# start writing
-vuepress dev
+- **Default theme**: highlight current region in sidebar ([#272](https://github.com/vuejs/vuepress/issues/272)) ([6b6d268](https://github.com/vuejs/vuepress/commit/6b6d268))
+- **Default theme**: `last updated` UI in default theme. ([#338](https://github.com/vuejs/vuepress/issues/338)) ([272df57](https://github.com/vuejs/vuepress/commit/272df57))
+- **Build**: Using `babel` and support `JSX` in vue. (close: [#318](https://github.com/vuejs/vuepress/issues/318)) ([#336](https://github.com/vuejs/vuepress/issues/336)) ([82cd8bd](https://github.com/vuejs/vuepress/commit/82cd8bd))
+- **Build**: Generate the timestamp of last updated for each doc (close [#258](https://github.com/vuejs/vuepress/issues/258)) ([#282](https://github.com/vuejs/vuepress/issues/282)) ([d9b290b](https://github.com/vuejs/vuepress/commit/d9b290b))
+- **Build**: Bump up `webpack` to 4.8.1 (close: [#309](https://github.com/vuejs/vuepress/issues/309)) ([9e3f005](https://github.com/vuejs/vuepress/commit/9e3f005))
+- **Config**: Support disable navbar globally ([#246](https://github.com/vuejs/vuepress/issues/246)) ([e725ad2](https://github.com/vuejs/vuepress/commit/e725ad2))
+- **Config**: Support global markdown config for attributes of external links ([#358](https://github.com/vuejs/vuepress/issues/358)) ([20e5bd8](https://github.com/vuejs/vuepress/commit/20e5bd8))
+- **Config**: Support hide edit link by page (close: [#284](https://github.com/vuejs/vuepress/issues/284)) ([#286](https://github.com/vuejs/vuepress/issues/286)) ([d46819c](https://github.com/vuejs/vuepress/commit/d46819c))
+- Handle telephone links ([#325](https://github.com/vuejs/vuepress/issues/325)) ([087467a](https://github.com/vuejs/vuepress/commit/087467a))
+- Header extraction improvement (close: [#238](https://github.com/vuejs/vuepress/issues/238)) ([#271](https://github.com/vuejs/vuepress/issues/271)) ([53c8489](https://github.com/vuejs/vuepress/commit/53c8489))
+- Make code type insensitive (close: [#347](https://github.com/vuejs/vuepress/issues/347)) ([5e87b65](https://github.com/vuejs/vuepress/commit/5e87b65))
 
-# build to static files
-vuepress build
-```
+### Bug Fixes
 
-::: warning COMPATIBILITY NOTE
-VuePress requires Node.js >= 8.
-:::
+* $page is missing at 404 page ([#388](https://github.com/vuejs/vuepress/issues/388)) ([cefc8c3](https://github.com/vuejs/vuepress/commit/cefc8c3))
+* avoid the searchbox exceeded out of screen in narrow screen ([#254](https://github.com/vuejs/vuepress/issues/254)) ([8f04081](https://github.com/vuejs/vuepress/commit/8f04081))
+* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([6514c8f](https://github.com/vuejs/vuepress/commit/6514c8f))
+* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([d0ef06f](https://github.com/vuejs/vuepress/commit/d0ef06f))
+* dropdown overlap due to word wrapping (close: [#359](https://github.com/vuejs/vuepress/issues/359)) ([#360](https://github.com/vuejs/vuepress/issues/360)) ([c65a8b7](https://github.com/vuejs/vuepress/commit/c65a8b7))
+* duplicate slash when docs dir is not set ([#361](https://github.com/vuejs/vuepress/issues/361)) ([0c59ed5](https://github.com/vuejs/vuepress/commit/0c59ed5))
+* ensure `<script>` blocks in SFCs in node_modules are transpiled ([4bf56d7](https://github.com/vuejs/vuepress/commit/4bf56d7))
+* glob patterns error on windows (close: [#348](https://github.com/vuejs/vuepress/issues/348)) ([#400](https://github.com/vuejs/vuepress/issues/400)) ([ab53998](https://github.com/vuejs/vuepress/commit/ab53998))
+* image overflow at custom content (close: [#381](https://github.com/vuejs/vuepress/issues/381)) ([#383](https://github.com/vuejs/vuepress/issues/383)) ([145cf4f](https://github.com/vuejs/vuepress/commit/145cf4f))
+* index file judgement bug (close: [#306](https://github.com/vuejs/vuepress/issues/306)) ([#308](https://github.com/vuejs/vuepress/issues/308)) ([fefa16c](https://github.com/vuejs/vuepress/commit/fefa16c))
+* missing title and desc in 404 and custom theme. ([fcaee80](https://github.com/vuejs/vuepress/commit/fcaee80))
+* postcss-loader warnings (close: [#278](https://github.com/vuejs/vuepress/issues/278)) ([34c7f99](https://github.com/vuejs/vuepress/commit/34c7f99))
+* potential duplicate iteration keys at dropdown ([#249](https://github.com/vuejs/vuepress/issues/249)) ([1417a35](https://github.com/vuejs/vuepress/commit/1417a35))
+* relative link checking ([31b8feb](https://github.com/vuejs/vuepress/commit/31b8feb))
+* remove style override limitation to custom theme (close: 404) ([#405](https://github.com/vuejs/vuepress/issues/405)) ([69bd59d](https://github.com/vuejs/vuepress/commit/69bd59d))
+* resolve custom theme from global cli (close: [#392](https://github.com/vuejs/vuepress/issues/392)) ([#399](https://github.com/vuejs/vuepress/issues/399)) ([01142df](https://github.com/vuejs/vuepress/commit/01142df))
+* title cannot be number at front matter ([#297](https://github.com/vuejs/vuepress/issues/297)) ([5023d19](https://github.com/vuejs/vuepress/commit/5023d19))
+* unexpected scroll behavior after clicking sidebar links ([#298](https://github.com/vuejs/vuepress/issues/298)) ([6081a3d](https://github.com/vuejs/vuepress/commit/6081a3d))
+* unexpected top blank space when navbar is disable ([#316](https://github.com/vuejs/vuepress/issues/316)) ([2bdc68e](https://github.com/vuejs/vuepress/commit/2bdc68e))
diff --git a/lib/markdown/highlightLines.js b/lib/markdown/highlightLines.js
new file mode 100644
index 0000000000..ec35a1b049
--- /dev/null
+++ b/lib/markdown/highlightLines.js
@@ -0,0 +1,58 @@
+// forked from https://github.com/egoist/markdown-it-highlight-lines
+
+const RE = /{([\d,-]+)}/
+const wrapperRE = /^<pre .*?><code>/
+
+module.exports = md => {
+  const fence = md.renderer.rules.fence
+  md.renderer.rules.fence = (...args) => {
+    const [tokens, idx, options] = args
+    const token = tokens[idx]
+
+    if (!token.info || !RE.test(token.info)) {
+      return fence(...args)
+    }
+
+    const langName = token.info.replace(RE, '').trim()
+    token.info = langName
+
+    const lineNumbers = RE.exec(token.info)[1]
+      .split(',')
+      .map(v => v.split('-').map(v => parseInt(v, 10)))
+
+    const code = options.highlight
+      ? options.highlight(token.content, langName)
+      : token.content
+
+    const rawCode = code.replace(wrapperRE, '')
+    const leadingWrapper = code.match(wrapperRE)[0]
+
+    const codeSplits = rawCode.split('\n').map((split, index) => {
+      const lineNumber = index + 1
+      const inRange = lineNumbers.some(([start, end]) => {
+        if (start && end) {
+          return lineNumber >= start && lineNumber <= end
+        }
+        return lineNumber === start
+      })
+      if (inRange) {
+        return {
+          code: `<span class="highlighted-line">${split}</span>`,
+          highlighted: true
+        }
+      }
+      return {
+        code: split
+      }
+    })
+    let highlightedCode = leadingWrapper
+    codeSplits.forEach(split => {
+      if (split.highlighted) {
+        highlightedCode += split.code
+      } else {
+        highlightedCode += `${split.code}\n`
+      }
+    })
+    return highlightedCode
+  }
+}
diff --git a/lib/markdown/index.js b/lib/markdown/index.js
index 71df65757d..cf7021be40 100644
--- a/lib/markdown/index.js
+++ b/lib/markdown/index.js
@@ -1,5 +1,6 @@
 const highlight = require('./highlight')
-const line = require('./line')
+const highlightLines = require('./highlightLines')
+const lineNumbers = require('./lineNumbers')
 const component = require('./component')
 const hoistScriptStyle = require('./hoist')
 const convertRouterLink = require('./link')
@@ -8,6 +9,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')
 
 module.exports = ({ markdown = {}} = {}) => {
   // allow user config slugify
@@ -19,9 +21,8 @@ module.exports = ({ markdown = {}} = {}) => {
   })
     // custom plugins
     .use(component)
-    .use(line, {
-      lineNumbers: markdown.lineNumbers
-    })
+    .use(highlightLines)
+    .use(lineNumbers)
     .use(convertRouterLink, Object.assign({
       target: '_blank',
       rel: 'noopener noreferrer'
@@ -39,7 +40,8 @@ module.exports = ({ markdown = {}} = {}) => {
     }, markdown.anchor))
     .use(toc, Object.assign({
       slugify,
-      includeLevel: [2, 3]
+      includeLevel: [2, 3],
+      format: parseHeaders
     }, markdown.toc))
 
   // apply user config
diff --git a/lib/markdown/line.js b/lib/markdown/line.js
deleted file mode 100644
index 0c2ec4ddad..0000000000
--- a/lib/markdown/line.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Modified from https://github.com/egoist/markdown-it-highlight-lines
-
-const RE = /{([\d,-]+)}/
-const wrapperRE = /(^<pre .*?><code>)([^]*)(<\/code><\/pre>)/
-
-module.exports = (md, { lineNumbers = false } = {}) => {
-  const fence = md.renderer.rules.fence
-  md.renderer.rules.fence = (...args) => {
-    const [tokens, idx, options] = args
-    const token = tokens[idx]
-    const highlightLine = RE.test(token.info)
-
-    if (!token.info || (!highlightLine && !lineNumbers)) {
-      return fence(...args)
-    }
-
-    const langName = token.info.replace(RE, '').trim()
-    const code = options.highlight
-      ? options.highlight(token.content, langName)
-      : token.content
-
-    const codeMatch = code.match(wrapperRE)
-
-    const [, leadingWrapper, rawCode, endingWrapper] = codeMatch
-
-    let highlightedLineNumbers
-    if (highlightLine) {
-      highlightedLineNumbers = RE.exec(token.info)[1]
-      .split(',')
-      .map(v => v.split('-').map(v => parseInt(v, 10)))
-    }
-
-    let finalCode = leadingWrapper
-    if (lineNumbers) {
-      finalCode = finalCode.slice(-0, -7) + ' line-number-mode><code>'
-    }
-
-    const codeSplits = rawCode.split('\n')
-    const codeSplitsMaxIndex = codeSplits.length - 1
-
-    codeSplits.forEach((split, index) => {
-      if (lineNumbers) {
-        if (index === codeSplitsMaxIndex) {
-          return
-        }
-        // Cannot apply all '<span>' to 'vertical-align: top' to make the line number(block)
-        // and code(inline) vertical align, because there are some annoying text nodes at code.
-        // The first space is to make 'line-wrapper' correctly display as a inline block, so
-        // the line number can have a correct relative position container, while the 2nd space
-        // is to make 'line-wrapper' horizontal center.
-        finalCode += `<span class="line-wrapper">&nbsp;<span class="line-number">&nbsp;${index + 1}</span></span>`
-      }
-
-      if (highlightLine) {
-        const lineNumber = index + 1
-        const inRange = highlightedLineNumbers.some(([start, end]) => {
-          if (start && end) {
-            return lineNumber >= start && lineNumber <= end
-          }
-          return lineNumber === start
-        })
-        if (inRange) {
-          finalCode += `<span class="highlighted-line">${split || '\n'}</span>`
-          return
-        }
-      }
-      finalCode += index === codeSplitsMaxIndex ? split : `${split}\n`
-    })
-
-    finalCode += endingWrapper
-    return finalCode
-  }
-}
diff --git a/package.json b/package.json
index 8103d9b85e..83b1397543 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuepress",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
   "bin": {

From fa8aa12467e907637e99c9f1d587af98ca6b0213 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 11:52:58 +0800
Subject: [PATCH 11/21] chore: remove unexpected change

---
 CHANGELOG.md | 58 ----------------------------------------------------
 1 file changed, 58 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 776636cbb4..de89e5788d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,61 +1,3 @@
-<a name="0.9.0"></a>
-# [0.9.0](https://github.com/vuejs/vuepress/compare/v0.8.4...v0.9.0) (2018-05-11)
-
-
-### Bug Fixes
-
-* $page is missing at 404 page ([#388](https://github.com/vuejs/vuepress/issues/388)) ([cefc8c3](https://github.com/vuejs/vuepress/commit/cefc8c3))
-* avoid the searchbox exceeded out of screen in narrow screen ([#254](https://github.com/vuejs/vuepress/issues/254)) ([8f04081](https://github.com/vuejs/vuepress/commit/8f04081))
-* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([6514c8f](https://github.com/vuejs/vuepress/commit/6514c8f))
-* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([d0ef06f](https://github.com/vuejs/vuepress/commit/d0ef06f))
-* dropdown overlap due to word wrapping (close: [#359](https://github.com/vuejs/vuepress/issues/359)) ([#360](https://github.com/vuejs/vuepress/issues/360)) ([c65a8b7](https://github.com/vuejs/vuepress/commit/c65a8b7))
-* duplicate slash when docs dir is not set ([#361](https://github.com/vuejs/vuepress/issues/361)) ([0c59ed5](https://github.com/vuejs/vuepress/commit/0c59ed5))
-* ensure `<script>` blocks in SFCs in node_modules are transpiled ([4bf56d7](https://github.com/vuejs/vuepress/commit/4bf56d7))
-* glob patterns error on windows (close: [#348](https://github.com/vuejs/vuepress/issues/348)) ([#400](https://github.com/vuejs/vuepress/issues/400)) ([ab53998](https://github.com/vuejs/vuepress/commit/ab53998))
-* image overflow at custom content (close: [#381](https://github.com/vuejs/vuepress/issues/381)) ([#383](https://github.com/vuejs/vuepress/issues/383)) ([145cf4f](https://github.com/vuejs/vuepress/commit/145cf4f))
-* index file judgement bug (close: [#306](https://github.com/vuejs/vuepress/issues/306)) ([#308](https://github.com/vuejs/vuepress/issues/308)) ([fefa16c](https://github.com/vuejs/vuepress/commit/fefa16c))
-* missing title and desc in 404 and custom theme. ([fcaee80](https://github.com/vuejs/vuepress/commit/fcaee80))
-* postcss-loader warnings (close: [#278](https://github.com/vuejs/vuepress/issues/278)) ([34c7f99](https://github.com/vuejs/vuepress/commit/34c7f99))
-* potential duplicate iteration keys at dropdown ([#249](https://github.com/vuejs/vuepress/issues/249)) ([1417a35](https://github.com/vuejs/vuepress/commit/1417a35))
-* relative link checking ([31b8feb](https://github.com/vuejs/vuepress/commit/31b8feb))
-* remove style override limitation to custom theme (close: 404) ([#405](https://github.com/vuejs/vuepress/issues/405)) ([69bd59d](https://github.com/vuejs/vuepress/commit/69bd59d))
-* resolve custom theme from global cli (close: [#392](https://github.com/vuejs/vuepress/issues/392)) ([#399](https://github.com/vuejs/vuepress/issues/399)) ([01142df](https://github.com/vuejs/vuepress/commit/01142df))
-* title cannot be number at front matter ([#297](https://github.com/vuejs/vuepress/issues/297)) ([5023d19](https://github.com/vuejs/vuepress/commit/5023d19))
-* unexpected scroll behavior after clicking sidebar links ([#298](https://github.com/vuejs/vuepress/issues/298)) ([6081a3d](https://github.com/vuejs/vuepress/commit/6081a3d))
-* unexpected top blank space when navbar is disable ([#316](https://github.com/vuejs/vuepress/issues/316)) ([2bdc68e](https://github.com/vuejs/vuepress/commit/2bdc68e))
-
-
-### Features
-
-* bump up webpack to 4.8.1 (close: [#309](https://github.com/vuejs/vuepress/issues/309)) ([9e3f005](https://github.com/vuejs/vuepress/commit/9e3f005))
-* generate the timestamp of last updated for each doc (close [#258](https://github.com/vuejs/vuepress/issues/258)) ([#282](https://github.com/vuejs/vuepress/issues/282)) ([d9b290b](https://github.com/vuejs/vuepress/commit/d9b290b))
-* handle telephone links ([#325](https://github.com/vuejs/vuepress/issues/325)) ([087467a](https://github.com/vuejs/vuepress/commit/087467a))
-* header extraction improvement (close: [#238](https://github.com/vuejs/vuepress/issues/238)) ([#271](https://github.com/vuejs/vuepress/issues/271)) ([53c8489](https://github.com/vuejs/vuepress/commit/53c8489))
-* hide edit link by page (close: [#284](https://github.com/vuejs/vuepress/issues/284)) ([#286](https://github.com/vuejs/vuepress/issues/286)) ([d46819c](https://github.com/vuejs/vuepress/commit/d46819c))
-* highlight current region in sidebar ([#272](https://github.com/vuejs/vuepress/issues/272)) ([6b6d268](https://github.com/vuejs/vuepress/commit/6b6d268))
-* last updated UI in default theme. ([#338](https://github.com/vuejs/vuepress/issues/338)) ([272df57](https://github.com/vuejs/vuepress/commit/272df57))
-* make code type insensitive (close: [#347](https://github.com/vuejs/vuepress/issues/347)) ([5e87b65](https://github.com/vuejs/vuepress/commit/5e87b65))
-* support disable navbar globally ([#246](https://github.com/vuejs/vuepress/issues/246)) ([e725ad2](https://github.com/vuejs/vuepress/commit/e725ad2))
-* support global markdown config for attributes of external links ([#358](https://github.com/vuejs/vuepress/issues/358)) ([20e5bd8](https://github.com/vuejs/vuepress/commit/20e5bd8))
-* using babel and support JSX in vue. (close: [#318](https://github.com/vuejs/vuepress/issues/318)) ([#336](https://github.com/vuejs/vuepress/issues/336)) ([82cd8bd](https://github.com/vuejs/vuepress/commit/82cd8bd))
-
-
-
-<a name="0.8.4"></a>
-## [0.8.4](https://github.com/vuejs/vuepress/compare/v0.8.3...v0.8.4) (2018-04-24)
-
-
-### Bug Fixes
-
-* algolia regression - missing options (close [#234](https://github.com/vuejs/vuepress/issues/234)) ([b19bd89](https://github.com/vuejs/vuepress/commit/b19bd89))
-
-
-### Features
-
-* support disable navbar via front matter (close: [#187](https://github.com/vuejs/vuepress/issues/187)) ([#232](https://github.com/vuejs/vuepress/issues/232)) ([504268c](https://github.com/vuejs/vuepress/commit/504268c))
-
-
-
 <a name="0.8.4"></a>
 ## [0.8.4](https://github.com/vuejs/vuepress/compare/v0.8.3...v0.8.4) (2018-04-24)
 

From 8352408496d38d3c5a895459b73c728b445734e3 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 11:53:37 +0800
Subject: [PATCH 12/21] chore: remove unexpected change - 2

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

diff --git a/package.json b/package.json
index 83b1397543..8103d9b85e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuepress",
-  "version": "0.9.0",
+  "version": "0.8.4",
   "description": "Minimalistic doc generator with Vue component based layout system",
   "main": "lib/index.js",
   "bin": {

From 0a1b1d90aeac319e0b7d5cf8349c9a80698bd00f Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 11:54:28 +0800
Subject: [PATCH 13/21] chore: chore: remove unexpected change - 3

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

diff --git a/README.md b/README.md
index db2337c702..523176228c 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,11 @@ https://vuepress.vuejs.org/
 - [Multi-Language Support](https://vuepress.vuejs.org/guide/i18n.html)
 - A default theme with:
   - Responsive layout
-  - Optional Homepage
-  - [Automatic basic typeahead search](https://vuepress.vuejs.org/default-theme-config/#built-in-search)
+  - [Optional Homepage](https://vuepress.vuejs.org/default-theme-config/#homepage)
+  - [Simple out-of-the-box header-based search](https://vuepress.vuejs.org/default-theme-config/#built-in-search)
   - [Algolia Search](https://vuepress.vuejs.org/default-theme-config/#algolia-search)
   - Customizable navbar and sidebar
-  - Auto-generated GitHub link and page edit links
+  - [Auto-generated GitHub link and page edit links](https://vuepress.vuejs.org/default-theme-config/#git-repo-and-edit-links)
 
 ## Todo Features
 

From 103da0c3387c09ee3d887f5db5a883baa00a344b Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 12:10:34 +0800
Subject: [PATCH 14/21] chore: chore: chore: remove unexpected change - 4

---
 docs/README.md | 64 ++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 9edfdef5da..3cd3d75032 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,42 +1,34 @@
-**The exciting 0.9.0 is going to be released !** 🆙👏
+---
+home: true
+heroImage: /hero.png
+actionText: Get Started →
+actionLink: /guide/
+features:
+- title: Simplicity First
+  details: Minimal setup with markdown-centered project structure helps you focus on writing.
+- title: Vue-Powered
+  details: Enjoy the dev experience of Vue + webpack, use Vue components in markdown, and develop custom themes with Vue.
+- title: Performant
+  details: VuePress generates pre-rendered static HTML for each page, and runs as an SPA once a page is loaded.
+footer: MIT Licensed | Copyright © 2018-present Evan You
+---
 
-<a name="0.9.0"></a>
-# [0.9.0](https://github.com/vuejs/vuepress/compare/v0.8.4...v0.9.0) (2018-05-09)
+### As Easy as 1, 2, 3
 
-This release 
+``` bash
+# install
+yarn global add vuepress # OR npm install -g vuepress
 
-### Features & Improvements
+# create a markdown file
+echo '# Hello VuePress' > README.md
 
-- **Default theme**: highlight current region in sidebar ([#272](https://github.com/vuejs/vuepress/issues/272)) ([6b6d268](https://github.com/vuejs/vuepress/commit/6b6d268))
-- **Default theme**: `last updated` UI in default theme. ([#338](https://github.com/vuejs/vuepress/issues/338)) ([272df57](https://github.com/vuejs/vuepress/commit/272df57))
-- **Build**: Using `babel` and support `JSX` in vue. (close: [#318](https://github.com/vuejs/vuepress/issues/318)) ([#336](https://github.com/vuejs/vuepress/issues/336)) ([82cd8bd](https://github.com/vuejs/vuepress/commit/82cd8bd))
-- **Build**: Generate the timestamp of last updated for each doc (close [#258](https://github.com/vuejs/vuepress/issues/258)) ([#282](https://github.com/vuejs/vuepress/issues/282)) ([d9b290b](https://github.com/vuejs/vuepress/commit/d9b290b))
-- **Build**: Bump up `webpack` to 4.8.1 (close: [#309](https://github.com/vuejs/vuepress/issues/309)) ([9e3f005](https://github.com/vuejs/vuepress/commit/9e3f005))
-- **Config**: Support disable navbar globally ([#246](https://github.com/vuejs/vuepress/issues/246)) ([e725ad2](https://github.com/vuejs/vuepress/commit/e725ad2))
-- **Config**: Support global markdown config for attributes of external links ([#358](https://github.com/vuejs/vuepress/issues/358)) ([20e5bd8](https://github.com/vuejs/vuepress/commit/20e5bd8))
-- **Config**: Support hide edit link by page (close: [#284](https://github.com/vuejs/vuepress/issues/284)) ([#286](https://github.com/vuejs/vuepress/issues/286)) ([d46819c](https://github.com/vuejs/vuepress/commit/d46819c))
-- Handle telephone links ([#325](https://github.com/vuejs/vuepress/issues/325)) ([087467a](https://github.com/vuejs/vuepress/commit/087467a))
-- Header extraction improvement (close: [#238](https://github.com/vuejs/vuepress/issues/238)) ([#271](https://github.com/vuejs/vuepress/issues/271)) ([53c8489](https://github.com/vuejs/vuepress/commit/53c8489))
-- Make code type insensitive (close: [#347](https://github.com/vuejs/vuepress/issues/347)) ([5e87b65](https://github.com/vuejs/vuepress/commit/5e87b65))
+# start writing
+vuepress dev
 
-### Bug Fixes
+# build to static files
+vuepress build
+```
 
-* $page is missing at 404 page ([#388](https://github.com/vuejs/vuepress/issues/388)) ([cefc8c3](https://github.com/vuejs/vuepress/commit/cefc8c3))
-* avoid the searchbox exceeded out of screen in narrow screen ([#254](https://github.com/vuejs/vuepress/issues/254)) ([8f04081](https://github.com/vuejs/vuepress/commit/8f04081))
-* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([6514c8f](https://github.com/vuejs/vuepress/commit/6514c8f))
-* code looks not good at small sreen (close: [#350](https://github.com/vuejs/vuepress/issues/350)) ([d0ef06f](https://github.com/vuejs/vuepress/commit/d0ef06f))
-* dropdown overlap due to word wrapping (close: [#359](https://github.com/vuejs/vuepress/issues/359)) ([#360](https://github.com/vuejs/vuepress/issues/360)) ([c65a8b7](https://github.com/vuejs/vuepress/commit/c65a8b7))
-* duplicate slash when docs dir is not set ([#361](https://github.com/vuejs/vuepress/issues/361)) ([0c59ed5](https://github.com/vuejs/vuepress/commit/0c59ed5))
-* ensure `<script>` blocks in SFCs in node_modules are transpiled ([4bf56d7](https://github.com/vuejs/vuepress/commit/4bf56d7))
-* glob patterns error on windows (close: [#348](https://github.com/vuejs/vuepress/issues/348)) ([#400](https://github.com/vuejs/vuepress/issues/400)) ([ab53998](https://github.com/vuejs/vuepress/commit/ab53998))
-* image overflow at custom content (close: [#381](https://github.com/vuejs/vuepress/issues/381)) ([#383](https://github.com/vuejs/vuepress/issues/383)) ([145cf4f](https://github.com/vuejs/vuepress/commit/145cf4f))
-* index file judgement bug (close: [#306](https://github.com/vuejs/vuepress/issues/306)) ([#308](https://github.com/vuejs/vuepress/issues/308)) ([fefa16c](https://github.com/vuejs/vuepress/commit/fefa16c))
-* missing title and desc in 404 and custom theme. ([fcaee80](https://github.com/vuejs/vuepress/commit/fcaee80))
-* postcss-loader warnings (close: [#278](https://github.com/vuejs/vuepress/issues/278)) ([34c7f99](https://github.com/vuejs/vuepress/commit/34c7f99))
-* potential duplicate iteration keys at dropdown ([#249](https://github.com/vuejs/vuepress/issues/249)) ([1417a35](https://github.com/vuejs/vuepress/commit/1417a35))
-* relative link checking ([31b8feb](https://github.com/vuejs/vuepress/commit/31b8feb))
-* remove style override limitation to custom theme (close: 404) ([#405](https://github.com/vuejs/vuepress/issues/405)) ([69bd59d](https://github.com/vuejs/vuepress/commit/69bd59d))
-* resolve custom theme from global cli (close: [#392](https://github.com/vuejs/vuepress/issues/392)) ([#399](https://github.com/vuejs/vuepress/issues/399)) ([01142df](https://github.com/vuejs/vuepress/commit/01142df))
-* title cannot be number at front matter ([#297](https://github.com/vuejs/vuepress/issues/297)) ([5023d19](https://github.com/vuejs/vuepress/commit/5023d19))
-* unexpected scroll behavior after clicking sidebar links ([#298](https://github.com/vuejs/vuepress/issues/298)) ([6081a3d](https://github.com/vuejs/vuepress/commit/6081a3d))
-* unexpected top blank space when navbar is disable ([#316](https://github.com/vuejs/vuepress/issues/316)) ([2bdc68e](https://github.com/vuejs/vuepress/commit/2bdc68e))
+::: warning COMPATIBILITY NOTE
+VuePress requires Node.js >= 8.
+:::

From a1f19b31966cdfd2a219076a445b3296ec77f831 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 13:18:42 +0800
Subject: [PATCH 15/21] feat: hoist lineNumbers as a separate plugin

---
 docs/.vuepress/config.js            |  3 +++
 lib/default-theme/styles/code.styl  | 41 ++++++++++++++++-------------
 lib/default-theme/styles/theme.styl |  2 +-
 lib/markdown/index.js               |  5 ++++
 lib/markdown/lineNumbers.js         | 26 ++++++++++++++++++
 lib/markdown/preWrapper.js          |  2 +-
 6 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 lib/markdown/lineNumbers.js

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index ad70d04dba..dea9678221 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -25,6 +25,9 @@ module.exports = {
   ],
   serviceWorker: true,
   theme: 'vue',
+  markdown: {
+    lineNumbers: true
+  },
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,
diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index 7b82ab5ed1..3e75fc52bd 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -1,5 +1,7 @@
 @require './config'
 
+$lineNumberWrapperWidth = 3.5rem
+
 .content
   code
     color lighten($textColor, 20%)
@@ -37,6 +39,26 @@ div[class*="language-"]
     right 1em
     font-size 0.75rem
     color rgba(255, 255, 255, 0.4)
+  &[line-numbers-mode]
+    position relative
+    pre
+      padding-left $lineNumberWrapperWidth
+      vertical-align middle
+    .line-numbers-wrapper
+      position absolute
+      background-color $codeBgColor
+      width $lineNumberWrapperWidth
+      border-radius 6px
+      text-align center
+      color rgba(255, 255, 255, 0.4)
+      padding 1.25rem 0
+      top 0
+      line-height 1.4
+      br
+        user-select none
+      .line-number
+        user-select none
+        font-size 0.85em
 
 div[class="language-js"], div[class="language-javascript"]
   &:before
@@ -91,22 +113,3 @@ div[class="language-bash"]:before
 
 div[class="language-yaml"]:before
   content "yaml"
-
-$lineNumberWrapperWidth = 3rem
-
-.content pre[line-number-mode]
-  padding-left $lineNumberWrapperWidth
-  vertical-align middle
-  .highlighted-line
-    margin 0 -1.5rem 0 $lineNumberWrapperWidth
-    padding 0 1.5rem 0 $lineNumberWrapperWidth
-  .line-wrapper
-    user-select none
-    display inline-block
-    position  relative
-  .line-number
-    position absolute
-    left - $lineNumberWrapperWidth
-    width $lineNumberWrapperWidth
-    text-align center
-    color rgba(255, 255, 255, 0.4)
diff --git a/lib/default-theme/styles/theme.styl b/lib/default-theme/styles/theme.styl
index cefae34472..1c62ec8ec3 100644
--- a/lib/default-theme/styles/theme.styl
+++ b/lib/default-theme/styles/theme.styl
@@ -138,7 +138,7 @@ a.header-anchor
   &:hover
     text-decoration none
 
-code, kbd
+code, kbd, .line-number
   font-family source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace
 
 p, ul, ol
diff --git a/lib/markdown/index.js b/lib/markdown/index.js
index 5ea8fef1f0..29c994039b 100644
--- a/lib/markdown/index.js
+++ b/lib/markdown/index.js
@@ -1,6 +1,7 @@
 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')
@@ -49,6 +50,10 @@ module.exports = ({ markdown = {}} = {}) => {
     markdown.config(md)
   }
 
+  if (markdown.lineNumbers) {
+    md.use(lineNumbers)
+  }
+
   // override render to allow custom plugins return data
   const render = md.render
   md.render = (...args) => {
diff --git a/lib/markdown/lineNumbers.js b/lib/markdown/lineNumbers.js
new file mode 100644
index 0000000000..eeae8c4ebd
--- /dev/null
+++ b/lib/markdown/lineNumbers.js
@@ -0,0 +1,26 @@
+// markdown-it plugin for generating line numbers.
+// It depends on preWrapper plugin.
+
+module.exports = md => {
+  const fence = md.renderer.rules.fence
+  md.renderer.rules.fence = (...args) => {
+    const rawCode = fence(...args)
+    const code = rawCode.slice(
+      rawCode.indexOf('<code>'),
+      rawCode.indexOf('</code>')
+    )
+
+    const lines = code.split('\n')
+    const lineNumbersCode = [...Array(lines.length - 1)]
+      .map((line, index) => `<span class="line-number">${index + 1}</span><br>`).join('')
+
+    const lineNumbersWrapperCode =
+      `<div class="line-numbers-wrapper">${lineNumbersCode}</div>`
+
+    const finalCode = rawCode
+      .replace('<!--beforeend-->', `${lineNumbersWrapperCode}<!--beforeend-->`)
+      .replace('code-mode', 'line-numbers-mode')
+
+    return finalCode
+  }
+}
diff --git a/lib/markdown/preWrapper.js b/lib/markdown/preWrapper.js
index 01ef8574a7..a9bb7d9190 100644
--- a/lib/markdown/preWrapper.js
+++ b/lib/markdown/preWrapper.js
@@ -6,6 +6,6 @@ module.exports = md => {
     const [tokens, idx] = args
     const token = tokens[idx]
     const rawCode = fence(...args)
-    return `<!--beforebegin--><div class="language-${token.info.trim()}"><!--afterbegin-->${rawCode}<!--beforeend--></div><!--afterend-->`
+    return `<!--beforebegin--><div class="language-${token.info.trim()}" code-mode><!--afterbegin-->${rawCode}<!--beforeend--></div><!--afterend-->`
   }
 }

From 538ea1d380a75a5c7413a23b70a8d947b4003aa6 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 14:27:59 +0800
Subject: [PATCH 16/21] chore: tweaks

---
 lib/default-theme/styles/code.styl   | 6 ++----
 lib/default-theme/styles/config.styl | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index 3e75fc52bd..20233e8349 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -1,7 +1,5 @@
 @require './config'
 
-$lineNumberWrapperWidth = 3.5rem
-
 .content
   code
     color lighten($textColor, 20%)
@@ -42,12 +40,12 @@ div[class*="language-"]
   &[line-numbers-mode]
     position relative
     pre
-      padding-left $lineNumberWrapperWidth
+      padding-left $lineNumbersWrapperWidth
       vertical-align middle
     .line-numbers-wrapper
       position absolute
       background-color $codeBgColor
-      width $lineNumberWrapperWidth
+      width $lineNumbersWrapperWidth
       border-radius 6px
       text-align center
       color rgba(255, 255, 255, 0.4)
diff --git a/lib/default-theme/styles/config.styl b/lib/default-theme/styles/config.styl
index 158de9024f..385551e054 100644
--- a/lib/default-theme/styles/config.styl
+++ b/lib/default-theme/styles/config.styl
@@ -15,4 +15,7 @@ $MQNarrow = 959px
 $MQMobile = 719px
 $MQMobileNarrow = 419px
 
+// code
+$lineNumbersWrapperWidth = 3.5rem
+
 @import '~@temp/override.styl' // generated from user config

From b2702d1ebee72c85bd9c8a909c347f3df448ac38 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 16:55:47 +0800
Subject: [PATCH 17/21] style: enhancement

---
 lib/default-theme/styles/code.styl | 38 ++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index 17b5372e5f..e7fd796a89 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -30,7 +30,8 @@ div[class*="language-"]
     user-select none
     padding-top 1.3rem
     position absolute
-    z-index 0
+    top 0
+    left 0
     width 100%
     line-height 1.4
     .highlighted
@@ -46,23 +47,46 @@ div[class*="language-"]
     font-size 0.75rem
     color rgba(255, 255, 255, 0.4)
   &[line-numbers-mode]
-    position relative
+    &::after
+      content ''
+      position absolute
+      z-index 2
+      top 0
+      left 0
+      width $lineNumbersWrapperWidth
+      height 100%
+      border-radius 6px 0 0 6px
+      border-right 1px solid rgba(0, 0, 0, 66%)
+      background-color $codeBgColor
+    .highlight-lines
+      .highlighted
+        position relative
+        &:before
+          content ' '
+          position absolute
+          z-index 3
+          left 0
+          top 0
+          display block
+          width $lineNumbersWrapperWidth
+          height 100%
+          background-color rgba(0, 0, 0, 66%)
     pre
-      padding-left $lineNumbersWrapperWidth
+      padding-left $lineNumbersWrapperWidth + 1 rem
       vertical-align middle
     .line-numbers-wrapper
       position absolute
-      background-color $codeBgColor
+      top 0
       width $lineNumbersWrapperWidth
-      border-radius 6px
       text-align center
-      color rgba(255, 255, 255, 0.4)
+      color rgba(255, 255, 255, 0.3)
       padding 1.25rem 0
-      top 0
       line-height 1.4
       br
         user-select none
       .line-number
+        position relative
+        z-index 4
         user-select none
         font-size 0.85em
 

From 228f91edb98fe63b8feb891aaaff6c6b059c3601 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 17:19:20 +0800
Subject: [PATCH 18/21] refactor(pre-wrapper): change attr to class

---
 lib/default-theme/styles/code.styl | 30 ++++++++++++++++--------------
 lib/markdown/lineNumbers.js        |  2 +-
 lib/markdown/preWrapper.js         |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index e7fd796a89..687dd31b73 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -46,20 +46,11 @@ div[class*="language-"]
     right 1em
     font-size 0.75rem
     color rgba(255, 255, 255, 0.4)
-  &[line-numbers-mode]
-    &::after
-      content ''
-      position absolute
-      z-index 2
-      top 0
-      left 0
-      width $lineNumbersWrapperWidth
-      height 100%
-      border-radius 6px 0 0 6px
-      border-right 1px solid rgba(0, 0, 0, 66%)
-      background-color $codeBgColor
-    .highlight-lines
-      .highlighted
+  &:not(.line-numbers-mode)
+    .line-numbers-wrapper
+      display none
+  &.line-numbers-mode
+    .highlight-lines .highlighted
         position relative
         &:before
           content ' '
@@ -89,6 +80,17 @@ div[class*="language-"]
         z-index 4
         user-select none
         font-size 0.85em
+    &::after
+      content ''
+      position absolute
+      z-index 2
+      top 0
+      left 0
+      width $lineNumbersWrapperWidth
+      height 100%
+      border-radius 6px 0 0 6px
+      border-right 1px solid rgba(0, 0, 0, 66%)
+      background-color $codeBgColor
 
 div[class="language-js"], div[class="language-javascript"]
   &:before
diff --git a/lib/markdown/lineNumbers.js b/lib/markdown/lineNumbers.js
index eeae8c4ebd..bc95d2b064 100644
--- a/lib/markdown/lineNumbers.js
+++ b/lib/markdown/lineNumbers.js
@@ -19,7 +19,7 @@ module.exports = md => {
 
     const finalCode = rawCode
       .replace('<!--beforeend-->', `${lineNumbersWrapperCode}<!--beforeend-->`)
-      .replace('code-mode', 'line-numbers-mode')
+      .replace('extra-class', 'line-numbers-mode')
 
     return finalCode
   }
diff --git a/lib/markdown/preWrapper.js b/lib/markdown/preWrapper.js
index ae7513e97b..8f1b1d7396 100644
--- a/lib/markdown/preWrapper.js
+++ b/lib/markdown/preWrapper.js
@@ -13,7 +13,7 @@ module.exports = md => {
     const [tokens, idx] = args
     const token = tokens[idx]
     const rawCode = fence(...args)
-    return `<!--beforebegin--><div class="language-${token.info.trim()}" code-mode>` +
+    return `<!--beforebegin--><div class="language-${token.info.trim()} extra-class">` +
     `<!--afterbegin-->${rawCode}<!--beforeend--></div><!--afterend-->`
   }
 }

From be5d675ba983d0be8d072bed14524352a9c1c6b1 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 17:38:02 +0800
Subject: [PATCH 19/21] docs: add doc for line numbers

---
 docs/config/README.md    | 7 +++++++
 docs/zh/config/README.md | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/docs/config/README.md b/docs/config/README.md
index 2c4cd8370b..9582d02e2b 100644
--- a/docs/config/README.md
+++ b/docs/config/README.md
@@ -127,6 +127,13 @@ Provide config options to the used theme. The options will vary depending on the
 
 ## Markdown
 
+### markdown.lineNumbers
+
+- Type: `boolean`
+- Default: `undefined`
+
+Whether to show line numbers to the left of each code blocks.
+
 ### markdown.slugify
 
 - Type: `Function`
diff --git a/docs/zh/config/README.md b/docs/zh/config/README.md
index 1cde934b7d..2bd994f758 100644
--- a/docs/zh/config/README.md
+++ b/docs/zh/config/README.md
@@ -126,6 +126,13 @@ module.exports = {
 
 ## Markdown
 
+### markdown.lineNumbers
+
+- 类型: `boolean`
+- 默认值: `undefined`
+
+是否在每个代码块的左侧显示行号。
+
 ### markdown.anchor
 
 - 类型: `Object`

From 41f7362872a4012259866e046d4bd71b4130bae9 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Sun, 13 May 2018 23:50:33 +0800
Subject: [PATCH 20/21] chore: recover config.

---
 docs/.vuepress/config.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index dea9678221..ad70d04dba 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -25,9 +25,6 @@ module.exports = {
   ],
   serviceWorker: true,
   theme: 'vue',
-  markdown: {
-    lineNumbers: true
-  },
   themeConfig: {
     repo: 'vuejs/vuepress',
     editLinks: true,

From 38806294cdbc9e928e102cb7f84a1147c1b05d61 Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Mon, 14 May 2018 00:07:49 +0800
Subject: [PATCH 21/21] fix: missing language tip

---
 lib/default-theme/styles/code.styl | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/default-theme/styles/code.styl b/lib/default-theme/styles/code.styl
index 687dd31b73..3c6c3fb45c 100644
--- a/lib/default-theme/styles/code.styl
+++ b/lib/default-theme/styles/code.styl
@@ -92,60 +92,60 @@ div[class*="language-"]
       border-right 1px solid rgba(0, 0, 0, 66%)
       background-color $codeBgColor
 
-div[class="language-js"], div[class="language-javascript"]
+div[class*="language-js"], div[class*="language-javascript"]
   &:before
     content "js"
 
-div[class="language-ts"], div[class="language-typescript"]
+div[class*="language-ts"], div[class*="language-typescript"]
   &:before
     content "ts"
 
-div[class="language-html"], div[class="language-markup"]
+div[class*="language-html"], div[class*="language-markup"]
   &:before
     content "html"
 
-div[class="language-markdown"], div[class="language-md"]
+div[class*="language-markdown"], div[class*="language-md"]
   &:before
     content "md"
 
-div[class="language-vue"]:before
+div[class*="language-vue"]:before
   content "vue"
 
-div[class="language-css"]:before
+div[class*="language-css"]:before
   content "css"
 
-div[class="language-sass"]:before
+div[class*="language-sass"]:before
   content "sass"
 
-div[class="language-less"]:before
+div[class*="language-less"]:before
   content "less"
 
-div[class="language-scss"]:before
+div[class*="language-scss"]:before
   content "scss"
 
-div[class="language-stylus"]:before
+div[class*="language-stylus"]:before
   content "stylus"
 
-div[class="language-json"]:before
+div[class*="language-json"]:before
   content "json"
 
-div[class="language-ruby"]:before
+div[class*="language-ruby"]:before
   content "rb"
 
-div[class="language-python"]:before
+div[class*="language-python"]:before
   content "py"
 
-div[class="language-go"]:before
+div[class*="language-go"]:before
   content "go"
 
-div[class="language-java"]:before
+div[class*="language-java"]:before
   content "java"
 
-div[class="language-c"]:before
+div[class*="language-c"]:before
   content "c"
 
-div[class="language-bash"]:before
+div[class*="language-bash"]:before
   content "sh"
 
-div[class="language-yaml"]:before
+div[class*="language-yaml"]:before
   content "yaml"