From 9be46bc79c06b59e695f59c4dafe21208672e866 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 17 Nov 2023 09:26:31 -0800 Subject: [PATCH 1/6] chore: update axios for dependabot 202 --- scripts/package.json | 2 +- scripts/yarn.lock | 79 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 70 insertions(+), 11 deletions(-) diff --git a/scripts/package.json b/scripts/package.json index 9eeaa547c0..927e9bda7a 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -16,7 +16,7 @@ "@types/js-yaml": "^4.0.4", "@types/node": "^16.11.5", "@yarnpkg/parsers": "^3.0.0-rc.44", - "axios": "^0.26.0", + "axios": "^1.6.2", "execa": "^5.1.1", "fs-extra": "^10.0.0", "glob": "^7.2.0", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 032425efab..d001a787d0 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -155,12 +155,21 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.26.0": - version: 0.26.1 - resolution: "axios@npm:0.26.1" +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d + languageName: node + linkType: hard + +"axios@npm:^1.6.2": + version: 1.6.2 + resolution: "axios@npm:1.6.2" dependencies: - follow-redirects: ^1.14.8 - checksum: 77ad7f1e6ca04fcd3fa8af1795b09d8b7c005b71a31f28d99ba40cda0bdcc12a4627801d7fac5efa62b9f667a8402bd54c669039694373bc8d44f6be611f785c + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 9b77e030e85e4f9cbcba7bb52fbff67d6ce906c92d213e0bd932346a50140faf83733bf786f55bd58301bd92f9973885c7b87d6348023e10f7eaf286d0791a1d languageName: node linkType: hard @@ -181,6 +190,15 @@ __metadata: languageName: node linkType: hard +"combined-stream@npm:^1.0.8": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" + dependencies: + delayed-stream: ~1.0.0 + checksum: 0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5 + languageName: node + linkType: hard + "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" @@ -206,6 +224,13 @@ __metadata: languageName: node linkType: hard +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19 + languageName: node + linkType: hard + "diff@npm:^4.0.1": version: 4.0.2 resolution: "diff@npm:4.0.2" @@ -240,13 +265,24 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.8": - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" +"follow-redirects@npm:^1.15.0": + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: da5932b70e63944d38eecaa16954bac4347036f08303c913d166eda74809d8797d38386e3a0eb1d2fe37d2aaff2764cce8e9dbd99459d860cf2cdfa237923b5f + checksum: 915a2cf22e667bdf47b1a43cc6b7dce14d95039e9bbf9a24d0e739abfbdfa00077dd43c86d4a7a19efefcc7a99af144920a175eedc3888d268af5df67c272ee5 + languageName: node + linkType: hard + +"form-data@npm:^4.0.0": + version: 4.0.0 + resolution: "form-data@npm:4.0.0" + dependencies: + asynckit: ^0.4.0 + combined-stream: ^1.0.8 + mime-types: ^2.1.12 + checksum: cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e languageName: node linkType: hard @@ -384,6 +420,22 @@ __metadata: languageName: node linkType: hard +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa + languageName: node + linkType: hard + +"mime-types@npm:^2.1.12": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: 1.52.0 + checksum: 82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2 + languageName: node + linkType: hard + "mimic-fn@npm:^2.1.0": version: 2.1.0 resolution: "mimic-fn@npm:2.1.0" @@ -441,6 +493,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b + languageName: node + linkType: hard + "scripts@workspace:.": version: 0.0.0-use.local resolution: "scripts@workspace:." @@ -450,7 +509,7 @@ __metadata: "@types/js-yaml": ^4.0.4 "@types/node": ^16.11.5 "@yarnpkg/parsers": ^3.0.0-rc.44 - axios: ^0.26.0 + axios: ^1.6.2 execa: ^5.1.1 fs-extra: ^10.0.0 glob: ^7.2.0 From 0edb0950c2d1fecb64d82be65d298e4f35472855 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 17 Nov 2023 09:28:27 -0800 Subject: [PATCH 2/6] chore: update axios for dependabot 206 --- packages/amplify-util-mock/package.json | 2 +- yarn.lock | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json index 68acdbc3bc..acba867761 100644 --- a/packages/amplify-util-mock/package.json +++ b/packages/amplify-util-mock/package.json @@ -42,6 +42,7 @@ "amplify-codegen": "^4.7.2", "amplify-dynamodb-simulator": "2.9.8", "amplify-storage-simulator": "1.11.3", + "axios": "^1.6.2", "chokidar": "^3.5.3", "detect-port": "^1.3.0", "dotenv": "^8.2.0", @@ -80,7 +81,6 @@ "aws-cdk-lib": "~2.80.0", "aws-sdk": "^2.1464.0", "aws-sdk-mock": "^5.8.0", - "axios": "^0.26.0", "constructs": "^10.0.5", "graphql": "^15.5.0", "graphql-auth-transformer": "^7.2.68", diff --git a/yarn.lock b/yarn.lock index 732e90c1e5..739bf0e91e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -909,7 +909,7 @@ __metadata: aws-cdk-lib: ~2.80.0 aws-sdk: ^2.1464.0 aws-sdk-mock: ^5.8.0 - axios: ^0.26.0 + axios: ^1.6.2 chokidar: ^3.5.3 constructs: ^10.0.5 detect-port: ^1.3.0 @@ -15094,6 +15094,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.6.2": + version: 1.6.2 + resolution: "axios@npm:1.6.2" + dependencies: + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 9b77e030e85e4f9cbcba7bb52fbff67d6ce906c92d213e0bd932346a50140faf83733bf786f55bd58301bd92f9973885c7b87d6348023e10f7eaf286d0791a1d + languageName: node + linkType: hard + "axobject-query@npm:^2.2.0": version: 2.2.0 resolution: "axobject-query@npm:2.2.0" From 9b9b3662365c1d2803f84ed7c484c63871c84955 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 17 Nov 2023 10:09:31 -0800 Subject: [PATCH 3/6] chore: update axios for dependabot 203 --- packages/amplify-category-auth/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json index 52d81c5551..02244c2133 100644 --- a/packages/amplify-category-auth/package.json +++ b/packages/amplify-category-auth/package.json @@ -38,7 +38,7 @@ "amplify-util-headless-input": "1.9.17", "aws-cdk-lib": "~2.80.0", "aws-sdk": "^2.1464.0", - "axios": "^0.26.0", + "axios": "^1.6.2", "chalk": "^4.1.1", "change-case": "^4.1.1", "constructs": "^10.0.5", diff --git a/yarn.lock b/yarn.lock index 739bf0e91e..79c923b92e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -224,7 +224,7 @@ __metadata: amplify-util-headless-input: 1.9.17 aws-cdk-lib: ~2.80.0 aws-sdk: ^2.1464.0 - axios: ^0.26.0 + axios: ^1.6.2 chalk: ^4.1.1 change-case: ^4.1.1 cloudform-types: ^4.2.0 From 069534418f9f8b6409bcc4a8931a80274431090b Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 17 Nov 2023 10:11:12 -0800 Subject: [PATCH 4/6] chore: update axios for dependabot 204 --- packages/amplify-cli-npm/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json index 4c8d9fea66..1b3fca666a 100644 --- a/packages/amplify-cli-npm/package.json +++ b/packages/amplify-cli-npm/package.json @@ -31,7 +31,7 @@ "node": ">=12.0.0" }, "dependencies": { - "axios": "^0.26.0", + "axios": "^1.6.2", "rimraf": "^3.0.2", "tar-stream": "^2.2.0" }, diff --git a/yarn.lock b/yarn.lock index 79c923b92e..6424e85c7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1169,7 +1169,7 @@ __metadata: dependencies: "@aws-amplify/cli-internal": 12.8.2 "@types/tar": ^6.1.1 - axios: ^0.26.0 + axios: ^1.6.2 rimraf: ^3.0.2 tar-stream: ^2.2.0 bin: From dac6bedad0bcb6692111f4a80371d380d3bc880f Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 17 Nov 2023 10:13:40 -0800 Subject: [PATCH 5/6] chore: update axios for dependabot 205 --- packages/amplify-e2e-tests/package.json | 2 +- yarn.lock | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json index c6b33eefd4..eb57b782b9 100644 --- a/packages/amplify-e2e-tests/package.json +++ b/packages/amplify-e2e-tests/package.json @@ -43,7 +43,7 @@ "aws-appsync": "^4.1.1", "aws-cdk-lib": "~2.80.0", "aws-sdk": "^2.1464.0", - "axios": "^0.26.0", + "axios": "^1.6.2", "constructs": "^10.0.5", "dotenv": "^8.2.0", "esm": "^3.2.25", diff --git a/yarn.lock b/yarn.lock index 6424e85c7b..2aaa42f008 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14121,7 +14121,7 @@ __metadata: aws-appsync: ^4.1.1 aws-cdk-lib: ~2.80.0 aws-sdk: ^2.1464.0 - axios: ^0.26.0 + axios: ^1.6.2 constructs: ^10.0.5 dotenv: ^8.2.0 esm: ^3.2.25 @@ -15074,15 +15074,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.26.0": - version: 0.26.0 - resolution: "axios@npm:0.26.0" - dependencies: - follow-redirects: ^1.14.8 - checksum: 22a8e41f1d2fc1a923fbb68b6b0025f27dbb0b51fba80124c0e432dfa347f8827d10820fa131233d222343d4790776d87b80081363c6623ad8a2e1d0586e5ee8 - languageName: node - linkType: hard - "axios@npm:^1.0.0": version: 1.3.2 resolution: "axios@npm:1.3.2" @@ -19998,7 +19989,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: From b507cebdf0acae135a12926dfac75ca6d7e81be3 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 17 Nov 2023 13:06:16 -0800 Subject: [PATCH 6/6] chore: yarn dedupe --- yarn.lock | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2aaa42f008..77beedfe3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15074,18 +15074,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.0.0": - version: 1.3.2 - resolution: "axios@npm:1.3.2" - dependencies: - follow-redirects: ^1.15.0 - form-data: ^4.0.0 - proxy-from-env: ^1.1.0 - checksum: 163f4b41e7a447b17aa131cd915aea0cf35aa00eb62531292c66359436dc16eef82cab64a5dc2cafcb612744b34789fa84615031cd06a55ac982e7add14e4468 - languageName: node - linkType: hard - -"axios@npm:^1.6.2": +"axios@npm:^1.0.0, axios@npm:^1.6.2": version: 1.6.2 resolution: "axios@npm:1.6.2" dependencies: