Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vue stuff #2032

Merged
merged 29 commits into from
Oct 16, 2017
Merged

Update vue stuff #2032

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e3b0cd5
Update vue from 2.4.4 to 2.5.1 in addons/knobs
dependencies-bot Oct 13, 2017
66d082a
Update vue from 2.4.4 to 2.5.1 in app/vue
dependencies-bot Oct 13, 2017
ec813ad
Update vue-hot-reload-api from 2.1.1 to 2.2.0 in app/vue
dependencies-bot Oct 13, 2017
c11b1b5
Update vue-template-compiler from 2.4.4 to 2.5.1 in app/vue
dependencies-bot Oct 13, 2017
36c8b75
Update vue from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink
dependencies-bot Oct 13, 2017
17002cd
Update vuex from 2.4.1 to 2.5.0 in examples/vue-kitchen-sink
dependencies-bot Oct 13, 2017
9ff8628
Update vue-hot-reload-api from 2.1.0 to 2.2.0 in examples/vue-kitchen…
dependencies-bot Oct 13, 2017
d888a9b
Update vue-template-compiler from 2.4.4 to 2.5.1 in examples/vue-kitc…
dependencies-bot Oct 13, 2017
480eb19
Merge remote-tracking branch 'origin/vue-2.5.1-23.0.0-addons--knobs' …
Hypnosphi Oct 13, 2017
d1c7102
Merge remote-tracking branch 'origin/vue-2.5.1-23.0.0-examples--vue-k…
Hypnosphi Oct 13, 2017
ff6ae8f
Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-…
Hypnosphi Oct 13, 2017
fcd4ed4
Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-…
Hypnosphi Oct 13, 2017
3d1535a
Merge remote-tracking branch 'origin/vue-template-compiler-2.5.1-23.0…
Hypnosphi Oct 13, 2017
1f0fd22
Merge remote-tracking branch 'origin/vue-template-compiler-2.5.1-23.0…
Hypnosphi Oct 13, 2017
4bd1209
Merge remote-tracking branch 'origin/vuex-2.5.0-23.0.0-examples--vue-…
Hypnosphi Oct 13, 2017
11aab36
Update vue from 2.4.4 to 2.5.2 in addons/knobs
dependencies-bot Oct 14, 2017
dc6ea6b
Update vue from 2.4.4 to 2.5.2 in app/vue
dependencies-bot Oct 14, 2017
80f8848
Update vue-template-compiler from 2.4.4 to 2.5.2 in app/vue
dependencies-bot Oct 14, 2017
b453fcd
Update vue from 2.4.4 to 2.5.2 in examples/vue-kitchen-sink
dependencies-bot Oct 14, 2017
e2e9586
Update vue-template-compiler from 2.4.4 to 2.5.2 in examples/vue-kitc…
dependencies-bot Oct 14, 2017
960b8a5
Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-addons--knobs' …
Hypnosphi Oct 14, 2017
6e2f12c
Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-app--vue' into …
Hypnosphi Oct 14, 2017
11d1575
Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-examples--vue-k…
Hypnosphi Oct 14, 2017
931c809
Merge remote-tracking branch 'origin/vue-template-compiler-2.5.2-24.0…
Hypnosphi Oct 14, 2017
c8ffe55
Merge remote-tracking branch 'origin/vue-template-compiler-2.5.2-24.0…
Hypnosphi Oct 14, 2017
92a525d
Update lockfile
Hypnosphi Oct 14, 2017
ff23b76
Merge branch 'master' into vue-2.5.1-23.0.0-app--vue
Hypnosphi Oct 14, 2017
522bfee
Merge branch 'master' into vue-2.5.1-23.0.0-app--vue
Hypnosphi Oct 15, 2017
16054b5
Merge branch 'master' into vue-2.5.1-23.0.0-app--vue
Hypnosphi Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/knobs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"style-loader": "^0.19.0",
"typescript": "^2.2.2",
"typescript-definition-tester": "^0.0.5",
"vue": "^2.4.2"
"vue": "^2.5.2"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 3 additions & 3 deletions app/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"vue": "^2.4.2",
"vue-hot-reload-api": "^2.1.1",
"vue": "^2.5.2",
"vue-hot-reload-api": "^2.2.0",
"vue-loader": "^12.2.1",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.4.2",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack-dev-middleware": "^1.12.0",
"webpack-hot-middleware": "^2.19.1"
Expand Down
8 changes: 4 additions & 4 deletions examples/vue-kitchen-sink/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
"cross-env": "^3.0.0",
"css-loader": "^0.28.7",
"file-loader": "^0.11.2",
"vue-hot-reload-api": "^2.1.0",
"vue-hot-reload-api": "^2.2.0",
"vue-loader": "^12.2.1",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.4.2",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.2"
},
"dependencies": {
"vue": "^2.4.2",
"vuex": "^2.3.1"
"vue": "^2.5.2",
"vuex": "^2.5.0"
},
"scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12110,9 +12110,9 @@ vue-hot-reload-api@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"

vue-hot-reload-api@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.1.tgz#1ba6712166182fd651753804b9d8d8d02d855579"
vue-hot-reload-api@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz#9a21b35ced3634434a43ee80efb7350ea8fb206d"

vue-loader@^12.2.1:
version "12.2.2"
Expand All @@ -12139,9 +12139,9 @@ vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
hash-sum "^1.0.2"
loader-utils "^1.0.2"

vue-template-compiler@^2.4.2:
version "2.4.4"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57"
vue-template-compiler@^2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.2.tgz#6f198ebc677b8f804315cd33b91e849315ae7177"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
Expand All @@ -12150,13 +12150,13 @@ vue-template-es2015-compiler@^1.2.2:
version "1.5.3"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"

vue@^2.4.2:
version "2.4.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789"
vue@^2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.2.tgz#fd367a87bae7535e47f9dc5c9ec3b496e5feb5a4"

vuex@^2.3.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.4.1.tgz#7890b650ba8565b70937b4e7670577082dfe8bc1"
vuex@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.5.0.tgz#20f0265ade6c9a5ac6724a405d3ffdb4726c9741"

walker@~1.0.5:
version "1.0.7"
Expand Down