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

# Conflicts: # addons/knobs/package.json # yarn.lock
storybookjs · Nov 21, 2017 · 462a8d9 · 462a8d9
2 parents 5e62058 + 762e8e3
commit 462a8d9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -31,7 +31,7 @@
   "devDependencies": {
     "raw-loader": "^0.5.1",
     "style-loader": "^0.19.0",
-    "vue": "^2.5.6"
+    "vue": "^2.5.8"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -69,7 +69,7 @@
     "webpack": "^3.8.1",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-hot-middleware": "^2.20.0",
-    "ws": "^3.3.1"
+    "ws": "^3.3.2"
   },
   "devDependencies": {
     "react-native": "^0.50.3"

diff --git a/app/vue/package.json b/app/vue/package.json
@@ -78,9 +78,9 @@
   },
   "devDependencies": {
     "nodemon": "^1.12.1",
-    "vue": "^2.5.6",
+    "vue": "^2.5.8",
     "vue-loader": "^13.5.0",
-    "vue-template-compiler": "^2.5.6"
+    "vue-template-compiler": "^2.5.8"
   },
   "peerDependencies": {
     "vue": "*",

diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
@@ -21,12 +21,12 @@
     "vue-hot-reload-api": "^2.2.4",
     "vue-loader": "^13.5.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.6",
+    "vue-template-compiler": "^2.5.8",
     "webpack": "^3.6.0",
     "webpack-dev-server": "^2.9.3"
   },
   "dependencies": {
-    "vue": "^2.5.6",
+    "vue": "^2.5.8",
     "vuex": "^3.0.0"
   },
   "scripts": {

diff --git a/yarn.lock b/yarn.lock
@@ -13873,9 +13873,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.6:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.6.tgz#93f062a230a4437ef16064f1eef9cf3797d34bb4"
+vue-template-compiler@^2.5.8:
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.8.tgz#826ae77e1d5faa7fa5fca554f33872dde38de674"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -13884,9 +13884,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.6:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.6.tgz#73654fefa4b37f25dfc657b8b834b44c90822cd7"
+vue@^2.5.8:
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.8.tgz#f855c1c27255184a82225f4bef225473e8faf15b"
 
 vuex@^3.0.0:
   version "3.0.1"
@@ -14327,14 +14327,22 @@ ws@^2.0.3:
     safe-buffer "~5.0.1"
     ultron "~1.1.0"
 
-ws@^3.0.0, ws@^3.3.1:
+ws@^3.0.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.1.tgz#d97e34dee06a1190c61ac1e95f43cb60b78cf939"
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
+ws@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
 wtf-8@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"