From adf0d7f05d52c8cd513355c97cc4cee5c2b194c6 Mon Sep 17 00:00:00 2001 From: Iain Sproat <68657+iainsproat@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:15:51 +0100 Subject: [PATCH] chore(deps): tidy up resolutions (#2390) * remove resolution for @babel/traverse * remove resolution for undici * ensure word-wrap is minimum, not pinned * remove axios * express: define resolution more specifically * fast-xml-parser: define resolution more specifically * serialize-javascript: define resolution with more specificity * tough-cookie: resolutions defined with more specifity * word-wrap: the original package is fixed so resolution can be removed * xml2js: remove resolution as all dependencies now meet resolution criteria * resolutions in alphabetical order --- package.json | 23 ++++++------- yarn.lock | 96 +++++++++++++++++++++++++++------------------------- 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index 6195a6467..9fa9db991 100644 --- a/package.json +++ b/package.json @@ -65,35 +65,32 @@ "zx": "^8.1.2" }, "resolutions": { - "@babel/traverse": ">=7.23.2", + "@aws-sdk/client-sts/fast-xml-parser": ">=4.2.5", + "@aws-sdk/client-s3/fast-xml-parser": ">=4.2.5", + "@bull-board/express/express": ">=4.19.2", + "@datadog/datadog-ci/ws": "^7.5.10", "@microsoft/api-extractor/semver": "^7.5.4", "@rushstack/node-core-library/semver": "^7.5.4", "@typescript-eslint/eslint-plugin": "^7.12.0", "@typescript-eslint/parser": "^7.12.0", - "typescript-eslint": "^7.12.0", "@types/react": "file:./packages/frontend-2/type-augmentations/stubs/types__react", - "axios": ">=1.6.0", "core-js": "3.22.4", "core-js-compat/semver": "^7.5.4", "eslint": "^9.4.0", "eslint-config-prettier": "^9.1.0", - "express": ">=4.19.2", - "fast-xml-parser": ">=4.2.5", "graphql": "^15.3.0", "levelup/bl": ">=1.2.3", "levelup/semver": ">=5.7.2", + "mocha/serialize-javascript": ">=6.0.2", "prettier": "^2.8.7", - "serialize-javascript": ">=6.0.2", + "puppeteer-core/ws": "^8.17.1", + "request/tough-cookie": ">=4.1.3", + "rollup-plugin-terser/serialize-javascript": ">=6.0.2", "simple-update-notifier/semver": "^7.5.4", - "tough-cookie": ">=4.1.3", "tslib": "^2.3.1", "typescript": "^5.2.2", - "undici": "^5.28.4", - "wait-on": ">=7.2.0", - "word-wrap": "npm:@aashutoshrathi/word-wrap@^1.2.4", - "xml2js": ">=0.5.0", - "puppeteer-core/ws": "^8.17.1", - "@datadog/datadog-ci/ws": "^7.5.10" + "typescript-eslint": "^7.12.0", + "wait-on": ">=7.2.0" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index a559c31b9..32fdd79ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3473,15 +3473,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-hoist-variables@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-hoist-variables@npm:7.22.5" - dependencies: - "@babel/types": "npm:^7.22.5" - checksum: 10/394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc - languageName: node - linkType: hard - "@babel/helper-hoist-variables@npm:^7.24.7": version: 7.24.7 resolution: "@babel/helper-hoist-variables@npm:7.24.7" @@ -8272,21 +8263,21 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:>=7.23.2": - version: 7.23.2 - resolution: "@babel/traverse@npm:7.23.2" +"@babel/traverse@npm:^7.0.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.7, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.10, @babel/traverse@npm:^7.17.3, @babel/traverse@npm:^7.17.9, @babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2, @babel/traverse@npm:^7.18.5, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6, @babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.22.11, @babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3, @babel/traverse@npm:^7.23.4, @babel/traverse@npm:^7.23.9, @babel/traverse@npm:^7.24.0, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/traverse@npm:7.24.7" dependencies: - "@babel/code-frame": "npm:^7.22.13" - "@babel/generator": "npm:^7.23.0" - "@babel/helper-environment-visitor": "npm:^7.22.20" - "@babel/helper-function-name": "npm:^7.23.0" - "@babel/helper-hoist-variables": "npm:^7.22.5" - "@babel/helper-split-export-declaration": "npm:^7.22.6" - "@babel/parser": "npm:^7.23.0" - "@babel/types": "npm:^7.23.0" - debug: "npm:^4.1.0" + "@babel/code-frame": "npm:^7.24.7" + "@babel/generator": "npm:^7.24.7" + "@babel/helper-environment-visitor": "npm:^7.24.7" + "@babel/helper-function-name": "npm:^7.24.7" + "@babel/helper-hoist-variables": "npm:^7.24.7" + "@babel/helper-split-export-declaration": "npm:^7.24.7" + "@babel/parser": "npm:^7.24.7" + "@babel/types": "npm:^7.24.7" + debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10/e4fcb8f8395804956df4ae1301230a14b6eb35b74a7058a0e0b40f6f4be7281e619e6dafe400e833d4512da5d61cf17ea177d04b00a8f7cf3d8d69aff83ca3d8 + checksum: 10/785cf26383a992740e492efba7016de964cd06c05c9d7146fa1b5ead409e054c444f50b36dc37856884a56e32cf9d3105ddf1543486b6df68300bffb117a245a languageName: node linkType: hard @@ -23481,14 +23472,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:>=1.6.0": - version: 1.6.4 - resolution: "axios@npm:1.6.4" +"axios@npm:^1.0.0, axios@npm:^1.6.0, axios@npm:^1.6.1, axios@npm:^1.6.5, axios@npm:^1.6.8": + version: 1.7.2 + resolution: "axios@npm:1.7.2" dependencies: - follow-redirects: "npm:^1.15.4" + follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10/ed15229f447dd81a5a9e3dac5c84d64f8598145b1102fb6f8c5feb0d02d0dafaef7bf071d2575a7687dd0c014b9da2edbcff59ee9a57b59da941ae673b938919 + checksum: 10/6ae80dda9736bb4762ce717f1a26ff997d94672d3a5799ad9941c24d4fb019c1dff45be8272f08d1975d7950bac281f3ba24aff5ecd49ef5a04d872ec428782f languageName: node linkType: hard @@ -30143,7 +30134,7 @@ __metadata: languageName: node linkType: hard -"express@npm:>=4.19.2": +"express@npm:>=4.19.2, express@npm:^4.17.3, express@npm:^4.19.2": version: 4.19.2 resolution: "express@npm:4.19.2" dependencies: @@ -30392,14 +30383,25 @@ __metadata: languageName: node linkType: hard -"fast-xml-parser@npm:>=4.2.5": - version: 4.2.6 - resolution: "fast-xml-parser@npm:4.2.6" +"fast-xml-parser@npm:4.2.5": + version: 4.2.5 + resolution: "fast-xml-parser@npm:4.2.5" dependencies: strnum: "npm:^1.0.5" bin: fxparser: src/cli/cli.js - checksum: 10/b44fff2405149cf485114eeb9148566efb0b8078f9618d352455f655d35a81c0e30d93f2aecfc8307e4da17d0486c052bf7a986cad343ee5e1730045bac2c961 + checksum: 10/4be7ebe24d6a9a60c278e1423cd86a7da9a77ec64c95563e2c552363caf7a777e0c87c9de1255c2f4e8dea9bce8905dc2bdc58a34e9f2b73c4693654456ad284 + languageName: node + linkType: hard + +"fast-xml-parser@npm:>=4.2.5, fast-xml-parser@npm:^4.2.5": + version: 4.4.0 + resolution: "fast-xml-parser@npm:4.4.0" + dependencies: + strnum: "npm:^1.0.5" + bin: + fxparser: src/cli/cli.js + checksum: 10/f1592fa810d3923c46c7037d5adf1c309580d1d14780312019f33e4967f6ffcb5632168a5e889fe9d30794f6a087a0a095bb21cdf62320a96c6b304395212658 languageName: node linkType: hard @@ -30817,7 +30819,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6": version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" peerDependenciesMeta: @@ -46165,7 +46167,7 @@ __metadata: languageName: node linkType: hard -"serialize-javascript@npm:>=6.0.2": +"serialize-javascript@npm:>=6.0.2, serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1": version: 6.0.2 resolution: "serialize-javascript@npm:6.0.2" dependencies: @@ -48673,15 +48675,15 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:>=4.1.3": - version: 4.1.3 - resolution: "tough-cookie@npm:4.1.3" +"tough-cookie@npm:>=4.1.3, tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3": + version: 4.1.4 + resolution: "tough-cookie@npm:4.1.4" dependencies: psl: "npm:^1.1.33" punycode: "npm:^2.1.1" universalify: "npm:^0.2.0" url-parse: "npm:^1.5.3" - checksum: 10/cf148c359b638a7069fc3ba9a5257bdc9616a6948a98736b92c3570b3f8401cf9237a42bf716878b656f372a1fb65b74dd13a46ccff8eceba14ffd053d33f72a + checksum: 10/75663f4e2cd085f16af0b217e4218772adf0617fb3227171102618a54ce0187a164e505d61f773ed7d65988f8ff8a8f935d381f87da981752c1171b076b4afac languageName: node linkType: hard @@ -49459,7 +49461,7 @@ __metadata: languageName: node linkType: hard -"undici@npm:^5.28.4": +"undici@npm:^5.22.1, undici@npm:^5.28.2, undici@npm:^5.28.4": version: 5.28.4 resolution: "undici@npm:5.28.4" dependencies: @@ -52451,10 +52453,10 @@ __metadata: languageName: node linkType: hard -"word-wrap@npm:@aashutoshrathi/word-wrap@^1.2.4": - version: 1.2.6 - resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" - checksum: 10/6eebd12a5cd03cee38fcb915ef9f4ea557df6a06f642dfc7fe8eb4839eb5c9ca55a382f3604d52c14200b0c214c12af5e1f23d2a6d8e23ef2d016b105a9d6c0a +"word-wrap@npm:^1.0.3, word-wrap@npm:^1.2.5": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: 10/1ec6f6089f205f83037be10d0c4b34c9183b0b63fca0834a5b3cee55dd321429d73d40bb44c8fc8471b5203d6e8f8275717f49a8ff4b2b0ab41d7e1b563e0854 languageName: node linkType: hard @@ -52667,13 +52669,13 @@ __metadata: languageName: node linkType: hard -"xml2js@npm:>=0.5.0": - version: 0.6.2 - resolution: "xml2js@npm:0.6.2" +"xml2js@npm:0.5.0": + version: 0.5.0 + resolution: "xml2js@npm:0.5.0" dependencies: sax: "npm:>=0.6.0" xmlbuilder: "npm:~11.0.0" - checksum: 10/df29de8eeedb762c367d87945c39bcf54db19a2c522607491c266ed6184b5a749e37ff29cfaed0ac149da9ba332ac3dcf8e5ff2bd0a206be3343eca95faa941d + checksum: 10/27c4d759214e99be5ec87ee5cb1290add427fa43df509d3b92d10152b3806fd2f7c9609697a18b158ccf2caa01e96af067cdba93196f69ca10c90e4f79a08896 languageName: node linkType: hard