Skip to content

Commit 490e464

Browse files
committed
chore: modify jest config, ts-jest => 26.xx.xx, tsconfig'include add test\/**\/*
1 parent cc63d0c commit 490e464

File tree

5 files changed

+31
-51
lines changed

5 files changed

+31
-51
lines changed

jest.config.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
const { default: tsJestPreset } = require('ts-jest')
2-
31
const defaults = {
4-
...tsJestPreset,
52
coverageDirectory: './coverage/',
63
collectCoverage: true,
74
testURL: 'http://localhost',
85
}
9-
10-
const testFolderPath = (folderName) =>
11-
`<rootDir>/test/${folderName}/**/*.{js,ts,tsx}`
6+
const testFolderPath = (folderName) => `<rootDir>/test/${folderName}/**/*.js`
127

138
const NORMAL_TEST_FOLDERS = ['components', 'hooks', 'integration', 'utils']
149

@@ -18,6 +13,16 @@ const standardConfig = {
1813
testMatch: NORMAL_TEST_FOLDERS.map(testFolderPath),
1914
}
2015

16+
const tsTestFolderPath = (folderName) =>
17+
`<rootDir>/test/${folderName}/**/*.{ts,tsx}`
18+
19+
const tsStandardConfig = {
20+
...defaults,
21+
displayName: 'ReactDOM',
22+
preset: 'ts-jest',
23+
testMatch: NORMAL_TEST_FOLDERS.map(tsTestFolderPath),
24+
}
25+
2126
const rnConfig = {
2227
...defaults,
2328
displayName: 'React Native',
@@ -29,5 +34,5 @@ const rnConfig = {
2934
}
3035

3136
module.exports = {
32-
projects: [standardConfig, rnConfig],
37+
projects: [tsStandardConfig, standardConfig, rnConfig],
3338
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"rimraf": "^3.0.2",
110110
"rollup": "^2.32.1",
111111
"rollup-plugin-terser": "^7.0.2",
112-
"ts-jest": "^27.0.3",
112+
"ts-jest": "26.5.6",
113113
"typescript": "^4.3.4"
114114
},
115115
"browserify": {

src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,6 @@ export type ResolveArrayThunks<TDispatchProps extends ReadonlyArray<any>> =
272272
export interface TypedUseSelectorHook<TState> {
273273
<TSelected>(
274274
selector: (state: TState) => TSelected,
275-
equalityFn?: (left: TSelected, right: TSelected) => boolean
275+
equalityFn?: EqualityFn<TSelected>
276276
): TSelected
277277
}

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"declaration": true,
1212
"emitDeclarationOnly": true,
1313
"outDir": "./es",
14-
"forceConsistentCasingInFileNames": true
14+
"forceConsistentCasingInFileNames": true,
1515
},
16-
"include": ["src/**/*", "types"],
16+
"include": ["src/**/*", "test/**/*", "types"],
1717
"exclude": ["node_modules", "dist"]
1818
}

yarn.lock

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3571,9 +3571,9 @@ __metadata:
35713571
linkType: hard
35723572

35733573
"@types/normalize-package-data@npm:^2.4.0":
3574-
version: 2.4.0
3575-
resolution: "@types/normalize-package-data@npm:2.4.0"
3576-
checksum: 6d077e73be7ac6227b678829c7bd765607136cdef537fd4ee7f368d9302a651aea924254d69826663322048436d90d6e7c679c9aa99c4824a687c568aab8ce4f
3574+
version: 2.4.1
3575+
resolution: "@types/normalize-package-data@npm:2.4.1"
3576+
checksum: d7bb5756003a5dbf3ea1ee24ee336c036f3670a7f1ca2c8c840b5ba8fdf4b7063f8d8df16ec0427f622cc97e1c44710f089720d7caa521a5f4ec6f4073c69261
35773577
languageName: node
35783578
linkType: hard
35793579

@@ -3599,9 +3599,9 @@ __metadata:
35993599
linkType: hard
36003600

36013601
"@types/prettier@npm:^2.0.0":
3602-
version: 2.3.1
3603-
resolution: "@types/prettier@npm:2.3.1"
3604-
checksum: 62ddbb1ba05d0df97fe49536e0d5409ea76d45cd2f6de062ff351d049e667b77010d2e912733d5d3255829fa1958c684a059e619f9d81e2ba9f27a6204a06149
3602+
version: 2.3.2
3603+
resolution: "@types/prettier@npm:2.3.2"
3604+
checksum: 7b425386aaf3b03fa63382ed1aceff367477ef9a52a2705978bfb1495fa1d8795316e1ab84671f6c8c5920de59a33d1567d837b9eb033996983efdfdbce84cb3
36053605
languageName: node
36063606
linkType: hard
36073607

@@ -5606,7 +5606,7 @@ __metadata:
56065606
languageName: node
56075607
linkType: hard
56085608

5609-
"ci-info@npm:^3.0.0, ci-info@npm:^3.1.1":
5609+
"ci-info@npm:^3.0.0":
56105610
version: 3.2.0
56115611
resolution: "ci-info@npm:3.2.0"
56125612
checksum: d4a898d60111d00f2b7a06a349162971fe0603aefa208fe8d1343ce9e93c48e3d37311c47211d5c9040d25b43038c817588e5b7d8eab5d17b00aec49c7b5fade
@@ -9694,17 +9694,6 @@ __metadata:
96949694
languageName: node
96959695
linkType: hard
96969696

9697-
"is-ci@npm:^3.0.0":
9698-
version: 3.0.0
9699-
resolution: "is-ci@npm:3.0.0"
9700-
dependencies:
9701-
ci-info: ^3.1.1
9702-
bin:
9703-
is-ci: bin.js
9704-
checksum: 1e26d3ba6634ebee83f9d22f260354c5d950eada4d609c30cc2642069f8ba52f3aeb4c9bbf8099aaf04a2f44a1ed7beef2a24485f988753c8c078a57e9b3a2fd
9705-
languageName: node
9706-
linkType: hard
9707-
97089697
"is-color-stop@npm:^1.1.0":
97099698
version: 1.1.0
97109699
resolution: "is-color-stop@npm:1.1.0"
@@ -10711,7 +10700,7 @@ __metadata:
1071110700
languageName: node
1071210701
linkType: hard
1071310702

10714-
"jest-util@npm:^26.6.2":
10703+
"jest-util@npm:^26.1.0, jest-util@npm:^26.6.2":
1071510704
version: 26.6.2
1071610705
resolution: "jest-util@npm:26.6.2"
1071710706
dependencies:
@@ -10725,20 +10714,6 @@ __metadata:
1072510714
languageName: node
1072610715
linkType: hard
1072710716

10728-
"jest-util@npm:^27.0.0":
10729-
version: 27.0.6
10730-
resolution: "jest-util@npm:27.0.6"
10731-
dependencies:
10732-
"@jest/types": ^27.0.6
10733-
"@types/node": "*"
10734-
chalk: ^4.0.0
10735-
graceful-fs: ^4.2.4
10736-
is-ci: ^3.0.0
10737-
picomatch: ^2.2.3
10738-
checksum: a62ab3304ad58eb5fa130d66680d987890fca8c0505857a1b8bbcc8cf1de35eb3b82e19bdc5084dd10f68b3ce373234723f57f6e83781d4a4f66be1b647b488d
10739-
languageName: node
10740-
linkType: hard
10741-
1074210717
"jest-validate@npm:^24.9.0":
1074310718
version: 24.9.0
1074410719
resolution: "jest-validate@npm:24.9.0"
@@ -14561,7 +14536,7 @@ __metadata:
1456114536
rimraf: ^3.0.2
1456214537
rollup: ^2.32.1
1456314538
rollup-plugin-terser: ^7.0.2
14564-
ts-jest: ^27.0.3
14539+
ts-jest: 26.5.6
1456514540
typescript: ^4.3.4
1456614541
peerDependencies:
1456714542
react: ^16.8.3 || ^17
@@ -16963,26 +16938,26 @@ __metadata:
1696316938
languageName: node
1696416939
linkType: hard
1696516940

16966-
"ts-jest@npm:^27.0.3":
16967-
version: 27.0.3
16968-
resolution: "ts-jest@npm:27.0.3"
16941+
"ts-jest@npm:26.5.6":
16942+
version: 26.5.6
16943+
resolution: "ts-jest@npm:26.5.6"
1696916944
dependencies:
1697016945
bs-logger: 0.x
1697116946
buffer-from: 1.x
1697216947
fast-json-stable-stringify: 2.x
16973-
jest-util: ^27.0.0
16948+
jest-util: ^26.1.0
1697416949
json5: 2.x
1697516950
lodash: 4.x
1697616951
make-error: 1.x
1697716952
mkdirp: 1.x
1697816953
semver: 7.x
1697916954
yargs-parser: 20.x
1698016955
peerDependencies:
16981-
jest: ^27.0.0
16956+
jest: ">=26 <27"
1698216957
typescript: ">=3.8 <5.0"
1698316958
bin:
1698416959
ts-jest: cli.js
16985-
checksum: a63f3a8620a16335d745f22377a9cc118129d28a5b122c609a7c6aabbb8048c85733c771a0dd39b136e8a75401473409452bdd3c5b9e3b85317c2e3f3ac03267
16960+
checksum: fd32a8b256091d45d850c491fd090f74a368d44bccc8fedfa0dd074757727e7f07621eb2a69ebf081428f44a357a879237a2cf0aef970896410d454d0bf87ac6
1698616961
languageName: node
1698716962
linkType: hard
1698816963

0 commit comments

Comments
 (0)