Skip to content

Commit

Permalink
Fixed source map generation with async SourceMapConsumer
Browse files Browse the repository at this point in the history
Fixes #179
  • Loading branch information
Rishabh Karnad committed Aug 9, 2019
1 parent 870192b commit 3b7f6fe
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 28 deletions.
33 changes: 19 additions & 14 deletions packages/vue-native-scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -505,21 +505,26 @@ if (reactNativeMinorVersion >= 59) {
}

function sourceMapAstInPlace(tsMap, babelAst) {
var tsConsumer = new sourceMap.SourceMapConsumer(tsMap);
traverse$1.cheap(babelAst, function (node) {
if (node.loc) {
var originalStart = tsConsumer.originalPositionFor(node.loc.start);
if (originalStart.line) {
node.loc.start.line = originalStart.line;
node.loc.start.column = originalStart.column;
}
var originalEnd = tsConsumer.originalPositionFor(node.loc.end);
if (originalEnd.line) {
node.loc.end.line = originalEnd.line;
node.loc.end.column = originalEnd.column;
}
return sourceMap.SourceMapConsumer.with(
tsMap,
null,
function (consumer) {
traverse$1.cheap(babelAst, function (node) {
if (node.loc) {
var originalStart = consumer.originalPositionFor(node.loc.start);
if (originalStart.line) {
node.loc.start.line = originalStart.line;
node.loc.start.column = originalStart.column;
}
var originalEnd = consumer.originalPositionFor(node.loc.end);
if (originalEnd.line) {
node.loc.end.line = originalEnd.line;
node.loc.end.column = originalEnd.column;
}
}
});
}
});
);
}

function transform(ref) {
Expand Down
33 changes: 19 additions & 14 deletions src/platforms/vue-native/scripts/transformerPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,26 @@ if (reactNativeMinorVersion >= 59) {
}

function sourceMapAstInPlace(tsMap, babelAst) {
const tsConsumer = new SourceMapConsumer(tsMap);
traverse.cheap(babelAst, node => {
if (node.loc) {
const originalStart = tsConsumer.originalPositionFor(node.loc.start);
if (originalStart.line) {
node.loc.start.line = originalStart.line;
node.loc.start.column = originalStart.column;
}
const originalEnd = tsConsumer.originalPositionFor(node.loc.end);
if (originalEnd.line) {
node.loc.end.line = originalEnd.line;
node.loc.end.column = originalEnd.column;
}
return SourceMapConsumer.with(
tsMap,
null,
(consumer) => {
traverse.cheap(babelAst, node => {
if (node.loc) {
const originalStart = consumer.originalPositionFor(node.loc.start);
if (originalStart.line) {
node.loc.start.line = originalStart.line;
node.loc.start.column = originalStart.column;
}
const originalEnd = consumer.originalPositionFor(node.loc.end);
if (originalEnd.line) {
node.loc.end.line = originalEnd.line;
node.loc.end.column = originalEnd.column;
}
}
});
}
});
);
}

export function transform({ src, filename, options }) {
Expand Down

0 comments on commit 3b7f6fe

Please sign in to comment.