Skip to content

Commit e2e8fe9

Browse files
authored
Merge pull request #4624 from reduxjs/feature/5.0-tooling-updates-2
2 parents dae0da7 + cacf745 commit e2e8fe9

File tree

3 files changed

+178
-43
lines changed

3 files changed

+178
-43
lines changed

.github/workflows/test.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ jobs:
4444
- name: Install deps
4545
run: yarn install
4646

47+
- name: Lint
48+
run: yarn lint
49+
4750
- name: Build
4851
run: yarn build
4952

package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"devDependencies": {
6060
"@babel/core": "^7.19.0",
6161
"@types/node": "^18.7.16",
62-
"@typescript-eslint/eslint-plugin": "^5.36.2",
63-
"@typescript-eslint/parser": "^5.36.2",
62+
"@typescript-eslint/eslint-plugin": "^6",
63+
"@typescript-eslint/parser": "^6",
6464
"cross-env": "^7.0.3",
6565
"esbuild-extra": "^0.1.3",
6666
"eslint": "^8.23.0",
@@ -79,7 +79,9 @@
7979
"vitest": "^0.34.0"
8080
},
8181
"resolutions": {
82-
"esbuild": "0.19.7"
82+
"esbuild": "0.19.7",
83+
"@typescript-eslint/eslint-plugin": "6.12.0",
84+
"@typescript-eslint/parser": "6.12.0"
8385
},
8486
"sideEffects": false
8587
}

yarn.lock

+170-40
Original file line numberDiff line numberDiff line change
@@ -1608,6 +1608,24 @@ __metadata:
16081608
languageName: node
16091609
linkType: hard
16101610

1611+
"@eslint-community/eslint-utils@npm:^4.4.0":
1612+
version: 4.4.0
1613+
resolution: "@eslint-community/eslint-utils@npm:4.4.0"
1614+
dependencies:
1615+
eslint-visitor-keys: ^3.3.0
1616+
peerDependencies:
1617+
eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
1618+
checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
1619+
languageName: node
1620+
linkType: hard
1621+
1622+
"@eslint-community/regexpp@npm:^4.5.1":
1623+
version: 4.10.0
1624+
resolution: "@eslint-community/regexpp@npm:4.10.0"
1625+
checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b
1626+
languageName: node
1627+
linkType: hard
1628+
16111629
"@eslint/eslintrc@npm:^1.4.1":
16121630
version: 1.4.1
16131631
resolution: "@eslint/eslintrc@npm:1.4.1"
@@ -1923,6 +1941,13 @@ __metadata:
19231941
languageName: node
19241942
linkType: hard
19251943

1944+
"@types/json-schema@npm:^7.0.12":
1945+
version: 7.0.15
1946+
resolution: "@types/json-schema@npm:7.0.15"
1947+
checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98
1948+
languageName: node
1949+
linkType: hard
1950+
19261951
"@types/json-schema@npm:^7.0.9":
19271952
version: 7.0.11
19281953
resolution: "@types/json-schema@npm:7.0.11"
@@ -1958,27 +1983,35 @@ __metadata:
19581983
languageName: node
19591984
linkType: hard
19601985

1961-
"@typescript-eslint/eslint-plugin@npm:^5.36.2, @typescript-eslint/eslint-plugin@npm:^5.5.0":
1962-
version: 5.51.0
1963-
resolution: "@typescript-eslint/eslint-plugin@npm:5.51.0"
1986+
"@types/semver@npm:^7.5.0":
1987+
version: 7.5.6
1988+
resolution: "@types/semver@npm:7.5.6"
1989+
checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037
1990+
languageName: node
1991+
linkType: hard
1992+
1993+
"@typescript-eslint/eslint-plugin@npm:6.12.0":
1994+
version: 6.12.0
1995+
resolution: "@typescript-eslint/eslint-plugin@npm:6.12.0"
19641996
dependencies:
1965-
"@typescript-eslint/scope-manager": 5.51.0
1966-
"@typescript-eslint/type-utils": 5.51.0
1967-
"@typescript-eslint/utils": 5.51.0
1997+
"@eslint-community/regexpp": ^4.5.1
1998+
"@typescript-eslint/scope-manager": 6.12.0
1999+
"@typescript-eslint/type-utils": 6.12.0
2000+
"@typescript-eslint/utils": 6.12.0
2001+
"@typescript-eslint/visitor-keys": 6.12.0
19682002
debug: ^4.3.4
1969-
grapheme-splitter: ^1.0.4
1970-
ignore: ^5.2.0
1971-
natural-compare-lite: ^1.4.0
1972-
regexpp: ^3.2.0
1973-
semver: ^7.3.7
1974-
tsutils: ^3.21.0
2003+
graphemer: ^1.4.0
2004+
ignore: ^5.2.4
2005+
natural-compare: ^1.4.0
2006+
semver: ^7.5.4
2007+
ts-api-utils: ^1.0.1
19752008
peerDependencies:
1976-
"@typescript-eslint/parser": ^5.0.0
1977-
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
2009+
"@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
2010+
eslint: ^7.0.0 || ^8.0.0
19782011
peerDependenciesMeta:
19792012
typescript:
19802013
optional: true
1981-
checksum: 5351d8cec13bd9867ce4aaf7052aa31c9ca867fc89c620fc0fe5718ac2cbc165903275db59974324d98e45df0d33a73a4367d236668772912731031a672cfdcd
2014+
checksum: a791ebe432a6cac50a15c9e98502b62e874de0c7e35fd320b9bdca21afd4ae88c88cff45ee50a95362da14e98965d946e57b15965f5522f1153568a3fe45db8a
19822015
languageName: node
19832016
linkType: hard
19842017

@@ -1993,20 +2026,21 @@ __metadata:
19932026
languageName: node
19942027
linkType: hard
19952028

1996-
"@typescript-eslint/parser@npm:^5.36.2, @typescript-eslint/parser@npm:^5.5.0":
1997-
version: 5.51.0
1998-
resolution: "@typescript-eslint/parser@npm:5.51.0"
2029+
"@typescript-eslint/parser@npm:6.12.0":
2030+
version: 6.12.0
2031+
resolution: "@typescript-eslint/parser@npm:6.12.0"
19992032
dependencies:
2000-
"@typescript-eslint/scope-manager": 5.51.0
2001-
"@typescript-eslint/types": 5.51.0
2002-
"@typescript-eslint/typescript-estree": 5.51.0
2033+
"@typescript-eslint/scope-manager": 6.12.0
2034+
"@typescript-eslint/types": 6.12.0
2035+
"@typescript-eslint/typescript-estree": 6.12.0
2036+
"@typescript-eslint/visitor-keys": 6.12.0
20032037
debug: ^4.3.4
20042038
peerDependencies:
2005-
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
2039+
eslint: ^7.0.0 || ^8.0.0
20062040
peerDependenciesMeta:
20072041
typescript:
20082042
optional: true
2009-
checksum: 096ec819132839febd4f390c4bbf31687e06191092c244dbd189a64cd7383fbaba728f2765e8809cd9834c0069163ab38b0e5f0f6360157d831647d4c295f8cd
2043+
checksum: 92923b7ee61f52d6b74f515640fe6bbb6b0a922d20dabeb6b59bc73f3c132bf750a2b706bb40fbe6d233c6ecc1abe905c99aa062280bb78e5724334f5b6c4ac5
20102044
languageName: node
20112045
linkType: hard
20122046

@@ -2020,20 +2054,30 @@ __metadata:
20202054
languageName: node
20212055
linkType: hard
20222056

2023-
"@typescript-eslint/type-utils@npm:5.51.0":
2024-
version: 5.51.0
2025-
resolution: "@typescript-eslint/type-utils@npm:5.51.0"
2057+
"@typescript-eslint/scope-manager@npm:6.12.0":
2058+
version: 6.12.0
2059+
resolution: "@typescript-eslint/scope-manager@npm:6.12.0"
20262060
dependencies:
2027-
"@typescript-eslint/typescript-estree": 5.51.0
2028-
"@typescript-eslint/utils": 5.51.0
2061+
"@typescript-eslint/types": 6.12.0
2062+
"@typescript-eslint/visitor-keys": 6.12.0
2063+
checksum: 4cc4eb1bcd04ba7b0a1de4284521cde5f3f25f2530f78dfcb3f098396b142fd30a45f615a87dc7a3adddbd131a6255cb12b1df19aacff71a3f766992ddef183f
2064+
languageName: node
2065+
linkType: hard
2066+
2067+
"@typescript-eslint/type-utils@npm:6.12.0":
2068+
version: 6.12.0
2069+
resolution: "@typescript-eslint/type-utils@npm:6.12.0"
2070+
dependencies:
2071+
"@typescript-eslint/typescript-estree": 6.12.0
2072+
"@typescript-eslint/utils": 6.12.0
20292073
debug: ^4.3.4
2030-
tsutils: ^3.21.0
2074+
ts-api-utils: ^1.0.1
20312075
peerDependencies:
2032-
eslint: "*"
2076+
eslint: ^7.0.0 || ^8.0.0
20332077
peerDependenciesMeta:
20342078
typescript:
20352079
optional: true
2036-
checksum: ab9747b0c629cfaaab903eed8ce1e39d34d69a402ce5faf2f1fff2bbb461bdbe034044b1368ba67ba8e5c1c512172e07d83c8a563635d8de811bf148d95c7dec
2080+
checksum: c345c45f1262eee4b9f6960a59b3aba960643d0004094a3d8fb9682ab79af2fae864695029246dc9e0d4fdb2f3d017a56b7dc034e551d263deba75c2ef048d39
20372081
languageName: node
20382082
linkType: hard
20392083

@@ -2044,6 +2088,13 @@ __metadata:
20442088
languageName: node
20452089
linkType: hard
20462090

2091+
"@typescript-eslint/types@npm:6.12.0":
2092+
version: 6.12.0
2093+
resolution: "@typescript-eslint/types@npm:6.12.0"
2094+
checksum: d3b40f9d400f6455ce5ae610651597c9e9ec85d46ca6d3c1025597a76305c557ebc5b88340ec6db0e694c9c79f1299d375b87a1a5b9314b22231dbbb5ce54695
2095+
languageName: node
2096+
linkType: hard
2097+
20472098
"@typescript-eslint/typescript-estree@npm:5.51.0":
20482099
version: 5.51.0
20492100
resolution: "@typescript-eslint/typescript-estree@npm:5.51.0"
@@ -2062,6 +2113,24 @@ __metadata:
20622113
languageName: node
20632114
linkType: hard
20642115

2116+
"@typescript-eslint/typescript-estree@npm:6.12.0":
2117+
version: 6.12.0
2118+
resolution: "@typescript-eslint/typescript-estree@npm:6.12.0"
2119+
dependencies:
2120+
"@typescript-eslint/types": 6.12.0
2121+
"@typescript-eslint/visitor-keys": 6.12.0
2122+
debug: ^4.3.4
2123+
globby: ^11.1.0
2124+
is-glob: ^4.0.3
2125+
semver: ^7.5.4
2126+
ts-api-utils: ^1.0.1
2127+
peerDependenciesMeta:
2128+
typescript:
2129+
optional: true
2130+
checksum: 943f7ff2e164d812f6ae0a2d5096836aff00b1fda39937b03f126f266f03f3655794f5fc4643b49b71c312126d9422dfd764744bd1ba41ee6821a5bac1511aa2
2131+
languageName: node
2132+
linkType: hard
2133+
20652134
"@typescript-eslint/utils@npm:5.51.0, @typescript-eslint/utils@npm:^5.43.0":
20662135
version: 5.51.0
20672136
resolution: "@typescript-eslint/utils@npm:5.51.0"
@@ -2080,6 +2149,23 @@ __metadata:
20802149
languageName: node
20812150
linkType: hard
20822151

2152+
"@typescript-eslint/utils@npm:6.12.0":
2153+
version: 6.12.0
2154+
resolution: "@typescript-eslint/utils@npm:6.12.0"
2155+
dependencies:
2156+
"@eslint-community/eslint-utils": ^4.4.0
2157+
"@types/json-schema": ^7.0.12
2158+
"@types/semver": ^7.5.0
2159+
"@typescript-eslint/scope-manager": 6.12.0
2160+
"@typescript-eslint/types": 6.12.0
2161+
"@typescript-eslint/typescript-estree": 6.12.0
2162+
semver: ^7.5.4
2163+
peerDependencies:
2164+
eslint: ^7.0.0 || ^8.0.0
2165+
checksum: dad05bd0e4db7a88c2716f9ee83c7c28c30d71e57392e58dc0db66b5f5c4c86b9db14142c6a1a82cf1650da294d31980c56a118015d3a2a645acb8b8a5ebc315
2166+
languageName: node
2167+
linkType: hard
2168+
20832169
"@typescript-eslint/visitor-keys@npm:5.51.0":
20842170
version: 5.51.0
20852171
resolution: "@typescript-eslint/visitor-keys@npm:5.51.0"
@@ -2090,6 +2176,16 @@ __metadata:
20902176
languageName: node
20912177
linkType: hard
20922178

2179+
"@typescript-eslint/visitor-keys@npm:6.12.0":
2180+
version: 6.12.0
2181+
resolution: "@typescript-eslint/visitor-keys@npm:6.12.0"
2182+
dependencies:
2183+
"@typescript-eslint/types": 6.12.0
2184+
eslint-visitor-keys: ^3.4.1
2185+
checksum: 3d8dc74ae748a95fe60b48dbaecca8d9c0c8df344d8034e3843057251fba24f06a3d29dbb9f525c9540b538d8c24221d3cf119ac483e9de38149a978051c72f3
2186+
languageName: node
2187+
linkType: hard
2188+
20932189
"@vitest/expect@npm:0.34.6":
20942190
version: 0.34.6
20952191
resolution: "@vitest/expect@npm:0.34.6"
@@ -3443,6 +3539,13 @@ __metadata:
34433539
languageName: node
34443540
linkType: hard
34453541

3542+
"eslint-visitor-keys@npm:^3.4.1":
3543+
version: 3.4.3
3544+
resolution: "eslint-visitor-keys@npm:3.4.3"
3545+
checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
3546+
languageName: node
3547+
linkType: hard
3548+
34463549
"eslint@npm:^8.23.0":
34473550
version: 8.34.0
34483551
resolution: "eslint@npm:8.34.0"
@@ -3949,6 +4052,13 @@ __metadata:
39494052
languageName: node
39504053
linkType: hard
39514054

4055+
"graphemer@npm:^1.4.0":
4056+
version: 1.4.0
4057+
resolution: "graphemer@npm:1.4.0"
4058+
checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673
4059+
languageName: node
4060+
linkType: hard
4061+
39524062
"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
39534063
version: 1.0.2
39544064
resolution: "has-bigints@npm:1.0.2"
@@ -4078,6 +4188,13 @@ __metadata:
40784188
languageName: node
40794189
linkType: hard
40804190

4191+
"ignore@npm:^5.2.4":
4192+
version: 5.3.0
4193+
resolution: "ignore@npm:5.3.0"
4194+
checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9
4195+
languageName: node
4196+
linkType: hard
4197+
40814198
"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1":
40824199
version: 3.3.0
40834200
resolution: "import-fresh@npm:3.3.0"
@@ -4879,13 +4996,6 @@ __metadata:
48794996
languageName: node
48804997
linkType: hard
48814998

4882-
"natural-compare-lite@npm:^1.4.0":
4883-
version: 1.4.0
4884-
resolution: "natural-compare-lite@npm:1.4.0"
4885-
checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225
4886-
languageName: node
4887-
linkType: hard
4888-
48894999
"natural-compare@npm:^1.4.0":
48905000
version: 1.4.0
48915001
resolution: "natural-compare@npm:1.4.0"
@@ -5378,8 +5488,8 @@ __metadata:
53785488
dependencies:
53795489
"@babel/core": ^7.19.0
53805490
"@types/node": ^18.7.16
5381-
"@typescript-eslint/eslint-plugin": ^5.36.2
5382-
"@typescript-eslint/parser": ^5.36.2
5491+
"@typescript-eslint/eslint-plugin": ^6
5492+
"@typescript-eslint/parser": ^6
53835493
cross-env: ^7.0.3
53845494
esbuild-extra: ^0.1.3
53855495
eslint: ^8.23.0
@@ -5692,6 +5802,17 @@ __metadata:
56925802
languageName: node
56935803
linkType: hard
56945804

5805+
"semver@npm:^7.5.4":
5806+
version: 7.5.4
5807+
resolution: "semver@npm:7.5.4"
5808+
dependencies:
5809+
lru-cache: ^6.0.0
5810+
bin:
5811+
semver: bin/semver.js
5812+
checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
5813+
languageName: node
5814+
linkType: hard
5815+
56955816
"set-blocking@npm:^2.0.0":
56965817
version: 2.0.0
56975818
resolution: "set-blocking@npm:2.0.0"
@@ -6097,6 +6218,15 @@ __metadata:
60976218
languageName: node
60986219
linkType: hard
60996220

6221+
"ts-api-utils@npm:^1.0.1":
6222+
version: 1.0.3
6223+
resolution: "ts-api-utils@npm:1.0.3"
6224+
peerDependencies:
6225+
typescript: ">=4.2.0"
6226+
checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6
6227+
languageName: node
6228+
linkType: hard
6229+
61006230
"ts-interface-checker@npm:^0.1.9":
61016231
version: 0.1.13
61026232
resolution: "ts-interface-checker@npm:0.1.13"

0 commit comments

Comments
 (0)