GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-07 05:21:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-app--vue' into vue-2.5.1-23.0.0-app--vue

Browse Source 
# Conflicts:
#	app/vue/package.json
This commit is contained in:
hypnos 2017-10-13 21:44:26 +03:00
commit ff6ae8fdc5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/vue/package.json
View File

@ -71,7 +71,7 @@
"util-deprecate": "^1.0.2", "util-deprecate": "^1.0.2",
"uuid": "^3.1.0", "uuid": "^3.1.0",
"vue": "^2.5.1", "vue": "^2.5.1",
"vue-hot-reload-api": "^2.1.1", "vue-hot-reload-api": "^2.2.0",
"vue-loader": "^12.2.1", "vue-loader": "^12.2.1",
"vue-style-loader": "^3.0.1", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.4.2", "vue-template-compiler": "^2.4.2",

6
yarn.lock
View File

@ -12060,9 +12060,9 @@ vue-hot-reload-api@^2.1.0:
version "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" 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: vue-hot-reload-api@^2.2.0:
version "2.1.1" version "2.2.0"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.1.tgz#1ba6712166182fd651753804b9d8d8d02d855579" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz#9a21b35ced3634434a43ee80efb7350ea8fb206d"
vue-loader@^12.2.1: vue-loader@^12.2.1:
version "12.2.2" version "12.2.2"