Skip to content

Commit

Permalink
Merge branch 'master' into storyshots-support-NODE_PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
igor-dv authored Jan 30, 2018
2 parents dd0c4ba + 3e14b28 commit 233d73d
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"ts-loader": "^2.2.2",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"react-native-iphone-x-helper": "^1.0.1",
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"serve-favicon": "^2.4.5",
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion app/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"serve-favicon": "^2.4.5",
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"chromatic": "npm --prefix examples/official-storybook run chromatic"
},
"devDependencies": {
"@types/lodash": "^4.14.97",
"@types/lodash": "^4.14.98",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.1",
Expand Down Expand Up @@ -71,7 +71,7 @@
"jest-config": "^22.1.4",
"jest-diff": "^22.1.0",
"jest-environment-jsdom": "^22.1.4",
"jest-enzyme": "^4.0.2",
"jest-enzyme": "^4.1.0",
"jest-image-snapshot": "^2.3.0",
"jest-jasmine2": "^22.1.4",
"jest-preset-angular": "^5.0.0",
Expand Down
35 changes: 24 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@
version "4.14.92"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.92.tgz#6e3cb0b71a1e12180a47a42a744e856c3ae99a57"

"@types/lodash@^4.14.97":
version "4.14.97"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.97.tgz#7262d6d5fc5e87cdb3f68eb33accd4024f2b211e"
"@types/lodash@^4.14.98":
version "4.14.98"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.98.tgz#aaf012ae443e657e7885e605a4c1b340db160609"

"@types/mz@0.0.32":
version "0.0.32"
Expand Down Expand Up @@ -4547,9 +4547,9 @@ enzyme-adapter-utils@^1.3.0:
object.assign "^4.0.4"
prop-types "^15.6.0"

enzyme-matchers@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.0.2.tgz#3f4457d0d0da3e268af4bee9f222439dfca26214"
enzyme-matchers@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.1.1.tgz#ce8c177f96f05e757a2c7b5ca4040450c3beb57c"
dependencies:
circular-json-es6 "^2.0.1"
deep-equal-ident "^1.1.1"
Expand Down Expand Up @@ -7847,11 +7847,11 @@ jest-environment-node@^22.1.4:
jest-mock "^22.1.0"
jest-util "^22.1.4"

jest-enzyme@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.0.2.tgz#c3a87f311889819d51ae2639c9da412da07cfc4a"
jest-enzyme@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.1.1.tgz#db080b3ff2f93ab7161715d69801d1d5f187ed13"
dependencies:
enzyme-matchers "^4.0.2"
enzyme-matchers "^4.1.1"
enzyme-to-json "^3.3.0"

jest-get-type@^21.2.0:
Expand Down Expand Up @@ -14677,7 +14677,7 @@ uglifyjs-webpack-plugin@^0.4.6:
uglify-js "^2.8.29"
webpack-sources "^1.0.1"

uglifyjs-webpack-plugin@^1.1.5, uglifyjs-webpack-plugin@^1.1.6:
uglifyjs-webpack-plugin@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19"
dependencies:
Expand All @@ -14690,6 +14690,19 @@ uglifyjs-webpack-plugin@^1.1.5, uglifyjs-webpack-plugin@^1.1.6:
webpack-sources "^1.1.0"
worker-farm "^1.5.2"

uglifyjs-webpack-plugin@^1.1.7:
version "1.1.8"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz#1302fb9471a7daf3d0a5174da6d65f0f415e75ad"
dependencies:
cacache "^10.0.1"
find-cache-dir "^1.0.0"
schema-utils "^0.4.2"
serialize-javascript "^1.4.0"
source-map "^0.6.1"
uglify-es "^3.3.4"
webpack-sources "^1.1.0"
worker-farm "^1.5.2"

uid-number@0.0.6, uid-number@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
Expand Down

0 comments on commit 233d73d

Please sign in to comment.