From ba7e50c3279645282e292cb897f94165b68ac2c6 Mon Sep 17 00:00:00 2001 From: ZauberNerd Date: Mon, 15 Apr 2019 16:58:18 +0200 Subject: [PATCH] fix: upgrade to latest untool release --- packages/config/package.json | 4 +- packages/graphql/package.json | 2 +- packages/hops/package.json | 8 +-- packages/lambda/package.json | 4 +- packages/mixin/package.json | 2 +- packages/pwa/package.json | 4 +- packages/react/package.json | 4 +- packages/spec/package.json | 2 +- yarn.lock | 115 ++++++++++++++-------------------- 9 files changed, 63 insertions(+), 82 deletions(-) diff --git a/packages/config/package.json b/packages/config/package.json index 6d002287f..fd89a4886 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -17,8 +17,8 @@ "url": "https://github.com/xing/hops.git" }, "dependencies": { - "@untool/core": "^1.5.1", - "@untool/webpack": "^1.5.1" + "@untool/core": "^1.6.2", + "@untool/webpack": "^1.6.2" }, "homepage": "https://github.com/xing/hops/tree/master/packages/config#readme" } diff --git a/packages/graphql/package.json b/packages/graphql/package.json index b47874101..574f61e3d 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -19,7 +19,7 @@ "url": "https://github.com/xing/hops.git" }, "dependencies": { - "@untool/webpack": "^1.5.1", + "@untool/webpack": "^1.6.2", "apollo-cache-inmemory": "^1.3.6", "apollo-client": "^2.5.1", "apollo-link-http": "^1.5.5", diff --git a/packages/hops/package.json b/packages/hops/package.json index 4f518fcfc..997ba07fe 100644 --- a/packages/hops/package.json +++ b/packages/hops/package.json @@ -27,10 +27,10 @@ "url": "https://github.com/xing/hops.git" }, "dependencies": { - "@untool/express": "^1.5.1", - "@untool/info": "^1.5.1", - "@untool/webpack": "^1.5.1", - "@untool/yargs": "^1.5.1", + "@untool/express": "^1.6.2", + "@untool/info": "^1.6.2", + "@untool/webpack": "^1.6.2", + "@untool/yargs": "^1.6.2", "hops-express": "^11.6.0", "hops-mixin": "^11.6.0", "hops-react": "^11.6.0", diff --git a/packages/lambda/package.json b/packages/lambda/package.json index 3023857fa..ea61cf4b1 100644 --- a/packages/lambda/package.json +++ b/packages/lambda/package.json @@ -18,8 +18,8 @@ "url": "https://github.com/xing/hops.git" }, "dependencies": { - "@untool/core": "^1.5.1", - "@untool/express": "^1.5.1", + "@untool/core": "^1.6.2", + "@untool/express": "^1.6.2", "archiver": "^3.0.0", "aws-sdk": "^2.286.2", "globby": "^9.0.0", diff --git a/packages/mixin/package.json b/packages/mixin/package.json index 2a2f05b00..86555f0b8 100644 --- a/packages/mixin/package.json +++ b/packages/mixin/package.json @@ -18,7 +18,7 @@ "url": "https://github.com/xing/hops.git" }, "dependencies": { - "@untool/core": "^1.5.1", + "@untool/core": "^1.6.2", "mixinable": "^4.0.0" }, "homepage": "https://github.com/xing/hops/tree/master/packages/mixin#readme" diff --git a/packages/pwa/package.json b/packages/pwa/package.json index 580bf61cb..076370ad6 100644 --- a/packages/pwa/package.json +++ b/packages/pwa/package.json @@ -20,8 +20,8 @@ "url": "https://github.com/xing/hops.git" }, "dependencies": { - "@untool/core": "^1.5.1", - "@untool/webpack": "^1.5.1", + "@untool/core": "^1.6.2", + "@untool/webpack": "^1.6.2", "app-manifest-loader": "^2.0.0", "file-loader": "^3.0.0", "hops-mixin": "^11.6.0", diff --git a/packages/react/package.json b/packages/react/package.json index 28d5c077e..7c256510f 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -21,8 +21,8 @@ "@babel/core": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-transform-flow-strip-types": "^7.0.0", - "@untool/core": "^1.5.1", - "@untool/react": "^1.5.1", + "@untool/core": "^1.6.2", + "@untool/react": "^1.6.2", "hops-mixin": "^11.6.0" }, "peerDependencies": { diff --git a/packages/spec/package.json b/packages/spec/package.json index c51f831f8..c272a457a 100644 --- a/packages/spec/package.json +++ b/packages/spec/package.json @@ -31,7 +31,7 @@ "jest-environment-node": "^23.4.0", "mktemp": "^0.4.0", "puppeteer": "^1.11.0", - "resolve-from": "^4.0.0", + "resolve-from": "^5.0.0", "rimraf": "^2.6.2", "url-join": "^4.0.0" }, diff --git a/yarn.lock b/yarn.lock index 9951ad951..e07b83540 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1669,10 +1669,10 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d" integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg== -"@untool/core@^1.5.1", "@untool/core@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@untool/core/-/core-1.6.1.tgz#a271015a87f153caf74dcbcef5827f9a53fb1581" - integrity sha512-OA/UMMDvSk/Z9zVhjp/qIASiDmp6bKxAEURukj+7OmoOBhxr8s4K3xyR50B25ZtLhry2Kvaf7YMjN3jOohaA7w== +"@untool/core@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@untool/core/-/core-1.6.2.tgz#00e05578c34060f2545ed99983b4103d245c1136" + integrity sha512-mAwhMul5O+jwKxciXGxx+/gcpNnVn4QUfHbjIYcvAaMmfMzAXq/vhA3ukSSfASkPE3ePkxJLkeVbvPe0aqEjDQ== dependencies: ajv "^6.9.2" check-error "^1.0.2" @@ -1688,13 +1688,13 @@ mixinable "^4.0.0" supports-color "^6.0.0" -"@untool/express@^1.5.1", "@untool/express@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@untool/express/-/express-1.6.1.tgz#3f8a35e40c3cc13ebd9473f2a6c2efc88cb620c5" - integrity sha512-Fwg55CZamP83dq4IO99JnBZyyoRPqWHw+7umxLTQVjVvJQ4dik/+5POR3UMmNkgcU6EjWZV+W5cw5XlR+AY2aA== +"@untool/express@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@untool/express/-/express-1.6.2.tgz#0af0c74acd621032064eb65d449c1a36cf879aa8" + integrity sha512-eMs9S12bBh29V49H+1CLjQfwq0DKgZtgNNQjHH5LblIiAo5v+wpw4DvmuyC0l/hT8UXxDyXIYUrIIXcnyz0g+A== dependencies: - "@untool/core" "^1.6.1" - "@untool/yargs" "^1.6.1" + "@untool/core" "^1.6.2" + "@untool/yargs" "^1.6.2" chalk "^2.4.2" debug "^4.0.0" directory-index "^0.1.0" @@ -1707,51 +1707,53 @@ mixinable "^4.0.0" morgan "^1.9.1" node-mocks-http "^1.7.0" + pathifist "^1.0.0" portfinder "^1.0.19" pretty-bytes "^5.1.0" pretty-ms "^4.0.0" split "^1.0.1" supports-color "^6.0.0" -"@untool/info@^1.5.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@untool/info/-/info-1.6.1.tgz#f2e6c1962a498f0f8444392e65dea7b26dd5e564" - integrity sha512-GwsyuEKQNIgYn+AFeCE/M99soS5NA8FpJNEfp28+NQSKZbgV67zCA65nftvuTP6EoVOJAwrNsX3YYpOHo44brQ== +"@untool/info@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@untool/info/-/info-1.6.2.tgz#2f8368ac667ae50ee0eb823d5883954af512a1d3" + integrity sha512-n5gXcV8KOFukxGX96mcbb6A4jbpsBc0QnM2379cQvMHwXg3WbdQG72g7VzHJSfeJUiZN0ea756ikTePK3Y7c9Q== dependencies: - "@untool/core" "^1.6.1" + "@untool/core" "^1.6.2" chalk "^2.4.2" duplitect "^2.0.1" enhanced-resolve "^4.1.0" mixinable "^4.0.0" -"@untool/react@^1.5.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@untool/react/-/react-1.6.1.tgz#87e8e7ab7e830bf761cb4200f810b9b602b9ba90" - integrity sha512-zeb+R4rPz0ORbxUzmpAMgTjSnXTuCBftjQZ8EdIOeF2FYF+6qtWYoJox8/CUf/BuOI43SjUJQPsqQQasXwOjbg== +"@untool/react@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@untool/react/-/react-1.6.2.tgz#154e40184eb4c3af4a25ffb6fc09bd6d9806faa0" + integrity sha512-yTIrT7jxrJq0JpUYVcjADZ2qnfLbzQOfFybpcMdA6HyA/A/17MiWDOKfpENTCAG6k4RO7W18X6b1LCC1GT3pPg== dependencies: "@babel/core" "^7.4.0" "@babel/preset-react" "^7.0.0" - "@untool/core" "^1.6.1" + "@untool/core" "^1.6.2" babel-plugin-transform-react-remove-prop-types "^0.4.19" clone "^2.1.2" duplitect "^2.0.1" is-plain-object "^2.0.4" mixinable "^4.0.0" + pathifist "^1.0.0" prop-types "^15.7.2" serialize-javascript "^1.4.0" -"@untool/webpack@^1.5.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@untool/webpack/-/webpack-1.6.1.tgz#68912d85ca55433b9e0762b9c2e1eaa43306d87f" - integrity sha512-LUT6jINL5Om6BXLww2MgzgWKJoxz6Eu9HDQqf7ANfN7Wa/IapKfuyF/eCy4nMnOWlcqpb32WbtJSvHE4dxnV9w== +"@untool/webpack@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@untool/webpack/-/webpack-1.6.2.tgz#423852f753dcc89b9dcad83e8469331ed1debf2c" + integrity sha512-0gtJY32hyXQsLe0QCC8hKiEQZpSWVSr52gvN6Ja9Kvlm8P02g6Rzyzx0bBE6+KX/CVquVpYo0cDc8IX6pHkJzA== dependencies: "@babel/core" "^7.4.0" "@babel/plugin-syntax-dynamic-import" "^7.0.0" "@babel/polyfill" "^7.4.0" "@babel/preset-env" "^7.4.2" - "@untool/core" "^1.6.1" - "@untool/express" "^1.6.1" - "@untool/yargs" "^1.6.1" + "@untool/core" "^1.6.2" + "@untool/express" "^1.6.2" + "@untool/yargs" "^1.6.2" babel-loader "8" babel-plugin-dynamic-import-node "^2.0.0" caniuse-lite "^1.0.30000898" @@ -1783,12 +1785,12 @@ webpack-hot-middleware "^2.22.2" webpack-sources "^1.1.0" -"@untool/yargs@^1.5.1", "@untool/yargs@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@untool/yargs/-/yargs-1.6.1.tgz#adb4ec0d9e46a70a8c583ff5ec16656da353582e" - integrity sha512-J0IW3giH3dEtm4Abebowt+j+3UYtl/hyg8VTzxILweC556nid9Z0jcaTJLzf2jOMbCaNK+0qnNrXex2F5H080w== +"@untool/yargs@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@untool/yargs/-/yargs-1.6.2.tgz#a06a4eb0a45c09d2cc1be5b6344d91dcf5d04a18" + integrity sha512-cQ25d9wfW0zysAAjQwXBUYUmOCKeiWyTtx8VNouYLiMZ/yqzq24bLSKaZzAZBNoxgWaoB3J2KvINXzmRbE7jcA== dependencies: - "@untool/core" "^1.6.1" + "@untool/core" "^1.6.2" mixinable "^4.0.0" yargs "^13.0.0" @@ -3277,9 +3279,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957: - version "1.0.30000958" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000958.tgz#f6307b1512bccc64269e3ac4733072454ede1fd0" - integrity sha512-+KfdlJj6IOOrYmX723ZymUttwietVOGQfVKPAkjn+hxWg6FyPVaaIq+euUDu5mK1lblkRcF4Nlw949Lrac72sA== + version "1.0.30000959" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000959.tgz#215d3455866da874179c6170202f0cc64f961cfd" + integrity sha512-6BvqmS0VLmY4sJCz6AbIJRQfcns8McDxi424y+3kmtisJeA9/5qslP+K8sqremDau7UU4WSsqdRP032JrqZY8Q== capture-exit@^1.2.0: version "1.2.0" @@ -3690,15 +3692,7 @@ conventional-changelog-writer@^4.0.3: split "^1.0.0" through2 "^2.0.0" -conventional-commits-filter@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3" - integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A== - dependencies: - is-subset "^0.1.1" - modify-values "^1.0.0" - -conventional-commits-filter@^2.0.2: +conventional-commits-filter@^2.0.1, conventional-commits-filter@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1" integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ== @@ -3706,20 +3700,7 @@ conventional-commits-filter@^2.0.2: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-parser@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c" - integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg== - dependencies: - JSONStream "^1.0.4" - is-text-path "^1.0.0" - lodash "^4.2.1" - meow "^4.0.0" - split2 "^2.0.0" - through2 "^2.0.0" - trim-off-newlines "^1.0.0" - -conventional-commits-parser@^3.0.2: +conventional-commits-parser@^3.0.1, conventional-commits-parser@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742" integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog== @@ -5855,12 +5836,12 @@ gud@^1.0.0: integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== gzip-size@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80" - integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA== + version "5.1.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.0.tgz#2db0396c71f5c902d5cf6b52add5030b93c99bd2" + integrity sha512-wfSnvypBDRW94v5W3ckvvz/zFUNdJ81VgOP6tE4bPpRUcc0wGqU+y0eZjJEvKxwubJFix6P84sE8M51YWLT7rQ== dependencies: duplexer "^0.1.1" - pify "^3.0.0" + pify "^4.0.1" handlebars@^4.0.3, handlebars@^4.1.0: version "4.1.2" @@ -6738,11 +6719,6 @@ is-stream@^1.0.1, is-stream@^1.1.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= -is-subset@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" - integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= - is-svg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" @@ -10716,6 +10692,11 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-pathname@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"