Skip to content

Commit c17c70e

Browse files
kefranabgkefranabg
authored
feat($core): Upgrade vue version (#1876)
1 parent 51de6cf commit c17c70e

File tree

11 files changed

+61
-40
lines changed

11 files changed

+61
-40
lines changed

‎packages/@vuepress/core/lib/node/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ module.exports = class App {
154154
.use(require('./internal-plugins/frontmatterBlock'))
155155
.use('container', {
156156
type: 'slot',
157-
before: info => `<template slot="${info}">`,
157+
before: info => `<template #${info}>`,
158158
after: '</template>'
159159
})
160160
.use('container', {

‎packages/@vuepress/core/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
"postcss-safe-parser": "^4.0.1",
5555
"toml": "^3.0.0",
5656
"url-loader": "^1.0.1",
57-
"vue": "^2.5.16",
58-
"vue-loader": "^15.2.4",
59-
"vue-router": "^3.0.2",
60-
"vue-server-renderer": "^2.5.16",
61-
"vue-template-compiler": "^2.5.16",
57+
"vue": "^2.6.10",
58+
"vue-loader": "^15.7.1",
59+
"vue-router": "^3.1.3",
60+
"vue-server-renderer": "^2.6.10",
61+
"vue-template-compiler": "^2.6.10",
6262
"vuepress-html-webpack-plugin": "^3.2.0",
63-
"vuepress-plugin-container": "^2.0.0",
63+
"vuepress-plugin-container": "^2.0.2",
6464
"webpack": "^4.8.1",
6565
"webpack-chain": "^4.6.0",
6666
"webpack-dev-server": "^3.5.1",

‎packages/@vuepress/test-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"jest": "^24.7.1",
3030
"jest-serializer-vue": "^2.0.2",
3131
"ts-jest": "^24.0.2",
32-
"vue": "^2.5.16",
32+
"vue": "^2.6.10",
3333
"vue-jest": "^4.0.0-beta.1",
34-
"vue-template-compiler": "^2.5.16"
34+
"vue-template-compiler": "^2.6.10"
3535
},
3636
"author": "ULIVZ <[email protected]>",
3737
"license": "MIT",

‎packages/@vuepress/theme-default/layouts/Layout.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
>
2222
<slot
2323
name="sidebar-top"
24-
slot="top"
24+
#top
2525
/>
2626
<slot
2727
name="sidebar-bottom"
28-
slot="bottom"
28+
#bottom
2929
/>
3030
</Sidebar>
3131

@@ -37,11 +37,11 @@
3737
>
3838
<slot
3939
name="page-top"
40-
slot="top"
40+
#top
4141
/>
4242
<slot
4343
name="page-bottom"
44-
slot="bottom"
44+
#bottom
4545
/>
4646
</Page>
4747
</div>

‎packages/@vuepress/theme-default/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"lodash": "^4.17.15",
3838
"stylus": "^0.54.5",
3939
"stylus-loader": "^3.0.2",
40-
"vuepress-plugin-container": "^2.0.0",
40+
"vuepress-plugin-container": "^2.0.2",
4141
"vuepress-plugin-smooth-scroll": "^0.0.3"
4242
}
4343
}

‎packages/@vuepress/theme-vue/layouts/Layout.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<ParentLayout>
3-
<CarbonAds slot="sidebar-top"/>
4-
<BuySellAds slot="page-bottom"/>
3+
<CarbonAds #sidebar-top/>
4+
<BuySellAds #page-bottom/>
55
</ParentLayout>
66
</template>
77

‎packages/docs/docs/plugin/official/plugin-pwa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ First, you need to create a global component (e.g. `MySWUpdatePopup`) at `.vuepr
216216
<template>
217217
<SWUpdatePopup>
218218
<div
219-
slot-scope="{ enabled, reload, message, buttonText }"
219+
v-slot="{ enabled, reload, message, buttonText }"
220220
class="my-sw-update-popup">
221221
{{ message }}<br>
222222
<button @click="reload">{{ buttonText }}</button>

‎packages/docs/docs/theme/inheritance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ You can use `@parent-theme` to access the root path of the parent theme. The fol
163163
<!-- themePath/components/Foo.vue -->
164164
<template>
165165
<ParentLayout>
166-
<Foo slot="foo"/>
166+
<Foo #foo/>
167167
</ParentLayout>
168168
</template>
169169

‎packages/docs/docs/zh/plugin/official/plugin-pwa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ module.exports = {
216216
<template>
217217
<SWUpdatePopup>
218218
<div
219-
slot-scope="{ enabled, reload, message, buttonText }"
219+
v-slot="{ enabled, reload, message, buttonText }"
220220
class="my-sw-update-popup">
221221
{{ message }}<br>
222222
<button @click="reload">{{ buttonText }}</button>

‎packages/docs/docs/zh/theme/inheritance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ theme
159159
<!-- themePath/components/Foo.vue -->
160160
<template>
161161
<ParentLayout>
162-
<Foo slot="foo"/>
162+
<Foo #foo/>
163163
</ParentLayout>
164164
</template>
165165

‎yarn.lock

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@
18211821
"@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
18221822
camelcase "^5.0.0"
18231823

1824-
"@vue/component-compiler-utils@^2.4.0", "@vue/component-compiler-utils@^2.5.1":
1824+
"@vue/component-compiler-utils@^2.4.0":
18251825
version "2.6.0"
18261826
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b"
18271827
dependencies:
@@ -1835,6 +1835,21 @@
18351835
source-map "~0.6.1"
18361836
vue-template-es2015-compiler "^1.9.0"
18371837

1838+
"@vue/component-compiler-utils@^3.0.0":
1839+
version "3.0.0"
1840+
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634"
1841+
integrity sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==
1842+
dependencies:
1843+
consolidate "^0.15.1"
1844+
hash-sum "^1.0.2"
1845+
lru-cache "^4.1.2"
1846+
merge-source-map "^1.1.0"
1847+
postcss "^7.0.14"
1848+
postcss-selector-parser "^5.0.0"
1849+
prettier "1.16.3"
1850+
source-map "~0.6.1"
1851+
vue-template-es2015-compiler "^1.9.0"
1852+
18381853
"@vue/test-utils@^1.0.0-beta.29":
18391854
version "1.0.0-beta.29"
18401855
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0"
@@ -11918,23 +11933,26 @@ vue-jest@^4.0.0-beta.1:
1191811933
source-map "^0.5.6"
1191911934
ts-jest "^23.10.5"
1192011935

11921-
vue-loader@^15.2.4:
11922-
version "15.7.0"
11923-
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz#27275aa5a3ef4958c5379c006dd1436ad04b25b3"
11936+
vue-loader@^15.7.1:
11937+
version "15.7.1"
11938+
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd"
11939+
integrity sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==
1192411940
dependencies:
11925-
"@vue/component-compiler-utils" "^2.5.1"
11941+
"@vue/component-compiler-utils" "^3.0.0"
1192611942
hash-sum "^1.0.2"
1192711943
loader-utils "^1.1.0"
1192811944
vue-hot-reload-api "^2.3.0"
1192911945
vue-style-loader "^4.1.0"
1193011946

11931-
vue-router@^3.0.2:
11932-
version "3.0.2"
11933-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
11947+
vue-router@^3.1.3:
11948+
version "3.1.3"
11949+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
11950+
integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==
1193411951

11935-
vue-server-renderer@^2.5.16:
11936-
version "2.6.8"
11937-
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.8.tgz#7f191eede16778d96916f2f9199efa781fd30879"
11952+
vue-server-renderer@^2.6.10:
11953+
version "2.6.10"
11954+
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.10.tgz#cb2558842ead360ae2ec1f3719b75564a805b375"
11955+
integrity sha512-UYoCEutBpKzL2fKCwx8zlRtRtwxbPZXKTqbl2iIF4yRZUNO/ovrHyDAJDljft0kd+K0tZhN53XRHkgvCZoIhug==
1193811956
dependencies:
1193911957
chalk "^1.1.3"
1194011958
hash-sum "^1.0.2"
@@ -11952,9 +11970,10 @@ vue-style-loader@^4.1.0:
1195211970
hash-sum "^1.0.2"
1195311971
loader-utils "^1.0.2"
1195411972

11955-
vue-template-compiler@^2.5.16:
11956-
version "2.6.8"
11957-
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz#750802604595134775b9c53141b9850b35255e1c"
11973+
vue-template-compiler@^2.6.10:
11974+
version "2.6.10"
11975+
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
11976+
integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==
1195811977
dependencies:
1195911978
de-indent "^1.0.2"
1196011979
he "^1.1.0"
@@ -11967,9 +11986,10 @@ vue-toasted@^1.1.25:
1196711986
version "1.1.26"
1196811987
resolved "https://registry.yarnpkg.com/vue-toasted/-/vue-toasted-1.1.26.tgz#1333d1a42157ab78389c3810023a49ba94e69c7b"
1196911988

11970-
vue@^2.5.16:
11971-
version "2.6.8"
11972-
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.8.tgz#f21cbc536bfc14f7d1d792a137bb12f69e60ea91"
11989+
vue@^2.6.10:
11990+
version "2.6.10"
11991+
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
11992+
integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==
1197311993

1197411994
vuepress-html-webpack-plugin@^3.2.0:
1197511995
version "3.2.0"
@@ -11983,9 +12003,10 @@ vuepress-html-webpack-plugin@^3.2.0:
1198312003
toposort "^1.0.0"
1198412004
util.promisify "1.0.0"
1198512005

11986-
vuepress-plugin-container@^2.0.0:
11987-
version "2.0.1"
11988-
resolved "https://registry.yarnpkg.com/vuepress-plugin-container/-/vuepress-plugin-container-2.0.1.tgz#b20ef97dd91f137c8be119460927c5ffd64e0f77"
12006+
vuepress-plugin-container@^2.0.2:
12007+
version "2.0.2"
12008+
resolved "https://registry.yarnpkg.com/vuepress-plugin-container/-/vuepress-plugin-container-2.0.2.tgz#3489cc732c7a210b31f202556e1346125dffeb73"
12009+
integrity sha512-SrGYYT7lkie7xlIlAVhn+9sDW42MytNCoxWL/2uDr+q9wZA4h1uYlQvfc2DVjy+FsM9PPPSslkeo/zCpYVY82g==
1198912010
dependencies:
1199012011
markdown-it-container "^2.0.0"
1199112012

0 commit comments

Comments
 (0)