Merge branch 'master' into merge-angular-cli-webpack-config

addons/actions/package.json

@@ -25,7 +25,7 @@
  "make-error": "^1.3.2",
  "prop-types": "^15.6.0",
  "react-inspector": "^2.2.2",
- "uuid": "^3.1.0"
+ "uuid": "^3.2.0"
  },
  "peerDependencies": {
  "@storybook/addons": "^3.3.0",

addons/events/package.json

@@ -25,7 +25,7 @@
  "format-json": "^1.0.3",
  "prop-types": "^15.6.0",
  "react-textarea-autosize": "^5.2.1",
- "uuid": "^3.1.0"
+ "uuid": "^3.2.0"
  },
  "peerDependencies": {
  "@storybook/addons": "^3.3.0",

app/angular/package.json

@@ -80,7 +80,7 @@
  "uglifyjs-webpack-plugin": "^1.1.6",
  "url-loader": "^0.5.8",
  "util-deprecate": "^1.0.2",
- "uuid": "^3.1.0",
+ "uuid": "^3.2.0",
  "webpack": "^2.5.1 || ^3.0.0",
  "webpack-dev-middleware": "^1.10.2",
  "webpack-hot-middleware": "^2.18.0",

app/polymer/package.json

@@ -75,7 +75,7 @@
  "style-loader": "^0.18.2",
  "url-loader": "^0.6.2",
  "util-deprecate": "^1.0.2",
- "uuid": "^3.1.0",
+ "uuid": "^3.2.0",
  "webpack": "^3.6.0",
  "webpack-dev-middleware": "^1.12.0",
  "webpack-hot-middleware": "^2.20.0"

app/react-native/package.json

@@ -66,7 +66,7 @@
  "url-loader": "^0.6.2",
  "url-parse": "^1.1.9",
  "util-deprecate": "^1.0.2",
- "uuid": "^3.1.0",
+ "uuid": "^3.2.0",
  "webpack": "^3.10.0",
  "webpack-dev-middleware": "^1.12.2",
  "webpack-hot-middleware": "^2.21.0",

app/react/package.json

@@ -77,7 +77,7 @@
  "uglifyjs-webpack-plugin": "^1.1.6",
  "url-loader": "^0.6.2",
  "util-deprecate": "^1.0.2",
- "uuid": "^3.1.0",
+ "uuid": "^3.2.0",
  "webpack": "^3.10.0",
  "webpack-dev-middleware": "^1.12.2",
  "webpack-hot-middleware": "^2.21.0"

app/vue/package.json

@@ -73,7 +73,7 @@
  "uglifyjs-webpack-plugin": "^1.1.6",
  "url-loader": "^0.6.2",
  "util-deprecate": "^1.0.2",
- "uuid": "^3.1.0",
+ "uuid": "^3.2.0",
  "vue-hot-reload-api": "^2.2.4",
  "vue-style-loader": "^3.0.1",
  "webpack": "^3.10.0",

examples/official-storybook/package.json

@@ -37,7 +37,7 @@
  "react": "^16.2.0",
  "react-chromatic": "^0.7.3",
  "react-dom": "^16.2.0",
- "uuid": "^3.1.0"
+ "uuid": "^3.2.0"
  },
  "private": true
 }

lib/ui/package.json

@@ -34,7 +34,7 @@
  "react-fuzzy": "^0.5.1",
  "react-icons": "^2.2.7",
  "react-inspector": "^2.2.2",
- "react-modal": "^3.1.10",
+ "react-modal": "^3.1.11",
  "react-split-pane": "^0.1.74",
  "react-treebeard": "^2.1.0",
  "redux": "^3.7.2"

package.json

@@ -59,7 +59,7 @@
  "eslint-plugin-jest": "^21.6.2",
  "eslint-plugin-json": "^1.2.0",
  "eslint-plugin-jsx-a11y": "^6.0.3",
- "eslint-plugin-prettier": "^2.4.0",
+ "eslint-plugin-prettier": "^2.5.0",
  "eslint-plugin-react": "^7.5.1",
  "gh-pages": "^1.1.0",
  "github-release-from-changelog": "^1.3.0",
@@ -76,7 +76,7 @@
  "jest-jasmine2": "^22.1.1",
  "jest-preset-angular": "^5.0.0",
  "jest-vue-preprocessor": "^1.3.1",
- "lerna": "^2.6.0",
+ "lerna": "^2.7.1",
  "lint-staged": "^6.0.0",
  "lodash": "^4.17.4",
  "nodemon": "^1.14.11",

yarn.lock

@@ -4816,13 +4816,20 @@ eslint-plugin-jsx-a11y@^6.0.3:
  emoji-regex "^6.1.0"
  jsx-ast-utils "^2.0.0"
 
-eslint-plugin-prettier@^2.2.0, eslint-plugin-prettier@^2.4.0:
+eslint-plugin-prettier@^2.2.0:
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz#85cab0775c6d5e3344ef01e78d960f166fb93aae"
  dependencies:
  fast-diff "^1.1.1"
  jest-docblock "^21.0.0"
 
+eslint-plugin-prettier@^2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.5.0.tgz#39a91dd7528eaf19cd42c0ee3f2c1f684606a05f"
+ dependencies:
+ fast-diff "^1.1.1"
+ jest-docblock "^21.0.0"
+
 [email protected]:
  version "7.4.0"
  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
@@ -8672,9 +8679,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.6.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.7.0.tgz#1df22aebaa82d8134b19303ac3e503146d1e4e9a"
+lerna@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.7.1.tgz#abd536376eca5e9f41a6d611da5b744534ef906f"
  dependencies:
  async "^1.5.0"
  chalk "^2.1.0"
@@ -11812,9 +11819,9 @@ react-modal@^2.2.4, react-modal@^2.4.1:
  exenv "^1.2.0"
  prop-types "^15.5.10"
 
-react-modal@^3.1.10:
- version "3.1.10"
- resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.10.tgz#8898b5cc4ebba78adbb8dea4c55a69818aa682cc"
+react-modal@^3.1.11:
+ version "3.1.11"
+ resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.11.tgz#95c8223fcee7013258ad2d149c38c9f870c89958"
  dependencies:
  exenv "^1.2.0"
  prop-types "^15.5.10"
@@ -14938,6 +14945,10 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@~3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+uuid@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.0.tgz#19a63e22b3b32a0ba23984a4f384836465e24949"
+
 v8flags@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"