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

Switch to GenMapping for sourcemap generation #1190

Merged
merged 7 commits into from May 10, 2022
Merged

Switch to GenMapping for sourcemap generation #1190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d23354e
Switch to GenMapping for sourcemap generation
jridgewell Apr 30, 2022
04953b4
Apply suggestions from code review
jridgewell May 1, 2022
8f938df
Fix dependency
jridgewell May 1, 2022
f6dbb8f
Switch to source-map compatible @jridgewell/source-map
jridgewell May 1, 2022
b2e5a12
Update TS types
jridgewell May 1, 2022
6cab7f2
Support source-map's async SourceMapConsumer
jridgewell May 2, 2022
2cc6270
Fix sourcesContent check with source-map's SourceMapGenerator
jridgewell May 7, 2022
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
2 changes: 1 addition & 1 deletion lib/minify.js
View file
Open in desktop
Expand Up @@ -274,7 +274,7 @@ async function minify(files, options, _fs_module) {
if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
throw new Error("original source content unavailable");
}
options.format.source_map = SourceMap({
options.format.source_map = await SourceMap({
file: options.sourceMap.filename,
orig: options.sourceMap.content,
root: options.sourceMap.root,
Expand Down
9 changes: 7 additions & 2 deletions lib/sourcemap.js
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ import {SourceMapConsumer, SourceMapGenerator} from "@jridgewell/source-map";
import {defaults, HOP} from "./utils/index.js";

// a small wrapper around source-map and @jridgewell/source-map
function SourceMap(options) {
async function SourceMap(options) {
options = defaults(options, {
file : null,
root : null,
Expand All @@ -67,7 +67,10 @@ function SourceMap(options) {
sourcesContent[name] = files[name];
}
if (options.orig) {
orig_map = new SourceMapConsumer(options.orig);
// We support both @jridgewell/source-map (which has a sync
// SourceMapConsumer) and source-map (which has an async
// SourceMapConsumer).
orig_map = await new SourceMapConsumer(options.orig);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice!

if (orig_map.sourcesContent) {
orig_map.sources.forEach(function(source, i) {
var content = orig_map.sourcesContent[i];
Expand Down Expand Up @@ -119,6 +122,8 @@ function SourceMap(options) {
}

function destroy() {
// @jridgewell/source-map's SourceMapConsumer does not need to be
// manually freed.
if (orig_map && orig_map.destroy) orig_map.destroy();
}

Expand Down