From 2cd833a5ddbb3894ba348a71ae73ced5f8ed96b2 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 28 Feb 2019 01:42:47 +0800
Subject: [PATCH 1/5] slot syntax

---
 packages/@vuepress/core/package.json                      | 2 +-
 .../@vuepress/markdown/lib/markdownSlotsContainers.js     | 2 +-
 packages/@vuepress/theme-blog/layouts/Layout2.vue         | 4 ++--
 packages/@vuepress/theme-default/layouts/Layout.vue       | 8 ++++----
 packages/@vuepress/theme-vue/layouts/Layout.vue           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index e27bfdbfda..a16feae5aa 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -53,7 +53,7 @@
     "postcss-loader": "^2.1.5",
     "toml": "^2.3.3",
     "url-loader": "^1.0.1",
-    "vue": "^2.5.16",
+    "vue": "^2.6.7",
     "vue-loader": "^15.2.4",
     "vue-router": "^3.0.2",
     "vue-server-renderer": "^2.5.16",
diff --git a/packages/@vuepress/markdown/lib/markdownSlotsContainers.js b/packages/@vuepress/markdown/lib/markdownSlotsContainers.js
index c70101f122..1e29e20d28 100644
--- a/packages/@vuepress/markdown/lib/markdownSlotsContainers.js
+++ b/packages/@vuepress/markdown/lib/markdownSlotsContainers.js
@@ -6,7 +6,7 @@ module.exports = md => {
   md
     .use(container, SLOT_KEY, {
       render: (tokens, idx) => tokens[idx].nesting === 1
-        ? `<template slot="${tokens[idx].info.trim().slice(SLOT_KEY.length).trim()}">`
+        ? `<template #${tokens[idx].info.trim().slice(SLOT_KEY.length).trim()}>`
         : '</template>'
     })
 }
diff --git a/packages/@vuepress/theme-blog/layouts/Layout2.vue b/packages/@vuepress/theme-blog/layouts/Layout2.vue
index cde03ada1c..6e1b480f1a 100755
--- a/packages/@vuepress/theme-blog/layouts/Layout2.vue
+++ b/packages/@vuepress/theme-blog/layouts/Layout2.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="container">
     <header>
-      <Content slot="header"/>
+      <Content #header/>
     </header>
     <main>
       <Content/>
     </main>
     <footer>
-      <Content slot="footer"/>
+      <Content #footer/>
     </footer>
   </div>
 </template>
diff --git a/packages/@vuepress/theme-default/layouts/Layout.vue b/packages/@vuepress/theme-default/layouts/Layout.vue
index d1960a3e25..0f0251fc82 100644
--- a/packages/@vuepress/theme-default/layouts/Layout.vue
+++ b/packages/@vuepress/theme-default/layouts/Layout.vue
@@ -21,11 +21,11 @@
     >
       <slot
         name="sidebar-top"
-        slot="top"
+        #top
       />
       <slot
         name="sidebar-bottom"
-        slot="bottom"
+        #bottom
       />
     </Sidebar>
 
@@ -37,11 +37,11 @@
     >
       <slot
         name="page-top"
-        slot="top"
+        #top
       />
       <slot
         name="page-bottom"
-        slot="bottom"
+        #bottom
       />
     </Page>
   </div>
diff --git a/packages/@vuepress/theme-vue/layouts/Layout.vue b/packages/@vuepress/theme-vue/layouts/Layout.vue
index 632abbec77..383a5772de 100644
--- a/packages/@vuepress/theme-vue/layouts/Layout.vue
+++ b/packages/@vuepress/theme-vue/layouts/Layout.vue
@@ -1,7 +1,7 @@
 <template>
   <ParentLayout>
-    <CarbonAds slot="sidebar-top"/>
-    <BuySellAds slot="page-bottom"/>
+    <CarbonAds #sidebar-top/>
+    <BuySellAds #page-bottom/>
   </ParentLayout>
 </template>
 

From 3df2b8dfd3fb22cd33964eeb26e412aa0a7c2286 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 28 Feb 2019 01:56:23 +0800
Subject: [PATCH 2/5] bump version

---
 packages/@vuepress/core/package.json       |  4 ++--
 packages/@vuepress/test-utils/package.json |  4 ++++
 yarn.lock                                  | 21 ++++++++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index a16feae5aa..c2d61af31c 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -56,8 +56,8 @@
     "vue": "^2.6.7",
     "vue-loader": "^15.2.4",
     "vue-router": "^3.0.2",
-    "vue-server-renderer": "^2.5.16",
-    "vue-template-compiler": "^2.5.16",
+    "vue-server-renderer": "^2.6.7",
+    "vue-template-compiler": "^2.6.7",
     "vuepress-html-webpack-plugin": "^3.2.0",
     "webpack": "^4.8.1",
     "webpack-chain": "^4.6.0",
diff --git a/packages/@vuepress/test-utils/package.json b/packages/@vuepress/test-utils/package.json
index 6033fdd41d..525f0f4936 100644
--- a/packages/@vuepress/test-utils/package.json
+++ b/packages/@vuepress/test-utils/package.json
@@ -31,6 +31,10 @@
     "ts-jest": "^23.10.5",
     "vue-jest": "^2.6.0"
   },
+  "peerDependencies": {
+    "vue": "^2.x",
+    "vue-template-compiler": "^2.x"
+  },
   "author": "ULIVZ <chl814@foxmail.com>",
   "license": "MIT",
   "bugs": {
diff --git a/yarn.lock b/yarn.lock
index 64877e1baa..80ee265ed8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9967,9 +9967,10 @@ vue-router@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
 
-vue-server-renderer@^2.5.16:
-  version "2.5.16"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.16.tgz#279ef8e37e502a0de3a9ae30758cc04a472eaac0"
+vue-server-renderer@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.7.tgz#ff40f69a439da8993a6e171b7d58575bfbeefb79"
+  integrity sha512-CVtGR+bE63y4kyIeOcCEF2UNKquSquFQAsTHZ5R1cGM4L4Z0BXgAUEcngTOy8kN+tubt3c1zpRvbrok/bHKeDg==
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -9987,9 +9988,10 @@ vue-style-loader@^4.1.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.16:
-  version "2.5.16"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb"
+vue-template-compiler@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.7.tgz#7f6c14eacf3c912d28d33b029cde706d9756e00c"
+  integrity sha512-ZjxJLr6Lw2gj6aQGKwBWTxVNNd28/qggIdwvr5ushrUHUvqgbHD0xusOVP2yRxT4pX3wRIJ2LfxjgFT41dEtoQ==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -10002,9 +10004,10 @@ vue-toasted@^1.1.25:
   version "1.1.25"
   resolved "https://registry.yarnpkg.com/vue-toasted/-/vue-toasted-1.1.25.tgz#27b1f40866d98f8bf817722869f3d97f7c0d4db1"
 
-vue@^2.5.16:
-  version "2.5.16"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085"
+vue@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.7.tgz#254f188e7621d2d19ee28d0c0442c6d21b53ae2d"
+  integrity sha512-g7ADfQ82QU+j6F/bVDioVQf2ccIMYLuR4E8ev+RsDBlmwRkhGO3HhgF4PF9vpwjdPpxyb1zzLur2nQ2oIMAMEg==
 
 vuepress-html-webpack-plugin@^3.2.0:
   version "3.2.0"

From 7dfd8c9963a89710c9c8b11cf348308a1419373f Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Sun, 3 Mar 2019 00:45:44 +0800
Subject: [PATCH 3/5] bump vue-loader version

---
 packages/@vuepress/core/package.json |   8 +-
 yarn.lock                            | 105 ++++++++++++++++++---------
 2 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json
index c2d61af31c..be0f3c5deb 100644
--- a/packages/@vuepress/core/package.json
+++ b/packages/@vuepress/core/package.json
@@ -53,11 +53,11 @@
     "postcss-loader": "^2.1.5",
     "toml": "^2.3.3",
     "url-loader": "^1.0.1",
-    "vue": "^2.6.7",
-    "vue-loader": "^15.2.4",
+    "vue": "^2.6.8",
+    "vue-loader": "^15.7.0",
     "vue-router": "^3.0.2",
-    "vue-server-renderer": "^2.6.7",
-    "vue-template-compiler": "^2.6.7",
+    "vue-server-renderer": "^2.6.8",
+    "vue-template-compiler": "^2.6.8",
     "vuepress-html-webpack-plugin": "^3.2.0",
     "webpack": "^4.8.1",
     "webpack-chain": "^4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 80ee265ed8..96417de94e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1272,19 +1272,20 @@
     babel-plugin-transform-vue-jsx "^4.0.1"
     core-js "^2.5.7"
 
-"@vue/component-compiler-utils@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.1.0.tgz#8331eadc8acdbc35aace5a61d2153e6f6434bfe2"
+"@vue/component-compiler-utils@^2.5.1":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b"
+  integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==
   dependencies:
     consolidate "^0.15.1"
     hash-sum "^1.0.2"
     lru-cache "^4.1.2"
     merge-source-map "^1.1.0"
-    postcss "^6.0.20"
-    postcss-selector-parser "^3.1.1"
-    prettier "^1.13.7"
-    source-map "^0.5.6"
-    vue-template-es2015-compiler "^1.6.0"
+    postcss "^7.0.14"
+    postcss-selector-parser "^5.0.0"
+    prettier "1.16.3"
+    source-map "~0.6.1"
+    vue-template-es2015-compiler "^1.9.0"
 
 "@vue/test-utils@^1.0.0-beta.16":
   version "1.0.0-beta.21"
@@ -2478,6 +2479,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -3222,6 +3232,11 @@ cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
 
+cssesc@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
+  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+
 cssnano@^3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
@@ -3634,7 +3649,7 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
-dot-prop@^4.1.1, dot-prop@^4.2.0:
+dot-prop@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
   dependencies:
@@ -7955,11 +7970,12 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
+postcss-selector-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
+  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
   dependencies:
-    dot-prop "^4.1.1"
+    cssesc "^2.0.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
@@ -8001,7 +8017,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.17, postcss@^6.0.20:
+postcss@^6.0.0, postcss@^6.0.17:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
   dependencies:
@@ -8017,6 +8033,15 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+postcss@^7.0.14:
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
+  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -8029,9 +8054,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.13.7:
-  version "1.13.7"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
+prettier@1.16.3:
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
+  integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
 
 pretty-bytes@^4.0.2:
   version "4.0.2"
@@ -9367,6 +9393,13 @@ supports-color@^5.3.0, supports-color@^5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -9953,11 +9986,12 @@ vue-jest@^2.6.0:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-loader@^15.2.4:
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.6.tgz#4ad4e56a0ca1fd89ebc4220f9e3bd4723097b397"
+vue-loader@^15.7.0:
+  version "15.7.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz#27275aa5a3ef4958c5379c006dd1436ad04b25b3"
+  integrity sha512-x+NZ4RIthQOxcFclEcs8sXGEWqnZHodL2J9Vq+hUz+TDZzBaDIh1j3d9M2IUlTjtrHTZy4uMuRdTi8BGws7jLA==
   dependencies:
-    "@vue/component-compiler-utils" "^2.0.0"
+    "@vue/component-compiler-utils" "^2.5.1"
     hash-sum "^1.0.2"
     loader-utils "^1.1.0"
     vue-hot-reload-api "^2.3.0"
@@ -9967,10 +10001,10 @@ vue-router@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
 
-vue-server-renderer@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.7.tgz#ff40f69a439da8993a6e171b7d58575bfbeefb79"
-  integrity sha512-CVtGR+bE63y4kyIeOcCEF2UNKquSquFQAsTHZ5R1cGM4L4Z0BXgAUEcngTOy8kN+tubt3c1zpRvbrok/bHKeDg==
+vue-server-renderer@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.8.tgz#7f191eede16778d96916f2f9199efa781fd30879"
+  integrity sha512-aiN2Fz3Sw35KRDQYqSSdsWjOtYcDWpm8rjcf3oSf/iiwFF/i1Q9UjDWvxQv4mbqVRBXGhdoICClQ005IZJoVbQ==
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -9988,10 +10022,10 @@ vue-style-loader@^4.1.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.7.tgz#7f6c14eacf3c912d28d33b029cde706d9756e00c"
-  integrity sha512-ZjxJLr6Lw2gj6aQGKwBWTxVNNd28/qggIdwvr5ushrUHUvqgbHD0xusOVP2yRxT4pX3wRIJ2LfxjgFT41dEtoQ==
+vue-template-compiler@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz#750802604595134775b9c53141b9850b35255e1c"
+  integrity sha512-SwWKANE5ee+oJg+dEJmsdxsxWYICPsNwk68+1AFjOS8l0O/Yz2845afuJtFqf3UjS/vXG7ECsPeHHEAD65Cjng==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -10000,14 +10034,19 @@ vue-template-es2015-compiler@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
 
+vue-template-es2015-compiler@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
+  integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
+
 vue-toasted@^1.1.25:
   version "1.1.25"
   resolved "https://registry.yarnpkg.com/vue-toasted/-/vue-toasted-1.1.25.tgz#27b1f40866d98f8bf817722869f3d97f7c0d4db1"
 
-vue@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.7.tgz#254f188e7621d2d19ee28d0c0442c6d21b53ae2d"
-  integrity sha512-g7ADfQ82QU+j6F/bVDioVQf2ccIMYLuR4E8ev+RsDBlmwRkhGO3HhgF4PF9vpwjdPpxyb1zzLur2nQ2oIMAMEg==
+vue@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.8.tgz#f21cbc536bfc14f7d1d792a137bb12f69e60ea91"
+  integrity sha512-+vp9lEC2Kt3yom673pzg1J7T1NVGuGzO9j8Wxno+rQN2WYVBX2pyo/RGQ3fXCLh2Pk76Skw/laAPCuBuEQ4diw==
 
 vuepress-html-webpack-plugin@^3.2.0:
   version "3.2.0"

From e12193d6391811e5bae1eb388147de6ebf39eda9 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Sun, 3 Mar 2019 00:58:43 +0800
Subject: [PATCH 4/5] update docs

---
 packages/docs/docs/plugin/official/plugin-pwa.md    | 2 +-
 packages/docs/docs/theme/inheritance.md             | 2 +-
 packages/docs/docs/zh/plugin/official/plugin-pwa.md | 2 +-
 packages/docs/docs/zh/theme/inheritance.md          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/docs/docs/plugin/official/plugin-pwa.md b/packages/docs/docs/plugin/official/plugin-pwa.md
index 7db310a844..8b07548436 100644
--- a/packages/docs/docs/plugin/official/plugin-pwa.md
+++ b/packages/docs/docs/plugin/official/plugin-pwa.md
@@ -179,7 +179,7 @@ First, you need to create a global component (e.g. `MySWUpdatePopup`) at `.vuepr
 <template>
   <SWUpdatePopup>
     <div
-      slot-scope="{ enabled, reload, message, buttonText }"
+      v-slot="{ enabled, reload, message, buttonText }"
       class="my-sw-update-popup">
       {{ message }}<br>
       <button @click="reload">{{ buttonText }}</button>
diff --git a/packages/docs/docs/theme/inheritance.md b/packages/docs/docs/theme/inheritance.md
index 58f7603f68..d1c2f38e75 100755
--- a/packages/docs/docs/theme/inheritance.md
+++ b/packages/docs/docs/theme/inheritance.md
@@ -159,7 +159,7 @@ You can use `@parent-theme` to access the root path of the parent theme. The fol
 <!-- themePath/components/Foo.vue -->
 <template>
   <ParentLayout>
-    <Foo slot="foo"/>
+    <Foo #foo/>
   </ParentLayout>
 </template>
 
diff --git a/packages/docs/docs/zh/plugin/official/plugin-pwa.md b/packages/docs/docs/zh/plugin/official/plugin-pwa.md
index 4f5c738f4a..6cadb96ce2 100644
--- a/packages/docs/docs/zh/plugin/official/plugin-pwa.md
+++ b/packages/docs/docs/zh/plugin/official/plugin-pwa.md
@@ -178,7 +178,7 @@ module.exports = {
 <template>
   <SWUpdatePopup>
     <div
-      slot-scope="{ enabled, reload, message, buttonText }"
+      v-slot="{ enabled, reload, message, buttonText }"
       class="my-sw-update-popup">
       {{ message }}<br>
       <button @click="reload">{{ buttonText }}</button>
diff --git a/packages/docs/docs/zh/theme/inheritance.md b/packages/docs/docs/zh/theme/inheritance.md
index cc0816b36b..7ac207856e 100755
--- a/packages/docs/docs/zh/theme/inheritance.md
+++ b/packages/docs/docs/zh/theme/inheritance.md
@@ -158,7 +158,7 @@ theme
 <!-- themePath/components/Foo.vue -->
 <template>
   <ParentLayout>
-    <Foo slot="foo"/>
+    <Foo #foo/>
   </ParentLayout>
 </template>
 

From 1f97b2bd7b8313948b84dfa34db892d8bdf1a46b Mon Sep 17 00:00:00 2001
From: giraud florent <feltron@girauds-MacBook-Pro.local>
Date: Fri, 6 Sep 2019 18:31:18 -0400
Subject: [PATCH 5/5] chore(conflicts): resolve 2/3 conflicts

---
 packages/@vuepress/markdown/index.js          | 225 ++++++++++--------
 .../markdown/lib/markdownSlotsContainers.js   |  12 -
 2 files changed, 120 insertions(+), 117 deletions(-)
 delete mode 100644 packages/@vuepress/markdown/lib/markdownSlotsContainers.js

diff --git a/packages/@vuepress/markdown/index.js b/packages/@vuepress/markdown/index.js
index cc8d09fb40..960bedc3fb 100644
--- a/packages/@vuepress/markdown/index.js
+++ b/packages/@vuepress/markdown/index.js
@@ -1,26 +1,31 @@
-'use strict'
+"use strict";
 
 /**
  * Module dependencies.
  */
 
-const Config = require('markdown-it-chain')
-const LRUCache = require('lru-cache')
-const highlight = require('./lib/highlight')
-const { PLUGINS, REQUIRED_PLUGINS } = require('./lib/constant')
-const highlightLinesPlugin = require('./lib/highlightLines')
-const preWrapperPlugin = require('./lib/preWrapper')
-const lineNumbersPlugin = require('./lib/lineNumbers')
-const componentPlugin = require('./lib/component')
-const hoistScriptStylePlugin = require('./lib/hoist')
-const convertRouterLinkPlugin = require('./lib/link')
-const containersPlugin = require('./lib/containers')
-const markdownSlotsContainersPlugin = require('./lib/markdownSlotsContainers')
-const snippetPlugin = require('./lib/snippet')
-const emojiPlugin = require('markdown-it-emoji')
-const anchorPlugin = require('markdown-it-anchor')
-const tocPlugin = require('markdown-it-table-of-contents')
-const { parseHeaders, slugify: _slugify, logger, chalk, hash } = require('@vuepress/shared-utils')
+const Config = require("markdown-it-chain");
+const LRUCache = require("lru-cache");
+const highlight = require("./lib/highlight");
+const { PLUGINS, REQUIRED_PLUGINS } = require("./lib/constant");
+const highlightLinesPlugin = require("./lib/highlightLines");
+const preWrapperPlugin = require("./lib/preWrapper");
+const lineNumbersPlugin = require("./lib/lineNumbers");
+const componentPlugin = require("./lib/component");
+const hoistScriptStylePlugin = require("./lib/hoist");
+const convertRouterLinkPlugin = require("./lib/link");
+const containersPlugin = require("./lib/containers");
+const snippetPlugin = require("./lib/snippet");
+const emojiPlugin = require("markdown-it-emoji");
+const anchorPlugin = require("markdown-it-anchor");
+const tocPlugin = require("markdown-it-table-of-contents");
+const {
+  parseHeaders,
+  slugify: _slugify,
+  logger,
+  chalk,
+  hash
+} = require("@vuepress/shared-utils");
 
 /**
  * Create markdown by config.
@@ -34,152 +39,162 @@ module.exports = (markdown = {}) => {
     lineNumbers,
     beforeInstantiate,
     afterInstantiate
-  } = markdown
+  } = markdown;
 
   // allow user config slugify
-  const slugify = markdown.slugify || _slugify
+  const slugify = markdown.slugify || _slugify;
 
   // using chainedAPI
-  const config = new Config()
+  const config = new Config();
 
-  config
-    .options
-      .html(true)
-      .highlight(highlight)
-      .end()
+  config.options
+    .html(true)
+    .highlight(highlight)
+    .end()
 
     .plugin(PLUGINS.COMPONENT)
-      .use(componentPlugin)
-      .end()
+    .use(componentPlugin)
+    .end()
 
     .plugin(PLUGINS.HIGHLIGHT_LINES)
-      .use(highlightLinesPlugin)
-      .end()
+    .use(highlightLinesPlugin)
+    .end()
 
     .plugin(PLUGINS.PRE_WRAPPER)
-      .use(preWrapperPlugin)
-      .end()
+    .use(preWrapperPlugin)
+    .end()
 
     .plugin(PLUGINS.SNIPPET)
-      .use(snippetPlugin)
-      .end()
+    .use(snippetPlugin)
+    .end()
 
     .plugin(PLUGINS.CONVERT_ROUTER_LINK)
-      .use(convertRouterLinkPlugin, [Object.assign({
-        target: '_blank',
-        rel: 'noopener noreferrer'
-      }, externalLinks)])
-      .end()
+    .use(convertRouterLinkPlugin, [
+      Object.assign(
+        {
+          target: "_blank",
+          rel: "noopener noreferrer"
+        },
+        externalLinks
+      )
+    ])
+    .end()
 
     .plugin(PLUGINS.HOIST_SCRIPT_STYLE)
-      .use(hoistScriptStylePlugin)
-      .end()
+    .use(hoistScriptStylePlugin)
+    .end()
 
     .plugin(PLUGINS.CONTAINERS)
-      .use(containersPlugin)
-      .end()
-
-    .plugin(PLUGINS.MARKDOWN_SLOTS_CONTAINERS)
-      .use(markdownSlotsContainersPlugin)
-      .end()
+    .use(containersPlugin)
+    .end()
 
     .plugin(PLUGINS.EMOJI)
-      .use(emojiPlugin)
-      .end()
+    .use(emojiPlugin)
+    .end()
 
     .plugin(PLUGINS.ANCHOR)
-      .use(anchorPlugin, [Object.assign({
-        slugify,
-        permalink: true,
-        permalinkBefore: true,
-        permalinkSymbol: '#'
-      }, anchor)])
-      .end()
+    .use(anchorPlugin, [
+      Object.assign(
+        {
+          slugify,
+          permalink: true,
+          permalinkBefore: true,
+          permalinkSymbol: "#"
+        },
+        anchor
+      )
+    ])
+    .end()
 
     .plugin(PLUGINS.TOC)
-      .use(tocPlugin, [Object.assign({
-        slugify,
-        includeLevel: [2, 3],
-        format: parseHeaders
-      }, toc)])
-      .end()
+    .use(tocPlugin, [
+      Object.assign(
+        {
+          slugify,
+          includeLevel: [2, 3],
+          format: parseHeaders
+        },
+        toc
+      )
+    ])
+    .end();
 
   if (lineNumbers) {
-    config
-      .plugin(PLUGINS.LINE_NUMBERS)
-        .use(lineNumbersPlugin)
+    config.plugin(PLUGINS.LINE_NUMBERS).use(lineNumbersPlugin);
   }
 
-  beforeInstantiate && beforeInstantiate(config)
+  beforeInstantiate && beforeInstantiate(config);
 
-  const md = config.toMd(require('markdown-it'), markdown)
+  const md = config.toMd(require("markdown-it"), markdown);
 
-  afterInstantiate && afterInstantiate(md)
+  afterInstantiate && afterInstantiate(md);
 
   // override parse to allow cache
-  const parse = md.parse
-  const cache = new LRUCache({ max: 1000 })
+  const parse = md.parse;
+  const cache = new LRUCache({ max: 1000 });
   md.parse = (src, env) => {
-    const key = hash(src + env.relPath)
-    const cached = cache.get(key)
+    const key = hash(src + env.relPath);
+    const cached = cache.get(key);
     if (cached) {
-      return cached
+      return cached;
     } else {
-      const tokens = parse.call(md, src, env)
-      cache.set(key, tokens)
-      return tokens
+      const tokens = parse.call(md, src, env);
+      cache.set(key, tokens);
+      return tokens;
     }
-  }
+  };
 
-  module.exports.dataReturnable(md)
+  module.exports.dataReturnable(md);
 
   // expose slugify
-  md.slugify = slugify
+  md.slugify = slugify;
 
-  return md
-}
+  return md;
+};
 
-module.exports.dataReturnable = function dataReturnable (md) {
+module.exports.dataReturnable = function dataReturnable(md) {
   // override render to allow custom plugins return data
-  const render = md.render
+  const render = md.render;
   md.render = (...args) => {
-    md.$data = {}
-    md.$data.__data_block = {}
-    md.$dataBlock = md.$data.__data_block
-    const html = render.call(md, ...args)
+    md.$data = {};
+    md.$data.__data_block = {};
+    md.$dataBlock = md.$data.__data_block;
+    const html = render.call(md, ...args);
     return {
       html,
       data: md.$data,
       dataBlockString: toDataBlockString(md.$dataBlock)
-    }
-  }
-}
+    };
+  };
+};
 
-function toDataBlockString (ob) {
+function toDataBlockString(ob) {
   if (Object.keys(ob).length === 0) {
-    return ''
+    return "";
   }
-  return `<data>${JSON.stringify(ob)}</data>`
+  return `<data>${JSON.stringify(ob)}</data>`;
 }
 
-function isRequiredPlugin (plugin) {
-  return REQUIRED_PLUGINS.includes(plugin)
+function isRequiredPlugin(plugin) {
+  return REQUIRED_PLUGINS.includes(plugin);
 }
 
-function removePlugin (config, plugin) {
-  logger.debug(`Built-in markdown-it plugin ${chalk.green(plugin)} was removed.`)
-  config.plugins.delete(plugin)
+function removePlugin(config, plugin) {
+  logger.debug(
+    `Built-in markdown-it plugin ${chalk.green(plugin)} was removed.`
+  );
+  config.plugins.delete(plugin);
 }
 
-function removeAllBuiltInPlugins (config) {
+function removeAllBuiltInPlugins(config) {
   Object.keys(PLUGINS).forEach(key => {
     if (!isRequiredPlugin(PLUGINS[key])) {
-      removePlugin(config, PLUGINS[key])
+      removePlugin(config, PLUGINS[key]);
     }
-  })
+  });
 }
 
-module.exports.isRequiredPlugin = isRequiredPlugin
-module.exports.removePlugin = removePlugin
-module.exports.removeAllBuiltInPlugins = removeAllBuiltInPlugins
-module.exports.PLUGINS = PLUGINS
+module.exports.isRequiredPlugin = isRequiredPlugin;
+module.exports.removePlugin = removePlugin;
+module.exports.removeAllBuiltInPlugins = removeAllBuiltInPlugins;
+module.exports.PLUGINS = PLUGINS;
diff --git a/packages/@vuepress/markdown/lib/markdownSlotsContainers.js b/packages/@vuepress/markdown/lib/markdownSlotsContainers.js
deleted file mode 100644
index 1e29e20d28..0000000000
--- a/packages/@vuepress/markdown/lib/markdownSlotsContainers.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const container = require('markdown-it-container')
-
-const SLOT_KEY = 'slot'
-
-module.exports = md => {
-  md
-    .use(container, SLOT_KEY, {
-      render: (tokens, idx) => tokens[idx].nesting === 1
-        ? `<template #${tokens[idx].info.trim().slice(SLOT_KEY.length).trim()}>`
-        : '</template>'
-    })
-}