Merge pull request #52 from kulshekhar/fix-for-source-map-consumer

Fix for source map consumer
kulshekhar · Nov 4, 2016 · 4e45b38 · 4e45b38
2 parents 37c7a2e + e1f95e5
commit 4e45b38
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,6 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+# We need to include this folders, because they are mocks for integration tests
+!tests/**/node_modules
diff --git a/.npmignore b/.npmignore
@@ -17,6 +17,9 @@ pids
 *.pid
 *.seed
 
+# nodist config for testing in different versions of node
+.node-version
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Build Status for node v7](https://travis-badges.herokuapp.com/repos/kulshekhar/ts-jest/branches/master?job=0)](https://travis-ci.org/kulshekhar/ts-jest)
 [![Build Status for node v6](https://travis-badges.herokuapp.com/repos/kulshekhar/ts-jest/branches/master?job=1)](https://travis-ci.org/kulshekhar/ts-jest)
 [![Build Status for node v4](https://travis-badges.herokuapp.com/repos/kulshekhar/ts-jest/branches/master?job=2)](https://travis-ci.org/kulshekhar/ts-jest)
+[![Build Status for Windows](https://ci.appveyor.com/api/projects/status/gknb1pl72o0w0coc?svg=true)](https://ci.appveyor.com/project/Igmat/ts-jest)
 
 ## Table of Contents
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,28 @@
+# appveyor file
+# http://www.appveyor.com/docs/appveyor-yml
+
+# build version format
+version: "{build}"
+
+# fix lineendings in Windows
+init:
+  - git config --global core.autocrlf input
+
+# what combinations to test
+environment:
+  matrix:
+    - nodejs_version: 4
+    - nodejs_version: 6
+    - nodejs_version: 7
+
+# get the latest stable version of Node 0.STABLE.latest
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+
+build: off
+
+test_script:
+  - node --version
+  - npm --version
+  - cmd: npm test --no-color
diff --git a/src/default-retrieve-map-handler.ts b/src/default-retrieve-map-handler.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,11 +1,9 @@
-import { defaultRetrieveMapHandler } from './default-retrieve-map-handler';
 import { defaultRetrieveFileHandler } from './default-retrieve-file-handler';
 import * as sourceMapSupport from 'source-map-support';
 
 export function install() {
   var options: sourceMapSupport.Options = {};
   options.retrieveFile = defaultRetrieveFileHandler;
-  options.retrieveSourceMap = defaultRetrieveMapHandler;
   options.emptyCacheBetweenOperations = true; // left here only for sourceMapCache TODO: check this for correctness and performance with false velue
   options['environment'] = 'node';
 

diff --git a/src/retrieve-sourceMap-url.ts b/src/retrieve-sourceMap-url.ts
diff --git a/src/transpile-if-ts.ts b/src/transpile-if-ts.ts
@@ -5,17 +5,11 @@ export function transpileIfTypescript(path, contents) {
   if (path && (path.endsWith('.tsx') || path.endsWith('.ts'))) {
 
     let transpiled = tsc.transpileModule(contents, {
-      compilerOptions: addSourceMapToTSConfig(),
+      compilerOptions: getTSConfig({ __TS_CONFIG__: global['__TS_CONFIG__'] }, true),
       fileName: path
     });
 
     return transpiled.outputText;
   }
   return contents;
-}
-
-function addSourceMapToTSConfig() {
-  // if a global __TS_CONFIG__ is set, update the compiler setting to include inline SourceMap
-  var config = getTSConfig({ __TS_CONFIG__: global['__TS_CONFIG__'] }, true);
-  return config;
 }
diff --git a/tests/button/__mocks__/ts-jest.ts b/tests/button/__mocks__/ts-jest.ts
diff --git a/tests/button/node_modules/ts-jest.js b/tests/button/node_modules/ts-jest.js
diff --git a/tests/simple/__mocks__/ts-jest.ts b/tests/simple/__mocks__/ts-jest.ts
diff --git a/tests/simple/node_modules/ts-jest.js b/tests/simple/node_modules/ts-jest.js
diff --git a/tests/tsconfig-test/__mocks__/ts-jest.ts b/tests/tsconfig-test/__mocks__/ts-jest.ts
diff --git a/tests/watch-test/__mocks__/ts-jest.ts b/tests/watch-test/__mocks__/ts-jest.ts
diff --git a/tests/watch-test/node_modules/ts-jest.js b/tests/watch-test/node_modules/ts-jest.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,9 @@ pids @@
     *.pid
     *.seed
+    # nodist config for testing in different versions of node
+    .node-version
     # Directory for instrumented libs generated by jscoverage/JSCover
     lib-cov
@@ Expand Down @@