Skip to content

Commit 72f867e

Browse files
authored
Merge pull request #4091 from aryaemami59/fix-tsconfig
Update `tsconfig.typetests.json` include all TS files
2 parents 8616a04 + 1189418 commit 72f867e

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",
@@ -68,8 +68,7 @@
6868
"type-fest": "2.19.0",
6969
"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",
7070
"@typescript-eslint/eslint-plugin": "6.12.0",
71-
"@typescript-eslint/parser": "6.12.0",
72-
"typescript": "5.2.2"
71+
"@typescript-eslint/parser": "6.12.0"
7372
},
7473
"scripts": {
7574
"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
@@ -263,11 +263,11 @@ __metadata:
263263
languageName: node
264264
linkType: hard
265265

266-
"@arethetypeswrong/cli@npm:^0.13.1":
267-
version: 0.13.1
268-
resolution: "@arethetypeswrong/cli@npm:0.13.1"
266+
"@arethetypeswrong/cli@npm:^0.13.5":
267+
version: 0.13.5
268+
resolution: "@arethetypeswrong/cli@npm:0.13.5"
269269
dependencies:
270-
"@arethetypeswrong/core": 0.13.0
270+
"@arethetypeswrong/core": 0.13.5
271271
chalk: ^4.1.2
272272
cli-table3: ^0.6.3
273273
commander: ^10.0.1
@@ -276,20 +276,21 @@ __metadata:
276276
semver: ^7.5.4
277277
bin:
278278
attw: dist/index.js
279-
checksum: a200d2c5cd6f6245e4e2afa3a1ea98eb588a4d2a2cf7e6b76c92451d430c7c1bdcd5075e5ab6f9929dcdea36dd072fdcdb32ef085609e40c801ab40cbc96100b
279+
checksum: 6fe8ff6f529bbdd9427172bfb8a796d741aa17d0ba50cfa402f68cca8d288c0ada2e96d5ed01590da4d035da755e6156476e74e3d4c9fdfac1328a882ba61559
280280
languageName: node
281281
linkType: hard
282282

283-
"@arethetypeswrong/core@npm:0.13.0":
284-
version: 0.13.0
285-
resolution: "@arethetypeswrong/core@npm:0.13.0"
283+
"@arethetypeswrong/core@npm:0.13.5":
284+
version: 0.13.5
285+
resolution: "@arethetypeswrong/core@npm:0.13.5"
286286
dependencies:
287287
"@andrewbranch/untar.js": ^1.0.3
288288
fflate: ^0.7.4
289289
semver: ^7.5.4
290-
typescript: ^5.2.2
290+
ts-expose-internals-conditionally: 1.0.0-empty.0
291+
typescript: 5.3.3
291292
validate-npm-package-name: ^5.0.0
292-
checksum: cfe30a1ca0259ae6021971f155f9cba83a8329144eeac00164db680d4e46ad244b3f4bfb47b972bc19117dd3c72f2885e74b8cc1d1edc95e95960f090908efd6
293+
checksum: f44d99cd453668aa1b171ebc6a05f2e3745f599effabbafbbca702a2f87b449eb73b8ea1db25a268affdff561493f807ae18f58297b7116b1a19396568709a88
293294
languageName: node
294295
linkType: hard
295296

@@ -7017,7 +7018,7 @@ __metadata:
70177018
version: 0.0.0-use.local
70187019
resolution: "@reduxjs/toolkit@workspace:packages/toolkit"
70197020
dependencies:
7020-
"@arethetypeswrong/cli": ^0.13.1
7021+
"@arethetypeswrong/cli": ^0.13.5
70217022
"@microsoft/api-extractor": ^7.13.2
70227023
"@phryneas/ts-version": ^1.0.2
70237024
"@size-limit/preset-small-lib": ^4.11.0
@@ -26063,9 +26064,9 @@ fsevents@^1.2.7:
2606326064
linkType: hard
2606426065

2606526066
"reselect@npm:^5.0.1":
26066-
version: 5.0.1
26067-
resolution: "reselect@npm:5.0.1"
26068-
checksum: 7663b4c28a0e908e74dc25262e1d813d028b9c2ee96160cb0f40a16f09c5ac632fa16af6bafede7eb0ff16ab2d5bea2cd8814d9a9488e0262b8317fef90b1dc0
26067+
version: 5.1.0
26068+
resolution: "reselect@npm:5.1.0"
26069+
checksum: 5bc9c5d03d7caea00d0c0e24330bf23d91801227346fec1cef6a60988ab8d3dd7cee76e6994ca0915bc1c20845bb2bd929b95753763e0a9db74c0f9dff5cb845
2606926070
languageName: node
2607026071
linkType: hard
2607126072

@@ -26489,7 +26490,7 @@ fsevents@^1.2.7:
2648926490
prettier: ^2.2.1
2649026491
release-it: ^14.12.5
2649126492
serve: ^14.2.0
26492-
typescript: 5.2
26493+
typescript: ^5.2.2
2649326494
languageName: unknown
2649426495
linkType: soft
2649526496

@@ -28987,6 +28988,13 @@ fsevents@^1.2.7:
2898728988
languageName: node
2898828989
linkType: hard
2898928990

28991+
"ts-expose-internals-conditionally@npm:1.0.0-empty.0":
28992+
version: 1.0.0-empty.0
28993+
resolution: "ts-expose-internals-conditionally@npm:1.0.0-empty.0"
28994+
checksum: 6b4f546fc59f04f68d579f1bc0704541ec17521f84d32a15b45bef5dbc7a787143a065e19541cc5b64ff494f16f223bce59f3f5bf10ec538e5739e23c0efb878
28995+
languageName: node
28996+
linkType: hard
28997+
2899028998
"ts-interface-checker@npm:^0.1.9":
2899128999
version: 0.1.13
2899229000
resolution: "ts-interface-checker@npm:0.1.13"
@@ -29284,7 +29292,17 @@ fsevents@^1.2.7:
2928429292
languageName: node
2928529293
linkType: hard
2928629294

29287-
"typescript@npm:5.2.2":
29295+
"typescript@npm:4.1.3":
29296+
version: 4.1.3
29297+
resolution: "typescript@npm:4.1.3"
29298+
bin:
29299+
tsc: bin/tsc
29300+
tsserver: bin/tsserver
29301+
checksum: 0a25f7d7cebbc5ad23f41cb30918643460477be265bd3bcd400ffedb77d16e97d46f2b0c31393b2f990c5cf5b9f7a829ad6aff8636988b8f30abf81c656237c0
29302+
languageName: node
29303+
linkType: hard
29304+
29305+
"typescript@npm:5.2":
2928829306
version: 5.2.2
2928929307
resolution: "typescript@npm:5.2.2"
2929029308
bin:
@@ -29294,7 +29312,57 @@ fsevents@^1.2.7:
2929429312
languageName: node
2929529313
linkType: hard
2929629314

29297-
"typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>":
29315+
"typescript@npm:5.3.3, typescript@npm:^5.0.0, typescript@npm:^5.2.2":
29316+
version: 5.3.3
29317+
resolution: "typescript@npm:5.3.3"
29318+
bin:
29319+
tsc: bin/tsc
29320+
tsserver: bin/tsserver
29321+
checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
29322+
languageName: node
29323+
linkType: hard
29324+
29325+
"typescript@npm:^4.1.3, typescript@npm:^4.3.4, typescript@npm:^4.8.0, typescript@npm:^4.9, typescript@npm:~4.9":
29326+
version: 4.9.5
29327+
resolution: "typescript@npm:4.9.5"
29328+
bin:
29329+
tsc: bin/tsc
29330+
tsserver: bin/tsserver
29331+
checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db
29332+
languageName: node
29333+
linkType: hard
29334+
29335+
"typescript@npm:~4.2.4":
29336+
version: 4.2.4
29337+
resolution: "typescript@npm:4.2.4"
29338+
bin:
29339+
tsc: bin/tsc
29340+
tsserver: bin/tsserver
29341+
checksum: 89c397df192f239359ad798b96d8e8d552e12c0c189ac5676cec4c20c410d6eec636b8e59a88f2aef0a56d961a9678d99c400099be9b7cae2f7b062eb4b7b171
29342+
languageName: node
29343+
linkType: hard
29344+
29345+
"typescript@npm:~4.3.2":
29346+
version: 4.3.5
29347+
resolution: "typescript@npm:4.3.5"
29348+
bin:
29349+
tsc: bin/tsc
29350+
tsserver: bin/tsserver
29351+
checksum: bab033b5e2b0790dd35b77fd005df976ef80b8d84fd2c6e63cc31808151875beae9216e5a315fe7068e8499905c3c354248fe83272cdfc13b7705635f0c66c97
29352+
languageName: node
29353+
linkType: hard
29354+
29355+
"typescript@patch:typescript@4.1.3#~builtin<compat/typescript>":
29356+
version: 4.1.3
29357+
resolution: "typescript@patch:typescript@npm%3A4.1.3#~builtin<compat/typescript>::version=4.1.3&hash=701156"
29358+
bin:
29359+
tsc: bin/tsc
29360+
tsserver: bin/tsserver
29361+
checksum: ed3df76d9b6efb448e5e73bca671698cda353a3807199ad95c78782a857e7685ccc94b799ac885423ced65ee21c87cbbeb823642c5dfd715efae5ebbc6137070
29362+
languageName: node
29363+
linkType: hard
29364+
29365+
"typescript@patch:typescript@5.2#~builtin<compat/typescript>":
2929829366
version: 5.2.2
2929929367
resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=701156"
2930029368
bin:
@@ -29304,6 +29372,46 @@ fsevents@^1.2.7:
2930429372
languageName: node
2930529373
linkType: hard
2930629374

29375+
"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>":
29376+
version: 5.3.3
29377+
resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=701156"
29378+
bin:
29379+
tsc: bin/tsc
29380+
tsserver: bin/tsserver
29381+
checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
29382+
languageName: node
29383+
linkType: hard
29384+
29385+
"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>":
29386+
version: 4.9.5
29387+
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=701156"
29388+
bin:
29389+
tsc: bin/tsc
29390+
tsserver: bin/tsserver
29391+
checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20
29392+
languageName: node
29393+
linkType: hard
29394+
29395+
"typescript@patch:typescript@~4.2.4#~builtin<compat/typescript>":
29396+
version: 4.2.4
29397+
resolution: "typescript@patch:typescript@npm%3A4.2.4#~builtin<compat/typescript>::version=4.2.4&hash=701156"
29398+
bin:
29399+
tsc: bin/tsc
29400+
tsserver: bin/tsserver
29401+
checksum: eb86e0e8022e5297f7a7b871b6edfbf33b57049416ada8bf97c358760125c7c79f074fbebd1b8e8230f858ae05eb22ad0e805e8f6acd5eae1fa886681624c15e
29402+
languageName: node
29403+
linkType: hard
29404+
29405+
"typescript@patch:typescript@~4.3.2#~builtin<compat/typescript>":
29406+
version: 4.3.5
29407+
resolution: "typescript@patch:typescript@npm%3A4.3.5#~builtin<compat/typescript>::version=4.3.5&hash=701156"
29408+
bin:
29409+
tsc: bin/tsc
29410+
tsserver: bin/tsserver
29411+
checksum: 365df18cf979c971ef9543b2acaa8694377a803f98e1804c41d0ede0b09d7046cb0cd98f2eaf3884b0fe923c01a60af1f653841bd8805c9715d5479c09a4ebe4
29412+
languageName: node
29413+
linkType: hard
29414+
2930729415
"ua-parser-js@npm:^0.7.18":
2930829416
version: 0.7.28
2930929417
resolution: "ua-parser-js@npm:0.7.28"

0 commit comments

Comments
 (0)