Merge remote-tracking branch 'origin/master' into release/3.3

This commit is contained in:
Hypnosphi 2017-11-17 21:17:28 +03:00
commit 83d76e4536
4 changed files with 18 additions and 14 deletions

View File

@ -31,7 +31,7 @@
"devDependencies": {
"raw-loader": "^0.5.1",
"style-loader": "^0.19.0",
"vue": "^2.5.3"
"vue": "^2.5.5"
},
"peerDependencies": {
"react": "*",

View File

@ -70,7 +70,7 @@
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"vue-hot-reload-api": "^2.2.3",
"vue-hot-reload-api": "^2.2.4",
"vue-style-loader": "^3.0.1",
"webpack": "^3.6.0",
"webpack-dev-middleware": "^1.12.0",
@ -78,9 +78,9 @@
},
"devDependencies": {
"nodemon": "^1.12.1",
"vue": "^2.5.3",
"vue": "^2.5.5",
"vue-loader": "^13.5.0",
"vue-template-compiler": "^2.5.3"
"vue-template-compiler": "^2.5.5"
},
"peerDependencies": {
"vue": "*",

View File

@ -18,15 +18,15 @@
"cross-env": "^5.1.1",
"css-loader": "^0.28.7",
"file-loader": "^1.1.5",
"vue-hot-reload-api": "^2.2.3",
"vue-hot-reload-api": "^2.2.4",
"vue-loader": "^13.5.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.3",
"vue-template-compiler": "^2.5.5",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.3"
},
"dependencies": {
"vue": "^2.5.3",
"vue": "^2.5.5",
"vuex": "^3.0.0"
},
"scripts": {

View File

@ -13847,10 +13847,14 @@ void-elements@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
vue-hot-reload-api@^2.2.0, vue-hot-reload-api@^2.2.3:
vue-hot-reload-api@^2.2.0:
version "2.2.3"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.3.tgz#43c8e5506d65a271d2571936d77253019fd3eb17"
vue-hot-reload-api@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
vue-loader@^13.5.0:
version "13.5.0"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.5.0.tgz#52f7b3790a267eff80012b77ea187a54586dd5d4"
@ -13876,9 +13880,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.5.3:
version "2.5.3"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.3.tgz#ab631b0694e211a6aaf0d800102b37836aae36a4"
vue-template-compiler@^2.5.5:
version "2.5.5"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.5.tgz#0cfb47c784f75500d94aa57d2220bb324b59fae0"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
@ -13887,9 +13891,9 @@ 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@^2.5.3:
version "2.5.3"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.3.tgz#e1a3b1f49b6e93e574ce040b95cbc873912fecc1"
vue@^2.5.5:
version "2.5.5"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.5.tgz#cc3cd9b2a4f1d7356861ae0f71da0e6beb091910"
vuex@^3.0.0:
version "3.0.1"