From d6f2ce2b5a0d532edc98d90660e91b5116e89f4d Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 24 Nov 2022 09:21:09 +0100 Subject: [PATCH] update --- libs/remix-tests/package.json | 2 +- libs/remix-tests/tests/testRunner.cli.spec.ts | 4 ++++ libs/remix-url-resolver/package.json | 2 +- libs/remixd/package.json | 2 +- package.json | 2 +- yarn.lock | 21 ++++++++++++++++++- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 25ac9ab340..9811df595c 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -46,7 +46,7 @@ "@remix-project/remix-url-resolver": "^0.0.40", "ansi-gray": "^0.1.1", "async": "^2.6.0", - "axios": ">=0.21.1", + "axios": "1.1.3", "change-case": "^3.0.1", "color-support": "^1.1.3", "colors": "1.4.0", diff --git a/libs/remix-tests/tests/testRunner.cli.spec.ts b/libs/remix-tests/tests/testRunner.cli.spec.ts index a7b9953dd9..6cdaf68ae9 100644 --- a/libs/remix-tests/tests/testRunner.cli.spec.ts +++ b/libs/remix-tests/tests/testRunner.cli.spec.ts @@ -11,6 +11,10 @@ describe('testRunner: remix-tests CLI', () => { const dirContent = result.stdout.toString() // Install dependencies if 'node_modules' is not already present if(!dirContent.includes('node_modules')) { + execSync('yarn add @remix-project/remix-lib ../../libs/remix-lib', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') }) + execSync('yarn add @remix-project/remix-url-resolver ../../libs/remix-url-resolver', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') }) + execSync('yarn add @remix-project/remix-solidity ../../libs/remix-solidity', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') }) + execSync('yarn add @remix-project/remix-simulator ../../libs/remix-simulator', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') }) execSync('yarn install', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') }) } } diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index 92f3af9e9c..41750fbf2d 100644 --- a/libs/remix-url-resolver/package.json +++ b/libs/remix-url-resolver/package.json @@ -25,7 +25,7 @@ "license": "MIT", "dependencies": { "@erebos/bzz-node": "^0.13.0", - "axios": ">=0.21.1", + "axios": "1.1.3", "url": "^0.11.0", "valid-url": "^1.0.9" }, diff --git a/libs/remixd/package.json b/libs/remixd/package.json index c0f9a673f7..857456d346 100644 --- a/libs/remixd/package.json +++ b/libs/remixd/package.json @@ -40,7 +40,7 @@ "@remixproject/plugin-api": "^0.3.11", "@remixproject/plugin-utils": "^0.3.11", "@remixproject/plugin-ws": "^0.3.11", - "axios": ">=0.21.1", + "axios": "1.1.3", "chokidar": "^2.1.8", "commander": "^2.20.3", "fs-extra": "^3.0.1", diff --git a/package.json b/package.json index f25adea484..bd56a51828 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "@types/nightwatch": "^2.3.1", "ansi-gray": "^0.1.1", "async": "^2.6.2", - "axios": ">=0.26.0", + "axios": "1.1.2", "bootstrap": "^5.1.3", "brace": "^0.8.0", "change-case": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index 8000846047..911c4a35b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5866,13 +5866,22 @@ axe-core@^4.0.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5" integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA== -axios@*, axios@>=0.26.0: +axios@*: version "0.26.0" resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928" integrity sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og== dependencies: follow-redirects "^1.14.8" +axios@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.2.tgz#8b6f6c540abf44ab98d9904e8daf55351ca4a331" + integrity sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axios@^0.21.1: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" @@ -11268,6 +11277,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.12.1, follow-redirects@^1.14.0, fol resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + for-each@~0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -19426,6 +19440,11 @@ proxy-addr@~2.0.5: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"