Merge branch 'master' of github.com:vuejs/vuepress into explode-md-includes

Author: ycmjason

lib/default-theme/Layout.vue

@@ -150,9 +150,9 @@ export default {
           (scrollTop >= anchor.parentElement.offsetTop + 10 &&
             (!nextAnchor || scrollTop < nextAnchor.parentElement.offsetTop - 10))
 
-        if (isActive && this.$route.hash !== anchor.hash) {
+        if (isActive && decodeURIComponent(this.$route.hash) !== decodeURIComponent(anchor.hash)) {
           store.disableScrollBehavior = true
-          this.$router.replace(anchor.hash, () => {
+          this.$router.replace(decodeURIComponent(anchor.hash), () => {
             // execute after scrollBehavior handler.
             this.$nextTick(() => {
               store.disableScrollBehavior = false

lib/prepare.js

@@ -230,7 +230,8 @@ async function resolveOptions (sourceDir) {
       data.frontmatter = frontmatter.data
     }
     if (frontmatter.excerpt) {
-      data.excerpt = frontmatter.excerpt
+      const { html } = markdown.render(frontmatter.excerpt)
+      data.excerpt = html
     }
     return data
   }))

lib/webpack/createBaseConfig.js

@@ -95,7 +95,7 @@ module.exports = function createBaseConfig ({
           if (filepath.startsWith(libDir)) {
             return false
           }
-          // always trasnpile js in vue files
+          // always transpile js in vue files
           if (/\.vue\.js$/.test(filepath)) {
             return false
           }
@@ -197,7 +197,8 @@ module.exports = function createBaseConfig ({
         .options({
           modules,
           localIdentName: `[local]_[hash:base64:8]`,
-          importLoaders: 1
+          importLoaders: 1,
+          sourceMap: !isProd
         })
 
       rule.use('postcss-loader').loader('postcss-loader').options(Object.assign({
@@ -212,6 +213,7 @@ module.exports = function createBaseConfig ({
   }
 
   createCSSRule('css', /\.css$/)
+  createCSSRule('postcss', /\.p(ost)?css$/)
   createCSSRule('scss', /\.scss$/, 'sass-loader', siteConfig.scss)
   createCSSRule('sass', /\.sass$/, 'sass-loader', Object.assign({ indentedSyntax: true }, siteConfig.sass))
   createCSSRule('less', /\.less$/, 'less-loader', siteConfig.less)