Merge branch 'master' into feat/refine-theme-api

Author: ulivz

Diff for: CHANGELOG.md

@@ -23,7 +23,7 @@
 
 * **$core:** support global layout (close: [#1226](https://github.com/vuejs/vuepress/issues/1226)) ([c91f55a](https://github.com/vuejs/vuepress/commit/c91f55a))
 
-  From now on, users have the ability to use a custom global layout component via [siteConfig](https://vuepress.vuejs.org/miscellaneous/glossary.html#siteconfig) or [themeEntry](https://vuepress.vuejs.org/miscellaneous/glossary.html#themeentry):
+  From now on, users have the ability to use a custom global layout component via [siteConfig](https://v1.vuepress.vuejs.org/miscellaneous/glossary.html#siteconfig) or [themeEntryFile](https://v1.vuepress.vuejs.org/miscellaneous/glossary.html#themeentryfile):
 
   ```js
   module.exports = {
@@ -103,7 +103,7 @@
 * **$core:** Cannot load assets when `base` is not '/' (close:  [#1238](https://github.com/vuejs/vuepress/issues/1238))([#1239](https://github.com/vuejs/vuepress/issues/1239)) ([8a234bb](https://github.com/vuejs/vuepress/commit/8a234bb))
   <br>This is a regression issue of leverage webpack-dev-server at [#1195](https://github.com/vuejs/vuepress/issues/1195).
 
-* **$markdown:** Remove colon as separator for [Import Code Snippets](https://vuepress.vuejs.org/guide/markdown.html#import-code-snippets) (close: [#1151](https://github.com/vuejs/vuepress/issues/1151)) ([#1236](https://github.com/vuejs/vuepress/issues/1236)) ([099d346](https://github.com/vuejs/vuepress/commit/099d346))
+* **$markdown:** Remove colon as separator for [Import Code Snippets](https://v1.vuepress.vuejs.org/guide/markdown.html#import-code-snippets) (close: [#1151](https://github.com/vuejs/vuepress/issues/1151)) ([#1236](https://github.com/vuejs/vuepress/issues/1236)) ([099d346](https://github.com/vuejs/vuepress/commit/099d346))
 
 
 ### Features
@@ -129,7 +129,7 @@
 ### Features
 
 * **$core:** Leverage `webpack-dev-server` and sunset `webpack-serve` ([#1195](https://github.com/vuejs/vuepress/issues/1195)) ([81e3ef6](https://github.com/vuejs/vuepress/commit/81e3ef6))
-  - Add new plugin option api [beforeDevServer](https://vuepress.vuejs.org/plugin/option-api.html#beforedevserver) and [afterDevServer](https://vuepress.vuejs.org/plugin/option-api.html#afterdevserver).
+  - Add new plugin option api [beforeDevServer](https://v1.vuepress.vuejs.org/plugin/option-api.html#beforedevserver) and [afterDevServer](https://v1.vuepress.vuejs.org/plugin/option-api.html#afterdevserver).
   - Remove `enhanceDevServer`.  
   - Publish [vuepress-plugin-export](https://github.com/ulivz/vuepress-plugin-export).
 * **$core:** Allow a theme package using a sub directory (close [#1204](https://github.com/vuejs/vuepress/issues/1204)) ([#1206](https://github.com/vuejs/vuepress/issues/1206)) ([febe3a7](https://github.com/vuejs/vuepress/commit/febe3a7))
@@ -139,7 +139,7 @@
 
 * **$core:** - Plugin option `enhanceDevServer` was removed.
   - **For 0.x users**, there is no any effect since we didn't expose API to modify it.
-  - **For 1.x users whose version of VuePress is lower than 1.0.0-alpha.33**, you should use [`beforeDevServer`](https://vuepress.vuejs.org/plugin/option-api.html#beforedevserver)(i.e. [before](https://webpack.js.org/configuration/dev-server/#devserver-before) in `webpack-dev-server`) to replace `enhanceDevServer`, you can also use [`afterDevServer`](https://vuepress.vuejs.org/plugin/option-api.html#afterdevserver)(i.e. [after](https://webpack.js.org/configuration/dev-server/#devserver-after) in `webpack-dev-server`) to execute custom middleware after all other middleware internally within the server.
+  - **For 1.x users whose version of VuePress is lower than 1.0.0-alpha.33**, you should use [`beforeDevServer`](https://v1.vuepress.vuejs.org/plugin/option-api.html#beforedevserver)(i.e. [before](https://webpack.js.org/configuration/dev-server/#devserver-before) in `webpack-dev-server`) to replace `enhanceDevServer`, you can also use [`afterDevServer`](https://v1.vuepress.vuejs.org/plugin/option-api.html#afterdevserver)(i.e. [after](https://webpack.js.org/configuration/dev-server/#devserver-after) in `webpack-dev-server`) to execute custom middleware after all other middleware internally within the server.
 
 <a name="1.0.0-alpha.32"></a>
 # [1.0.0-alpha.32](https://github.com/vuejs/vuepress/compare/v1.0.0-alpha.31...v1.0.0-alpha.32) (2019-01-15)
@@ -225,7 +225,7 @@
 
 * **$core:** pass generated page paths to `generated` hook ([#925](https://github.com/vuejs/vuepress/issues/925)) ([5ee2b2b](https://github.com/vuejs/vuepress/commit/5ee2b2b))
 * **$core:** `extendCli` Plugin Option API ([#1069](https://github.com/vuejs/vuepress/issues/1069)) ([e963731](https://github.com/vuejs/vuepress/commit/e963731))
-  - See [docs](https://vuepress.vuejs.org/plugin/option-api.html#extendcli).
+  - See [docs](https://v1.vuepress.vuejs.org/plugin/option-api.html#extendcli).
 * **$plugin-search:** searchable paths with test RegExp ([#1032](https://github.com/vuejs/vuepress/issues/1032)) ([d6bddf1](https://github.com/vuejs/vuepress/commit/d6bddf1))
 
 
@@ -621,7 +621,7 @@
 ### Features
 
 - **Plugin API**
-  - [Documentation](https://vuepress.vuejs.org/plugin/)
+  - [Documentation](https://v1.vuepress.vuejs.org/plugin/)
   - Multiple official plugins
     - [@vuepress/plugin-active-header-links](https://github.com/vuejs/vuepress/tree/master/packages/@vuepress/plugin-active-header-links)
     - [@vuepress/plugin-back-to-top](https://github.com/vuejs/vuepress/tree/master/packages/%40vuepress/plugin-back-to-top) (Thanks to @ycmjason )
@@ -636,18 +636,18 @@
 
 - **Refined Theme API**
   - From now on, the theme will no longer use Layout.vue as the entry point, but you can have your own configuration. For example, a theme can have some built-in plugins.
-  - [Documentation](https://vuepress.vuejs.org/theme/)
+  - [Documentation](https://v1.vuepress.vuejs.org/theme/)
 
 - **Permalinks**
   - From now on, VuePress supports custom routing in addition to the default file-level-based routing.
-  - [Documentation](https://vuepress.vuejs.org/guide/permalinks.html)
+  - [Documentation](https://v1.vuepress.vuejs.org/guide/permalinks.html)
 
 - **Markdown slots**
-  - [Documentation](https://vuepress.vuejs.org/guide/markdown-slot.html)
+  - [Documentation](https://v1.vuepress.vuejs.org/guide/markdown-slot.html)
 
 - **Free to add new pages**
   - You can add new pages with content (i.e. pointing to markdown files) or no content (i.e. common routes).
-  - [Documentation](https://vuepress.vuejs.org/plugin/option-api.html#additionalpages)
+  - [Documentation](https://v1.vuepress.vuejs.org/plugin/option-api.html#additionalpages)
 
 - **Custom temp path**
   - The running of VuePress actually depends on some temporary files generated during the build time. Before that, its default location is in `node_modules`, but now you can start configuring it, but don't forget to add it to gitignore.
@@ -799,7 +799,7 @@
 * **$core:**: version data layer ([0c5b752](https://github.com/vuejs/vuepress/commit/0c5b752))
 * **$default-theme:** new file-level API: `style.styl`. ([2f53f2f](https://github.com/vuejs/vuepress/commit/2f53f2f))
   1. Fixed overriding css variable doesn't work at `0.11.0` (close: [#639](https://github.com/vuejs/vuepress/issues/639))
-  2. Split `override.styl` into two APIs: `override.styl` and `style.styl`, the former will focus on ONLY the stylus constants override, while the latter will focus on styles override or custom styles. See also: https://vuepress.vuejs.org/default-theme-config/#simple-css-override.
+  2. Split `override.styl` into two APIs: `override.styl` and `style.styl`, the former will focus on ONLY the stylus constants override, while the latter will focus on styles override or custom styles. See also: https://v1.vuepress.vuejs.org/default-theme-config/#simple-css-override.
 
 
 <a name="0.11.0"></a>

Diff for: README.md

@@ -12,26 +12,24 @@
   <a href="https://discordapp.com/invite/HBherRA"><img src="https://img.shields.io/badge/Discord-join%20chat-738bd7.svg" alt="vuepress channel on Discord"></a>
 </p>
 
-> This is the branch for `VuePress Next` and docs are available at https://vuepress.vuejs.org.
+> This is the branch for `VuePress 1.x` and docs are available at https://v1.vuepress.vuejs.org.
 
 ## Status: alpha
 
 Certain combinations of plugins may not work properly, and things may change or break until we reach `beta` phase. Do not use in production yet unless you are adventurous.
 
-For 0.x, it's moved to [0.x branch](https://github.com/vuejs/vuepress/tree/0.x) and still maintained, the website was switching to https://v0.vuepress.vuejs.org.
-
-> Note that we are working hard to improve the documentation and contributions welcome if you keep up with the latest changes.
+For 0.x, it's moved to [0.x branch](https://github.com/vuejs/vuepress/tree/0.x) and still maintained, the website is: https://vuepress.vuejs.org.
 
 ## Install
 
 ```bash
-yarn add vuepress -D       # Install 0.x.x.
-yarn add vuepress@next -D  # Install next.
+yarn add vuepress -D       # Install 0.x
+yarn add vuepress@next -D  # Install 1.x.
 ```
 
 ## Showcase
 
-Check out [Awesome Vuepress](https://github.com/ulivz/awesome-vuepress) to find awesome things related to VuePress.
+Check out [Awesome Vuepress](https://github.com/ulivz/awesome-vuepress) to find awesome things related to VuePress 1.x .
 
 ## Development
 

Diff for: packages/@vuepress/core/lib/app/redirect.js

@@ -50,5 +50,5 @@ export function handleRedirectForCleanUrls (router) {
 }
 
 function isRouteExists (router, path) {
-  return router.options.routes.filter(route => route.path === path).length > 0
+  return router.options.routes.filter(route => route.path.toLowerCase() === path.toLowerCase()).length > 0
 }

Diff for: packages/@vuepress/markdown-loader/index.js

@@ -21,6 +21,7 @@ module.exports = function (src) {
   const isProd = process.env.NODE_ENV === 'production'
   const isServer = this.target === 'node'
   const options = getOptions(this)
+  const loader = Object.create(this)
   const { sourceDir } = options
   let { markdown } = options
   if (!markdown) {
@@ -71,6 +72,7 @@ module.exports = function (src) {
     data: { hoistedTags, links },
     dataBlockString
   } = markdown.render(content, {
+    loader,
     frontmatter: frontmatter.data,
     relPath: path.relative(sourceDir, file)
   })

Diff for: packages/@vuepress/markdown/lib/link.js

@@ -66,8 +66,8 @@ module.exports = (md, externalAttrs) => {
     const routerLinks = md.$data.routerLinks || (md.$data.routerLinks = [])
     routerLinks.push(to)
 
-    return Object.assign({}, token, {
-      tag: 'router-link'
+    return Object.create(token, {
+      tag: { value: 'router-link' }
     })
   }
 

Diff for: packages/@vuepress/theme-default/components/Home.vue

@@ -4,10 +4,10 @@
       <img
         v-if="data.heroImage"
         :src="$withBase(data.heroImage)"
-        alt="hero"
+        :alt="data.heroAlt || 'hero'"
       >
 
-      <h1 id="main-title">{{ data.heroText || $title || 'Hello' }}</h1>
+      <h1 v-if="data.heroText !== null" id="main-title">{{ data.heroText || $title || 'Hello' }}</h1>
 
       <p class="description">
         {{ data.tagline || $description || 'Welcome to your VuePress site' }}

Diff for: packages/docs/docs/.vuepress/config.js

@@ -1,17 +1,16 @@
-const path = require('path')
 const container = require('markdown-it-container')
 
 module.exports = ctx => ({
   dest: '../../vuepress',
   locales: {
     '/': {
       lang: 'en-US',
-      title: 'VuePress',
+      title: 'VuePress 1.x',
       description: 'Vue-powered Static Site Generator'
     },
     '/zh/': {
       lang: 'zh-CN',
-      title: 'VuePress',
+      title: 'VuePress 1.x',
       description: 'Vue 驱动的静态网站生成器'
     }
   },
@@ -32,10 +31,10 @@ module.exports = ctx => ({
     editLinks: true,
     docsDir: 'packages/docs/docs',
     // #697 Provided by the official algolia team.
-    algolia: ctx.isProd ? ({
-      apiKey: '3a539aab83105f01761a137c61004d85',
-      indexName: 'vuepress'
-    }) : null,
+    // algolia: ctx.isProd ? ({
+    //   apiKey: '3a539aab83105f01761a137c61004d85',
+    //   indexName: 'vuepress'
+    // }) : null,
     locales: {
       '/': {
         label: 'English',
@@ -64,7 +63,7 @@ module.exports = ctx => ({
     }
   },
   plugins: [
-    ['@vuepress/i18n-ui',!ctx.isProd],
+    ['@vuepress/i18n-ui', !ctx.isProd],
     ['@vuepress/back-to-top', true],
     ['@vuepress/pwa', {
       serviceWorker: true,
@@ -76,9 +75,6 @@ module.exports = ctx => ({
       ga: 'UA-128189152-1'
     }],
   ],
-  clientRootMixin: ctx.isProd
-    ? path.resolve(__dirname, 'mixin.js')
-    : [],
   extendMarkdown (md) {
     md.use(container, 'upgrade', {
       render: (tokens, idx) => tokens[idx].nesting === 1

Diff for: packages/docs/docs/.vuepress/mixin.js

@@ -49,5 +49,9 @@ module.exports = [
         ]
       }
     ]
-  }
+  },
+  {
+    text: '0.x',
+    link: 'https://vuepress.vuejs.org/'
+  },
 ]

Diff for: packages/docs/docs/.vuepress/nav/en.js

@@ -49,5 +49,9 @@ module.exports = [
         ]
       }
     ]
-  }
+  },
+  {
+    text: '0.x',
+    link: 'https://vuepress.vuejs.org/'
+  },
 ]

Diff for: packages/docs/docs/.vuepress/nav/zh.js

@@ -4,32 +4,5 @@
 //  font-size 30px;
 //}
 
-.toasted-container.compatibility-notification
-  &.top-right
-    right 4vw
-  .toasted
-    font-weight 400
-    width 400px
-    background-color $accentColor
-    padding 20px 20px
-    line-height 1.5
-    display block
-    box-shadow 0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.3)
-    .action.ripple
-      border 1px solid #fff
-      color #fff
-      float right
-      white-space nowrap
-      margin 0
-    code
-      text-decoration underline
-
-@media (max-width: $MQMobile)
-  .toasted-container.compatibility-notification
-    &.top-right
-      right 5vw
-    .toasted
-      width 80vw
-
 
 

Diff for: packages/docs/docs/.vuepress/styles/index.styl

@@ -178,7 +178,7 @@ module.exports = {
     sidebar: [
       {
         title: 'Group 1',   // 必要的
-        path: '/foo/'       // 可选的, 应该是一个绝对路径
+        path: '/foo/',      // 可选的, 应该是一个绝对路径
         collapsable: false, // 可选的, 默认值是 true,
         sidebarDepth: 1,    // 可选的, 默认值是 1
         children: [