Skip to content

Commit 559449e

Browse files
authored
chore: migrate type tests of each to TSTyche (#14994)
1 parent 08b8634 commit 559449e

File tree

16 files changed

+295
-570
lines changed

16 files changed

+295
-570
lines changed

.github/renovate.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
"rangeStrategy": "replace",
66
"postUpdateOptions": ["yarnDedupeHighest"],
77
"packageRules": [
8-
{
9-
"matchPackageNames": ["@tsd/typescript", "typescript"],
10-
"groupName": "typescript"
11-
},
12-
{
13-
"matchPackageNames": ["jest-runner-tsd", "tsd-lite"],
14-
"groupName": "tsd"
15-
},
168
{
179
"matchPackageNames": ["@lerna-lite/cli", "@lerna-lite/publish"],
1810
"groupName": "lerna-lite"

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: ts integration
4949
run: yarn test-ts --selectProjects ts-integration
5050
- name: type tests
51-
run: yarn tstyche --target 5.0,current && yarn test-ts --selectProjects type-tests
51+
run: yarn test-types --target 5.0,current
5252
- name: verify [email protected] compatibility
5353
run: yarn verify-old-ts
5454
- name: run ESLint with type info

jest.config.ts.mjs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ export default {
1919
roots: ['<rootDir>/e2e/__tests__'],
2020
testMatch: ['<rootDir>/e2e/__tests__/ts*'],
2121
},
22-
{
23-
displayName: {
24-
color: 'blue',
25-
name: 'type-tests',
26-
},
27-
modulePathIgnorePatterns: baseConfig.modulePathIgnorePatterns,
28-
roots: ['<rootDir>/packages'],
29-
runner: 'jest-runner-tsd',
30-
testMatch: ['**/packages/jest-types/__typetests__/each.test.ts'],
31-
},
3222
],
3323
reporters: ['default', 'github-actions'],
3424
};

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@lerna-lite/publish": "^3.0.0",
1717
"@microsoft/api-extractor": "^7.35.0",
1818
"@tsconfig/node16": "^16.1.0",
19-
"@tsd/typescript": "^5.0.4",
2019
"@types/babel__core": "^7.1.14",
2120
"@types/babel__generator": "^7.0.0",
2221
"@types/babel__template": "^7.0.2",
@@ -55,7 +54,6 @@
5554
"jest-changed-files": "workspace:*",
5655
"jest-junit": "^16.0.0",
5756
"jest-mock": "workspace:*",
58-
"jest-runner-tsd": "^6.0.0",
5957
"jest-serializer-ansi-escapes": "^3.0.0",
6058
"jest-silent-reporter": "^0.5.0",
6159
"jest-snapshot": "workspace:*",
@@ -80,7 +78,7 @@
8078
"strip-json-comments": "^3.1.1",
8179
"tempy": "^1.0.0",
8280
"ts-node": "^10.5.0",
83-
"tstyche": "^1.0.0",
81+
"tstyche": "^2.0.0-beta.0",
8482
"typescript": "^5.0.4",
8583
"webpack": "^5.68.0",
8684
"webpack-node-externals": "^3.0.0",
@@ -112,7 +110,7 @@
112110
"test-ci-partial:parallel": "yarn jest --color --config jest.config.ci.mjs",
113111
"test-leak": "yarn jest -i --detectLeaks --color jest-mock jest-diff jest-repl pretty-format",
114112
"test-ts": "yarn jest --config jest.config.ts.mjs",
115-
"test-types": "yarn tstyche && yarn test-ts --selectProjects type-tests",
113+
"test-types": "yarn tstyche",
116114
"test": "yarn lint && yarn jest",
117115
"typecheck": "yarn typecheck:examples && yarn typecheck:tests",
118116
"typecheck:examples": "tsc -p examples/expect-extend && tsc -p examples/typescript",

packages/expect/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
"devDependencies": {
3131
"@fast-check/jest": "^1.3.0",
3232
"@jest/test-utils": "workspace:*",
33-
"@tsd/typescript": "^5.0.4",
3433
"chalk": "^4.0.0",
35-
"immutable": "^4.0.0",
36-
"tsd-lite": "^0.8.0"
34+
"immutable": "^4.0.0"
3735
},
3836
"engines": {
3937
"node": "^16.10.0 || ^18.12.0 || >=20.0.0"

packages/jest-expect/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
"expect": "workspace:*",
2323
"jest-snapshot": "workspace:*"
2424
},
25-
"devDependencies": {
26-
"@tsd/typescript": "^5.0.4",
27-
"tsd-lite": "^0.8.0"
28-
},
2925
"engines": {
3026
"node": "^16.10.0 || ^18.12.0 || >=20.0.0"
3127
},

packages/jest-reporters/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
},
4242
"devDependencies": {
4343
"@jest/test-utils": "workspace:*",
44-
"@tsd/typescript": "^5.0.4",
4544
"@types/exit": "^0.1.30",
4645
"@types/graceful-fs": "^4.1.3",
4746
"@types/istanbul-lib-coverage": "^2.0.0",
@@ -52,8 +51,7 @@
5251
"@types/node-notifier": "^8.0.0",
5352
"jest-resolve": "workspace:*",
5453
"mock-fs": "^5.1.2",
55-
"node-notifier": "^10.0.0",
56-
"tsd-lite": "^0.8.0"
54+
"node-notifier": "^10.0.0"
5755
},
5856
"peerDependencies": {
5957
"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"

packages/jest-resolve/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030
"slash": "^3.0.0"
3131
},
3232
"devDependencies": {
33-
"@tsd/typescript": "^5.0.4",
3433
"@types/graceful-fs": "^4.1.3",
3534
"@types/pnpapi": "^0.0.5",
36-
"@types/resolve": "^1.20.2",
37-
"tsd-lite": "^0.8.0"
35+
"@types/resolve": "^1.20.2"
3836
},
3937
"engines": {
4038
"node": "^16.10.0 || ^18.12.0 || >=20.0.0"

packages/jest-runner/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,10 @@
4343
},
4444
"devDependencies": {
4545
"@jest/test-utils": "workspace:*",
46-
"@tsd/typescript": "^5.0.4",
4746
"@types/exit": "^0.1.30",
4847
"@types/graceful-fs": "^4.1.3",
4948
"@types/source-map-support": "^0.5.0",
50-
"jest-jasmine2": "workspace:*",
51-
"tsd-lite": "^0.8.0"
49+
"jest-jasmine2": "workspace:*"
5250
},
5351
"engines": {
5452
"node": "^16.10.0 || ^18.12.0 || >=20.0.0"

packages/jest-snapshot/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"@babel/preset-flow": "^7.7.2",
4646
"@babel/preset-react": "^7.12.1",
4747
"@jest/test-utils": "workspace:*",
48-
"@tsd/typescript": "^5.0.4",
4948
"@types/babel__core": "^7.1.14",
5049
"@types/graceful-fs": "^4.1.3",
5150
"@types/natural-compare": "^1.4.0",
@@ -54,8 +53,7 @@
5453
"ansi-regex": "^5.0.1",
5554
"ansi-styles": "^5.0.0",
5655
"prettier": "^3.0.3",
57-
"prettier-v2": "npm:prettier@^2.1.5",
58-
"tsd-lite": "^0.8.0"
56+
"prettier-v2": "npm:prettier@^2.1.5"
5957
},
6058
"engines": {
6159
"node": "^16.10.0 || ^18.12.0 || >=20.0.0"

0 commit comments

Comments
 (0)