Skip to content

Commit 03df4f9

Browse files
committed
fix(config/jest): set ts-jest transform unconditionally
This reverts commit 0badbb3.
1 parent 743d715 commit 03df4f9

File tree

3 files changed

+245
-648
lines changed

3 files changed

+245
-648
lines changed

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
"@babel/core": "^7.17.2",
131131
"@babel/preset-env": "^7.16.11",
132132
"@types/cross-spawn": "^6.0.2",
133-
"babel-jest": "^28.1.0",
134133
"depcheck": "^1.4.3",
135134
"eslint-config-kentcdodds": "^20.0.1",
136135
"husky": "^7.0.4",

src/config/jest.config.js

+15-18
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const {jsWithTs: preset} = require('ts-jest/presets')
44

5-
const {ifAnyDep, hasAnyDep, hasFile, fromRoot} = require('../utils')
5+
const {ifAnyDep, hasFile, fromRoot} = require('../utils')
66

77
const {
88
testMatch,
@@ -29,6 +29,14 @@ const jestConfig = {
2929
testMatch,
3030
testPathIgnorePatterns: [...ignores, '<rootDir>/dist'],
3131
testLocationInResults: true,
32+
transform: Object.fromEntries(
33+
// Ensure we can resolve the preset even when
34+
// it's in a nested `node_modules` installation
35+
Object.entries(preset.transform).map(([key, value]) => [
36+
key,
37+
require.resolve(value),
38+
]),
39+
),
3240
coveragePathIgnorePatterns: [
3341
...ignores,
3442
'src/(umd|cjs|esm)-entry.js$',
@@ -51,24 +59,13 @@ const jestConfig = {
5159
require.resolve('jest-watch-typeahead/filename'),
5260
require.resolve('jest-watch-typeahead/testname'),
5361
],
54-
globals: {},
55-
}
56-
57-
if (hasAnyDep('ts-jest') || hasFile('tsconfig.json')) {
58-
jestConfig.transform = Object.fromEntries(
59-
// Ensure we can resolve the preset even when
60-
// it's in a nested `node_modules` installation
61-
Object.entries(preset.transform).map(([key, value]) => [
62-
key,
63-
require.resolve(value),
64-
]),
65-
)
66-
67-
jestConfig.globals['ts-jest'] = {
68-
diagnostics: {
69-
warnOnly: true,
62+
globals: {
63+
'ts-jest': {
64+
diagnostics: {
65+
warnOnly: true,
66+
},
7067
},
71-
}
68+
},
7269
}
7370

7471
if (hasFile('tests/setup-env.js')) {

0 commit comments

Comments
 (0)