Skip to content

Commit 7843eb7

Browse files
authored
Merge branch 'jest-community:main' into prefer-jest-globals
2 parents 15c1f71 + ec205cd commit 7843eb7

File tree

2 files changed

+65
-50
lines changed

2 files changed

+65
-50
lines changed

tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"resolveJsonModule": true,
1717
"isolatedModules": true,
1818
"skipLibCheck": false,
19-
"forceConsistentCasingInFileNames": true
19+
"forceConsistentCasingInFileNames": true,
2020
},
2121
"files": ["eslint-remote-tester.config.ts"],
2222
"include": ["src/**/*", "tools/**/*"],
23-
"exclude": ["src/rules/__tests__/fixtures/**/*"]
23+
"exclude": ["src/rules/__tests__/fixtures/**/*"],
2424
}

yarn.lock

+63-48
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,21 @@ __metadata:
179179
languageName: node
180180
linkType: hard
181181

182+
"@babel/helper-define-polyfill-provider@npm:^0.5.0":
183+
version: 0.5.0
184+
resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0"
185+
dependencies:
186+
"@babel/helper-compilation-targets": ^7.22.6
187+
"@babel/helper-plugin-utils": ^7.22.5
188+
debug: ^4.1.1
189+
lodash.debounce: ^4.0.8
190+
resolve: ^1.14.2
191+
peerDependencies:
192+
"@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
193+
checksum: d24626b819d3875cb65189d761004e9230f2b3fb60542525c4785616f4b2366741369235a864b744f54beb26d625ae4b0af0c9bb3306b61bf4fccb61e0620020
194+
languageName: node
195+
linkType: hard
196+
182197
"@babel/helper-environment-visitor@npm:^7.22.20":
183198
version: 7.22.20
184199
resolution: "@babel/helper-environment-visitor@npm:7.22.20"
@@ -2016,12 +2031,12 @@ __metadata:
20162031
linkType: hard
20172032

20182033
"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
2019-
version: 0.3.21
2020-
resolution: "@jridgewell/trace-mapping@npm:0.3.21"
2034+
version: 0.3.22
2035+
resolution: "@jridgewell/trace-mapping@npm:0.3.22"
20212036
dependencies:
20222037
"@jridgewell/resolve-uri": ^3.1.0
20232038
"@jridgewell/sourcemap-codec": ^1.4.14
2024-
checksum: e91d3943c6d84687503ba033600d42b2a81d9eaf32758fee06449cd1415c59b944af08841e99f030b71f83bb5f814969e96fc8aa29e469eb3ea1b46597d13cff
2039+
checksum: ac7dd2cfe0b479aa1b81776d40d789243131cc792dc8b6b6a028c70fcd6171958ae1a71bf67b618ffe3c0c3feead9870c095ee46a5e30319410d92976b28f498
20252040
languageName: node
20262041
linkType: hard
20272042

@@ -2285,8 +2300,8 @@ __metadata:
22852300
linkType: hard
22862301

22872302
"@octokit/core@npm:^5.0.0":
2288-
version: 5.0.2
2289-
resolution: "@octokit/core@npm:5.0.2"
2303+
version: 5.1.0
2304+
resolution: "@octokit/core@npm:5.1.0"
22902305
dependencies:
22912306
"@octokit/auth-token": ^4.0.0
22922307
"@octokit/graphql": ^7.0.0
@@ -2295,7 +2310,7 @@ __metadata:
22952310
"@octokit/types": ^12.0.0
22962311
before-after-hook: ^2.2.0
22972312
universal-user-agent: ^6.0.0
2298-
checksum: 9ce060d61577f6805901ae5c33b2764a441db119ae0cca09104adf37b119cce68b656220de56c0c5004c9c9c1c892a7fdfbe9c0b1f5e398cb359dfd39c57eca8
2313+
checksum: 170d16f5577df484116238ce04e2dbd6b45d8e96b4680fee657ae22fcafb311af8df8a14ae80610f41c1a85493c927910698019a761914ff4b0323ddbabcc9a4
22992314
languageName: node
23002315
linkType: hard
23012316

@@ -2403,9 +2418,9 @@ __metadata:
24032418
linkType: hard
24042419

24052420
"@pkgr/core@npm:^0.1.0":
2406-
version: 0.1.0
2407-
resolution: "@pkgr/core@npm:0.1.0"
2408-
checksum: eeff0e0e517b1ed10eb4c1a8971413a8349bbfdab727dbe7d4085fd94eab95f0c3beb51b9245fef30562849d2a7a119e07ca48c343c8c4ec4e64ee289f50fe5e
2421+
version: 0.1.1
2422+
resolution: "@pkgr/core@npm:0.1.1"
2423+
checksum: 6f25fd2e3008f259c77207ac9915b02f1628420403b2630c92a07ff963129238c9262afc9e84344c7a23b5cc1f3965e2cd17e3798219f5fd78a63d144d3cceba
24092424
languageName: node
24102425
linkType: hard
24112426

@@ -2653,11 +2668,11 @@ __metadata:
26532668
linkType: hard
26542669

26552670
"@sinonjs/commons@npm:^3.0.0":
2656-
version: 3.0.0
2657-
resolution: "@sinonjs/commons@npm:3.0.0"
2671+
version: 3.0.1
2672+
resolution: "@sinonjs/commons@npm:3.0.1"
26582673
dependencies:
26592674
type-detect: 4.0.8
2660-
checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8
2675+
checksum: a7c3e7cc612352f4004873747d9d8b2d4d90b13a6d483f685598c945a70e734e255f1ca5dc49702515533c403b32725defff148177453b3f3915bcb60e9d4601
26612676
languageName: node
26622677
linkType: hard
26632678

@@ -2846,11 +2861,11 @@ __metadata:
28462861
linkType: hard
28472862

28482863
"@types/node@npm:*":
2849-
version: 20.11.0
2850-
resolution: "@types/node@npm:20.11.0"
2864+
version: 20.11.5
2865+
resolution: "@types/node@npm:20.11.5"
28512866
dependencies:
28522867
undici-types: ~5.26.4
2853-
checksum: 1bd6890db7e0404d11c33d28f46f19f73256f0ba35d19f0ef2a0faba09f366f188915fb9338eebebcc472075c1c4941e17c7002786aa69afa44980737846b200
2868+
checksum: a542727de1334ae20a3ca034b0ecf4b464a57ca01efc4f9cf43bd9ab93896125ab3c2de060ecd8f6ae23b86c6bf3463f681b643e69c032c6a662d376c98a6092
28542869
languageName: node
28552870
linkType: hard
28562871

@@ -3452,15 +3467,15 @@ __metadata:
34523467
linkType: hard
34533468

34543469
"babel-plugin-polyfill-corejs2@npm:^0.4.7":
3455-
version: 0.4.7
3456-
resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7"
3470+
version: 0.4.8
3471+
resolution: "babel-plugin-polyfill-corejs2@npm:0.4.8"
34573472
dependencies:
34583473
"@babel/compat-data": ^7.22.6
3459-
"@babel/helper-define-polyfill-provider": ^0.4.4
3474+
"@babel/helper-define-polyfill-provider": ^0.5.0
34603475
semver: ^6.3.1
34613476
peerDependencies:
34623477
"@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
3463-
checksum: b3c84ce44d00211c919a94f76453fb2065861612f3e44862eb7acf854e325c738a7441ad82690deba2b6fddfa2ad2cf2c46960f46fab2e3b17c6ed4fd2d73b38
3478+
checksum: 22857b87268b354e095452199464accba5fd8f690558a2f24b0954807ca2494b96da8d5c13507955802427582015160bce26a66893acf6da5dafbed8b336cf79
34643479
languageName: node
34653480
linkType: hard
34663481

@@ -3477,13 +3492,13 @@ __metadata:
34773492
linkType: hard
34783493

34793494
"babel-plugin-polyfill-regenerator@npm:^0.5.4":
3480-
version: 0.5.4
3481-
resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
3495+
version: 0.5.5
3496+
resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5"
34823497
dependencies:
3483-
"@babel/helper-define-polyfill-provider": ^0.4.4
3498+
"@babel/helper-define-polyfill-provider": ^0.5.0
34843499
peerDependencies:
34853500
"@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
3486-
checksum: 461b735c6c0eca3c7b4434d14bfa98c2ab80f00e2bdc1c69eb46d1d300092a9786d76bbd3ee55e26d2d1a2380c14592d8d638e271dfd2a2b78a9eacffa3645d1
3501+
checksum: 3a9b4828673b23cd648dcfb571eadcd9d3fadfca0361d0a7c6feeb5a30474e92faaa49f067a6e1c05e49b6a09812879992028ff3ef3446229ff132d6e1de7eb6
34873502
languageName: node
34883503
linkType: hard
34893504

@@ -3713,9 +3728,9 @@ __metadata:
37133728
linkType: hard
37143729

37153730
"caniuse-lite@npm:^1.0.30001565":
3716-
version: 1.0.30001576
3717-
resolution: "caniuse-lite@npm:1.0.30001576"
3718-
checksum: b8b332675fe703d5e57b02df5f100345f2a3796c537a42422f5bfc82d3256b8bad3f4e2788553656d2650006d13a4b5db99725e2a9462cc0c8035ba494ba1857
3731+
version: 1.0.30001579
3732+
resolution: "caniuse-lite@npm:1.0.30001579"
3733+
checksum: 7539dcff74d2243a30c428393dc690c87fa34d7da36434731853e9bcfe783757763b2971f5cc878e25242a93e184e53f167d11bd74955af956579f7af71cc764
37193734
languageName: node
37203735
linkType: hard
37213736

@@ -4203,11 +4218,11 @@ __metadata:
42034218
linkType: hard
42044219

42054220
"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
4206-
version: 3.35.0
4207-
resolution: "core-js-compat@npm:3.35.0"
4221+
version: 3.35.1
4222+
resolution: "core-js-compat@npm:3.35.1"
42084223
dependencies:
42094224
browserslist: ^4.22.2
4210-
checksum: 64c41ce6870aa9130b9d0cb8f00c05204094f46db7e345d520ec2e38f8b6e1d51e921d4974ceb880948f19c0a79e5639e55be0e56f88ea20e32e9a6274da7f82
4225+
checksum: 4c1a7076d31fa489eec5c46eb11c7127703f9756b5fed1eab9bf27b7f0f151247886d3fa488911078bd2801a5dfa12a9ea2ecb7a4e61dfa460b2c291805f503b
42114226
languageName: node
42124227
linkType: hard
42134228

@@ -4607,9 +4622,9 @@ __metadata:
46074622
linkType: hard
46084623

46094624
"electron-to-chromium@npm:^1.4.601":
4610-
version: 1.4.630
4611-
resolution: "electron-to-chromium@npm:1.4.630"
4612-
checksum: 9bf16b06b245d6937845bbef17c0babdf8e01845c8aa31eb2d7dc3a88cd34291d2dec0d8e329450a5b8dfcf5d3dc96c56aa1c8b224d942e3b1d508e9e3cb9788
4625+
version: 1.4.640
4626+
resolution: "electron-to-chromium@npm:1.4.640"
4627+
checksum: 021b8da324b2e574ffd9cd6943a74f8116d1947dbd4a43c89025594c469e18f2437b2b354363528dbc822538f510137c6ae315bce9b94b1d1f6e5d1c9cd302ef
46134628
languageName: node
46144629
linkType: hard
46154630

@@ -8774,8 +8789,8 @@ __metadata:
87748789
linkType: hard
87758790

87768791
"pacote@npm:^17.0.0, pacote@npm:^17.0.4, pacote@npm:^17.0.5":
8777-
version: 17.0.5
8778-
resolution: "pacote@npm:17.0.5"
8792+
version: 17.0.6
8793+
resolution: "pacote@npm:17.0.6"
87798794
dependencies:
87808795
"@npmcli/git": ^5.0.0
87818796
"@npmcli/installed-package-contents": ^2.0.1
@@ -8792,12 +8807,12 @@ __metadata:
87928807
promise-retry: ^2.0.1
87938808
read-package-json: ^7.0.0
87948809
read-package-json-fast: ^3.0.0
8795-
sigstore: ^2.0.0
8810+
sigstore: ^2.2.0
87968811
ssri: ^10.0.0
87978812
tar: ^6.1.11
87988813
bin:
87998814
pacote: lib/bin.js
8800-
checksum: 9cc3f4e0bfa1508b61ee301e08165cc137b14da5574b0b235b3072ea79bfbe1cd0ee855a21b4eb4406dd8507eef7563c8450cd74a9616b7661e89391d10a8fb5
8815+
checksum: e410331e0b1ea0d0764cdb412e8def62f90c3b2d7dccce16f3eb7c1f847d37d730e9661eff039f623777dccce1b3fcb4c4ad8c9e5950d60e6d8ef6eec924f8b3
88018816
languageName: node
88028817
linkType: hard
88038818

@@ -9045,11 +9060,11 @@ __metadata:
90459060
linkType: hard
90469061

90479062
"prettier@npm:^3.0.0":
9048-
version: 3.2.2
9049-
resolution: "prettier@npm:3.2.2"
9063+
version: 3.2.4
9064+
resolution: "prettier@npm:3.2.4"
90509065
bin:
90519066
prettier: bin/prettier.cjs
9052-
checksum: b416e1e4b26c351403343ebe461feda631c0eee5c3cf316c711204a08f3c639f38a8f9177c75e98a690998ff82e8ddc80c6bc027fb4ef6cedb6a4db035b4fe9a
9067+
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
90539068
languageName: node
90549069
linkType: hard
90559070

@@ -9570,9 +9585,9 @@ __metadata:
95709585
linkType: hard
95719586

95729587
"rfdc@npm:^1.3.0":
9573-
version: 1.3.0
9574-
resolution: "rfdc@npm:1.3.0"
9575-
checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32
9588+
version: 1.3.1
9589+
resolution: "rfdc@npm:1.3.1"
9590+
checksum: d5d1e930aeac7e0e0a485f97db1356e388bdbeff34906d206fe524dd5ada76e95f186944d2e68307183fdc39a54928d4426bbb6734851692cfe9195efba58b79
95769591
languageName: node
95779592
linkType: hard
95789593

@@ -9608,14 +9623,14 @@ __metadata:
96089623
linkType: hard
96099624

96109625
"safe-array-concat@npm:^1.0.1":
9611-
version: 1.0.1
9612-
resolution: "safe-array-concat@npm:1.0.1"
9626+
version: 1.1.0
9627+
resolution: "safe-array-concat@npm:1.1.0"
96139628
dependencies:
9614-
call-bind: ^1.0.2
9615-
get-intrinsic: ^1.2.1
9629+
call-bind: ^1.0.5
9630+
get-intrinsic: ^1.2.2
96169631
has-symbols: ^1.0.3
96179632
isarray: ^2.0.5
9618-
checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
9633+
checksum: 5c71eaa999168ee7474929f1cd3aae80f486353a651a094d9968936692cf90aa065224929a6486dcda66334a27dce4250a83612f9e0fef6dced1a925d3ac7296
96199634
languageName: node
96209635
linkType: hard
96219636

@@ -9842,7 +9857,7 @@ __metadata:
98429857
languageName: node
98439858
linkType: hard
98449859

9845-
"sigstore@npm:^2.0.0, sigstore@npm:^2.1.0":
9860+
"sigstore@npm:^2.1.0, sigstore@npm:^2.2.0":
98469861
version: 2.2.0
98479862
resolution: "sigstore@npm:2.2.0"
98489863
dependencies:

0 commit comments

Comments
 (0)