Skip to content

Commit 30fb2a0

Browse files
committed
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit into fix-codemods
2 parents de7aca4 + 72f867e commit 30fb2a0

File tree

4 files changed

+130
-23
lines changed

4 files changed

+130
-23
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"prettier": "^2.2.1",
3737
"release-it": "^14.12.5",
3838
"serve": "^14.2.0",
39-
"typescript": "5.2"
39+
"typescript": "^5.2.2"
4040
},
4141
"resolutions": {
4242
"@babel/core": "7.19.3",
@@ -67,8 +67,7 @@
6767
"type-fest": "2.19.0",
6868
"console-testing-library@0.6.1": "patch:console-testing-library@npm%3A0.6.1#./.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch",
6969
"@typescript-eslint/eslint-plugin": "6.12.0",
70-
"@typescript-eslint/parser": "6.12.0",
71-
"typescript": "5.2.2"
70+
"@typescript-eslint/parser": "6.12.0"
7271
},
7372
"scripts": {
7473
"build": "yarn build:packages",

packages/toolkit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050
},
5151
"devDependencies": {
52-
"@arethetypeswrong/cli": "^0.13.1",
52+
"@arethetypeswrong/cli": "^0.13.5",
5353
"@microsoft/api-extractor": "^7.13.2",
5454
"@phryneas/ts-version": "^1.0.2",
5555
"@size-limit/preset-small-lib": "^4.11.0",

packages/toolkit/src/tests/tsconfig.typetests.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "../../tsconfig.test.json",
33
"compilerOptions": {
44
"skipLibCheck": true,
5-
"rootDir": "../../src"
65
},
7-
"include": ["../dynamicMiddleware", "../entities", "../listenerMiddleware"]
6+
"include": ["../**/*.ts*"],
7+
"exclude": ["../query"]
88
}

yarn.lock

Lines changed: 125 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@ __metadata:
270270
languageName: node
271271
linkType: hard
272272

273-
"@arethetypeswrong/cli@npm:^0.13.1":
274-
version: 0.13.1
275-
resolution: "@arethetypeswrong/cli@npm:0.13.1"
273+
"@arethetypeswrong/cli@npm:^0.13.5":
274+
version: 0.13.5
275+
resolution: "@arethetypeswrong/cli@npm:0.13.5"
276276
dependencies:
277-
"@arethetypeswrong/core": 0.13.0
277+
"@arethetypeswrong/core": 0.13.5
278278
chalk: ^4.1.2
279279
cli-table3: ^0.6.3
280280
commander: ^10.0.1
@@ -283,20 +283,21 @@ __metadata:
283283
semver: ^7.5.4
284284
bin:
285285
attw: dist/index.js
286-
checksum: a200d2c5cd6f6245e4e2afa3a1ea98eb588a4d2a2cf7e6b76c92451d430c7c1bdcd5075e5ab6f9929dcdea36dd072fdcdb32ef085609e40c801ab40cbc96100b
286+
checksum: 6fe8ff6f529bbdd9427172bfb8a796d741aa17d0ba50cfa402f68cca8d288c0ada2e96d5ed01590da4d035da755e6156476e74e3d4c9fdfac1328a882ba61559
287287
languageName: node
288288
linkType: hard
289289

290-
"@arethetypeswrong/core@npm:0.13.0":
291-
version: 0.13.0
292-
resolution: "@arethetypeswrong/core@npm:0.13.0"
290+
"@arethetypeswrong/core@npm:0.13.5":
291+
version: 0.13.5
292+
resolution: "@arethetypeswrong/core@npm:0.13.5"
293293
dependencies:
294294
"@andrewbranch/untar.js": ^1.0.3
295295
fflate: ^0.7.4
296296
semver: ^7.5.4
297-
typescript: ^5.2.2
297+
ts-expose-internals-conditionally: 1.0.0-empty.0
298+
typescript: 5.3.3
298299
validate-npm-package-name: ^5.0.0
299-
checksum: cfe30a1ca0259ae6021971f155f9cba83a8329144eeac00164db680d4e46ad244b3f4bfb47b972bc19117dd3c72f2885e74b8cc1d1edc95e95960f090908efd6
300+
checksum: f44d99cd453668aa1b171ebc6a05f2e3745f599effabbafbbca702a2f87b449eb73b8ea1db25a268affdff561493f807ae18f58297b7116b1a19396568709a88
300301
languageName: node
301302
linkType: hard
302303

@@ -7333,7 +7334,7 @@ __metadata:
73337334
version: 0.0.0-use.local
73347335
resolution: "@reduxjs/toolkit@workspace:packages/toolkit"
73357336
dependencies:
7336-
"@arethetypeswrong/cli": ^0.13.1
7337+
"@arethetypeswrong/cli": ^0.13.5
73377338
"@microsoft/api-extractor": ^7.13.2
73387339
"@phryneas/ts-version": ^1.0.2
73397340
"@size-limit/preset-small-lib": ^4.11.0
@@ -26583,9 +26584,9 @@ fsevents@^1.2.7:
2658326584
linkType: hard
2658426585

2658526586
"reselect@npm:^5.0.1":
26586-
version: 5.0.1
26587-
resolution: "reselect@npm:5.0.1"
26588-
checksum: 7663b4c28a0e908e74dc25262e1d813d028b9c2ee96160cb0f40a16f09c5ac632fa16af6bafede7eb0ff16ab2d5bea2cd8814d9a9488e0262b8317fef90b1dc0
26587+
version: 5.1.0
26588+
resolution: "reselect@npm:5.1.0"
26589+
checksum: 5bc9c5d03d7caea00d0c0e24330bf23d91801227346fec1cef6a60988ab8d3dd7cee76e6994ca0915bc1c20845bb2bd929b95753763e0a9db74c0f9dff5cb845
2658926590
languageName: node
2659026591
linkType: hard
2659126592

@@ -26995,7 +26996,7 @@ fsevents@^1.2.7:
2699526996
prettier: ^2.2.1
2699626997
release-it: ^14.12.5
2699726998
serve: ^14.2.0
26998-
typescript: 5.2
26999+
typescript: ^5.2.2
2699927000
languageName: unknown
2700027001
linkType: soft
2700127002

@@ -29472,6 +29473,13 @@ fsevents@^1.2.7:
2947229473
languageName: node
2947329474
linkType: hard
2947429475

29476+
"ts-expose-internals-conditionally@npm:1.0.0-empty.0":
29477+
version: 1.0.0-empty.0
29478+
resolution: "ts-expose-internals-conditionally@npm:1.0.0-empty.0"
29479+
checksum: 6b4f546fc59f04f68d579f1bc0704541ec17521f84d32a15b45bef5dbc7a787143a065e19541cc5b64ff494f16f223bce59f3f5bf10ec538e5739e23c0efb878
29480+
languageName: node
29481+
linkType: hard
29482+
2947529483
"ts-interface-checker@npm:^0.1.9":
2947629484
version: 0.1.13
2947729485
resolution: "ts-interface-checker@npm:0.1.13"
@@ -29776,7 +29784,17 @@ fsevents@^1.2.7:
2977629784
languageName: node
2977729785
linkType: hard
2977829786

29779-
"typescript@npm:5.2.2":
29787+
"typescript@npm:4.1.3":
29788+
version: 4.1.3
29789+
resolution: "typescript@npm:4.1.3"
29790+
bin:
29791+
tsc: bin/tsc
29792+
tsserver: bin/tsserver
29793+
checksum: 0a25f7d7cebbc5ad23f41cb30918643460477be265bd3bcd400ffedb77d16e97d46f2b0c31393b2f990c5cf5b9f7a829ad6aff8636988b8f30abf81c656237c0
29794+
languageName: node
29795+
linkType: hard
29796+
29797+
"typescript@npm:5.2":
2978029798
version: 5.2.2
2978129799
resolution: "typescript@npm:5.2.2"
2978229800
bin:
@@ -29786,7 +29804,57 @@ fsevents@^1.2.7:
2978629804
languageName: node
2978729805
linkType: hard
2978829806

29789-
"typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>":
29807+
"typescript@npm:5.3.3, typescript@npm:^5.0.0, typescript@npm:^5.2.2":
29808+
version: 5.3.3
29809+
resolution: "typescript@npm:5.3.3"
29810+
bin:
29811+
tsc: bin/tsc
29812+
tsserver: bin/tsserver
29813+
checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
29814+
languageName: node
29815+
linkType: hard
29816+
29817+
"typescript@npm:^4.1.3, typescript@npm:^4.3.4, typescript@npm:^4.8.0, typescript@npm:^4.9, typescript@npm:~4.9":
29818+
version: 4.9.5
29819+
resolution: "typescript@npm:4.9.5"
29820+
bin:
29821+
tsc: bin/tsc
29822+
tsserver: bin/tsserver
29823+
checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db
29824+
languageName: node
29825+
linkType: hard
29826+
29827+
"typescript@npm:~4.2.4":
29828+
version: 4.2.4
29829+
resolution: "typescript@npm:4.2.4"
29830+
bin:
29831+
tsc: bin/tsc
29832+
tsserver: bin/tsserver
29833+
checksum: 89c397df192f239359ad798b96d8e8d552e12c0c189ac5676cec4c20c410d6eec636b8e59a88f2aef0a56d961a9678d99c400099be9b7cae2f7b062eb4b7b171
29834+
languageName: node
29835+
linkType: hard
29836+
29837+
"typescript@npm:~4.3.2":
29838+
version: 4.3.5
29839+
resolution: "typescript@npm:4.3.5"
29840+
bin:
29841+
tsc: bin/tsc
29842+
tsserver: bin/tsserver
29843+
checksum: bab033b5e2b0790dd35b77fd005df976ef80b8d84fd2c6e63cc31808151875beae9216e5a315fe7068e8499905c3c354248fe83272cdfc13b7705635f0c66c97
29844+
languageName: node
29845+
linkType: hard
29846+
29847+
"typescript@patch:typescript@4.1.3#~builtin<compat/typescript>":
29848+
version: 4.1.3
29849+
resolution: "typescript@patch:typescript@npm%3A4.1.3#~builtin<compat/typescript>::version=4.1.3&hash=701156"
29850+
bin:
29851+
tsc: bin/tsc
29852+
tsserver: bin/tsserver
29853+
checksum: ed3df76d9b6efb448e5e73bca671698cda353a3807199ad95c78782a857e7685ccc94b799ac885423ced65ee21c87cbbeb823642c5dfd715efae5ebbc6137070
29854+
languageName: node
29855+
linkType: hard
29856+
29857+
"typescript@patch:typescript@5.2#~builtin<compat/typescript>":
2979029858
version: 5.2.2
2979129859
resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=701156"
2979229860
bin:
@@ -29796,6 +29864,46 @@ fsevents@^1.2.7:
2979629864
languageName: node
2979729865
linkType: hard
2979829866

29867+
"typescript@patch:typescript@5.3.3#~builtin<compat/typescript>, typescript@patch:typescript@^5.0.0#~builtin<compat/typescript>, typescript@patch:typescript@^5.2.2#~builtin<compat/typescript>":
29868+
version: 5.3.3
29869+
resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=701156"
29870+
bin:
29871+
tsc: bin/tsc
29872+
tsserver: bin/tsserver
29873+
checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
29874+
languageName: node
29875+
linkType: hard
29876+
29877+
"typescript@patch:typescript@^4.1.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.3.4#~builtin<compat/typescript>, typescript@patch:typescript@^4.8.0#~builtin<compat/typescript>, typescript@patch:typescript@^4.9#~builtin<compat/typescript>, typescript@patch:typescript@~4.9#~builtin<compat/typescript>":
29878+
version: 4.9.5
29879+
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=701156"
29880+
bin:
29881+
tsc: bin/tsc
29882+
tsserver: bin/tsserver
29883+
checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20
29884+
languageName: node
29885+
linkType: hard
29886+
29887+
"typescript@patch:typescript@~4.2.4#~builtin<compat/typescript>":
29888+
version: 4.2.4
29889+
resolution: "typescript@patch:typescript@npm%3A4.2.4#~builtin<compat/typescript>::version=4.2.4&hash=701156"
29890+
bin:
29891+
tsc: bin/tsc
29892+
tsserver: bin/tsserver
29893+
checksum: eb86e0e8022e5297f7a7b871b6edfbf33b57049416ada8bf97c358760125c7c79f074fbebd1b8e8230f858ae05eb22ad0e805e8f6acd5eae1fa886681624c15e
29894+
languageName: node
29895+
linkType: hard
29896+
29897+
"typescript@patch:typescript@~4.3.2#~builtin<compat/typescript>":
29898+
version: 4.3.5
29899+
resolution: "typescript@patch:typescript@npm%3A4.3.5#~builtin<compat/typescript>::version=4.3.5&hash=701156"
29900+
bin:
29901+
tsc: bin/tsc
29902+
tsserver: bin/tsserver
29903+
checksum: 365df18cf979c971ef9543b2acaa8694377a803f98e1804c41d0ede0b09d7046cb0cd98f2eaf3884b0fe923c01a60af1f653841bd8805c9715d5479c09a4ebe4
29904+
languageName: node
29905+
linkType: hard
29906+
2979929907
"ua-parser-js@npm:^0.7.18":
2980029908
version: 0.7.28
2980129909
resolution: "ua-parser-js@npm:0.7.28"

0 commit comments

Comments
 (0)