Skip to content

Commit b7863d8

Browse files
authored
Merge pull request #5743 from BitGo/fix-axios-version
fix: upgraded axios to 1.8.2 and added in resolutions
2 parents 80ed436 + 6bdddf8 commit b7863d8

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"eslint-plugin-jsdoc": "^33.0.0",
2626
"eslint-plugin-prettier": "^3.4.0",
2727
"execa": "^5.0.0",
28+
"formidable": "3.2.4",
2829
"glob": "^7.1.3",
2930
"html-webpack-plugin": "^5.5.0",
3031
"https-browserify": "^1.0.0",
@@ -36,7 +37,6 @@
3637
"mocha": "^9.2.0",
3738
"nock": "^13.3.1",
3839
"nyc": "^15.1.0",
39-
"formidable": "3.2.4",
4040
"parse-url": "^8.1.0",
4141
"prettier": "^2.3.0",
4242
"process": "^0.11.10",
@@ -55,8 +55,8 @@
5555
"url": "^0.11.0",
5656
"webpack": "5.98.0",
5757
"webpack-cli": "^4.9.1",
58-
"yeoman-generator": "^5.6.1",
59-
"yargs": "^17.7.2"
58+
"yargs": "^17.7.2",
59+
"yeoman-generator": "^5.6.1"
6060
},
6161
"resolutions": {
6262
"@ethereumjs/util": "8.0.3",
@@ -83,7 +83,8 @@
8383
"socks": "2.7.3",
8484
"web3-utils": "4.2.1",
8585
"@polkadot/api": "14.1.1",
86-
"elliptic": "^6.6.1"
86+
"elliptic": "^6.6.1",
87+
"axios": "^1.8.2"
8788
},
8889
"workspaces": [
8990
"modules/*"
@@ -122,6 +123,7 @@
122123
"prepare-commit-msg": "node ./scripts/prepare-commit-msg.js"
123124
},
124125
"dependencies": {
126+
"axios": "^1.8.2",
125127
"terser": "^5.14.2",
126128
"tmp": "^0.2.3"
127129
},

yarn.lock

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6932,6 +6932,15 @@ axios@^1.0.0, axios@^1.3.1, axios@^1.3.4, axios@^1.4.0, axios@^1.6.0:
69326932
form-data "^4.0.0"
69336933
proxy-from-env "^1.1.0"
69346934

6935+
axios@^1.8.2:
6936+
version "1.8.2"
6937+
resolved "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
6938+
integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
6939+
dependencies:
6940+
follow-redirects "^1.15.6"
6941+
form-data "^4.0.0"
6942+
proxy-from-env "^1.1.0"
6943+
69356944
b64-lite@^1.3.1, b64-lite@^1.4.0:
69366945
version "1.4.0"
69376946
resolved "https://registry.npmjs.org/b64-lite/-/b64-lite-1.4.0.tgz#e62442de11f1f21c60e38b74f111ac0242283d3d"

0 commit comments

Comments
 (0)