merge master branch

vuejs · shigma · Jan 28, 2019 · Jan 29, 2019 · Feb 15, 2019 · Feb 15, 2019
commit 98945d4a07e757ec92b8519dd03cefedb6b3f4be
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/packages/@vuepress/core/lib/internal-plugins/enhanceApp.js b/packages/@vuepress/core/lib/internal-plugins/enhanceApp.js
diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js
diff --git a/packages/@vuepress/core/lib/prepare/loadTheme.js b/packages/@vuepress/core/lib/prepare/loadTheme.js
diff --git a/packages/@vuepress/markdown-loader/index.js b/packages/@vuepress/markdown-loader/index.js
@@ -31,7 +31,6 @@ module.exports = function (src) {
   // vue-loader, and will be applied on the same file multiple times when
   // selecting the individual blocks.
   const file = this.resourcePath
-  const loader = Object.create(this)
   const { content, data } = parseFrontmatter(src)
 
   if (!isProd && !isServer) {

diff --git a/packages/@vuepress/theme-blog/layouts/Layout2.vue b/packages/@vuepress/theme-blog/layouts/Layout2.vue
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
diff --git a/packages/docs/docs/miscellaneous/glossary.md b/packages/docs/docs/miscellaneous/glossary.md
diff --git a/packages/docs/docs/theme/inheritance.md b/packages/docs/docs/theme/inheritance.md
diff --git a/packages/docs/docs/theme/option-api.md b/packages/docs/docs/theme/option-api.md
diff --git a/packages/docs/docs/zh/miscellaneous/glossary.md b/packages/docs/docs/zh/miscellaneous/glossary.md
diff --git a/packages/docs/docs/zh/theme/inheritance.md b/packages/docs/docs/zh/theme/inheritance.md
diff --git a/packages/docs/docs/zh/theme/option-api.md b/packages/docs/docs/zh/theme/option-api.md
diff --git a/packages/docs/docs/zh/theme/writing-a-theme.md b/packages/docs/docs/zh/theme/writing-a-theme.md