Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CoffeeScript source map composition #8298

Merged
merged 1 commit into from Feb 10, 2017
Merged

Fix CoffeeScript source map composition #8298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions packages/coffeescript/plugin/compile-coffeescript.js
View file
Open in desktop
Expand Up @@ -44,8 +44,6 @@ export class CoffeeCompiler extends CachingCompiler {
literate: inputFile.getExtension() !== 'coffee',
// Return a source map.
sourceMap: true,
// Include the original source in the source map (sourcesContent field).
inlineMap: true,
// This becomes the "file" field of the source map.
generatedFile: '/' + this._outputFilePath(inputFile),
// This becomes the "sources" field of the source map.
Expand Down Expand Up @@ -87,6 +85,7 @@ export class CoffeeCompiler extends CachingCompiler {
}

let sourceMap = JSON.parse(output.v3SourceMap);
sourceMap.sourcesContent = [source];

output.js = stripExportedVars(
output.js,
Expand All @@ -104,11 +103,19 @@ export class CoffeeCompiler extends CachingCompiler {
doubleRoastedCoffee.data != null) {
output.js = doubleRoastedCoffee.data;

if (doubleRoastedCoffee.sourceMap) {
const coffeeSourceMap = doubleRoastedCoffee.sourceMap;

if (coffeeSourceMap) {
// Reference the compiled CoffeeScript file so that `applySourceMap`
// below can match it with the source map produced by the CoffeeScript
// compiler.
coffeeSourceMap.sources[0] = '/' + this._outputFilePath(inputFile);

// Combine the original CoffeeScript source map with the one
// produced by this.babelCompiler.processOneFileForTarget.
const smg = new SourceMapGenerator(
new SourceMapConsumer(doubleRoastedCoffee.sourceMap));
const smg = SourceMapGenerator.fromSourceMap(
new SourceMapConsumer(coffeeSourceMap)
);
smg.applySourceMap(new SourceMapConsumer(sourceMap));
sourceMap = smg.toJSON();
} else {
Expand Down