From d22cd58db38617b1c7958d75bdcfe850aa8af93a Mon Sep 17 00:00:00 2001 From: Michael Bradley Date: Fri, 25 Oct 2019 12:04:51 -0500 Subject: [PATCH] reorg some deps from packages/embark to the packages that actually depend on them (#1990) * build(deps): move @types/os-locale from packages/embark to packages/core/i18n * build(deps) move @types/globule from packages/embark to packages/plugins/coverage * build(deps): refactor stack/{api,proxy,webserver} deps relative to packages/embark * build(deps): remove unneeded @types/async dep from packages/stack/test-runner * build(deps): remove unneeded deps from packages/embark --- packages/core/i18n/package.json | 1 + packages/embark/package.json | 19 +- packages/plugins/coverage/package.json | 1 + packages/stack/api/package.json | 14 +- packages/stack/api/src/server.ts | 2 +- packages/stack/proxy/package.json | 3 + packages/stack/test-runner/package.json | 1 - packages/stack/webserver/package.json | 3 +- yarn.lock | 283 +++--------------------- 9 files changed, 57 insertions(+), 270 deletions(-) diff --git a/packages/core/i18n/package.json b/packages/core/i18n/package.json index c2321d5ae..f41544228 100644 --- a/packages/core/i18n/package.json +++ b/packages/core/i18n/package.json @@ -50,6 +50,7 @@ }, "devDependencies": { "@types/i18n": "0.8.3", + "@types/os-locale": "2.1.0", "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", "rimraf": "3.0.0", diff --git a/packages/embark/package.json b/packages/embark/package.json index 8ce3c15b1..3b6f9512e 100644 --- a/packages/embark/package.json +++ b/packages/embark/package.json @@ -61,7 +61,6 @@ "ascii-table": "0.0.9", "async": "2.6.1", "bip39": "3.0.2", - "body-parser": "1.19.0", "chalk": "2.4.2", "clone-deep": "4.0.0", "colors": "1.3.2", @@ -131,7 +130,6 @@ "fs-extra": "8.1.0", "glob": "7.1.4", "globule": "1.2.1", - "helmet": "3.13.0", "hosted-git-info": "2.7.1", "http-proxy": "1.17.0", "ipfs-api": "17.2.4", @@ -150,7 +148,6 @@ "promptly": "2.2.0", "propose": "0.0.5", "pump": "3.0.0", - "remix-tests": "0.1.1", "request": "2.88.0", "semver": "5.6.0", "shelljs": "0.8.3", @@ -182,23 +179,9 @@ "web3-providers-ws": "1.2.1", "web3-shh": "1.2.1", "web3-utils": "1.2.1", - "window-size": "1.1.1", - "yo-yoify": "4.3.0" + "window-size": "1.1.1" }, "devDependencies": { - "@types/async": "2.0.50", - "@types/body-parser": "1.17.1", - "@types/cors": "2.8.4", - "@types/express": "4.17.1", - "@types/express-ws": "3.0.0", - "@types/find-up": "2.1.0", - "@types/globule": "1.1.3", - "@types/helmet": "0.0.42", - "@types/i18n": "0.8.3", - "@types/node": "12.7.8", - "@types/os-locale": "2.1.0", - "@types/request": "2.48.3", - "@types/web3": "1.0.12", "chai": "4.1.2", "embark-solo": "^4.1.1", "embark-test-contract-0": "0.0.2", diff --git a/packages/plugins/coverage/package.json b/packages/plugins/coverage/package.json index f15545354..f6967ef64 100644 --- a/packages/plugins/coverage/package.json +++ b/packages/plugins/coverage/package.json @@ -57,6 +57,7 @@ "@babel/cli": "7.6.4", "@babel/core": "7.6.4", "@types/fs-extra": "7.0.0", + "@types/globule": "1.1.3", "@types/mocha": "5.2.7", "@types/prettier": "1.16.4", "@types/semver": "5.5.0", diff --git a/packages/stack/api/package.json b/packages/stack/api/package.json index ad48d230d..7c964eed2 100644 --- a/packages/stack/api/package.json +++ b/packages/stack/api/package.json @@ -43,11 +43,23 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.6.3", + "body-parser": "1.19.0", "colors": "1.3.2", + "cors": "2.8.5", "embark-i18n": "^4.1.1", - "embark-utils": "^4.1.1" + "embark-utils": "^4.1.1", + "express": "4.17.1", + "express-ws": "4.0.0", + "find-up": "4.1.0", + "helmet": "3.13.0" }, "devDependencies": { + "@types/body-parser": "1.17.1", + "@types/cors": "2.8.6", + "@types/express": "4.17.1", + "@types/express-ws": "3.0.0", + "@types/find-up": "4.0.0", + "@types/helmet": "0.0.42", "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", "rimraf": "3.0.0", diff --git a/packages/stack/api/src/server.ts b/packages/stack/api/src/server.ts index f08b0e3ec..73d0a9b93 100644 --- a/packages/stack/api/src/server.ts +++ b/packages/stack/api/src/server.ts @@ -37,7 +37,7 @@ export default class Server { this.monorepoRootPath = monorepoRootPathSync(); } // in the monorepo and other deduped installs embark-ui may be in a higher-up node_modules - const foundEmbarkUi = findUp.sync("node_modules/embark-ui", {cwd: embarkPath()}); + const foundEmbarkUi = findUp.sync("node_modules/embark-ui", {cwd: embarkPath(), type: "directory"}); if (foundEmbarkUi) { this.embarkUiBuildDir = path.join(foundEmbarkUi, "build"); } diff --git a/packages/stack/proxy/package.json b/packages/stack/proxy/package.json index ecc55a10e..5c45a2093 100644 --- a/packages/stack/proxy/package.json +++ b/packages/stack/proxy/package.json @@ -55,6 +55,9 @@ "web3-core-requestmanager": "1.2.1" }, "devDependencies": { + "@types/cors": "2.8.6", + "@types/express": "4.17.1", + "@types/express-ws": "3.0.0", "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", diff --git a/packages/stack/test-runner/package.json b/packages/stack/test-runner/package.json index 6564e9c99..4caff3f44 100644 --- a/packages/stack/test-runner/package.json +++ b/packages/stack/test-runner/package.json @@ -60,7 +60,6 @@ "web3": "1.2.1" }, "devDependencies": { - "@types/async": "2.0.50", "embark-solo": "^4.1.1", "eslint": "5.7.0", "mocha": "6.2.0", diff --git a/packages/stack/webserver/package.json b/packages/stack/webserver/package.json index 67fe374f9..04c0e882a 100644 --- a/packages/stack/webserver/package.json +++ b/packages/stack/webserver/package.json @@ -45,8 +45,7 @@ "async": "2.6.1", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", - "express": "4.16.3", - "express-http-proxy": "1.5.1", + "express": "4.17.1", "express-ws": "4.0.0", "open": "6.4.0", "serve-static": "1.13.2" diff --git a/yarn.lock b/yarn.lock index 86e7cc0aa..6efedeef7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3194,11 +3194,6 @@ "@types/connect" "*" "@types/node" "*" -"@types/caseless@*": - version "0.12.2" - resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" - integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== - "@types/connect@*": version "3.4.32" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28" @@ -3206,10 +3201,10 @@ dependencies: "@types/node" "*" -"@types/cors@2.8.4": - version "2.8.4" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.4.tgz#50991a759a29c0b89492751008c6af7a7c8267b0" - integrity sha512-ipZjBVsm2tF/n8qFGOuGBkUij9X9ZswVi9G3bx/6dz7POpVa6gVHcj1wsX/LVEn9MMF41fxK/PnZPPoTD1UFPw== +"@types/cors@2.8.6": + version "2.8.6" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.6.tgz#cfaab33c49c15b1ded32f235111ce9123009bd02" + integrity sha512-invOmosX0DqbpA+cE2yoHGUlF/blyf7nB0OGYBBiH27crcVm5NmFaZkLP4Ta1hGaesckCi5lVLlydNJCxkTOSg== dependencies: "@types/express" "*" @@ -3249,10 +3244,12 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" -"@types/find-up@2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/find-up/-/find-up-2.1.0.tgz#f5be9e3679e8780922204e7d0f4b4dca8041ded6" - integrity sha512-pPhwx7R/8hCm5lw9h8EExqmNLCvIpQ+PgWd/dWg3JBaehDaT2A0KgmHwgrYwGG6tDLLszfWBjEHDzbTqlrKlzg== +"@types/find-up@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/find-up/-/find-up-4.0.0.tgz#6b74a76670477a23f0793cfaf2dafc86df59723a" + integrity sha512-QlRNKeOPFWKisbNtKVOOGXw3AeLbkw8UmT/EyEGM6brfqpYffKBcch7f1y40NYN9O90aK2+K0xBMDJfOAsg2qg== + dependencies: + find-up "*" "@types/follow-redirects@1.5.0": version "1.5.0" @@ -3384,16 +3381,6 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== -"@types/request@2.48.3": - version "2.48.3" - resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.3.tgz#970b8ed2317568c390361d29c555a95e74bd6135" - integrity sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w== - dependencies: - "@types/caseless" "*" - "@types/node" "*" - "@types/tough-cookie" "*" - form-data "^2.5.0" - "@types/semver@5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" @@ -3412,11 +3399,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== -"@types/tough-cookie@*": - version "2.3.5" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.5.tgz#9da44ed75571999b65c37b60c9b2b88db54c585d" - integrity sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg== - "@types/underscore@*": version "1.9.2" resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.9.2.tgz#2c4f7743287218f5c2d9a83db3806672aa48530d" @@ -5016,22 +4998,6 @@ bn.js@^1.0.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-1.3.0.tgz#0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83" integrity sha1-DbTL+W+PI7dC9by50ap6mZSgXoM= -body-parser@1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" - integrity sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ= - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.1" - http-errors "~1.6.2" - iconv-lite "0.4.19" - on-finished "~2.3.0" - qs "6.5.1" - raw-body "2.3.2" - type-is "~1.6.15" - body-parser@1.19.0, body-parser@^1.16.0, body-parser@^1.18.2: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -6180,11 +6146,6 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= - content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -6302,11 +6263,6 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" @@ -6895,7 +6851,7 @@ debug@3.1.0, debug@=3.1.0: dependencies: ms "2.0.0" -debug@3.2.6, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: +debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -7146,12 +7102,7 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" - integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k= - -depd@~1.1.1, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -7751,7 +7702,7 @@ es6-map@^0.1.3: es6-symbol "~3.1.1" event-emitter "~0.3.5" -es6-promise@^4.0.3, es6-promise@^4.1.1: +es6-promise@^4.0.3: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== @@ -8807,15 +8758,6 @@ expect@^24.9.0: jest-message-util "^24.9.0" jest-regex-util "^24.9.0" -express-http-proxy@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/express-http-proxy/-/express-http-proxy-1.5.1.tgz#cbf45695c759693c9c5f946117462d25b57e77a8" - integrity sha512-k1RdysZWZ8wdPnsLa4iyrrYyUFih/sYKkn6WfkU/q5A8eUdh3l+oXhrRuQmEYEsZmiexVvpiOCkogl03jYfcbg== - dependencies: - debug "^3.0.1" - es6-promise "^4.1.1" - raw-body "^2.3.0" - express-ws@4.0.0, express-ws@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/express-ws/-/express-ws-4.0.0.tgz#dabd8dc974516418902a41fe6e30ed949b4d36c4" @@ -8823,42 +8765,6 @@ express-ws@4.0.0, express-ws@^4.0.0: dependencies: ws "^5.2.0" -express@4.16.3: - version "4.16.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53" - integrity sha1-avilAjUNsyRuzEvs9rWjTSL37VM= - dependencies: - accepts "~1.3.5" - array-flatten "1.1.1" - body-parser "1.18.2" - content-disposition "0.5.2" - content-type "~1.0.4" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.1.1" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.2" - path-to-regexp "0.1.7" - proxy-addr "~2.0.3" - qs "6.5.1" - range-parser "~1.2.0" - safe-buffer "5.1.1" - send "0.16.2" - serve-static "1.13.2" - setprototypeof "1.1.0" - statuses "~1.4.0" - type-is "~1.6.16" - utils-merge "1.0.1" - vary "~1.1.2" - express@4.17.1, express@^4.14.0, express@^4.16.2, express@^4.16.3, express@^4.17.0: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -9182,19 +9088,6 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" -finalhandler@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" - integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.4.0" - unpipe "~1.0.0" - finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -9248,6 +9141,14 @@ find-root@^1.0.0, find-root@^1.1.0: resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== +find-up@*, find-up@4.1.0, find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + find-up@2.1.0, find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -9262,14 +9163,6 @@ find-up@3.0.0, find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@4.1.0, find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -9427,7 +9320,7 @@ fork-ts-checker-webpack-plugin@1.5.0: tapable "^1.0.0" worker-rpc "^0.1.0" -form-data@2.5.1, form-data@^2.5.0: +form-data@2.5.1: version "2.5.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== @@ -10509,16 +10402,6 @@ http-deceiver@^1.2.7: resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= -http-errors@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" - integrity sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY= - dependencies: - depd "1.1.1" - inherits "2.0.3" - setprototypeof "1.0.3" - statuses ">= 1.3.1 < 2" - http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -10530,17 +10413,6 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@1.7.3, http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -10551,6 +10423,17 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-https@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/http-https/-/http-https-1.0.0.tgz#2f908dd5f1db4068c058cd6e6d4ce392c913389b" @@ -10641,11 +10524,6 @@ i18n@0.8.3: mustache "*" sprintf-js ">=1.0.3" -iconv-lite@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" - integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ== - iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -16076,7 +15954,7 @@ protons@^1.0.0, protons@^1.0.1: signed-varint "^2.0.1" varint "^5.0.0" -proxy-addr@~2.0.3, proxy-addr@~2.0.5: +proxy-addr@~2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== @@ -16194,11 +16072,6 @@ q@^1.1.2, q@^1.5.1: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" - integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== - qs@6.5.2, qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -16293,16 +16166,6 @@ range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" - integrity sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k= - dependencies: - bytes "3.0.0" - http-errors "1.6.2" - iconv-lite "0.4.19" - unpipe "1.0.0" - raw-body@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" @@ -16313,16 +16176,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@^2.3.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c" - integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA== - dependencies: - bytes "3.1.0" - http-errors "1.7.3" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-2.0.0.tgz#e2813d9e1e3f80d1bbade5ad082e809679e20c26" @@ -17366,21 +17219,6 @@ remix-lib-debugtest@latest: solc "^0.4.13" web3 "0.20.6" -remix-lib@0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/remix-lib/-/remix-lib-0.4.1.tgz#513e78794bdbd407b282797cd16018d9a95692c8" - integrity sha512-7k/O2GkJL7SqUID3a9ResfQ4X6G4JpJtneyjo7EGVpp18ZxPC57AiQ982+DBPzPcnWQ1NHgDFLtxKOZRmJ5yKg== - dependencies: - async "^2.1.2" - ethereumjs-block "^1.6.0" - ethereumjs-tx "^1.3.3" - ethereumjs-util "^5.1.2" - ethereumjs-vm "2.4.0" - ethers "^3.0.15" - fast-async "^6.1.2" - solc "^0.5.0" - web3 "0.20.6" - remix-lib@0.4.8: version "0.4.8" resolved "https://registry.yarnpkg.com/remix-lib/-/remix-lib-0.4.8.tgz#ddcb029748218ab169b0480e609aa9a06a604a8d" @@ -17397,22 +17235,6 @@ remix-lib@0.4.8: solc "^0.5.0" web3 "0.20.6" -remix-simulator@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/remix-simulator/-/remix-simulator-0.1.1.tgz#212155aba73478af96aa61d89fcb41f71ad1ed74" - integrity sha512-9sNS5+X8Zf80mYBp5sNVS62sAy8Irb9I18n41cOGE3C5SwxY2w60TfUHC9BHNJFWzXKK7tWvBoCpGRGkJMY9Bw== - dependencies: - ansi-gray "^0.1.1" - body-parser "^1.18.2" - color-support "^1.1.3" - express "^4.16.3" - express-ws "^4.0.0" - fast-async "^6.3.7" - merge "^1.2.0" - remix-lib "0.4.1" - time-stamp "^2.0.0" - web3 "1.0.0-beta.27" - remix-simulator@0.1.9-alpha: version "0.1.9-alpha" resolved "https://registry.yarnpkg.com/remix-simulator/-/remix-simulator-0.1.9-alpha.tgz#b8d9e5436c88f78e85d9bdfb1d177fe895408817" @@ -17433,18 +17255,6 @@ remix-simulator@0.1.9-alpha: time-stamp "^2.0.0" web3 "1.0.0-beta.27" -remix-solidity@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/remix-solidity/-/remix-solidity-0.3.1.tgz#e3a8cda2e54a79533c95b35a76ceb386c35a57cb" - integrity sha512-pbkupoKsY37TGlrX2HHrKzlDZB5Z8aWOMPddTPtjm/eztJEGRHlscr4pCrArD9FYeLijp5KdarYXj0pf9fx5GA== - dependencies: - ethereumjs-util "^4.5.0" - ethereumjs-vm "2.4.0" - fast-async "^6.1.2" - remix-lib "0.4.1" - solc "^0.5.0" - webworkify "^1.2.1" - remix-solidity@0.3.11: version "0.3.11" resolved "https://registry.yarnpkg.com/remix-solidity/-/remix-solidity-0.3.11.tgz#6ea52c15b1cbbbb10a365b2f6c8279503e41f9ca" @@ -17457,22 +17267,6 @@ remix-solidity@0.3.11: solc "^0.5.0" webworkify "^1.2.1" -remix-tests@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/remix-tests/-/remix-tests-0.1.1.tgz#52352d07a905d1eb62786c49f9d121a91de2ea84" - integrity sha512-YnNxcyOrw8NvW6XkAuT1g3+xAhAQX+ks8acFfrk7CVsBkbUg56i5jLN+4OtrcbNuFkWgHAH8EUuiXU6JBQamIg== - dependencies: - async "^2.6.0" - change-case "^3.0.1" - colors "^1.1.2" - commander "^2.13.0" - remix-lib "0.4.1" - remix-simulator "0.1.1" - remix-solidity "0.3.1" - signale "^1.2.1" - web3 "1.0.0-beta.36" - winston "^3.0.0" - remix-tests@0.1.14: version "0.1.14" resolved "https://registry.yarnpkg.com/remix-tests/-/remix-tests-0.1.14.tgz#015f54f2ff5ad017b5e4a811b88cbe400326b9f2" @@ -18243,11 +18037,6 @@ setimmediate@^1.0.4, setimmediate@^1.0.5: resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= -setprototypeof@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" - integrity sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ= - setprototypeof@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" @@ -18906,7 +18695,7 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -19912,7 +19701,7 @@ type-fest@^0.5.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== -type-is@~1.6.15, type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==