Skip to content

Commit

Permalink
fix: upgrade untool
Browse files Browse the repository at this point in the history
  • Loading branch information
@jhiode
jhiode committed Sep 11, 2019
1 parent cb652b7 commit 0e4c4b4
Show file tree
Hide file tree
Showing 8 changed files with 111 additions and 58 deletions.
4 changes: 2 additions & 2 deletions packages/config/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"url": "https://github.com/xing/hops.git"
},
"dependencies": {
"@untool/core": "^1.10.0",
"@untool/webpack": "^1.10.0"
"@untool/core": "^1.10.1",
"@untool/webpack": "^1.10.1"
},
"homepage": "https://github.com/xing/hops/tree/master/packages/config#readme"
}
4 changes: 2 additions & 2 deletions packages/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"url": "https://github.com/xing/hops.git"
},
"dependencies": {
"@untool/react": "^1.10.0",
"@untool/webpack": "^1.10.0",
"@untool/react": "^1.10.1",
"@untool/webpack": "^1.10.1",
"apollo-cache-inmemory": "^1.3.6",
"apollo-client": "^2.5.1",
"apollo-link-http": "^1.5.5",
Expand Down
8 changes: 4 additions & 4 deletions packages/hops/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"url": "https://github.com/xing/hops.git"
},
"dependencies": {
"@untool/express": "^1.10.0",
"@untool/info": "^1.10.0",
"@untool/webpack": "^1.10.0",
"@untool/yargs": "^1.10.0",
"@untool/express": "^1.10.1",
"@untool/info": "^1.10.1",
"@untool/webpack": "^1.10.1",
"@untool/yargs": "^1.10.1",
"hops-express": "^11.9.0",
"hops-mixin": "^11.9.0",
"hops-react": "^11.9.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/lambda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"url": "https://github.com/xing/hops.git"
},
"dependencies": {
"@untool/core": "^1.10.0",
"@untool/express": "^1.10.0",
"@untool/core": "^1.10.1",
"@untool/express": "^1.10.1",
"archiver": "^3.0.0",
"aws-sdk": "^2.286.2",
"globby": "^10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/mixin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"url": "https://github.com/xing/hops.git"
},
"dependencies": {
"@untool/core": "^1.10.0",
"@untool/core": "^1.10.1",
"mixinable": "^4.0.0"
},
"homepage": "https://github.com/xing/hops/tree/master/packages/mixin#readme"
Expand Down
4 changes: 2 additions & 2 deletions packages/pwa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"url": "https://github.com/xing/hops.git"
},
"dependencies": {
"@untool/core": "^1.10.0",
"@untool/webpack": "^1.10.0",
"@untool/core": "^1.10.1",
"@untool/webpack": "^1.10.1",
"app-manifest-loader": "^2.0.0",
"file-loader": "^4.0.0",
"hops-mixin": "^11.9.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@babel/core": "^7.4.0",
"@babel/plugin-proposal-class-properties": "^7.4.0",
"@babel/plugin-transform-flow-strip-types": "^7.4.0",
"@untool/core": "^1.10.0",
"@untool/react": "^1.10.0",
"@untool/core": "^1.10.1",
"@untool/react": "^1.10.1",
"hops-mixin": "^11.9.0"
},
"peerDependencies": {
Expand Down
139 changes: 96 additions & 43 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2102,10 +2102,10 @@
resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==

"@untool/core@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@untool/core/-/core-1.10.0.tgz#98e0736771c71aed31c572836451d3aede9462bb"
integrity sha512-he199C3yTnJsEUumo6fptQ47sI3MNVqlW3gO6TCYA/iGZvX27N9/jgfcP7i1PDijLAJcGCyVulnNKw0WSPKKfw==
"@untool/core@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@untool/core/-/core-1.10.1.tgz#6007323c22221dc749f25374378471d5d19d8900"
integrity sha512-j7JUEVxruEUniizx6SL5krxgwjsOxsJyDYs3+wOslTyPu4HrxQMif58ANkmETTBqDvz4wEXf3OFmhyTNDs2oQA==
dependencies:
ajv "^6.9.2"
check-error "^1.0.2"
Expand All @@ -2121,13 +2121,13 @@
mixinable "^4.0.0"
supports-color "^7.0.0"

"@untool/express@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@untool/express/-/express-1.10.0.tgz#9042586921e42104f462e44e3853b4997034e35c"
integrity sha512-OdFXZZJUvNBzAiP6I5S/dLgF/JaZdS/0LKtZpu/9p3Sf3WJ9Z2aIyJ4kHqHqwSY9EVddAWosKQxfODk4mZRUpw==
"@untool/express@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@untool/express/-/express-1.10.1.tgz#0f1017995e2b56b21cfa292dd56f17af6a814d57"
integrity sha512-P5Q1uMRbGOHzZumvsPBbM+7vQ3c7DP+DYFonfQraxCymUlouMyit4HciisFm8q5Q8UJD/o+jOmb9ppTqJu7hFA==
dependencies:
"@untool/core" "^1.10.0"
"@untool/yargs" "^1.10.0"
"@untool/core" "^1.10.1"
"@untool/yargs" "^1.10.1"
chalk "^2.4.2"
debug "^4.0.0"
directory-index "^0.1.0"
Expand All @@ -2141,57 +2141,59 @@
morgan "^1.9.1"
node-mocks-http "^1.7.0"
pathifist "^1.0.0"
portfinder "^1.0.19"
portfinder "^1.0.23"
pretty-bytes "^5.1.0"
pretty-ms "^5.0.0"
split "^1.0.1"
supports-color "^7.0.0"

"@untool/info@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@untool/info/-/info-1.10.0.tgz#58ee88f89abff2d2e90d160c11b533c1fd635ac9"
integrity sha512-rZhU8joHKKqSrDG9yC5ohwHn/zJ5P6f1CfH9UG8oB+/66SgQtFxhIJFb5JT84RCfxEQemU5Kh2+C/E5wYMK2IQ==
"@untool/info@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@untool/info/-/info-1.10.1.tgz#85b81283eab16bd70a682151b67083136cd85cc3"
integrity sha512-ySFdOO6modSvFdV36E1iWmMbDE68E1scip11JavCzJ+Au4WQVXGCLXuOSfwk9+IpygHDA6gU8gE/KEhVjnI24A==
dependencies:
"@untool/core" "^1.10.0"
"@untool/core" "^1.10.1"
chalk "^2.4.2"
duplitect "^2.0.1"
enhanced-resolve "^4.1.0"
escape-string-regexp "^2.0.0"
mixinable "^4.0.0"

"@untool/react@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@untool/react/-/react-1.10.0.tgz#24d91bf9caf20576478c8f4e0ca00ca10f8608ad"
integrity sha512-hCVU1L1pKJ8fPu+hDwEw23ziL7CYl7b4qVa1NdZBF3y55rSSeobZZ4r+/rkxHfhtC57Rb+Pmwk5R2GdTyufhZw==
"@untool/react@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@untool/react/-/react-1.10.1.tgz#9d5f90f8d4146a90a87cc309c0f60bccc8a33903"
integrity sha512-40ebnb0jmcJZc1cfKbWMgp1vYt9aRbU+1/qL4LMEs2xO79JMK8m8Tp7xJpYCdtlGSKpxhe3d9q+nqwAMcDkjSQ==
dependencies:
"@babel/core" "^7.4.0"
"@babel/preset-react" "^7.0.0"
"@untool/core" "^1.10.0"
"@untool/core" "^1.10.1"
babel-plugin-transform-react-remove-prop-types "^0.4.19"
clone "^2.1.2"
duplitect "^2.0.1"
is-plain-obj "^2.0.0"
mixinable "^4.0.0"
pathifist "^1.0.0"
prop-types "^15.7.2"
serialize-javascript "^1.4.0"
serialize-javascript "^2.0.0"

"@untool/webpack@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@untool/webpack/-/webpack-1.10.0.tgz#3e11b882fc04f2e2f0153b90ee4650e16a90caa9"
integrity sha512-1DxSh0mvBJI4SWUMY6/bP6Frt9W/gA9QFDIMG4E4iZ8+g1RQGk/skoTUcMtrBtUy3wgjCsmRmVJsxn51Td5jIg==
"@untool/webpack@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@untool/webpack/-/webpack-1.10.1.tgz#9a5cf59acf190898e8084ddeffe89b4269bf8aa3"
integrity sha512-g6hLwluKFa/tQnLurJjfh6yrM83+Zq2XydYdDkR14sYR//kf00VR/8r2PvUh6cFyYNcSyqkRjvFtEK/KG5O/YA==
dependencies:
"@babel/core" "^7.4.0"
"@babel/plugin-syntax-dynamic-import" "^7.0.0"
"@babel/preset-env" "^7.4.2"
"@untool/core" "^1.10.0"
"@untool/express" "^1.10.0"
"@untool/yargs" "^1.10.0"
"@untool/core" "^1.10.1"
"@untool/express" "^1.10.1"
"@untool/yargs" "^1.10.1"
babel-loader "^8.0.6"
babel-plugin-dynamic-import-node "^2.0.0"
caniuse-lite "^1.0.30000898"
chalk "^2.4.2"
core-js "^2.6.9"
debug "^4.0.0"
directory-index "^0.1.0"
duplitect "^2.0.1"
enhanced-resolve "^4.0.0"
eprom "^1.0.0"
Expand All @@ -2207,25 +2209,26 @@
pathifist "^1.0.0"
pretty-bytes "^5.1.0"
pretty-ms "^5.0.0"
regenerator-runtime "^0.13.3"
require-from-string "^2.0.1"
rimraf "^2.6.2"
rimraf "^3.0.0"
serialize-error "^4.1.0"
source-map-support "^0.5.6"
strip-ansi "^5.2.0"
supports-color "^7.0.0"
terser-webpack-plugin "^1.1.0"
terser-webpack-plugin "^2.0.0"
url-loader "^2.0.0"
webpack "^4.23.0"
webpack-dev-middleware "^3.1.0"
webpack-hot-middleware "^2.22.2"
webpack-sources "^1.1.0"

"@untool/yargs@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@untool/yargs/-/yargs-1.10.0.tgz#aafbbfa90d458c0f296fff3b3e8b697c12903a90"
integrity sha512-l1qvSoAFgDVlPAFWwD7Q9iYJfu2JQQQnJ6Xw6/q9ad8Y0FsS55MrmMhqzxSQulBd5a3vtGLTTy3zlrEpyv9HnQ==
"@untool/yargs@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@untool/yargs/-/yargs-1.10.1.tgz#4194e946333f1f2242c1f68c27938931729a9a02"
integrity sha512-u/Bb2RHKypZzjU1bvew8xsEAgul7XNYTO/qqJWdX+PybVPiLaRITFeRO13cFA16KtQnFN4ltzalW+D/84emYog==
dependencies:
"@untool/core" "^1.10.0"
"@untool/core" "^1.10.1"
is-plain-obj "^2.0.0"
mixinable "^4.0.0"
yargs "^13.0.0"
Expand Down Expand Up @@ -5866,6 +5869,15 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
make-dir "^2.0.0"
pkg-dir "^3.0.0"

find-cache-dir@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.0"
pkg-dir "^4.1.0"

find-up@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
Expand Down Expand Up @@ -7772,6 +7784,14 @@ jest-worker@^23.2.0:
dependencies:
merge-stream "^1.0.1"

jest-worker@^24.9.0:
version "24.9.0"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
dependencies:
merge-stream "^2.0.0"
supports-color "^6.1.0"

jest@^23.4.2:
version "23.6.0"
resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
Expand Down Expand Up @@ -8586,6 +8606,11 @@ merge-stream@^1.0.1:
dependencies:
readable-stream "^2.0.1"

merge-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==

merge2@^1.2.3:
version "1.2.4"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
Expand Down Expand Up @@ -9824,7 +9849,7 @@ pkg-dir@^3.0.0:
dependencies:
find-up "^3.0.0"

pkg-dir@^4.2.0:
pkg-dir@^4.1.0, pkg-dir@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
Expand Down Expand Up @@ -9853,7 +9878,7 @@ pn@^1.1.0:
resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==

portfinder@^1.0.19:
portfinder@^1.0.23:
version "1.0.24"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz#11efbc6865f12f37624b6531ead1d809ed965cfa"
integrity sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==
Expand Down Expand Up @@ -11149,7 +11174,7 @@ regenerator-runtime@^0.11.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==

regenerator-runtime@^0.13.2:
regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3:
version "0.13.3"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
Expand Down Expand Up @@ -11570,7 +11595,7 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"

schema-utils@^2.0.0, schema-utils@^2.0.1:
schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz#48a065ce219e0cacf4631473159037b2c1ae82da"
integrity sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==
Expand Down Expand Up @@ -11629,11 +11654,16 @@ serialize-error@^4.1.0:
dependencies:
type-fest "^0.3.0"

serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
serialize-javascript@^1.7.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==

serialize-javascript@^2.0.0, serialize-javascript@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==

[email protected]:
version "1.14.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
Expand Down Expand Up @@ -12373,7 +12403,7 @@ temp-write@^3.4.0:
temp-dir "^1.0.0"
uuid "^3.0.1"

terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.1:
terser-webpack-plugin@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
Expand All @@ -12388,6 +12418,20 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.1:
webpack-sources "^1.4.0"
worker-farm "^1.7.0"

terser-webpack-plugin@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.0.1.tgz#5e69a187133472174ef2fb51afc76a0f0a7b1d13"
integrity sha512-DXx8f7080P2dgW9Ydd7MUon81AL+GkGr9prfQRf+rH06dRrgCGIvtT7q73JRm2UzmjKeJGtro9O8zwL2y2udag==
dependencies:
cacache "^12.0.3"
find-cache-dir "^3.0.0"
jest-worker "^24.9.0"
schema-utils "^2.2.0"
serialize-javascript "^2.1.0"
source-map "^0.6.1"
terser "^4.2.1"
webpack-sources "^1.4.3"

terser@^4.1.2:
version "4.3.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.0.tgz#0259070576ff34d89c5cd2b8d91055cdce0212d5"
Expand All @@ -12397,6 +12441,15 @@ terser@^4.1.2:
source-map "~0.6.1"
source-map-support "~0.5.12"

terser@^4.2.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65"
integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
source-map-support "~0.5.12"

test-exclude@^4.2.1:
version "4.2.3"
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
Expand Down Expand Up @@ -13059,7 +13112,7 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"

webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
Expand Down

0 comments on commit 0e4c4b4

Please sign in to comment.