Always remove outDir while computing TypeScript Config for transpiling (

#311) Always remove outDir while computing TypeScript Config for transpiling
kulshekhar · Sep 1, 2017 · 27a205b · 27a205b
1 parent 64bbc6e
commit 27a205b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 14 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -35,5 +35,5 @@ Orta Therox <[email protected]>
 Patrick Housley <[email protected]>
 Rikki Tooley <[email protected]>
 Tom Crockett <[email protected]>
+Trivikram Kamat <[email protected]>
 Umidbek Karimov <[email protected]>
-
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "20.0.13",
+  "version": "20.0.14",
   "main": "index.js",
   "types": "./dist/index.d.ts",
   "description": "A preprocessor with sourcemap support to help use Typescript with Jest",

diff --git a/src/utils.ts b/src/utils.ts
@@ -184,11 +184,11 @@ export function getTSConfig(globals, collectCoverage: boolean = false) {
   config.inlineSourceMap = true;
   config.inlineSources = true;
 
-  if (collectCoverage) {
-    // the coverage report is broken if `.outDir` is set
-    // see https://github.com/kulshekhar/ts-jest/issues/201
-    delete config.outDir;
-  }
+  // the coverage report is broken if `.outDir` is set
+  // see https://github.com/kulshekhar/ts-jest/issues/201
+  // `.outDir` is removed even for test files as it affects with breakpoints
+  // see https://github.com/kulshekhar/ts-jest/issues/309
+  delete config.outDir;
 
   // Note: If we had to read the inline configuration, it's required to set the fields
   // to their string properties, and convert the result accordingly afterwards.

diff --git a/tests/__tests__/tsconfig-default.spec.ts b/tests/__tests__/tsconfig-default.spec.ts
@@ -15,8 +15,9 @@ describe('get default ts config', () => {
   it('should correctly read tsconfig.json', () => {
     const result = getTSConfig(null);
 
-    expect(result).toMatchObject({
+    expect(result).toEqual({
       inlineSourceMap: true,
+      inlineSources: true,
       target: ts.ScriptTarget.ES2015,
       module: ts.ModuleKind.CommonJS,
       moduleResolution: ts.ModuleResolutionKind.NodeJs,

diff --git a/tests/__tests__/tsconfig-inline.spec.ts b/tests/__tests__/tsconfig-inline.spec.ts
@@ -20,8 +20,27 @@ describe('get inline ts config', () => {
         },
       });
 
-      expect(result).toMatchObject({
+      expect(result).toEqual({
         inlineSourceMap: true,
+        inlineSources: true,
+        module: ts.ModuleKind.CommonJS,
+        jsx: ts.JsxEmit.React,
+      });
+    });
+
+    it('should not read sourceMap/outDir from tsconfig options', () => {
+      const result = getTSConfig({
+        __TS_CONFIG__: {
+          module: 'commonjs',
+          jsx: 'react',
+          outDir: 'build',
+          sourceMap: true,
+        },
+      });
+
+      expect(result).toEqual({
+        inlineSourceMap: true,
+        inlineSources: true,
         module: ts.ModuleKind.CommonJS,
         jsx: ts.JsxEmit.React,
       });

diff --git a/tests/__tests__/tsconfig-string.spec.ts b/tests/__tests__/tsconfig-string.spec.ts
@@ -16,8 +16,9 @@ describe('get ts config from string', () => {
         __TS_CONFIG__: 'my-tsconfig.json',
       });
 
-      expect(result).toMatchObject({
+      expect(result).toEqual({
         inlineSourceMap: true,
+        inlineSources: true,
         target: ts.ScriptTarget.ES2015,
         module: ts.ModuleKind.CommonJS,
         moduleResolution: ts.ModuleResolutionKind.NodeJs,
@@ -56,8 +57,9 @@ describe('get ts config from string', () => {
         __TS_CONFIG__: 'extends-tsconfig.json',
       });
 
-      expect(result).toMatchObject({
+      expect(result).toEqual({
         inlineSourceMap: true,
+        inlineSources: true,
         target: ts.ScriptTarget.ES2015,
         module: ts.ModuleKind.CommonJS,
         moduleResolution: ts.ModuleResolutionKind.NodeJs,
@@ -71,8 +73,9 @@ describe('get ts config from string', () => {
         __TS_CONFIG__: 'extends-with-overrides-tsconfig.json',
       });
 
-      expect(result).toMatchObject({
+      expect(result).toEqual({
         inlineSourceMap: true,
+        inlineSources: true,
         target: ts.ScriptTarget.ES5,
         module: ts.ModuleKind.CommonJS,
         moduleResolution: ts.ModuleResolutionKind.NodeJs,
@@ -93,6 +96,7 @@ describe('get ts config from string', () => {
 
       expect(result).toMatchObject({
         inlineSourceMap: true,
+        inlineSources: true,
         target: ts.ScriptTarget.ES2015,
         module: ts.ModuleKind.CommonJS,
         moduleResolution: ts.ModuleResolutionKind.NodeJs,
@@ -137,8 +141,9 @@ describe('get ts config from string', () => {
         },
       });
 
-      expect(result).toMatchObject({
+      expect(result).toEqual({
         inlineSourceMap: true,
+        inlineSources: true,
         target: ts.ScriptTarget.ES2015,
         module: ts.ModuleKind.CommonJS,
         moduleResolution: ts.ModuleResolutionKind.NodeJs,
@@ -154,8 +159,9 @@ describe('get ts config from string', () => {
         },
       });
 
-      expect(result).toMatchObject({
+      expect(result).toEqual({
         inlineSourceMap: true,
+        inlineSources: true,
         target: ts.ScriptTarget.ES5,
         module: ts.ModuleKind.CommonJS,
         moduleResolution: ts.ModuleResolutionKind.NodeJs,