fix(nx): merge jest.config.js globals with tsJestConfig instead of re…

…placing resolves nrwl#1059
jrista · Sep 29, 2019 · a3e01d1 · a3e01d1
1 parent 579a155
commit a3e01d1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/jest/src/builders/jest/jest.impl.ts b/packages/jest/src/builders/jest/jest.impl.ts
@@ -76,7 +76,10 @@ function run(
   const jestConfig: { globals: any } = require(options.jestConfig);
   const globals = jestConfig.globals || {};
   Object.assign(globals, {
-    'ts-jest': tsJestConfig
+    'ts-jest': {
+      ...(globals['ts-jest'] || {}),
+      ...tsJestConfig
+    }
   });
 
   const config: any = {