fix: merge config from globals with transformer config correctly (#…

…3842) Fixes #3841
kulshekhar · Sep 27, 2022 · 9c9fd60 · 9c9fd60
1 parent c76195b
commit 9c9fd60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/legacy/ts-jest-transformer.spec.ts b/src/legacy/ts-jest-transformer.spec.ts
@@ -304,7 +304,7 @@ describe('TsJestTransformer', () => {
     let tr!: TsJestTransformer
 
     beforeEach(() => {
-      tr = new TsJestTransformer()
+      tr = new TsJestTransformer({})
       jest.spyOn(TsJestCompiler.prototype, 'getResolvedModules').mockReturnValueOnce([])
     })
 

diff --git a/src/legacy/ts-jest-transformer.ts b/src/legacy/ts-jest-transformer.ts
@@ -109,12 +109,17 @@ export class TsJestTransformer implements SyncTransformer {
         if (config.globals?.['ts-jest']) {
           this._logger.warn(Deprecations.GlobalsTsJestConfigOption)
         }
+        const jestGlobalsConfig = config.globals ?? {}
+        const tsJestGlobalsConfig = jestGlobalsConfig['ts-jest'] ?? {}
         const migratedConfig = this.tsJestConfig
           ? {
               ...config,
               globals: {
-                ...(config.globals ?? Object.create(null)),
-                'ts-jest': this.tsJestConfig,
+                ...jestGlobalsConfig,
+                'ts-jest': {
+                  ...tsJestGlobalsConfig,
+                  ...this.tsJestConfig,
+                },
               },
             }
           : config