Merge pull request #411 from predeekc/master

Changed sourcemap file path resolution to use correct extension
ivogabe · Sep 21, 2016 · 6939231 · 6939231
2 parents fba026a + cc916a8
commit 6939231
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 2 deletions.
diff --git a/lib/output.ts b/lib/output.ts
@@ -106,10 +106,13 @@ export class Output {
 						file.sourceMapOrigins = [file.original];
 					}
 					const [, jsExtension] = utils.splitExtension(file.sourceMap.file); // js or jsx
+					const [filePath, ] = utils.splitExtension(originalFileName);
+					const outputFileName = `${filePath}.${jsExtension}`;
+
 					// Fix the output filename in the source map, which must be relative
 					// to the source root or it won't work correctly in gulp-sourcemaps if
 					// there are more transformations down in the pipeline.
-					file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, originalFileName).replace(/\.ts$/, '.' + jsExtension);
+					file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, outputFileName);
 				}
 
 				this.applySourceMaps(file);

diff --git a/release/output.js b/release/output.js
@@ -76,10 +76,12 @@ var Output = (function () {
                         file.sourceMapOrigins = [file.original];
                     }
                     var _a = utils.splitExtension(file.sourceMap.file), jsExtension = _a[1]; // js or jsx
+                    var filePath = utils.splitExtension(originalFileName)[0];
+                    var outputFileName = filePath + "." + jsExtension;
                     // Fix the output filename in the source map, which must be relative
                     // to the source root or it won't work correctly in gulp-sourcemaps if
                     // there are more transformations down in the pipeline.
-                    file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, originalFileName).replace(/\.ts$/, '.' + jsExtension);
+                    file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, outputFileName);
                 }
                 this.applySourceMaps(file);
                 if (!this.project.sortOutput) {

diff --git a/test/baselines/sourceMaps/1.6/js/Main/MainFileTsx.js b/test/baselines/sourceMaps/1.6/js/Main/MainFileTsx.js
diff --git a/test/baselines/sourceMaps/1.6/js/Main/MainFileTsx.js.map b/test/baselines/sourceMaps/1.6/js/Main/MainFileTsx.js.map
diff --git a/test/baselines/sourceMaps/1.7/js/Main/MainFileTsx.js b/test/baselines/sourceMaps/1.7/js/Main/MainFileTsx.js
diff --git a/test/baselines/sourceMaps/1.7/js/Main/MainFileTsx.js.map b/test/baselines/sourceMaps/1.7/js/Main/MainFileTsx.js.map
diff --git a/test/baselines/sourceMaps/1.8/js/Main/MainFileTsx.js b/test/baselines/sourceMaps/1.8/js/Main/MainFileTsx.js
diff --git a/test/baselines/sourceMaps/1.8/js/Main/MainFileTsx.js.map b/test/baselines/sourceMaps/1.8/js/Main/MainFileTsx.js.map
diff --git a/test/baselines/sourceMaps/dev/js/Main/MainFileTsx.js b/test/baselines/sourceMaps/dev/js/Main/MainFileTsx.js
diff --git a/test/baselines/sourceMaps/dev/js/Main/MainFileTsx.js.map b/test/baselines/sourceMaps/dev/js/Main/MainFileTsx.js.map
diff --git a/test/sourceMaps/Main/MainFileTsx.tsx b/test/sourceMaps/Main/MainFileTsx.tsx
@@ -0,0 +1,7 @@
+import IFoo = require("../Outer/Foo");
+
+var foo: IFoo = {
+    bar: 42
+};
+
+console.log(foo.bar);