Skip to content

Commit 9c9fd60

Browse files
authoredSep 27, 2022
fix: merge config from globals with transformer config correctly (#3842)
Fixes #3841
1 parent c76195b commit 9c9fd60

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed
 

‎src/legacy/ts-jest-transformer.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ describe('TsJestTransformer', () => {
304304
let tr!: TsJestTransformer
305305

306306
beforeEach(() => {
307-
tr = new TsJestTransformer()
307+
tr = new TsJestTransformer({})
308308
jest.spyOn(TsJestCompiler.prototype, 'getResolvedModules').mockReturnValueOnce([])
309309
})
310310

‎src/legacy/ts-jest-transformer.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,17 @@ export class TsJestTransformer implements SyncTransformer {
109109
if (config.globals?.['ts-jest']) {
110110
this._logger.warn(Deprecations.GlobalsTsJestConfigOption)
111111
}
112+
const jestGlobalsConfig = config.globals ?? {}
113+
const tsJestGlobalsConfig = jestGlobalsConfig['ts-jest'] ?? {}
112114
const migratedConfig = this.tsJestConfig
113115
? {
114116
...config,
115117
globals: {
116-
...(config.globals ?? Object.create(null)),
117-
'ts-jest': this.tsJestConfig,
118+
...jestGlobalsConfig,
119+
'ts-jest': {
120+
...tsJestGlobalsConfig,
121+
...this.tsJestConfig,
122+
},
118123
},
119124
}
120125
: config

0 commit comments

Comments
 (0)
Please sign in to comment.