From cbc41c22d67d4cc353be1f88f489a46ed1ec787d Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 11:21:17 +0100 Subject: [PATCH 1/3] chore: update to `eslint@8` (#12356) --- .eslintplugin/index.js | 8 +- package.json | 10 +- packages/expect-utils/src/utils.ts | 2 - packages/expect/src/asymmetricMatchers.ts | 2 - packages/jest-jasmine2/src/jasmine/Suite.ts | 2 +- packages/jest-leak-detector/src/index.ts | 2 - packages/jest-snapshot/src/index.ts | 2 - packages/jest-snapshot/src/printSnapshot.ts | 2 - packages/jest-snapshot/src/types.ts | 2 - .../src/plugins/DOMCollection.ts | 2 - yarn.lock | 487 ++++++++---------- 11 files changed, 227 insertions(+), 294 deletions(-) diff --git a/.eslintplugin/index.js b/.eslintplugin/index.js index 1c882510876f..b09f597f4252 100644 --- a/.eslintplugin/index.js +++ b/.eslintplugin/index.js @@ -9,6 +9,10 @@ exports.rules = { 'ban-types-eventually': require('@typescript-eslint/eslint-plugin').rules[ 'ban-types' ], - 'prefer-rest-params-eventually': require('eslint/lib/rules/prefer-rest-params'), - 'prefer-spread-eventually': require('eslint/lib/rules/prefer-spread'), + 'prefer-rest-params-eventually': + require('eslint/use-at-your-own-risk').builtinRules.get( + 'prefer-rest-params', + ), + 'prefer-spread-eventually': + require('eslint/use-at-your-own-risk').builtinRules.get('prefer-spread'), }; diff --git a/package.json b/package.json index 6430a8f14e2c..33dfed7ddb8a 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "@types/jest": "^26.0.15", "@types/node": "~12.12.0", "@types/which": "^2.0.0", - "@typescript-eslint/eslint-plugin": "^4.1.0", - "@typescript-eslint/parser": "^4.1.0", + "@typescript-eslint/eslint-plugin": "^5.11.0", + "@typescript-eslint/parser": "^5.11.0", "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "camelcase": "^6.2.0", @@ -32,15 +32,15 @@ "codecov": "^3.0.0", "debug": "^4.0.1", "dedent": "^0.7.0", - "eslint": "^7.7.0", + "eslint": "^8.8.0", "eslint-config-prettier": "^8.1.0", "eslint-import-resolver-typescript": "^2.5.0", "eslint-plugin-eslint-comments": "^3.1.2", "eslint-plugin-import": "^2.6.0", - "eslint-plugin-jest": "^24.0.0", + "eslint-plugin-jest": "^26.1.0", "eslint-plugin-local": "^1.0.0", "eslint-plugin-markdown": "^1.0.0", - "eslint-plugin-prettier": "^3.0.1", + "eslint-plugin-prettier": "^4.0.0", "execa": "^5.0.0", "fast-check": "^2.0.0", "find-process": "^1.4.1", diff --git a/packages/expect-utils/src/utils.ts b/packages/expect-utils/src/utils.ts index 9e546c303c26..b4611d9cab59 100644 --- a/packages/expect-utils/src/utils.ts +++ b/packages/expect-utils/src/utils.ts @@ -6,8 +6,6 @@ * */ -/* eslint-disable local/ban-types-eventually */ - import {isPrimitive} from 'jest-get-type'; import { equals, diff --git a/packages/expect/src/asymmetricMatchers.ts b/packages/expect/src/asymmetricMatchers.ts index 443552e6ff1f..fc8e043be269 100644 --- a/packages/expect/src/asymmetricMatchers.ts +++ b/packages/expect/src/asymmetricMatchers.ts @@ -38,7 +38,6 @@ const utils = Object.freeze({ subsetEquality, }); -// eslint-disable-next-line @typescript-eslint/ban-types function getPrototype(obj: object) { if (Object.getPrototypeOf) { return Object.getPrototypeOf(obj); @@ -51,7 +50,6 @@ function getPrototype(obj: object) { return obj.constructor.prototype; } -// eslint-disable-next-line @typescript-eslint/ban-types export function hasProperty(obj: object | null, property: string): boolean { if (!obj) { return false; diff --git a/packages/jest-jasmine2/src/jasmine/Suite.ts b/packages/jest-jasmine2/src/jasmine/Suite.ts index 4ea4d10802f0..271392dfd1b7 100644 --- a/packages/jest-jasmine2/src/jasmine/Suite.ts +++ b/packages/jest-jasmine2/src/jasmine/Suite.ts @@ -29,7 +29,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* eslint-disable local/ban-types-eventually, sort-keys, local/prefer-spread-eventually, local/prefer-rest-params-eventually */ +/* eslint-disable sort-keys, local/prefer-spread-eventually, local/prefer-rest-params-eventually */ import type {Config} from '@jest/types'; import {convertDescriptorToString} from 'jest-util'; diff --git a/packages/jest-leak-detector/src/index.ts b/packages/jest-leak-detector/src/index.ts index 2f7bb318bb3d..ded8b0381582 100644 --- a/packages/jest-leak-detector/src/index.ts +++ b/packages/jest-leak-detector/src/index.ts @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable local/ban-types-eventually */ - import {promisify} from 'util'; import {setFlagsFromString} from 'v8'; import {runInNewContext} from 'vm'; diff --git a/packages/jest-snapshot/src/index.ts b/packages/jest-snapshot/src/index.ts index ab9f1c1206bb..322f4f549453 100644 --- a/packages/jest-snapshot/src/index.ts +++ b/packages/jest-snapshot/src/index.ts @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable local/ban-types-eventually */ - import * as fs from 'graceful-fs'; import type {Config} from '@jest/types'; import type {FS as HasteFS} from 'jest-haste-map'; diff --git a/packages/jest-snapshot/src/printSnapshot.ts b/packages/jest-snapshot/src/printSnapshot.ts index 12621c88d8cf..f25574544257 100644 --- a/packages/jest-snapshot/src/printSnapshot.ts +++ b/packages/jest-snapshot/src/printSnapshot.ts @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable local/ban-types-eventually */ - import chalk = require('chalk'); import {getObjectSubset} from '@jest/expect-utils'; import { diff --git a/packages/jest-snapshot/src/types.ts b/packages/jest-snapshot/src/types.ts index 31db0429d212..40ddd1cabfaa 100644 --- a/packages/jest-snapshot/src/types.ts +++ b/packages/jest-snapshot/src/types.ts @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable local/ban-types-eventually */ - import type {MatcherState} from 'expect'; import type SnapshotState from './State'; diff --git a/packages/pretty-format/src/plugins/DOMCollection.ts b/packages/pretty-format/src/plugins/DOMCollection.ts index 3140e872a3ed..cb1b95c8fd4f 100644 --- a/packages/pretty-format/src/plugins/DOMCollection.ts +++ b/packages/pretty-format/src/plugins/DOMCollection.ts @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable local/ban-types-eventually */ - import {printListItems, printObjectProperties} from '../collections'; import type {Config, NewPlugin, Printer, Refs} from '../types'; diff --git a/yarn.lock b/yarn.lock index d11b8f194ba9..48813a05cc58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -271,15 +271,6 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:7.12.11": - version: 7.12.11 - resolution: "@babel/code-frame@npm:7.12.11" - dependencies: - "@babel/highlight": ^7.10.4 - checksum: 3963eff3ebfb0e091c7e6f99596ef4b258683e4ba8a134e4e95f77afe85be5c931e184fff6435fb4885d12eba04a5e25532f7fbc292ca13b48e7da943474e2f3 - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.15.8, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.8.3": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -626,7 +617,7 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.16.7": +"@babel/highlight@npm:^7.16.7": version: 7.16.10 resolution: "@babel/highlight@npm:7.16.10" dependencies: @@ -2396,20 +2387,20 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^0.4.3": - version: 0.4.3 - resolution: "@eslint/eslintrc@npm:0.4.3" +"@eslint/eslintrc@npm:^1.0.5": + version: 1.0.5 + resolution: "@eslint/eslintrc@npm:1.0.5" dependencies: ajv: ^6.12.4 - debug: ^4.1.1 - espree: ^7.3.0 + debug: ^4.3.2 + espree: ^9.2.0 globals: ^13.9.0 ignore: ^4.0.6 import-fresh: ^3.2.1 - js-yaml: ^3.13.1 + js-yaml: ^4.1.0 minimatch: ^3.0.4 strip-json-comments: ^3.1.1 - checksum: 03a7704150b868c318aab6a94d87a33d30dc2ec579d27374575014f06237ba1370ae11178db772f985ef680d469dc237e7b16a1c5d8edaaeb8c3733e7a95a6d3 + checksum: b35b50d7b65bd8acd92a05b6fb15ac62c0cefa40dfef0324ca5bf8632bf3679bab6e173c53b3ad1e1d837701cecdbd9c144b35f46588cdf4e046a9caa272488d languageName: node linkType: hard @@ -2436,18 +2427,18 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.5.0": - version: 0.5.0 - resolution: "@humanwhocodes/config-array@npm:0.5.0" +"@humanwhocodes/config-array@npm:^0.9.2": + version: 0.9.3 + resolution: "@humanwhocodes/config-array@npm:0.9.3" dependencies: - "@humanwhocodes/object-schema": ^1.2.0 + "@humanwhocodes/object-schema": ^1.2.1 debug: ^4.1.1 minimatch: ^3.0.4 - checksum: 44ee6a9f05d93dd9d5935a006b17572328ba9caff8002442f601736cbda79c580cc0f5a49ce9eb88fbacc5c3a6b62098357c2e95326cd17bb9f1a6c61d6e95e7 + checksum: 6e5d7d274941c459bab0a14a87e372206d89fad3e4879d982edc942e8cc34da6510ea3644b8535a2a9edaa6527e91dccceabc6837ffa8ee506d66bca5d269ebc languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.0": +"@humanwhocodes/object-schema@npm:^1.2.1": version: 1.2.1 resolution: "@humanwhocodes/object-schema@npm:1.2.1" checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 @@ -2619,8 +2610,8 @@ __metadata: "@types/jest": ^26.0.15 "@types/node": ~12.12.0 "@types/which": ^2.0.0 - "@typescript-eslint/eslint-plugin": ^4.1.0 - "@typescript-eslint/parser": ^4.1.0 + "@typescript-eslint/eslint-plugin": ^5.11.0 + "@typescript-eslint/parser": ^5.11.0 ansi-regex: ^5.0.1 ansi-styles: ^5.0.0 camelcase: ^6.2.0 @@ -2629,15 +2620,15 @@ __metadata: codecov: ^3.0.0 debug: ^4.0.1 dedent: ^0.7.0 - eslint: ^7.7.0 + eslint: ^8.8.0 eslint-config-prettier: ^8.1.0 eslint-import-resolver-typescript: ^2.5.0 eslint-plugin-eslint-comments: ^3.1.2 eslint-plugin-import: ^2.6.0 - eslint-plugin-jest: ^24.0.0 + eslint-plugin-jest: ^26.1.0 eslint-plugin-local: ^1.0.0 eslint-plugin-markdown: ^1.0.0 - eslint-plugin-prettier: ^3.0.1 + eslint-plugin-prettier: ^4.0.0 execa: ^5.0.0 fast-check: ^2.0.0 find-process: ^1.4.1 @@ -4744,22 +4735,22 @@ __metadata: linkType: hard "@types/eslint-scope@npm:^3.7.0": - version: 3.7.2 - resolution: "@types/eslint-scope@npm:3.7.2" + version: 3.7.3 + resolution: "@types/eslint-scope@npm:3.7.3" dependencies: "@types/eslint": "*" "@types/estree": "*" - checksum: 7ce2b4a07c22e7b265d4ee145196fcf00993b8aaeecaf5cecc8231c820a000c00bfaee6c026a2f363c215822c8fbf5dbedb2d3f56621cdda87a6601db2a05319 + checksum: 6772b05e1b92003d1f295e81bc847a61f4fbe8ddab77ffa49e84ed3f9552513bdde677eb53ef167753901282857dd1d604d9f82eddb34a233495932b2dc3dc17 languageName: node linkType: hard "@types/eslint@npm:*": - version: 7.29.0 - resolution: "@types/eslint@npm:7.29.0" + version: 8.4.1 + resolution: "@types/eslint@npm:8.4.1" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: df13991c554954353ce8f3bb03e19da6cc71916889443d68d178d4f858b561ba4cc4a4f291c6eb9eebb7f864b12b9b9313051b3a8dfea3e513dadf3188a77bdf + checksum: b5790997ee9d3820d16350192d41849b0e2448c9e93650acac672ddf502e35c0a5a25547172a9eec840a96687cd94ba1cee672cbd86640f8f4ff1b65960d2ab9 languageName: node linkType: hard @@ -4797,7 +4788,7 @@ __metadata: languageName: node linkType: hard -"@types/express@npm:*": +"@types/express@npm:*, @types/express@npm:^4.17.13": version: 4.17.13 resolution: "@types/express@npm:4.17.13" dependencies: @@ -4965,7 +4956,7 @@ __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.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@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.9 resolution: "@types/json-schema@npm:7.0.9" checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705 @@ -5389,103 +5380,120 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.1.0": - version: 4.33.0 - resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0" +"@typescript-eslint/eslint-plugin@npm:^5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.11.0" dependencies: - "@typescript-eslint/experimental-utils": 4.33.0 - "@typescript-eslint/scope-manager": 4.33.0 - debug: ^4.3.1 + "@typescript-eslint/scope-manager": 5.11.0 + "@typescript-eslint/type-utils": 5.11.0 + "@typescript-eslint/utils": 5.11.0 + debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 - regexpp: ^3.1.0 + regexpp: ^3.2.0 semver: ^7.3.5 tsutils: ^3.21.0 peerDependencies: - "@typescript-eslint/parser": ^4.0.0 - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + "@typescript-eslint/parser": ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: d74855d0a5ffe0b2f362ec02fcd9301d39a53fb4155b9bd0cb15a0a31d065143129ebf98df9d86af4b6f74de1d423a4c0d8c0095520844068117453afda5bc4f + checksum: fa546ba4397f3e693870c39d1e8df6feccb728a7092be6312b78806a64c4ff4648cff0462503d3e510e8b173b9704c19e78d2a7af790ab1c0309782e33a89c32 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.33.0, @typescript-eslint/experimental-utils@npm:^4.0.1": - version: 4.33.0 - resolution: "@typescript-eslint/experimental-utils@npm:4.33.0" +"@typescript-eslint/parser@npm:^5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/parser@npm:5.11.0" dependencies: - "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.33.0 - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/typescript-estree": 4.33.0 - eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 + "@typescript-eslint/scope-manager": 5.11.0 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/typescript-estree": 5.11.0 + debug: ^4.3.2 peerDependencies: - eslint: "*" - checksum: f859800ada0884f92db6856f24efcb1d073ac9883ddc2b1aa9339f392215487895bed8447ebce3741e8141bb32e545244abef62b73193ba9a8a0527c523aabae + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 521b6e701d877dc0514c6a3992f4900aa6fea28ba7c0bc03c634dad2b50aa195401e45683dfebd9e8492a857cd84bba3b585d8fe8d0cd1d7e2720372c34c50a3 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.1.0": - version: 4.33.0 - resolution: "@typescript-eslint/parser@npm:4.33.0" +"@typescript-eslint/scope-manager@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/scope-manager@npm:5.11.0" dependencies: - "@typescript-eslint/scope-manager": 4.33.0 - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/typescript-estree": 4.33.0 - debug: ^4.3.1 - peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 102457eae1acd516211098fea081c8a2ed728522bbda7f5a557b6ef23d88970514f9a0f6285d53fca134d3d4d7d17822b5d5e12438d5918df4d1f89cc9e67d57 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/visitor-keys": 5.11.0 + checksum: bf7feaed495ed4cafa1b89a2b73781b30061d019e1c1b3765dc8006e7f36b537f6f451e37c77400067771318b4f0c5915804084dc6299ea7c6ecde2daf0aca1c languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/scope-manager@npm:4.33.0" +"@typescript-eslint/type-utils@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/type-utils@npm:5.11.0" dependencies: - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/visitor-keys": 4.33.0 - checksum: 9a25fb7ba7c725ea7227a24d315b0f6aacbad002e2549a049edf723c1d3615c22f5c301f0d7d615b377f2cdf2f3519d97e79af0c459de6ef8d2aaf0906dff13e + "@typescript-eslint/utils": 5.11.0 + debug: ^4.3.2 + tsutils: ^3.21.0 + peerDependencies: + eslint: "*" + peerDependenciesMeta: + typescript: + optional: true + checksum: fd570806d82874289ded6bfd90ff5414d4365b95b4a2e911f7ff2fee6e2c7675d0f2f71580c24cb8be733c3dfe2cd33eedff99ae2aa50f61b1b5af76499074eb languageName: node linkType: hard -"@typescript-eslint/types@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/types@npm:4.33.0" - checksum: 3baae1ca35872421b4eb60f5d3f3f32dc1d513f2ae0a67dee28c7d159fd7a43ed0d11a8a5a0f0c2d38507ffa036fc7c511cb0f18a5e8ac524b3ebde77390ec53 +"@typescript-eslint/types@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/types@npm:5.11.0" + checksum: b1531481da75a6c89510ad03f3db68e4797b25438bb902ee322bd1c154b83396016271cc00356dcdbc300a8ee421493aae803b8c716f36d7b4808fe045ae3a2a languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/typescript-estree@npm:4.33.0" +"@typescript-eslint/typescript-estree@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.11.0" dependencies: - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/visitor-keys": 4.33.0 - debug: ^4.3.1 - globby: ^11.0.3 - is-glob: ^4.0.1 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/visitor-keys": 5.11.0 + debug: ^4.3.2 + globby: ^11.0.4 + is-glob: ^4.0.3 semver: ^7.3.5 tsutils: ^3.21.0 peerDependenciesMeta: typescript: optional: true - checksum: 2566984390c76bd95f43240057215c068c69769e406e27aba41e9f21fd300074d6772e4983fa58fe61e80eb5550af1548d2e31e80550d92ba1d051bb00fe6f5c + checksum: 7bda55501c586efd7f8065b4158016486d8af92b8419931fbea7cec9bfe074075de8cdebec8baa1ac8a5c3f973599b9dd44a51fced1792176e49cd60cc8e5442 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/visitor-keys@npm:4.33.0" +"@typescript-eslint/utils@npm:5.11.0, @typescript-eslint/utils@npm:^5.10.0": + version: 5.11.0 + resolution: "@typescript-eslint/utils@npm:5.11.0" dependencies: - "@typescript-eslint/types": 4.33.0 - eslint-visitor-keys: ^2.0.0 - checksum: 59953e474ad4610c1aa23b2b1a964445e2c6201521da6367752f37939d854352bbfced5c04ea539274065e012b1337ba3ffa49c2647a240a4e87155378ba9873 + "@types/json-schema": ^7.0.9 + "@typescript-eslint/scope-manager": 5.11.0 + "@typescript-eslint/types": 5.11.0 + "@typescript-eslint/typescript-estree": 5.11.0 + eslint-scope: ^5.1.1 + eslint-utils: ^3.0.0 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 5ab1a15db1e0a2fbb857a8a16325459ad3d5239066f2641aa93ad9f7d08252d3a4ca6ae356c51cba1c6c81a65d84883436566b01932fa55b64a69796b950900d + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:5.11.0": + version: 5.11.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.11.0" + dependencies: + "@typescript-eslint/types": 5.11.0 + eslint-visitor-keys: ^3.0.0 + checksum: 8f0b6fe1e86bc93825a137be3220f57e3a4bee410cca5d35963a0cd416750b31291a73c4294676d94ed0f5066b4cfb3a8f512d409881daa550d1645f4381eb21 languageName: node linkType: hard @@ -5766,7 +5774,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^7.1.1, acorn@npm:^7.4.0": +"acorn@npm:^7.1.1": version: 7.4.1 resolution: "acorn@npm:7.4.1" bin: @@ -5775,7 +5783,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4, acorn@npm:^8.2.4, acorn@npm:^8.4.1": +"acorn@npm:^8.0.4, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.0": version: 8.7.0 resolution: "acorn@npm:8.7.0" bin: @@ -5893,7 +5901,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.6.0, ajv@npm:^8.8.0": +"ajv@npm:^8.0.0, ajv@npm:^8.6.0, ajv@npm:^8.8.0": version: 8.8.2 resolution: "ajv@npm:8.8.2" dependencies: @@ -5989,13 +5997,6 @@ __metadata: languageName: node linkType: hard -"ansi-colors@npm:^4.1.1": - version: 4.1.1 - resolution: "ansi-colors@npm:4.1.1" - checksum: 138d04a51076cb085da0a7e2d000c5c0bb09f6e772ed5c65c53cb118d37f6c5f1637506d7155fb5f330f0abcf6f12fa2e489ac3f8cdab9da393bf1bb4f9a32b0 - languageName: node - linkType: hard - "ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.1": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" @@ -6365,13 +6366,6 @@ __metadata: languageName: node linkType: hard -"astral-regex@npm:^2.0.0": - version: 2.0.0 - resolution: "astral-regex@npm:2.0.0" - checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766 - languageName: node - linkType: hard - "async-limiter@npm:~1.0.0": version: 1.0.1 resolution: "async-limiter@npm:1.0.1" @@ -7381,9 +7375,9 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.3.0, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2": - version: 3.5.2 - resolution: "chokidar@npm:3.5.2" +"chokidar@npm:^3.3.0, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2, chokidar@npm:^3.5.3": + version: 3.5.3 + resolution: "chokidar@npm:3.5.3" dependencies: anymatch: ~3.1.2 braces: ~3.0.2 @@ -7396,7 +7390,7 @@ __metadata: dependenciesMeta: fsevents: optional: true - checksum: d1fda32fcd67d9f6170a8468ad2630a3c6194949c9db3f6a91b16478c328b2800f433fb5d2592511b6cb145a47c013ea1cce60b432b1a001ae3ee978a8bffc2d + checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c languageName: node linkType: hard @@ -8503,7 +8497,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1": +"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1, debug@npm:^4.3.2": version: 4.3.3 resolution: "debug@npm:4.3.3" dependencies: @@ -9177,15 +9171,6 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.5": - version: 2.3.6 - resolution: "enquirer@npm:2.3.6" - dependencies: - ansi-colors: ^4.1.1 - checksum: 1c0911e14a6f8d26721c91e01db06092a5f7675159f0261d69c403396a385afd13dd76825e7678f66daffa930cfaa8d45f506fb35f818a2788463d022af1b884 - languageName: node - linkType: hard - "entities@npm:^1.1.1, entities@npm:~1.1.1": version: 1.1.2 resolution: "entities@npm:1.1.2" @@ -9498,14 +9483,13 @@ __metadata: languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.1": - version: 2.7.1 - resolution: "eslint-module-utils@npm:2.7.1" +"eslint-module-utils@npm:^2.7.2": + version: 2.7.3 + resolution: "eslint-module-utils@npm:2.7.3" dependencies: debug: ^3.2.7 find-up: ^2.1.0 - pkg-dir: ^2.0.0 - checksum: c30dfa125aafe65e5f6a30a31c26932106fcf09934a2f47d7f8a393ed9106da7b07416f2337b55c85f9db0175c873ee0827be5429a24ec381b49940f342b9ac3 + checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678 languageName: node linkType: hard @@ -9522,40 +9506,42 @@ __metadata: linkType: hard "eslint-plugin-import@npm:^2.6.0": - version: 2.25.3 - resolution: "eslint-plugin-import@npm:2.25.3" + version: 2.25.4 + resolution: "eslint-plugin-import@npm:2.25.4" dependencies: array-includes: ^3.1.4 array.prototype.flat: ^1.2.5 debug: ^2.6.9 doctrine: ^2.1.0 eslint-import-resolver-node: ^0.3.6 - eslint-module-utils: ^2.7.1 + eslint-module-utils: ^2.7.2 has: ^1.0.3 is-core-module: ^2.8.0 is-glob: ^4.0.3 minimatch: ^3.0.4 object.values: ^1.1.5 resolve: ^1.20.0 - tsconfig-paths: ^3.11.0 + tsconfig-paths: ^3.12.0 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: 8bdf4b1fafb0e5c8f57a1673f72d84307d32c06a23942990d198c8b32a85a5ae0098872d1ef5bf80d7dfe8ec542f6a671e3c5e706731a80b493c9015f7a147f5 + checksum: 0af24f5c7c6ca692f42e3947127f0ae7dfe44f1e02740f7cbe988b510a9c52bab0065d7df04e2d953dcc88a4595a00cbdcf14018acf8cd75cfd47b72efcbb734 languageName: node linkType: hard -"eslint-plugin-jest@npm:^24.0.0": - version: 24.7.0 - resolution: "eslint-plugin-jest@npm:24.7.0" +"eslint-plugin-jest@npm:^26.1.0": + version: 26.1.0 + resolution: "eslint-plugin-jest@npm:26.1.0" dependencies: - "@typescript-eslint/experimental-utils": ^4.0.1 + "@typescript-eslint/utils": ^5.10.0 peerDependencies: - "@typescript-eslint/eslint-plugin": ">= 4" - eslint: ">=5" + "@typescript-eslint/eslint-plugin": ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: "@typescript-eslint/eslint-plugin": optional: true - checksum: a4056582825ab3359d2e0e3aae50518f6f867d1cfb3240496605247d3ff9c84b4164f1a7e1f7087d5a2eae1343d738ada1ba74c422b13ad20b737601dc47ae08 + jest: + optional: true + checksum: 5d796092640202dd519c44c4270a335e7b5e7cd74f36b41754c2a9ed007a0110f4cc9b4b721dafe6724b3f93a3c9d27f9a0267c7e2a86e0f71a4a9f920897adc languageName: node linkType: hard @@ -9577,18 +9563,18 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-prettier@npm:^3.0.1": - version: 3.4.1 - resolution: "eslint-plugin-prettier@npm:3.4.1" +"eslint-plugin-prettier@npm:^4.0.0": + version: 4.0.0 + resolution: "eslint-plugin-prettier@npm:4.0.0" dependencies: prettier-linter-helpers: ^1.0.0 peerDependencies: - eslint: ">=5.0.0" - prettier: ">=1.13.0" + eslint: ">=7.28.0" + prettier: ">=2.0.0" peerDependenciesMeta: eslint-config-prettier: optional: true - checksum: fa6a89f0d7cba1cc87064352f5a4a68dc3739448dd279bec2bced1bfa3b704467e603d13b69dcec853f8fa30b286b8b715912898e9da776e1b016cf0ee48bd99 + checksum: 03d69177a3c21fa2229c7e427ce604429f0b20ab7f411e2e824912f572a207c7f5a41fd1f0a95b9b8afe121e291c1b1f1dc1d44c7aad4b0837487f9c19f5210d languageName: node linkType: hard @@ -9602,12 +9588,13 @@ __metadata: languageName: node linkType: hard -"eslint-utils@npm:^2.1.0": - version: 2.1.0 - resolution: "eslint-utils@npm:2.1.0" +"eslint-scope@npm:^7.1.0": + version: 7.1.0 + resolution: "eslint-scope@npm:7.1.0" dependencies: - eslint-visitor-keys: ^1.1.0 - checksum: 27500938f348da42100d9e6ad03ae29b3de19ba757ae1a7f4a087bdcf83ac60949bbb54286492ca61fac1f5f3ac8692dd21537ce6214240bf95ad0122f24d71d + esrecurse: ^4.3.0 + estraverse: ^5.2.0 + checksum: 2070470a0725438ed47075b2574a4c03cf59aa32648da8cff9e3548c84f6b0079cfdb9ee1dd7ab0bfe97011f64b2af5bfd4b69cf14a1292130dec661eec7914a languageName: node linkType: hard @@ -9622,13 +9609,6 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.0": - version: 1.3.0 - resolution: "eslint-visitor-keys@npm:1.3.0" - checksum: 37a19b712f42f4c9027e8ba98c2b06031c17e0c0a4c696cd429bd9ee04eb43889c446f2cd545e1ff51bef9593fcec94ecd2c2ef89129fcbbf3adadbef520376a - languageName: node - linkType: hard - "eslint-visitor-keys@npm:^2.0.0": version: 2.1.0 resolution: "eslint-visitor-keys@npm:2.1.0" @@ -9636,64 +9616,66 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^7.7.0": - version: 7.32.0 - resolution: "eslint@npm:7.32.0" +"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.1.0, eslint-visitor-keys@npm:^3.2.0": + version: 3.2.0 + resolution: "eslint-visitor-keys@npm:3.2.0" + checksum: fdadbb26f9e6417d3db7ad4f00bb0d573b6031c32fa72e8cdae32d038223faaeddff2ee443c90cb489bf774e75bff765c00912b8f9106d65e4f202ccd78c1b18 + languageName: node + linkType: hard + +"eslint@npm:^8.8.0": + version: 8.8.0 + resolution: "eslint@npm:8.8.0" dependencies: - "@babel/code-frame": 7.12.11 - "@eslint/eslintrc": ^0.4.3 - "@humanwhocodes/config-array": ^0.5.0 + "@eslint/eslintrc": ^1.0.5 + "@humanwhocodes/config-array": ^0.9.2 ajv: ^6.10.0 chalk: ^4.0.0 cross-spawn: ^7.0.2 - debug: ^4.0.1 + debug: ^4.3.2 doctrine: ^3.0.0 - enquirer: ^2.3.5 escape-string-regexp: ^4.0.0 - eslint-scope: ^5.1.1 - eslint-utils: ^2.1.0 - eslint-visitor-keys: ^2.0.0 - espree: ^7.3.1 + eslint-scope: ^7.1.0 + eslint-utils: ^3.0.0 + eslint-visitor-keys: ^3.2.0 + espree: ^9.3.0 esquery: ^1.4.0 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 file-entry-cache: ^6.0.1 functional-red-black-tree: ^1.0.1 - glob-parent: ^5.1.2 + glob-parent: ^6.0.1 globals: ^13.6.0 - ignore: ^4.0.6 + ignore: ^5.2.0 import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 - js-yaml: ^3.13.1 + js-yaml: ^4.1.0 json-stable-stringify-without-jsonify: ^1.0.1 levn: ^0.4.1 lodash.merge: ^4.6.2 minimatch: ^3.0.4 natural-compare: ^1.4.0 optionator: ^0.9.1 - progress: ^2.0.0 - regexpp: ^3.1.0 - semver: ^7.2.1 - strip-ansi: ^6.0.0 + regexpp: ^3.2.0 + strip-ansi: ^6.0.1 strip-json-comments: ^3.1.0 - table: ^6.0.9 text-table: ^0.2.0 v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: cc85af9985a3a11085c011f3d27abe8111006d34cc274291b3c4d7bea51a4e2ff6135780249becd919ba7f6d6d1ecc38a6b73dacb6a7be08d38453b344dc8d37 + checksum: 41a7e85bf84cf9f2d758ef3e8d08020a39a2836703728b59535684681349bd021c2c6e24174462b844a914870d707d2151e0371198899d957b444de91adaa435 languageName: node linkType: hard -"espree@npm:^7.3.0, espree@npm:^7.3.1": - version: 7.3.1 - resolution: "espree@npm:7.3.1" +"espree@npm:^9.2.0, espree@npm:^9.3.0": + version: 9.3.0 + resolution: "espree@npm:9.3.0" dependencies: - acorn: ^7.4.0 + acorn: ^8.7.0 acorn-jsx: ^5.3.1 - eslint-visitor-keys: ^1.3.0 - checksum: aa9b50dcce883449af2e23bc2b8d9abb77118f96f4cb313935d6b220f77137eaef7724a83c3f6243b96bc0e4ab14766198e60818caad99f9519ae5a336a39b45 + eslint-visitor-keys: ^3.1.0 + checksum: c0f1885c4eab652f9be08eb9228cea0df046b559b29d4aed8d6590ea9bd60177d4cb245d204a6f737a79a096861bb4ab8e480aeb8c1dbafef5beec1157353ce4 languageName: node linkType: hard @@ -11822,7 +11804,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.0.5, ignore@npm:^5.1.4, ignore@npm:^5.1.8": +"ignore@npm:^5.0.5, ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0": version: 5.2.0 resolution: "ignore@npm:5.2.0" checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77 @@ -13531,7 +13513,7 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:^4.0.0": +"js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0": version: 4.1.0 resolution: "js-yaml@npm:4.1.0" dependencies: @@ -14264,13 +14246,6 @@ __metadata: languageName: node linkType: hard -"lodash.truncate@npm:^4.4.2": - version: 4.4.2 - resolution: "lodash.truncate@npm:4.4.2" - checksum: b463d8a382cfb5f0e71c504dcb6f807a7bd379ff1ea216669aa42c52fc28c54e404bfbd96791aa09e6df0de2c1d7b8f1b7f4b1a61f324d38fe98bc535aeee4f5 - languageName: node - linkType: hard - "lodash.uniq@npm:4.5.0, lodash.uniq@npm:^4.5.0": version: 4.5.0 resolution: "lodash.uniq@npm:4.5.0" @@ -14580,12 +14555,12 @@ __metadata: languageName: node linkType: hard -"memfs@npm:^3.1.2, memfs@npm:^3.2.2": - version: 3.4.0 - resolution: "memfs@npm:3.4.0" +"memfs@npm:^3.1.2, memfs@npm:^3.4.1": + version: 3.4.1 + resolution: "memfs@npm:3.4.1" dependencies: fs-monkey: 1.0.3 - checksum: 56ed70e1bdbc67d0c3758fa76c7ef25cd48c93c192f20c492e6b9811d783fdc453528d7ea91d9a79d5e6e121efa865adffd13fda30db0fa2b894ab91dfd1d653 + checksum: 6d2f49d447d1be24ff9c747618933784eeb059189bc6a0d77b7a51c7daf06e2d3a74674a2e2ff1520e2c312bf91e719ed37144cf05087379b3ba0aef0b6aa062 languageName: node linkType: hard @@ -15569,10 +15544,10 @@ __metadata: languageName: node linkType: hard -"node-forge@npm:^0.10.0": - version: 0.10.0 - resolution: "node-forge@npm:0.10.0" - checksum: 5aa6dc9922e424a20ef101d2f517418e2bc9cfc0255dd22e0701c0fad1568445f510ee67f6f3fcdf085812c4ca1b847b8ba45683b34776828e41f5c1794e42e1 +"node-forge@npm:^1.2.0": + version: 1.2.1 + resolution: "node-forge@npm:1.2.1" + checksum: af4f88c3f69362359f35f6a9e231b35c96d906eeb6e976fb92742afe7fcdd76439dc22b41ce3755389d171f6320756ec7505bdfa7b252466c091b8c519a22674 languageName: node linkType: hard @@ -16750,15 +16725,6 @@ __metadata: languageName: node linkType: hard -"pkg-dir@npm:^2.0.0": - version: 2.0.0 - resolution: "pkg-dir@npm:2.0.0" - dependencies: - find-up: ^2.1.0 - checksum: 8c72b712305b51e1108f0ffda5ec1525a8307e54a5855db8fb1dcf77561a5ae98e2ba3b4814c9806a679f76b2f7e5dd98bde18d07e594ddd9fdd25e9cf242ea1 - languageName: node - linkType: hard - "pkg-dir@npm:^3.0.0": version: 3.0.0 resolution: "pkg-dir@npm:3.0.0" @@ -18464,7 +18430,7 @@ __metadata: languageName: node linkType: hard -"regexpp@npm:^3.1.0": +"regexpp@npm:^3.2.0": version: 3.2.0 resolution: "regexpp@npm:3.2.0" checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8 @@ -19287,12 +19253,12 @@ __metadata: languageName: node linkType: hard -"selfsigned@npm:^1.10.11": - version: 1.10.11 - resolution: "selfsigned@npm:1.10.11" +"selfsigned@npm:^2.0.0": + version: 2.0.0 + resolution: "selfsigned@npm:2.0.0" dependencies: - node-forge: ^0.10.0 - checksum: 1fd8fd317dc0b7d713d12d828131ac03c53abf41c4538b263fecd37bbc15688526c631654049ff00806b757ccb85492de6a13d6fefcad5cb54926631e48a76e1 + node-forge: ^1.2.0 + checksum: 43fca39a5aded2a8e97c1756af74c049a9dde12d47d302820f7d507d25c2ad7da4b04bc439a36620d63b4c0149bcf34ae7a729f978bf3b1bf48859c36ae34cee languageName: node linkType: hard @@ -19332,7 +19298,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:~7.3.0": +"semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:~7.3.0": version: 7.3.5 resolution: "semver@npm:7.3.5" dependencies: @@ -19641,17 +19607,6 @@ __metadata: languageName: node linkType: hard -"slice-ansi@npm:^4.0.0": - version: 4.0.0 - resolution: "slice-ansi@npm:4.0.0" - dependencies: - ansi-styles: ^4.0.0 - astral-regex: ^2.0.0 - is-fullwidth-code-point: ^3.0.0 - checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756 - languageName: node - linkType: hard - "slide@npm:^1.1.6": version: 1.1.6 resolution: "slide@npm:1.1.6" @@ -20123,7 +20078,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": +"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -20434,19 +20389,6 @@ __metadata: languageName: node linkType: hard -"table@npm:^6.0.9": - version: 6.7.5 - resolution: "table@npm:6.7.5" - dependencies: - ajv: ^8.0.1 - lodash.truncate: ^4.4.2 - slice-ansi: ^4.0.0 - string-width: ^4.2.3 - strip-ansi: ^6.0.1 - checksum: 76d01e33d6ef881f21bfe2e343101cb05ef4cedf506523d187af4f3a33f0f69cf25bca3e05c0c5c0eb348b405aaac29d9bb308ba9bf2c5ca7a82d032382a1649 - languageName: node - linkType: hard - "tapable@npm:^1.0.0": version: 1.1.3 resolution: "tapable@npm:1.1.3" @@ -20918,7 +20860,7 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.11.0, tsconfig-paths@npm:^3.9.0": +"tsconfig-paths@npm:^3.12.0, tsconfig-paths@npm:^3.9.0": version: 3.12.0 resolution: "tsconfig-paths@npm:3.12.0" dependencies: @@ -21953,33 +21895,34 @@ __metadata: languageName: node linkType: hard -"webpack-dev-middleware@npm:^5.3.0": - version: 5.3.0 - resolution: "webpack-dev-middleware@npm:5.3.0" +"webpack-dev-middleware@npm:^5.3.1": + version: 5.3.1 + resolution: "webpack-dev-middleware@npm:5.3.1" dependencies: colorette: ^2.0.10 - memfs: ^3.2.2 + memfs: ^3.4.1 mime-types: ^2.1.31 range-parser: ^1.2.1 schema-utils: ^4.0.0 peerDependencies: webpack: ^4.0.0 || ^5.0.0 - checksum: 01f9e11583bb682cd5ab5a1b9d6dc99545f777513c4c15aa67d10f5d057fc3d0c6f9365e02c07792d3c9b17bd47a16c8185e66eb66e9de74d8ccf561e75085e7 + checksum: 32e36b5893dde4107e5bb758afdc7fc61fd238a62635cb2964ed6b61e363793275a40870479daeae3fa3b87678c1311f44ba7492f6ebf30fe9360f2aab30bae1 languageName: node linkType: hard "webpack-dev-server@npm:^4.5.0": - version: 4.7.2 - resolution: "webpack-dev-server@npm:4.7.2" + version: 4.7.4 + resolution: "webpack-dev-server@npm:4.7.4" dependencies: "@types/bonjour": ^3.5.9 "@types/connect-history-api-fallback": ^1.3.5 + "@types/express": ^4.17.13 "@types/serve-index": ^1.9.1 "@types/sockjs": ^0.3.33 "@types/ws": ^8.2.2 ansi-html-community: ^0.0.8 bonjour: ^3.5.0 - chokidar: ^3.5.2 + chokidar: ^3.5.3 colorette: ^2.0.10 compression: ^1.7.4 connect-history-api-fallback: ^1.6.0 @@ -21994,13 +21937,13 @@ __metadata: p-retry: ^4.5.0 portfinder: ^1.0.28 schema-utils: ^4.0.0 - selfsigned: ^1.10.11 + selfsigned: ^2.0.0 serve-index: ^1.9.1 sockjs: ^0.3.21 spdy: ^4.0.2 strip-ansi: ^7.0.0 - webpack-dev-middleware: ^5.3.0 - ws: ^8.1.0 + webpack-dev-middleware: ^5.3.1 + ws: ^8.4.2 peerDependencies: webpack: ^4.37.0 || ^5.0.0 peerDependenciesMeta: @@ -22008,7 +21951,7 @@ __metadata: optional: true bin: webpack-dev-server: bin/webpack-dev-server.js - checksum: d3dd7d61f25a2ac1ac64d4298396043b1b8b46c009afc12c7af4d7c7724b077baa84d4ea353f1956e3f591ab09cde1d15f18d94e8884c1adaa2e1d816c37f814 + checksum: 58a7664e32144bdc4a720a044e685d6b4c030290875a06440d3f2471163d636a2be02b8b85168d554ecf3b0a41e7ba9fa3cd16f3bbdfee87b02fbb5329a8efa3 languageName: node linkType: hard @@ -22032,16 +21975,16 @@ __metadata: languageName: node linkType: hard -"webpack-sources@npm:^3.2.2": - version: 3.2.2 - resolution: "webpack-sources@npm:3.2.2" - checksum: cc81f1f1bfd1c25c7a565598850294b515bcccf7974d0249b4a0c8c607307866ce3f9e8cdef1c74d5facfb0d993944c499cfd4b7c8f52d01359b6671cc5823d4 +"webpack-sources@npm:^3.2.3": + version: 3.2.3 + resolution: "webpack-sources@npm:3.2.3" + checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607 languageName: node linkType: hard "webpack@npm:^5.61.0": - version: 5.65.0 - resolution: "webpack@npm:5.65.0" + version: 5.68.0 + resolution: "webpack@npm:5.68.0" dependencies: "@types/eslint-scope": ^3.7.0 "@types/estree": ^0.0.50 @@ -22057,7 +22000,7 @@ __metadata: eslint-scope: 5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 - graceful-fs: ^4.2.4 + graceful-fs: ^4.2.9 json-parse-better-errors: ^1.0.2 loader-runner: ^4.2.0 mime-types: ^2.1.27 @@ -22066,13 +22009,13 @@ __metadata: tapable: ^2.1.1 terser-webpack-plugin: ^5.1.3 watchpack: ^2.3.1 - webpack-sources: ^3.2.2 + webpack-sources: ^3.2.3 peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: 221ab8ccd440cb678269e86689704bbef81cf41393eb266625873e30c6980ffaa055bb1a7d14bf9fc0f5a2e6f03d15d068cbb995bc876757c01a4ca27fd2870c + checksum: ac6efd861a0bfb35d8a467fba0d87f905ef6e1a9a9f7e3db42ea459cf191268094cedd025d3eb36a1464e2208a0c193f3f4a92531ba58850246f3c6b8f210b03 languageName: node linkType: hard @@ -22569,9 +22512,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.1.0": - version: 8.4.0 - resolution: "ws@npm:8.4.0" +"ws@npm:^8.4.2": + version: 8.5.0 + resolution: "ws@npm:8.5.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -22580,7 +22523,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 5e37ccf0ecb8d8019d88b07af079e8f74248b688ad3109ab57cd5e1c9a7392545f572914d0c27f25e8b83a6cfc09a89ac151c556ff4fae26d6f824077e4f8239 + checksum: 76f2f90e40344bf18fd544194e7067812fb1372b2a37865678d8f12afe4b478ff2ebc0c7c0aff82cd5e6b66fc43d889eec0f1865c2365d8f7a66d92da7744a77 languageName: node linkType: hard From 45f5a430f00a6cd4e09393b9394549397d1ee319 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 11:22:01 +0100 Subject: [PATCH 2/3] feat: stop shipping `jasmine` by default (#12355) --- CHANGELOG.md | 1 + packages/jest-config/package.json | 1 - packages/jest-config/src/normalize.ts | 15 +++++++++++++-- packages/jest-config/tsconfig.json | 2 +- yarn.lock | 1 - 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7da446a4d95..d5a1cbabc77d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Features - `[expect]` [**BREAKING**] Migrate to ESM ([#12344](https://github.com/facebook/jest/pull/12344)) +- `[jest-config]` [**BREAKING**] Stop shipping `jest-jasmine2` by default ([#12355](https://github.com/facebook/jest/pull/12355)) - `[jest-environment-jsdom]` [**BREAKING**] Add default `browser` condition to `exportConditions` for `jsdom` environment ([#11924](https://github.com/facebook/jest/pull/11924)) - `[jest-environment-jsdom]` [**BREAKING**] Migrate to ESM ([#12340](https://github.com/facebook/jest/pull/12340)) - `[jest-environment-node]` [**BREAKING**] Add default `node` and `node-addon` conditions to `exportConditions` for `node` environment ([#11924](https://github.com/facebook/jest/pull/11924)) diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index 85df2d4f64e6..1515632d8410 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -38,7 +38,6 @@ "jest-environment-jsdom": "^27.5.1", "jest-environment-node": "^27.5.1", "jest-get-type": "^27.5.1", - "jest-jasmine2": "^27.5.1", "jest-regex-util": "^27.5.1", "jest-resolve": "^27.5.1", "jest-runner": "^27.5.1", diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts index b71971a9b1b9..935f733e3fa5 100644 --- a/packages/jest-config/src/normalize.ts +++ b/packages/jest-config/src/normalize.ts @@ -626,11 +626,22 @@ export default async function normalize( if ( !options.testRunner || options.testRunner === 'circus' || - options.testRunner === 'jest-circus' + options.testRunner === 'jest-circus' || + options.testRunner === 'jest-circus/runner' ) { options.testRunner = require.resolve('jest-circus/runner'); } else if (options.testRunner === 'jasmine2') { - options.testRunner = require.resolve('jest-jasmine2'); + try { + options.testRunner = require.resolve('jest-jasmine2'); + } catch (error: any) { + if (error.code === 'MODULE_NOT_FOUND') { + createConfigError( + 'jest-jasmine is no longer shipped by default with Jest, you need to install it explicitly or provide an absolute path to Jest', + ); + } + + throw error; + } } if (!options.coverageDirectory) { diff --git a/packages/jest-config/tsconfig.json b/packages/jest-config/tsconfig.json index 8d8261ca2028..47dcfb106c61 100644 --- a/packages/jest-config/tsconfig.json +++ b/packages/jest-config/tsconfig.json @@ -6,7 +6,7 @@ }, "include": ["./src/**/*"], "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], - // TODO: This is missing `babel-jest`, `jest-jasmine2`, `jest-circus` and + // TODO: This is missing `babel-jest`, `jest-circus` and // jest-test-sequencer, but that is just `require.resolve`d, so no real use // for their types "references": [ diff --git a/yarn.lock b/yarn.lock index 48813a05cc58..0809bc65a47b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12793,7 +12793,6 @@ __metadata: jest-environment-jsdom: ^27.5.1 jest-environment-node: ^27.5.1 jest-get-type: ^27.5.1 - jest-jasmine2: ^27.5.1 jest-regex-util: ^27.5.1 jest-resolve: ^27.5.1 jest-runner: ^27.5.1 From a651b6550f3a571110bf7fbfdd560e54843456f7 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 11:24:02 +0100 Subject: [PATCH 3/3] fix: remove defensive code marked for removal (#12353) --- CHANGELOG.md | 3 +++ packages/jest-config/src/index.ts | 3 --- packages/jest-resolve/src/utils.ts | 20 ++++++++------------ packages/jest-runner/src/index.ts | 3 --- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5a1cbabc77d..341e2533493d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,10 @@ - `[*]` [**BREAKING**] Drop support for `typescript@3.8`, minimum version is now `4.2` ([#11142](https://github.com/facebook/jest/pull/11142)) - `[*]` Bundle all `.d.ts` files into a single `index.d.ts` per module ([#12345](https://github.com/facebook/jest/pull/12345)) - `[expect]` [**BREAKING**] Remove support for importing `build/utils` ([#12323](https://github.com/facebook/jest/pull/12323)) +- `[jest-config]` [**BREAKING**] Remove `getTestEnvironment` export ([#12353](https://github.com/facebook/jest/pull/12353)) - `[@jest/core]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329)) +- `[jest-resolve]` [**BREAKING**] Make `requireResolveFunction` argument mandatory ([#12353](https://github.com/facebook/jest/pull/12353)) +- `[jest-runner]` [**BREAKING**] Remove some type exports from `@jest/test-result` ([#12353](https://github.com/facebook/jest/pull/12353)) - `[jest]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329)) ### Performance diff --git a/packages/jest-config/src/index.ts b/packages/jest-config/src/index.ts index e22cd5dfb754..dc3d063fc257 100644 --- a/packages/jest-config/src/index.ts +++ b/packages/jest-config/src/index.ts @@ -16,9 +16,6 @@ import readConfigFileAndSetRootDir from './readConfigFileAndSetRootDir'; import resolveConfigPath from './resolveConfigPath'; import {isJSONString, replaceRootDirInPath} from './utils'; -// TODO: remove export in Jest 28 -export {resolveTestEnvironment as getTestEnvironment} from 'jest-resolve'; - export {isJSONString} from './utils'; export {default as normalize} from './normalize'; export {default as deprecationEntries} from './Deprecated'; diff --git a/packages/jest-resolve/src/utils.ts b/packages/jest-resolve/src/utils.ts index f0fcef054fb0..045356edbe2c 100644 --- a/packages/jest-resolve/src/utils.ts +++ b/packages/jest-resolve/src/utils.ts @@ -96,12 +96,11 @@ const resolveWithPrefix = ( export const resolveTestEnvironment = ({ rootDir, testEnvironment: filePath, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { rootDir: Config.Path; testEnvironment: string; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }): string => resolveWithPrefix(undefined, { filePath, @@ -125,12 +124,11 @@ export const resolveWatchPlugin = ( { filePath, rootDir, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { filePath: string; rootDir: Config.Path; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }, ): string => resolveWithPrefix(resolver, { @@ -155,12 +153,11 @@ export const resolveRunner = ( { filePath, rootDir, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { filePath: string; rootDir: Config.Path; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }, ): string => resolveWithPrefix(resolver, { @@ -177,12 +174,11 @@ export const resolveSequencer = ( { filePath, rootDir, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { filePath: string; rootDir: Config.Path; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }, ): string => resolveWithPrefix(resolver, { diff --git a/packages/jest-runner/src/index.ts b/packages/jest-runner/src/index.ts index 2a471a35c493..88785a096342 100644 --- a/packages/jest-runner/src/index.ts +++ b/packages/jest-runner/src/index.ts @@ -28,9 +28,6 @@ import type { TestWatcher, } from './types'; -// TODO: remove re-export in Jest 28 -export type {Test, TestFileEvent, TestEvents} from '@jest/test-result'; - const TEST_WORKER_PATH = require.resolve('./testWorker'); interface WorkerInterface extends Worker {