Skip to content

Remove source-map from Rollup bundle #2055

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

Merged
lukastaegert merged 3 commits into from
Mar 15, 2018
Merged

Remove source-map from Rollup bundle #2055

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42ba292
remove source-map from bundle
mourner Mar 14, 2018
697bff2
more resilient location for errors
mourner Mar 14, 2018
b7ca117
remove segment coercions for now
mourner Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/Module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import extractNames from './ast/utils/extractNames';
import enhance from './ast/enhance';
import clone from './ast/clone';
import ModuleScope from './ast/scopes/ModuleScope';
import { encode } from 'sourcemap-codec';
import { RawSourceMap, SourceMapConsumer } from 'source-map';
import { RawSourceMap } from 'source-map';

@guybedford guybedford Mar 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we inline the RawSourceMap type we could remove source-map as a dependency entirely too.

@mourner mourner Mar 14, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still used in tests, and it might be better to keep it there because it's a "reference" implementation, which is good for verifying source maps.

import ImportSpecifier from './ast/nodes/ImportSpecifier';
import Graph from './Graph';
import Variable from './ast/variables/Variable';
Expand Down Expand Up @@ -471,24 +470,33 @@ export default class Module {

private getOriginalLocation(
sourcemapChain: RawSourceMap[],
location: { line: number; column: number }
location: { line: number; column: number; source?: string; name?: string }
) {
const filteredSourcemapChain = sourcemapChain
.filter(sourcemap => sourcemap.mappings)
.map(sourcemap => {
const encodedSourcemap = sourcemap;
if (sourcemap.mappings) {
encodedSourcemap.mappings = encode(encodedSourcemap.mappings);
}
return encodedSourcemap;
});
const filteredSourcemapChain = sourcemapChain.filter(sourcemap => sourcemap.mappings);

while (filteredSourcemapChain.length > 0) {
const sourcemap = filteredSourcemapChain.pop();
const smc = new SourceMapConsumer(sourcemap);
location = smc.originalPositionFor({
line: location.line,
column: location.column
});
const line: any = sourcemap.mappings[location.line - 1];
let locationFound = false;

if (line !== undefined) {
for (const segment of line) {
if (segment[0] >= location.column) {
if (segment.length < 4) break;
location = {
line: segment[2] + 1,
column: segment[3],
source: sourcemap.sources[segment[1]],
name: sourcemap.names[segment[4]]
};
locationFound = true;
break;
}
}
}
if (!locationFound) {
throw new Error("Can't resolve original location of error.");
}
}
return location;
}
Expand Down