Merge branch 'master' into eslint-4.9.0-25.0.0

storybookjs · Oct 15, 2017 · 5bfbbb7 · 5bfbbb7
2 parents 3c7fb03 + 1202bb2
commit 5bfbbb7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
@@ -3,13 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "@storybook/vue": "^3.2.0",
     "@storybook/addon-actions": "^3.2.0",
-    "@storybook/addon-links": "^3.2.0",
-    "@storybook/addons": "^3.2.0",
     "@storybook/addon-centered": "^3.2.1",
-    "@storybook/addon-notes": "^3.2.0",
     "@storybook/addon-knobs": "^3.2.0",
+    "@storybook/addon-links": "^3.2.0",
+    "@storybook/addon-notes": "^3.2.0",
+    "@storybook/addons": "^3.2.0",
+    "@storybook/vue": "^3.2.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.0",
@@ -22,7 +22,7 @@
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^3.6.0",
-    "webpack-dev-server": "^2.4.5"
+    "webpack-dev-server": "^2.9.2"
   },
   "dependencies": {
     "vue": "^2.4.2",

diff --git a/yarn.lock b/yarn.lock
@@ -12248,9 +12248,9 @@ webpack-dev-server@2.8.2:
     webpack-dev-middleware "^1.11.0"
     yargs "^6.6.0"
 
-webpack-dev-server@^2.4.5:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.1.tgz#7ac9320b61b00eb65b2109f15c82747fc5b93585"
+webpack-dev-server@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.2.tgz#0fbab915701d25a905a60e1e784df19727da800f"
   dependencies:
     ansi-html "0.0.7"
     array-includes "^3.0.3"