diff --git a/package.json b/package.json index 01bc72715..ab058af89 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ }, "resolutions": { "@types/react": "17.0.39", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0" + "@typescript-eslint/eslint-plugin": "7.0.1", + "@typescript-eslint/parser": "7.0.1" }, "scripts": { "build": "yarn workspaces foreach --interlaced --verbose --parallel --jobs 3 --exclude datagateway-common run build", diff --git a/packages/datagateway-common/package.json b/packages/datagateway-common/package.json index bf8f05482..e459b30ef 100644 --- a/packages/datagateway-common/package.json +++ b/packages/datagateway-common/package.json @@ -54,8 +54,8 @@ "@types/react": "17.0.39", "@types/react-router-dom": "5.3.3", "@types/react-virtualized": "9.21.10", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@typescript-eslint/eslint-plugin": "7.0.1", + "@typescript-eslint/parser": "7.0.1", "eslint": "8.56.0", "eslint-config-prettier": "8.10.0", "eslint-config-react-app": "7.0.0", diff --git a/packages/datagateway-dataview/package.json b/packages/datagateway-dataview/package.json index fc624497b..0bfa28ff9 100644 --- a/packages/datagateway-dataview/package.json +++ b/packages/datagateway-dataview/package.json @@ -114,8 +114,8 @@ "@testing-library/user-event": "14.5.2", "@types/react-redux": "7.1.22", "@types/redux-mock-store": "1.0.3", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@typescript-eslint/eslint-plugin": "7.0.1", + "@typescript-eslint/parser": "7.0.1", "blob-polyfill": "7.0.20220408", "cross-env": "7.0.3", "cypress": "11.2.0", diff --git a/packages/datagateway-download/package.json b/packages/datagateway-download/package.json index 3ab3e540f..32f42f90e 100644 --- a/packages/datagateway-download/package.json +++ b/packages/datagateway-download/package.json @@ -51,8 +51,8 @@ "@testing-library/user-event": "14.5.2", "@types/jsrsasign": "10.5.2", "@types/lodash.chunk": "4.2.6", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@typescript-eslint/eslint-plugin": "7.0.1", + "@typescript-eslint/parser": "7.0.1", "cross-env": "7.0.3", "cypress": "11.2.0", "cypress-failed-log": "2.10.0", diff --git a/packages/datagateway-search/package.json b/packages/datagateway-search/package.json index 7e4c6be9d..67a9f39b4 100644 --- a/packages/datagateway-search/package.json +++ b/packages/datagateway-search/package.json @@ -115,8 +115,8 @@ "@types/enzyme": "3.10.10", "@types/react-redux": "7.1.22", "@types/redux-mock-store": "1.0.3", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@typescript-eslint/eslint-plugin": "7.0.1", + "@typescript-eslint/parser": "7.0.1", "@wojtekmaj/enzyme-adapter-react-17": "0.6.6", "cross-env": "7.0.3", "cypress": "11.2.0", diff --git a/yarn.lock b/yarn.lock index 498895fe3..81555880f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1928,7 +1928,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -1939,7 +1939,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1": +"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": version: 4.10.0 resolution: "@eslint-community/regexpp@npm:4.10.0" checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b @@ -3373,10 +3373,10 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": - version: 7.0.11 - resolution: "@types/json-schema@npm:7.0.11" - checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98 languageName: node linkType: hard @@ -3624,10 +3624,10 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.12": - version: 7.3.13 - resolution: "@types/semver@npm:7.3.13" - checksum: 00c0724d54757c2f4bc60b5032fe91cda6410e48689633d5f35ece8a0a66445e3e57fa1d6e07eb780f792e82ac542948ec4d0b76eb3484297b79bd18b8cf1cb0 +"@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0": + version: 7.5.7 + resolution: "@types/semver@npm:7.5.7" + checksum: 5af9b13e3d74d86d4b618f6506ccbded801fb35dbc28608cd5a7bfb8bcac0021dd35ef305a72a0c2a8def0cff60acd706bfee16a9ed1c39a893d2a175e778ea7 languageName: node linkType: hard @@ -3737,27 +3737,28 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0" +"@typescript-eslint/eslint-plugin@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/eslint-plugin@npm:7.0.1" dependencies: - "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/type-utils": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@eslint-community/regexpp": ^4.5.1 + "@typescript-eslint/scope-manager": 7.0.1 + "@typescript-eslint/type-utils": 7.0.1 + "@typescript-eslint/utils": 7.0.1 + "@typescript-eslint/visitor-keys": 7.0.1 debug: ^4.3.4 graphemer: ^1.4.0 - ignore: ^5.2.0 - natural-compare-lite: ^1.4.0 - semver: ^7.3.7 - tsutils: ^3.21.0 + ignore: ^5.2.4 + natural-compare: ^1.4.0 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: fc104b389c768f9fa7d45a48c86d5c1ad522c1d0512943e782a56b1e3096b2cbcc1eea3fcc590647bf0658eef61aac35120a9c6daf979bf629ad2956deb516a1 + checksum: d2a6e84bb0aa22cb6d2f47bbb2e229e700a8ebc2e3fa02ead70450542345d5678411fa41e5d063debc3f014697f792cb1eb71deb8f45da80501cad912b313757 languageName: node linkType: hard @@ -3772,20 +3773,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/parser@npm:5.62.0" +"@typescript-eslint/parser@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/parser@npm:7.0.1" dependencies: - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 + "@typescript-eslint/scope-manager": 7.0.1 + "@typescript-eslint/types": 7.0.1 + "@typescript-eslint/typescript-estree": 7.0.1 + "@typescript-eslint/visitor-keys": 7.0.1 debug: ^4.3.4 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752 + checksum: de86c90e3697c949a1572d3f258eedf1cb2358adde9b0069138082d06ffade463605bec8b516df656b8a7250e34579afbecfe7cebc9a991ab79a60528b62358f languageName: node linkType: hard @@ -3809,20 +3811,30 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/type-utils@npm:5.62.0" +"@typescript-eslint/scope-manager@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/scope-manager@npm:7.0.1" dependencies: - "@typescript-eslint/typescript-estree": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@typescript-eslint/types": 7.0.1 + "@typescript-eslint/visitor-keys": 7.0.1 + checksum: b949cb829e4ad4409539be1a434a18ee5b59e56a4b4c0a4687ffde5c70ddda0edf1638426e9832ca9840fb0a831632c926f43dcce86b41ddd16256fd21165505 + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/type-utils@npm:7.0.1" + dependencies: + "@typescript-eslint/typescript-estree": 7.0.1 + "@typescript-eslint/utils": 7.0.1 debug: ^4.3.4 - tsutils: ^3.21.0 + ts-api-utils: ^1.0.1 peerDependencies: - eslint: "*" + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: fc41eece5f315dfda14320be0da78d3a971d650ea41300be7196934b9715f3fe1120a80207551eb71d39568275dbbcf359bde540d1ca1439d8be15e9885d2739 + checksum: eab9bea237c308d0c80ab68805ef6a3fa54d881cde59033a9740d8317f316821508b29eaeaff007a618dbda635b318ddfafe7e343e641d1a5364854792a7bc5f languageName: node linkType: hard @@ -3840,6 +3852,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/types@npm:7.0.1" + checksum: 3bd1b16171f578064b47d0fa8c5c6e85e857de764e0898ac08fc79a551ec7447242b74d1e2f8eaac1da70d3fa045c9a4d0001c52bbc81b83e7d02ee8230c3d71 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.49.0": version: 5.49.0 resolution: "@typescript-eslint/typescript-estree@npm:5.49.0" @@ -3876,6 +3895,25 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/typescript-estree@npm:7.0.1" + dependencies: + "@typescript-eslint/types": 7.0.1 + "@typescript-eslint/visitor-keys": 7.0.1 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + minimatch: 9.0.3 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 + peerDependenciesMeta: + typescript: + optional: true + checksum: d7124ed84622725785cdd885d15eb3ba446e332d1727a3ccb1ab44f785b023b98912da2573dacba506c89c5146037cb9982a499ec64c100d607357334ecdf6a8 + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.49.0": version: 5.49.0 resolution: "@typescript-eslint/utils@npm:5.49.0" @@ -3894,7 +3932,24 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.62.0, @typescript-eslint/utils@npm:^5.43.0": +"@typescript-eslint/utils@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/utils@npm:7.0.1" + dependencies: + "@eslint-community/eslint-utils": ^4.4.0 + "@types/json-schema": ^7.0.12 + "@types/semver": ^7.5.0 + "@typescript-eslint/scope-manager": 7.0.1 + "@typescript-eslint/types": 7.0.1 + "@typescript-eslint/typescript-estree": 7.0.1 + semver: ^7.5.4 + peerDependencies: + eslint: ^8.56.0 + checksum: b36669163136646aa8f9ef831f7e3026acc853e9083461a53fb89e53b7b0e5ade315a8387820632d370bfe8445db6489524570a253bcd8817e460e0e2b409c47 + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:^5.43.0": version: 5.62.0 resolution: "@typescript-eslint/utils@npm:5.62.0" dependencies: @@ -3932,6 +3987,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:7.0.1": + version: 7.0.1 + resolution: "@typescript-eslint/visitor-keys@npm:7.0.1" + dependencies: + "@typescript-eslint/types": 7.0.1 + eslint-visitor-keys: ^3.4.1 + checksum: ca07f5c6369f00d73e8bd22b1032288d11a5b4d25baca0f198c86f490c423b244b6a39e31c55fb45203a41879017d7eeab895fade7942c1795ec745bee6b411b + languageName: node + linkType: hard + "@ungap/structured-clone@npm:^1.2.0": version: 1.2.0 resolution: "@ungap/structured-clone@npm:1.2.0" @@ -6414,8 +6479,8 @@ __metadata: "@types/react": 17.0.39 "@types/react-router-dom": 5.3.3 "@types/react-virtualized": 9.21.10 - "@typescript-eslint/eslint-plugin": 5.62.0 - "@typescript-eslint/parser": 5.62.0 + "@typescript-eslint/eslint-plugin": 7.0.1 + "@typescript-eslint/parser": 7.0.1 axios: 1.6.1 connected-react-router: 6.9.1 date-fns: 2.30.0 @@ -6484,8 +6549,8 @@ __metadata: "@types/react-virtualized": 9.21.10 "@types/redux-logger": 3.0.8 "@types/redux-mock-store": 1.0.3 - "@typescript-eslint/eslint-plugin": 5.62.0 - "@typescript-eslint/parser": 5.62.0 + "@typescript-eslint/eslint-plugin": 7.0.1 + "@typescript-eslint/parser": 7.0.1 axios: 1.6.1 blob-polyfill: 7.0.20220408 connected-react-router: 6.9.1 @@ -6556,8 +6621,8 @@ __metadata: "@types/react-dom": 17.0.11 "@types/react-router-dom": 5.3.3 "@types/react-virtualized": 9.21.10 - "@typescript-eslint/eslint-plugin": 5.62.0 - "@typescript-eslint/parser": 5.62.0 + "@typescript-eslint/eslint-plugin": 7.0.1 + "@typescript-eslint/parser": 7.0.1 axios: 1.6.1 cross-env: 7.0.3 cypress: 11.2.0 @@ -6625,8 +6690,8 @@ __metadata: "@types/react-virtualized": 9.21.10 "@types/redux-logger": 3.0.8 "@types/redux-mock-store": 1.0.3 - "@typescript-eslint/eslint-plugin": 5.62.0 - "@typescript-eslint/parser": 5.62.0 + "@typescript-eslint/eslint-plugin": 7.0.1 + "@typescript-eslint/parser": 7.0.1 "@wojtekmaj/enzyme-adapter-react-17": 0.6.6 axios: 1.6.1 connected-react-router: 6.9.1 @@ -9367,10 +9432,10 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.2.0": - version: 5.2.4 - resolution: "ignore@npm:5.2.4" - checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef +"ignore@npm:^5.2.0, ignore@npm:^5.2.4": + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3 languageName: node linkType: hard @@ -11511,6 +11576,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:9.0.3": + version: 9.0.3 + resolution: "minimatch@npm:9.0.3" + dependencies: + brace-expansion: ^2.0.1 + checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5 + languageName: node + linkType: hard + "minimatch@npm:^5.0.1": version: 5.1.6 resolution: "minimatch@npm:5.1.6" @@ -11684,13 +11758,6 @@ __metadata: languageName: node linkType: hard -"natural-compare-lite@npm:^1.4.0": - version: 1.4.0 - resolution: "natural-compare-lite@npm:1.4.0" - checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225 - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -14613,14 +14680,14 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": - version: 7.3.8 - resolution: "semver@npm:7.3.8" +"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.4": + version: 7.6.0 + resolution: "semver@npm:7.6.0" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 + checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c languageName: node linkType: hard @@ -15743,6 +15810,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.0.1": + version: 1.2.1 + resolution: "ts-api-utils@npm:1.2.1" + peerDependencies: + typescript: ">=4.2.0" + checksum: 17a2a4454d65a6765b9351304cfd516fcda3098f49d72bba90cb7f22b6a09a573b4a1993fd7de7d6b8046c408960c5f21a25e64ccb969d484b32ea3b3e19d6e4 + languageName: node + linkType: hard + "ts-node@npm:^10.7.0": version: 10.9.1 resolution: "ts-node@npm:10.9.1"