Skip to content

Commit 95b10c7

Browse files
authored
Merge branch 'master' into brandon/BB2-4035-manual-upgrade-linters
2 parents df3d0a6 + 062a5ca commit 95b10c7

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@types/react": "^18.2.0",
1010
"@types/react-dom": "^18.2.0",
1111
"@vitejs/plugin-react-swc": "^3.7.2",
12-
"axios": "^1.7.4",
12+
"axios": "^1.12.0",
1313
"micromatch": "4.0.8",
1414
"process": "^0.11.10",
1515
"react": "^18.2.0",

client/yarn.lock

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3190,11 +3190,13 @@ available-typed-arrays@^1.0.7:
31903190
axe-core@^4.10.0:
31913191
version "4.10.2"
31923192

3193-
axios@^1.7.4:
3194-
version "1.7.8"
3193+
axios@^1.12.0:
3194+
version "1.12.2"
3195+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.2.tgz#6c307390136cf7a2278d09cec63b136dfc6e6da7"
3196+
integrity sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==
31953197
dependencies:
31963198
follow-redirects "^1.15.6"
3197-
form-data "^4.0.0"
3199+
form-data "^4.0.4"
31983200
proxy-from-env "^1.1.0"
31993201

32003202
axobject-query@^4.1.0:
@@ -4371,6 +4373,17 @@ form-data@^4.0.0:
43714373
combined-stream "^1.0.8"
43724374
mime-types "^2.1.12"
43734375

4376+
form-data@^4.0.4:
4377+
version "4.0.4"
4378+
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
4379+
integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
4380+
dependencies:
4381+
asynckit "^0.4.0"
4382+
combined-stream "^1.0.8"
4383+
es-set-tostringtag "^2.1.0"
4384+
hasown "^2.0.2"
4385+
mime-types "^2.1.12"
4386+
43744387
fsevents@~2.3.2, fsevents@~2.3.3:
43754388
version "2.3.3"
43764389
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
@@ -6232,7 +6245,7 @@ string-natural-compare@^3.0.1:
62326245

62336246
"string-width-cjs@npm:string-width@^4.2.0":
62346247
version "4.2.3"
6235-
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
6248+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
62366249
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
62376250
dependencies:
62386251
emoji-regex "^8.0.0"
@@ -6332,6 +6345,13 @@ string.prototype.trimstart@^1.0.8:
63326345
dependencies:
63336346
ansi-regex "^5.0.1"
63346347

6348+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
6349+
version "6.0.1"
6350+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
6351+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
6352+
dependencies:
6353+
ansi-regex "^5.0.1"
6354+
63356355
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
63366356
version "6.0.1"
63376357
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -6839,7 +6859,7 @@ wrap-ansi@^6.2.0:
68396859

68406860
wrap-ansi@^7.0.0:
68416861
version "7.0.0"
6842-
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
6862+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
68436863
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
68446864
dependencies:
68456865
ansi-styles "^4.0.0"

0 commit comments

Comments
 (0)