Skip to content

Commit

Permalink
feat($core): Upgrade vue version (#1876)
Browse files Browse the repository at this point in the history
  • Loading branch information
kefranabg committed Sep 24, 2019
1 parent 51de6cf commit c17c70e
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 40 deletions.
2 changes: 1 addition & 1 deletion packages/@vuepress/core/lib/node/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ module.exports = class App {
.use(require('./internal-plugins/frontmatterBlock'))
.use('container', {
type: 'slot',
before: info => `<template slot="${info}">`,
before: info => `<template #${info}>`,
after: '</template>'
})
.use('container', {
Expand Down
12 changes: 6 additions & 6 deletions packages/@vuepress/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"postcss-safe-parser": "^4.0.1",
"toml": "^3.0.0",
"url-loader": "^1.0.1",
"vue": "^2.5.16",
"vue-loader": "^15.2.4",
"vue-router": "^3.0.2",
"vue-server-renderer": "^2.5.16",
"vue-template-compiler": "^2.5.16",
"vue": "^2.6.10",
"vue-loader": "^15.7.1",
"vue-router": "^3.1.3",
"vue-server-renderer": "^2.6.10",
"vue-template-compiler": "^2.6.10",
"vuepress-html-webpack-plugin": "^3.2.0",
"vuepress-plugin-container": "^2.0.0",
"vuepress-plugin-container": "^2.0.2",
"webpack": "^4.8.1",
"webpack-chain": "^4.6.0",
"webpack-dev-server": "^3.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@vuepress/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"jest": "^24.7.1",
"jest-serializer-vue": "^2.0.2",
"ts-jest": "^24.0.2",
"vue": "^2.5.16",
"vue": "^2.6.10",
"vue-jest": "^4.0.0-beta.1",
"vue-template-compiler": "^2.5.16"
"vue-template-compiler": "^2.6.10"
},
"author": "ULIVZ <chl814@foxmail.com>",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions packages/@vuepress/theme-default/layouts/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
>
<slot
name="sidebar-top"
slot="top"
#top
/>
<slot
name="sidebar-bottom"
slot="bottom"
#bottom
/>
</Sidebar>

Expand All @@ -37,11 +37,11 @@
>
<slot
name="page-top"
slot="top"
#top
/>
<slot
name="page-bottom"
slot="bottom"
#bottom
/>
</Page>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/@vuepress/theme-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"lodash": "^4.17.15",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"vuepress-plugin-container": "^2.0.0",
"vuepress-plugin-container": "^2.0.2",
"vuepress-plugin-smooth-scroll": "^0.0.3"
}
}
4 changes: 2 additions & 2 deletions packages/@vuepress/theme-vue/layouts/Layout.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<ParentLayout>
<CarbonAds slot="sidebar-top"/>
<BuySellAds slot="page-bottom"/>
<CarbonAds #sidebar-top/>
<BuySellAds #page-bottom/>
</ParentLayout>
</template>

Expand Down
2 changes: 1 addition & 1 deletion packages/docs/docs/plugin/official/plugin-pwa.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,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>
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/docs/theme/inheritance.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,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>
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/docs/zh/plugin/official/plugin-pwa.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,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>
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/docs/zh/theme/inheritance.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ theme
<!-- themePath/components/Foo.vue -->
<template>
<ParentLayout>
<Foo slot="foo"/>
<Foo #foo/>
</ParentLayout>
</template>
Expand Down
61 changes: 41 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@
"@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
camelcase "^5.0.0"

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

"@vue/component-compiler-utils@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634"
integrity sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==
dependencies:
consolidate "^0.15.1"
hash-sum "^1.0.2"
lru-cache "^4.1.2"
merge-source-map "^1.1.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.29":
version "1.0.0-beta.29"
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0"
Expand Down Expand Up @@ -11918,23 +11933,26 @@ vue-jest@^4.0.0-beta.1:
source-map "^0.5.6"
ts-jest "^23.10.5"

vue-loader@^15.2.4:
version "15.7.0"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz#27275aa5a3ef4958c5379c006dd1436ad04b25b3"
vue-loader@^15.7.1:
version "15.7.1"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd"
integrity sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==
dependencies:
"@vue/component-compiler-utils" "^2.5.1"
"@vue/component-compiler-utils" "^3.0.0"
hash-sum "^1.0.2"
loader-utils "^1.1.0"
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"

vue-router@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
vue-router@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==

vue-server-renderer@^2.5.16:
version "2.6.8"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.8.tgz#7f191eede16778d96916f2f9199efa781fd30879"
vue-server-renderer@^2.6.10:
version "2.6.10"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.10.tgz#cb2558842ead360ae2ec1f3719b75564a805b375"
integrity sha512-UYoCEutBpKzL2fKCwx8zlRtRtwxbPZXKTqbl2iIF4yRZUNO/ovrHyDAJDljft0kd+K0tZhN53XRHkgvCZoIhug==
dependencies:
chalk "^1.1.3"
hash-sum "^1.0.2"
Expand All @@ -11952,9 +11970,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.6.8"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz#750802604595134775b9c53141b9850b35255e1c"
vue-template-compiler@^2.6.10:
version "2.6.10"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
Expand All @@ -11967,9 +11986,10 @@ vue-toasted@^1.1.25:
version "1.1.26"
resolved "https://registry.yarnpkg.com/vue-toasted/-/vue-toasted-1.1.26.tgz#1333d1a42157ab78389c3810023a49ba94e69c7b"

vue@^2.5.16:
version "2.6.8"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.8.tgz#f21cbc536bfc14f7d1d792a137bb12f69e60ea91"
vue@^2.6.10:
version "2.6.10"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==

vuepress-html-webpack-plugin@^3.2.0:
version "3.2.0"
Expand All @@ -11983,9 +12003,10 @@ vuepress-html-webpack-plugin@^3.2.0:
toposort "^1.0.0"
util.promisify "1.0.0"

vuepress-plugin-container@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/vuepress-plugin-container/-/vuepress-plugin-container-2.0.1.tgz#b20ef97dd91f137c8be119460927c5ffd64e0f77"
vuepress-plugin-container@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/vuepress-plugin-container/-/vuepress-plugin-container-2.0.2.tgz#3489cc732c7a210b31f202556e1346125dffeb73"
integrity sha512-SrGYYT7lkie7xlIlAVhn+9sDW42MytNCoxWL/2uDr+q9wZA4h1uYlQvfc2DVjy+FsM9PPPSslkeo/zCpYVY82g==
dependencies:
markdown-it-container "^2.0.0"

Expand Down

0 comments on commit c17c70e

Please sign in to comment.