Merge branch 'master' into custom-ts-config

2025-04-07 07:21:17 +08:00 · 2018-01-09 21:08:39 +02:00 · 2018-01-09 21:08:39 +02:00 · cd4027644b
commit cd4027644b
parent bb79199ef6 a5d439cd6c
13 changed files with 256 additions and 223 deletions
--- a/README.md
+++ b/README.md
@ -60,6 +60,8 @@ It runs a codemod to update all package names. Read all migration details in our

 For full documentation on using Storybook visit: [storybook.js.org](https://storybook.js.org)

+For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqohko.now.sh/)
+
 ## Projects

 ### Main Projects
--- a/addons/viewport/README.md
+++ b/addons/viewport/README.md
@ -4,7 +4,7 @@ Storybook Viewport Addon allows your stories to be displayed in different sizes

 This addon works with Storybook for: [React](https://github.com/storybooks/storybook/tree/master/app/react) and [Vue](https://github.com/storybooks/storybook/tree/master/app/vue).

-![Screenshot](https://github.com/storybooks/storybook/blob/master/docs/viewport.png)
+![Screenshot](https://github.com/storybooks/storybook/blob/master/addons/viewport/docs/viewport.png)

 ## Installation

--- a/app/angular/package.json
+++ b/app/angular/package.json
@ -43,7 +43,7 @@
    "case-sensitive-paths-webpack-plugin": "^2.0.0",
    "chalk": "^2.1.0",
    "commander": "^2.11.0",
-    "common-tags": "^1.4.0",
+    "common-tags": "^1.7.0",
    "configstore": "^3.1.0",
    "core-js": "^2.4.1",
    "cross-env": "^5.1.1",
@ -52,11 +52,13 @@
    "file-loader": "^0.11.1",
    "find-cache-dir": "^1.0.0",
    "global": "^4.3.2",
+    "html-loader": "^0.5.4",
    "html-webpack-plugin": "^2.30.1",
    "json-loader": "^0.5.4",
    "json-stringify-safe": "^5.0.1",
    "json5": "^0.5.1",
    "lodash.pick": "^4.4.0",
+    "markdown-loader": "^2.0.2",
    "postcss-flexbugs-fixes": "^3.0.0",
    "postcss-loader": "^2.0.10",
    "prop-types": "^15.5.10",
@ -87,7 +89,7 @@
    "babel-plugin-transform-decorators-legacy": "^1.3.4",
    "codelyzer": "^3.1.2",
    "mock-fs": "^4.3.0",
-    "nodemon": "^1.14.9",
+    "nodemon": "^1.14.10",
    "typescript": "^2.4.0"
  },
  "peerDependencies": {
--- a/app/angular/src/client/preview/angular/helpers.ts
+++ b/app/angular/src/client/preview/angular/helpers.ts
@ -59,6 +59,7 @@ const getComponentMetadata = ({
    schemas: [],
    declarations: [],
    providers: [],
+    entryComponents: [],
  },
 }: NgStory) => {
  if (!component || typeof component !== 'function') {
@ -73,7 +74,7 @@ const getComponentMetadata = ({
    (<any>propsMetadata)[key] = (<any>propsMeta)[key];
  });

-  const { imports = [], schemas = [], declarations = [], providers = [] } = moduleMetadata;
+  const { imports = [], schemas = [], declarations = [], providers = [], entryComponents = [] } = moduleMetadata;

  return {
    component,
@ -86,6 +87,7 @@ const getComponentMetadata = ({
      schemas,
      declarations,
      providers,
+      entryComponents,
    },
  };
 };
@ -118,13 +120,14 @@ const getModule = (
    schemas: [],
    declarations: [],
    providers: [],
+    entryComponents: [],
  }
 ): IModule => {
  const moduleMeta = new NgModule({
    declarations: [...declarations, ...moduleMetadata.declarations],
    imports: [BrowserModule, FormsModule, ...moduleMetadata.imports],
    providers: [{ provide: STORY, useValue: Object.assign({}, data) }, ...moduleMetadata.providers],
-    entryComponents: [...entryComponents],
+    entryComponents: [...entryComponents, ...moduleMetadata.entryComponents],
    schemas: [...moduleMetadata.schemas],
    bootstrap: [...bootstrap],
  });
--- a/app/angular/src/client/preview/angular/types.ts
+++ b/app/angular/src/client/preview/angular/types.ts
@ -3,6 +3,7 @@ export interface NgModuleMetadata {
  imports: Array<any>;
  schemas: Array<any>;
  providers: Array<any>;
+  entryComponents: Array<any>;
 }

 export interface ICollection {
--- a/app/react/package.json
+++ b/app/react/package.json
@ -46,7 +46,7 @@
    "case-sensitive-paths-webpack-plugin": "^2.1.1",
    "chalk": "^2.3.0",
    "commander": "^2.12.2",
-    "common-tags": "^1.6.0",
+    "common-tags": "^1.7.0",
    "configstore": "^3.1.1",
    "core-js": "^2.5.3",
    "css-loader": "^0.28.8",
@ -83,7 +83,7 @@
    "webpack-hot-middleware": "^2.21.0"
  },
  "devDependencies": {
-    "nodemon": "^1.14.9"
+    "nodemon": "^1.14.10"
  },
  "peerDependencies": {
    "babel-core": "^6.26.0 || ^7.0.0-0",
--- a/app/vue/package.json
+++ b/app/vue/package.json
@ -44,7 +44,7 @@
    "case-sensitive-paths-webpack-plugin": "^2.1.1",
    "chalk": "^2.3.0",
    "commander": "^2.12.2",
-    "common-tags": "^1.6.0",
+    "common-tags": "^1.7.0",
    "configstore": "^3.1.1",
    "core-js": "^2.5.3",
    "css-loader": "^0.28.8",
@ -53,10 +53,12 @@
    "file-loader": "^1.1.6",
    "find-cache-dir": "^1.0.0",
    "global": "^4.3.2",
+    "html-loader": "^0.5.4",
    "html-webpack-plugin": "^2.30.1",
    "json-loader": "^0.5.7",
    "json-stringify-safe": "^5.0.1",
    "json5": "^0.5.1",
+    "markdown-loader": "^2.0.2",
    "postcss-flexbugs-fixes": "^3.2.0",
    "postcss-loader": "^2.0.10",
    "prop-types": "^15.6.0",
@ -79,15 +81,15 @@
    "webpack-hot-middleware": "^2.21.0"
  },
  "devDependencies": {
-    "nodemon": "^1.14.9",
+    "nodemon": "^1.14.10",
    "vue": "^2.5.13",
-    "vue-loader": "^13.6.2",
+    "vue-loader": "^13.7.0",
    "vue-template-compiler": "^2.5.13"
  },
  "peerDependencies": {
    "babel-core": "^6.26.0 || ^7.0.0-0",
    "vue": "2.5.13",
-    "vue-loader": "13.6.2",
+    "vue-loader": "13.7.0",
    "vue-template-compiler": "2.5.13"
  }
 }
--- a/docs/package.json
+++ b/docs/package.json
@ -44,14 +44,14 @@
    "global": "^4.3.2",
    "highlight.js": "^9.12.0",
    "lodash": "^4.17.2",
-    "marked": "^0.3.7",
+    "marked": "^0.3.12",
    "prop-types": "^15.6.0",
    "react": "^15.6.1",
    "react-document-title": "^2.0.3",
    "react-dom": "^15.6.1",
    "react-helmet": "^5.0.3",
    "react-router": "^4.2.0",
-    "react-stack-grid": "^0.7.0",
+    "react-stack-grid": "^0.7.1",
    "sitemap": "^1.12.0"
  },
  "private": true
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@ -6634,14 +6634,14 @@ markdown-table@^1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"

+marked@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
+
 marked@^0.3.6:
  version "0.3.9"
  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.9.tgz#54ce6a57e720c3ac6098374ec625fcbcc97ff290"

-marked@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.7.tgz#80ef3bbf1bd00d1c9cfebe42ba1b8c85da258d0d"
-
 math-expression-evaluator@^1.2.14:
  version "1.2.17"
  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@ -8773,9 +8773,9 @@ react-split-pane@^0.1.74:
    prop-types "^15.5.10"
    react-style-proptype "^3.0.0"

-react-stack-grid@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/react-stack-grid/-/react-stack-grid-0.7.0.tgz#396109b811ae8a43920ce8b67421ed9978a8b677"
+react-stack-grid@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/react-stack-grid/-/react-stack-grid-0.7.1.tgz#cbf7353ce6c2acf712b827c36b0be234af84bee9"
  dependencies:
    easy-css-transform-builder "^0.0.2"
    exenv "^1.2.1"
--- a/examples/cra-kitchen-sink/package.json
+++ b/examples/cra-kitchen-sink/package.json
@ -40,7 +40,7 @@
    "enzyme": "^3.3.0",
    "enzyme-adapter-react-16": "^1.1.0",
    "enzyme-to-json": "^3.2.2",
-    "jest": "^22.0.4",
+    "jest": "^22.0.5",
    "react-scripts": "^1.0.17"
  },
  "private": true
--- a/examples/vue-kitchen-sink/package.json
+++ b/examples/vue-kitchen-sink/package.json
@ -19,11 +19,11 @@
    "css-loader": "^0.28.8",
    "file-loader": "^1.1.6",
    "vue-hot-reload-api": "^2.2.4",
-    "vue-loader": "^13.6.2",
+    "vue-loader": "^13.7.0",
    "vue-style-loader": "^3.0.1",
    "vue-template-compiler": "^2.5.13",
    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.10.0"
+    "webpack-dev-server": "^2.10.1"
  },
  "dependencies": {
    "vue": "^2.5.13",
--- a/package.json
+++ b/package.json
@ -37,7 +37,7 @@
    "@types/lodash": "^4.14.92",
    "babel-cli": "^6.26.0",
    "babel-core": "^6.26.0",
-    "babel-eslint": "^8.1.2",
+    "babel-eslint": "^8.2.1",
    "babel-plugin-transform-md-import-to-string": "^1.0.6",
    "babel-plugin-transform-runtime": "^6.23.0",
    "babel-polyfill": "^6.26.0",
@ -56,7 +56,7 @@
    "eslint-config-airbnb": "^16.1.0",
    "eslint-config-prettier": "^2.9.0",
    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.5.0",
+    "eslint-plugin-jest": "^21.6.1",
    "eslint-plugin-json": "^1.2.0",
    "eslint-plugin-jsx-a11y": "^6.0.3",
    "eslint-plugin-prettier": "^2.4.0",
@ -66,18 +66,18 @@
    "glob": "^7.1.2",
    "husky": "^0.14.3",
    "inquirer": "^4.0.2",
-    "jest": "^22.0.4",
-    "jest-cli": "^22.0.4",
-    "jest-config": "^22.0.4",
-    "jest-diff": "^22.0.3",
-    "jest-environment-jsdom": "^22.0.4",
+    "jest": "^22.0.5",
+    "jest-cli": "^22.0.5",
+    "jest-config": "^22.0.5",
+    "jest-diff": "^22.0.5",
+    "jest-environment-jsdom": "^22.0.5",
    "jest-enzyme": "^4.0.2",
    "jest-image-snapshot": "^2.2.1",
-    "jest-jasmine2": "^22.0.4",
-    "lerna": "^2.5.1",
+    "jest-jasmine2": "^22.0.5",
+    "lerna": "^2.6.0",
    "lint-staged": "^6.0.0",
    "lodash": "^4.17.4",
-    "nodemon": "^1.14.9",
+    "nodemon": "^1.14.10",
    "npmlog": "^4.1.2",
    "prettier": "^1.9.2",
    "puppeteer": "^0.13.0",
--- a/yarn.lock
+++ b/yarn.lock
@ -158,15 +158,7 @@
  dependencies:
    tslib "^1.7.1"

-"@babel/code-frame@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-"@babel/code-frame@^7.0.0-beta.35":
+"@babel/code-frame@7.0.0-beta.36", "@babel/code-frame@^7.0.0-beta.35":
  version "7.0.0-beta.36"
  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4"
  dependencies:
@ -174,46 +166,45 @@
    esutils "^2.0.2"
    js-tokens "^3.0.0"

-"@babel/helper-function-name@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57"
+"@babel/helper-function-name@7.0.0-beta.36":
+  version "7.0.0-beta.36"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d"
  dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.31"
-    "@babel/template" "7.0.0-beta.31"
-    "@babel/traverse" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
+    "@babel/helper-get-function-arity" "7.0.0-beta.36"
+    "@babel/template" "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.36"

-"@babel/helper-get-function-arity@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493"
+"@babel/helper-get-function-arity@7.0.0-beta.36":
+  version "7.0.0-beta.36"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8"
  dependencies:
-    "@babel/types" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.36"

-"@babel/template@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda"
+"@babel/template@7.0.0-beta.36":
+  version "7.0.0-beta.36"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00"
  dependencies:
-    "@babel/code-frame" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
-    babylon "7.0.0-beta.31"
+    "@babel/code-frame" "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.36"
+    babylon "7.0.0-beta.36"
    lodash "^4.2.0"

-"@babel/traverse@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df"
+"@babel/traverse@7.0.0-beta.36":
+  version "7.0.0-beta.36"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261"
  dependencies:
-    "@babel/code-frame" "7.0.0-beta.31"
-    "@babel/helper-function-name" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
-    babylon "7.0.0-beta.31"
+    "@babel/code-frame" "7.0.0-beta.36"
+    "@babel/helper-function-name" "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.36"
+    babylon "7.0.0-beta.36"
    debug "^3.0.1"
-    globals "^10.0.0"
+    globals "^11.1.0"
    invariant "^2.2.0"
    lodash "^4.2.0"

-"@babel/types@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4"
+"@babel/types@7.0.0-beta.36":
+  version "7.0.0-beta.36"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23"
  dependencies:
    esutils "^2.0.2"
    lodash "^4.2.0"
@ -956,14 +947,14 @@ babel-eslint@7.2.3:
    babel-types "^6.23.0"
    babylon "^6.17.0"

-babel-eslint@^8.1.2:
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.2.tgz#a39230b0c20ecbaa19a35d5633bf9b9ca2c8116f"
+babel-eslint@^8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951"
  dependencies:
-    "@babel/code-frame" "7.0.0-beta.31"
-    "@babel/traverse" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
-    babylon "7.0.0-beta.31"
+    "@babel/code-frame" "7.0.0-beta.36"
+    "@babel/traverse" "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.36"
+    babylon "7.0.0-beta.36"
    eslint-scope "~3.7.1"
    eslint-visitor-keys "^1.0.0"

@ -2110,9 +2101,9 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
    lodash "^4.17.4"
    to-fast-properties "^1.0.3"

-babylon@7.0.0-beta.31:
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f"
+babylon@7.0.0-beta.36:
+  version "7.0.0-beta.36"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"

 babylon@^6.17.0, babylon@^6.17.3, babylon@^6.18.0:
  version "6.18.0"
@ -2222,10 +2213,6 @@ binary-extensions@^1.0.0:
  version "1.11.0"
  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"

-bindings@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
-
 bl@^1.0.0:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
@ -3099,12 +3086,18 @@ commander@2.12.x, commander@^2.11.0, commander@^2.12.2, commander@^2.9.0, comman
  version "2.12.2"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"

-common-tags@^1.3.1, common-tags@^1.4.0, common-tags@^1.6.0:
+common-tags@^1.3.1:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.6.0.tgz#788e4bcc582f16993e5b2c92f76b1ccb80731537"
  dependencies:
    babel-runtime "^6.26.0"

+common-tags@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.7.0.tgz#2457c9d6c64f22b250c84c11c9b3f98b428f3083"
+  dependencies:
+    babel-runtime "^6.26.0"
+
 commondir@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@ -4724,9 +4717,9 @@ eslint-plugin-import@2.8.0, eslint-plugin-import@^2.8.0:
    minimatch "^3.0.3"
    read-pkg-up "^2.0.0"

-eslint-plugin-jest@^21.5.0:
-  version "21.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.5.0.tgz#c7a3bd2ee9d1c832b4e31dec89f6ad93e08d4853"
+eslint-plugin-jest@^21.6.1:
+  version "21.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.6.1.tgz#adca015bbdb8d23b210438ff9e1cee1dd9ec35df"

 eslint-plugin-json@^1.2.0:
  version "1.2.0"
@ -5120,16 +5113,16 @@ expect@^21.2.1:
    jest-message-util "^21.2.1"
    jest-regex-util "^21.2.0"

-expect@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-22.0.3.tgz#bb486de7d41bf3eb60d3b16dfd1c158a4d91ddfa"
+expect@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-22.0.5.tgz#a7b64c689e430c8af49a3460eb98adf0e51b5196"
  dependencies:
    ansi-styles "^3.2.0"
-    jest-diff "^22.0.3"
+    jest-diff "^22.0.5"
    jest-get-type "^22.0.3"
-    jest-matcher-utils "^22.0.3"
+    jest-matcher-utils "^22.0.5"
    jest-message-util "^22.0.3"
-    jest-regex-util "^22.0.3"
+    jest-regex-util "^22.0.5"

 exports-loader@^0.6.3:
  version "0.6.4"
@ -6013,11 +6006,7 @@ global@^4.3.0, global@^4.3.2:
    min-document "^2.19.0"
    process "~0.5.1"

-globals@^10.0.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
-
-globals@^11.0.1:
+globals@^11.0.1, globals@^11.1.0:
  version "11.1.0"
  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"

@ -7077,6 +7066,10 @@ is-function@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"

+is-generator-fn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+
 is-glob@^2.0.0, is-glob@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@ -7428,9 +7421,9 @@ jest-changed-files@^21.2.0:
  dependencies:
    throat "^4.0.0"

-jest-changed-files@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.0.3.tgz#3771315acfa24a0ed7e6c545de620db6f1b2d164"
+jest-changed-files@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.0.5.tgz#ff944a1100172e9095869f4f5432e3fff09ab4ab"
  dependencies:
    throat "^4.0.0"

@ -7503,9 +7496,9 @@ jest-cli@^21.2.1:
    worker-farm "^1.3.1"
    yargs "^9.0.0"

-jest-cli@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.0.4.tgz#0052abaad45c57861c05da8ab5d27bad13ad224d"
+jest-cli@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.0.5.tgz#a8c7e8bf9371cb0997fa3da97e13e01da8a47593"
  dependencies:
    ansi-escapes "^3.0.0"
    chalk "^2.0.1"
@ -7516,18 +7509,18 @@ jest-cli@^22.0.4:
    istanbul-lib-coverage "^1.1.1"
    istanbul-lib-instrument "^1.8.0"
    istanbul-lib-source-maps "^1.2.1"
-    jest-changed-files "^22.0.3"
-    jest-config "^22.0.4"
-    jest-environment-jsdom "^22.0.4"
+    jest-changed-files "^22.0.5"
+    jest-config "^22.0.5"
+    jest-environment-jsdom "^22.0.5"
    jest-get-type "^22.0.3"
    jest-haste-map "^22.0.3"
    jest-message-util "^22.0.3"
-    jest-regex-util "^22.0.3"
-    jest-resolve-dependencies "^22.0.3"
-    jest-runner "^22.0.4"
-    jest-runtime "^22.0.4"
-    jest-snapshot "^22.0.3"
-    jest-util "^22.0.4"
+    jest-regex-util "^22.0.5"
+    jest-resolve-dependencies "^22.0.5"
+    jest-runner "^22.0.5"
+    jest-runtime "^22.0.5"
+    jest-snapshot "^22.0.5"
+    jest-util "^22.0.5"
    jest-worker "^22.0.3"
    micromatch "^2.3.11"
    node-notifier "^5.1.2"
@ -7570,21 +7563,21 @@ jest-config@^21.2.1:
    jest-validate "^21.2.1"
    pretty-format "^21.2.1"

-jest-config@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.0.4.tgz#9c2a46c0907b1a1af54d9cdbf18e99b447034e11"
+jest-config@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.0.5.tgz#86471137c5172f1fafdbe3af07f9d516873c8d11"
  dependencies:
    chalk "^2.0.1"
    glob "^7.1.1"
-    jest-environment-jsdom "^22.0.4"
-    jest-environment-node "^22.0.4"
+    jest-environment-jsdom "^22.0.5"
+    jest-environment-node "^22.0.5"
    jest-get-type "^22.0.3"
-    jest-jasmine2 "^22.0.4"
-    jest-regex-util "^22.0.3"
+    jest-jasmine2 "^22.0.5"
+    jest-regex-util "^22.0.5"
    jest-resolve "^22.0.4"
-    jest-util "^22.0.4"
-    jest-validate "^22.0.3"
-    pretty-format "^22.0.3"
+    jest-util "^22.0.5"
+    jest-validate "^22.0.5"
+    pretty-format "^22.0.5"

 jest-diff@^20.0.3:
  version "20.0.3"
@ -7613,6 +7606,15 @@ jest-diff@^22.0.3:
    jest-get-type "^22.0.3"
    pretty-format "^22.0.3"

+jest-diff@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.0.5.tgz#dbd7e7ff28601179a87777291c1020a3140d9ad4"
+  dependencies:
+    chalk "^2.0.1"
+    diff "^3.2.0"
+    jest-get-type "^22.0.3"
+    pretty-format "^22.0.5"
+
 jest-docblock@22.0.0:
  version "22.0.0"
  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.0.tgz#2e6a79360172b90bd2cd235a4832e38388b3b658"
@ -7649,12 +7651,12 @@ jest-environment-jsdom@^21.2.1:
    jest-util "^21.2.1"
    jsdom "^9.12.0"

-jest-environment-jsdom@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.0.4.tgz#5723d4e724775ed38948de792e62f2d6a7f452df"
+jest-environment-jsdom@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.0.5.tgz#7b479452e387aef5b4bf8b9fe03e8be77493f5ea"
  dependencies:
-    jest-mock "^22.0.3"
-    jest-util "^22.0.4"
+    jest-mock "^22.0.5"
+    jest-util "^22.0.5"
    jsdom "^11.5.1"

 jest-environment-node@^20.0.3:
@ -7671,12 +7673,12 @@ jest-environment-node@^21.2.1:
    jest-mock "^21.2.0"
    jest-util "^21.2.1"

-jest-environment-node@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.0.4.tgz#068671f85a545f96a5469be3a3dd228fca79c709"
+jest-environment-node@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.0.5.tgz#3d77468c5ce763455a46f9469532e35a2f1d94d4"
  dependencies:
-    jest-mock "^22.0.3"
-    jest-util "^22.0.4"
+    jest-mock "^22.0.5"
+    jest-util "^22.0.5"

 jest-enzyme@^4.0.2:
  version "4.0.2"
@ -7774,27 +7776,27 @@ jest-jasmine2@^21.2.1:
    jest-snapshot "^21.2.1"
    p-cancelable "^0.3.0"

-jest-jasmine2@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.0.4.tgz#f7c0965116efe831ec674dc954b0134639b3dcee"
+jest-jasmine2@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.0.5.tgz#daf1c91f6ecc3d1e04bc9e52eef11bd04adfeff3"
  dependencies:
    callsites "^2.0.0"
    chalk "^2.0.1"
-    expect "^22.0.3"
+    co "^4.6.0"
+    expect "^22.0.5"
    graceful-fs "^4.1.11"
-    jest-diff "^22.0.3"
-    jest-matcher-utils "^22.0.3"
+    is-generator-fn "^1.0.0"
+    jest-diff "^22.0.5"
+    jest-matcher-utils "^22.0.5"
    jest-message-util "^22.0.3"
-    jest-snapshot "^22.0.3"
+    jest-snapshot "^22.0.5"
    source-map-support "^0.5.0"

-jest-leak-detector@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.0.3.tgz#b64904f0e8954a11edb79b0809ff4717fa762d99"
+jest-leak-detector@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.0.5.tgz#277f792b6a71fa3a412ddfbd5d14aa190c29bea5"
  dependencies:
-    pretty-format "^22.0.3"
-  optionalDependencies:
-    weak "^1.0.1"
+    pretty-format "^22.0.5"

 jest-matcher-utils@^20.0.3:
  version "20.0.3"
@ -7819,6 +7821,14 @@ jest-matcher-utils@^22.0.3:
    jest-get-type "^22.0.3"
    pretty-format "^22.0.3"

+jest-matcher-utils@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.0.5.tgz#f65628364b345703e6042d27fd9cf158f6eb23d3"
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.0.3"
+    pretty-format "^22.0.5"
+
 jest-matchers@^20.0.3:
  version "20.0.3"
  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.0.3.tgz#ca69db1c32db5a6f707fa5e0401abb55700dfd60"
@ -7862,9 +7872,9 @@ jest-mock@^21.2.0:
  version "21.2.0"
  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.2.0.tgz#7eb0770e7317968165f61ea2a7281131534b3c0f"

-jest-mock@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.0.3.tgz#c875e47b5b729c6c020a2fab317b275c0cf88961"
+jest-mock@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.0.5.tgz#c05b87c1ecc98de5b1eb88d4fcd01ee512a6963a"

 jest-regex-util@^20.0.3:
  version "20.0.3"
@ -7874,9 +7884,9 @@ jest-regex-util@^21.2.0:
  version "21.2.0"
  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-21.2.0.tgz#1b1e33e63143babc3e0f2e6c9b5ba1eb34b2d530"

-jest-regex-util@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.0.3.tgz#c5c10229de5ce2b27bf4347916d95b802ae9aa4d"
+jest-regex-util@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.0.5.tgz#e05eef614d7211d6320ac443f2996064890aa224"

 jest-resolve-dependencies@^20.0.3:
  version "20.0.3"
@ -7890,11 +7900,11 @@ jest-resolve-dependencies@^21.2.0:
  dependencies:
    jest-regex-util "^21.2.0"

-jest-resolve-dependencies@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.0.3.tgz#202ddf370069702cd1865a1952fcc7e52c92720e"
+jest-resolve-dependencies@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.0.5.tgz#d25e2e97ffbb3002c4a2f215520e0e44718b6cb0"
  dependencies:
-    jest-regex-util "^22.0.3"
+    jest-regex-util "^22.0.5"

 jest-resolve@^20.0.4:
  version "20.0.4"
@ -7934,18 +7944,18 @@ jest-runner@^21.2.1:
    throat "^4.0.0"
    worker-farm "^1.3.1"

-jest-runner@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.0.4.tgz#3aa43a31b05ce8271539df580c2eb916023d3367"
+jest-runner@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.0.5.tgz#69c352828aa8d5ac7ea62b9ac2d8a36cf4a63c53"
  dependencies:
-    jest-config "^22.0.4"
+    jest-config "^22.0.5"
    jest-docblock "^22.0.3"
    jest-haste-map "^22.0.3"
-    jest-jasmine2 "^22.0.4"
-    jest-leak-detector "^22.0.3"
+    jest-jasmine2 "^22.0.5"
+    jest-leak-detector "^22.0.5"
    jest-message-util "^22.0.3"
-    jest-runtime "^22.0.4"
-    jest-util "^22.0.4"
+    jest-runtime "^22.0.5"
+    jest-util "^22.0.5"
    jest-worker "^22.0.3"
    throat "^4.0.0"

@ -7991,9 +8001,9 @@ jest-runtime@^21.2.1:
    write-file-atomic "^2.1.0"
    yargs "^9.0.0"

-jest-runtime@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.0.4.tgz#8f69aa7b5fbb3acd35dc262cbf654e563f69b7b4"
+jest-runtime@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.0.5.tgz#e155adb25f4a5f099987dad502acd597790e5096"
  dependencies:
    babel-core "^6.0.0"
    babel-jest "^22.0.4"
@ -8001,11 +8011,11 @@ jest-runtime@^22.0.4:
    chalk "^2.0.1"
    convert-source-map "^1.4.0"
    graceful-fs "^4.1.11"
-    jest-config "^22.0.4"
+    jest-config "^22.0.5"
    jest-haste-map "^22.0.3"
-    jest-regex-util "^22.0.3"
+    jest-regex-util "^22.0.5"
    jest-resolve "^22.0.4"
-    jest-util "^22.0.4"
+    jest-util "^22.0.5"
    json-stable-stringify "^1.0.1"
    micromatch "^2.3.11"
    realpath-native "^1.0.0"
@ -8014,7 +8024,7 @@ jest-runtime@^22.0.4:
    write-file-atomic "^2.1.0"
    yargs "^10.0.3"

-jest-snapshot@>=20.0.3, jest-snapshot@^22.0.3:
+jest-snapshot@>=20.0.3:
  version "22.0.3"
  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.0.3.tgz#a949b393781d2fdb4773f6ea765dd67ad1da291e"
  dependencies:
@ -8047,6 +8057,17 @@ jest-snapshot@^21.2.1:
    natural-compare "^1.4.0"
    pretty-format "^21.2.1"

+jest-snapshot@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.0.5.tgz#ab52cc5c65c9caacdbc0c6369dc653ffbcace5ed"
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^22.0.5"
+    jest-matcher-utils "^22.0.5"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^22.0.5"
+
 jest-specific-snapshot@^0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/jest-specific-snapshot/-/jest-specific-snapshot-0.3.0.tgz#89d37c7c2e94180c7b58bfedf9d9dc172ebd19e3"
@ -8077,16 +8098,16 @@ jest-util@^21.2.1:
    jest-validate "^21.2.1"
    mkdirp "^0.5.1"

-jest-util@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.0.4.tgz#d920a513e0645aaab030cee38e4fe7d5bed8bb6d"
+jest-util@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.0.5.tgz#d124387b714bfcf3cd46a5b1aa00cc5491d26716"
  dependencies:
    callsites "^2.0.0"
    chalk "^2.0.1"
    graceful-fs "^4.1.11"
    is-ci "^1.0.10"
    jest-message-util "^22.0.3"
-    jest-validate "^22.0.3"
+    jest-validate "^22.0.5"
    mkdirp "^0.5.1"

 jest-validate@^20.0.3:
@ -8107,14 +8128,14 @@ jest-validate@^21.1.0, jest-validate@^21.2.1:
    leven "^2.1.0"
    pretty-format "^21.2.1"

-jest-validate@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.0.3.tgz#2850d949a36c48b1a40f7eebae1d8539126f7829"
+jest-validate@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.0.5.tgz#fbc6b9c0d2f583f73070f079e0c53be1c88adba5"
  dependencies:
    chalk "^2.0.1"
    jest-get-type "^22.0.3"
    leven "^2.1.0"
-    pretty-format "^22.0.3"
+    pretty-format "^22.0.5"

 jest-worker@22.0.0:
  version "22.0.0"
@ -8140,11 +8161,11 @@ jest@^21.2.1:
  dependencies:
    jest-cli "^21.2.1"

-jest@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-22.0.4.tgz#d3cf560ece6b825b115dce80b9826ceb40f87961"
+jest@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-22.0.5.tgz#552b4104dea91d63fa4f4f39443337d061f63019"
  dependencies:
-    jest-cli "^22.0.4"
+    jest-cli "^22.0.5"

 js-base64@^2.1.8, js-base64@^2.1.9:
  version "2.4.0"
@ -8527,9 +8548,9 @@ left-pad@^1.1.3, left-pad@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"

-lerna@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.5.1.tgz#d07099bd3051ee799f98c753328bd69e96c6fab8"
+lerna@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.6.0.tgz#865377717ca9e0daa5a2fbb00e364968d533650a"
  dependencies:
    async "^1.5.0"
    chalk "^2.1.0"
@ -8563,6 +8584,7 @@ lerna@^2.5.1:
    safe-buffer "^5.1.1"
    semver "^5.4.1"
    signal-exit "^3.0.2"
+    slash "^1.0.0"
    strong-log-transformer "^1.0.6"
    temp-write "^3.3.0"
    write-file-atomic "^2.3.0"
@ -9647,7 +9669,7 @@ mz@^2.4.0:
    object-assign "^4.0.1"
    thenify-all "^1.0.0"

-nan@^2.0.5, nan@^2.3.0, nan@^2.3.2:
+nan@^2.3.0, nan@^2.3.2:
  version "2.8.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"

@ -9859,15 +9881,16 @@ node-version@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.1.0.tgz#f437d7ba407e65e2c4eaef8887b1718ba523d4f0"

-nodemon@^1.14.9:
-  version "1.14.9"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.9.tgz#eec45a916db61503264037b4233c0f8a15d69802"
+nodemon@^1.14.10:
+  version "1.14.10"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.10.tgz#836d33ff0f89ad111b8d49e5e3b3cb872e36304e"
  dependencies:
    chokidar "^1.7.0"
    debug "^2.6.8"
    ignore-by-default "^1.0.1"
    minimatch "^3.0.4"
    pstree.remy "^1.1.0"
+    semver "^5.4.1"
    touch "^3.1.0"
    undefsafe "0.0.3"
    update-notifier "^2.3.0"
@ -11154,6 +11177,13 @@ pretty-format@^22.0.3:
    ansi-regex "^3.0.0"
    ansi-styles "^3.2.0"

+pretty-format@^22.0.5:
+  version "22.0.5"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.0.5.tgz#8bad3f12b2b84c76fc57a976bde6770eb4043c69"
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
 pretty-format@^4.2.1:
  version "4.3.1"
  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d"
@ -14847,9 +14877,9 @@ vue-hot-reload-api@^2.2.0, 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.6.2:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.6.2.tgz#43d9688f2c80400916104d1138941aacd7e389cb"
+vue-loader@^13.7.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.7.0.tgz#4d6a35b169c2a0a488842fb95c85052105fa9729"
  dependencies:
    consolidate "^0.14.0"
    hash-sum "^1.0.2"
@ -14934,13 +14964,6 @@ wcwidth@^1.0.0:
  dependencies:
    defaults "^1.0.3"

-weak@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/weak/-/weak-1.0.1.tgz#ab99aab30706959aa0200cb8cf545bb9cb33b99e"
-  dependencies:
-    bindings "^1.2.1"
-    nan "^2.0.5"
-
 webdriver-js-extender@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
@ -15021,9 +15044,9 @@ webpack-dev-server@2.9.4:
    webpack-dev-middleware "^1.11.0"
    yargs "^6.6.0"

-webpack-dev-server@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.10.0.tgz#6db9c77c8cf2e2d7ff85c89fb5e4de6f7227be19"
+webpack-dev-server@^2.10.1:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.10.1.tgz#a9768375346e62155860fe3cef3d4d641b24273e"
  dependencies:
    ansi-html "0.0.7"
    array-includes "^3.0.3"
@ -15051,7 +15074,7 @@ webpack-dev-server@^2.10.0:
    strip-ansi "^4.0.0"
    supports-color "^5.1.0"
    webpack-dev-middleware "1.12.2"
-    yargs "^10.0.3"
+    yargs "6.6.0"

 webpack-dev-server@~2.9.3:
  version "2.9.7"
@ -15543,6 +15566,24 @@ yargs@3.29.0:
    window-size "^0.1.2"
    y18n "^3.2.0"

+yargs@6.6.0, yargs@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
 yargs@^10.0.3:
  version "10.0.3"
  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae"
@ -15579,24 +15620,6 @@ yargs@^4.8.0:
    y18n "^3.2.1"
    yargs-parser "^2.4.1"

-yargs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
-
 yargs@^7.0.0, yargs@^7.0.2:
  version "7.1.0"
  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"