Skip to content

Commit 6939231

Browse files
authored
Merge pull request #411 from predeekc/master
Changed sourcemap file path resolution to use correct extension
2 parents fba026a + cc916a8 commit 6939231

File tree

11 files changed

+44
-2
lines changed

11 files changed

+44
-2
lines changed

lib/output.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,13 @@ export class Output {
106106
file.sourceMapOrigins = [file.original];
107107
}
108108
const [, jsExtension] = utils.splitExtension(file.sourceMap.file); // js or jsx
109+
const [filePath, ] = utils.splitExtension(originalFileName);
110+
const outputFileName = `${filePath}.${jsExtension}`;
111+
109112
// Fix the output filename in the source map, which must be relative
110113
// to the source root or it won't work correctly in gulp-sourcemaps if
111114
// there are more transformations down in the pipeline.
112-
file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, originalFileName).replace(/\.ts$/, '.' + jsExtension);
115+
file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, outputFileName);
113116
}
114117

115118
this.applySourceMaps(file);

release/output.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,12 @@ var Output = (function () {
7676
file.sourceMapOrigins = [file.original];
7777
}
7878
var _a = utils.splitExtension(file.sourceMap.file), jsExtension = _a[1]; // js or jsx
79+
var filePath = utils.splitExtension(originalFileName)[0];
80+
var outputFileName = filePath + "." + jsExtension;
7981
// Fix the output filename in the source map, which must be relative
8082
// to the source root or it won't work correctly in gulp-sourcemaps if
8183
// there are more transformations down in the pipeline.
82-
file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, originalFileName).replace(/\.ts$/, '.' + jsExtension);
84+
file.sourceMap.file = path.relative(file.sourceMap.sourceRoot, outputFileName);
8385
}
8486
this.applySourceMaps(file);
8587
if (!this.project.sortOutput) {

test/baselines/sourceMaps/1.6/js/Main/MainFileTsx.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/1.6/js/Main/MainFileTsx.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/1.7/js/Main/MainFileTsx.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/1.7/js/Main/MainFileTsx.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/1.8/js/Main/MainFileTsx.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/1.8/js/Main/MainFileTsx.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/dev/js/Main/MainFileTsx.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/baselines/sourceMaps/dev/js/Main/MainFileTsx.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)