Skip to content

Make 'omt:' URLs have relative emitted paths in sourcemaps #45

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make 'omt:' URLs have relative emitted paths in sourcemaps #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10df2a
Make 'omt:' URLs have relative emitted paths in sourcemaps
docd27 Jun 5, 2021
7ca1e56
Bump rollup to 2.29.0 since this requires rollup/rollup#3807
docd27 Jun 27, 2021
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
34 changes: 25 additions & 9 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"use strict";

const { readFileSync } = require("fs");
const { join } = require("path");
const { join, resolve, relative, isAbsolute } = require("path");
const ejs = require("ejs");
const MagicString = require("magic-string");
const json5 = require("json5");
Expand Down Expand Up @@ -58,6 +58,12 @@ const workerRegexpForOutput = /new\s+Worker\(new\s+URL\((?:'.*?'|".*?"),\s*modul

let longWarningAlreadyShown = false;

// Logic from rollup src/utils/relativeId.ts
function relativeId(id) {
if (!isAbsolute(id)) return id;
return relative(resolve(), id);
}

module.exports = function(opts = {}) {
opts = Object.assign({}, defaultOpts, opts);

Expand All @@ -78,19 +84,29 @@ module.exports = function(opts = {}) {
if (!id.startsWith(urlLoaderPrefix)) return;

const path = id.slice(urlLoaderPrefix.length);
const resolved = await this.resolve(path, importer);
const resolved = await this.resolve(path, importer, {skipSelf: true});
if (!resolved)
throw Error(`Cannot find module '${path}' from '${importer}'`);
const newId = resolved.id;

return urlLoaderPrefix + newId;
const resolvedPathRel = relativeId(resolved.id);
return {
...resolved,
id: urlLoaderPrefix + resolvedPathRel,
meta: {
...resolved.meta,
omt: { realId: resolved.id, importer },
},
};
},

load(id) {
if (!id.startsWith(urlLoaderPrefix)) return;

const realId = id.slice(urlLoaderPrefix.length);
const chunkRef = this.emitFile({ id: realId, type: "chunk" });
const {meta} = this.getModuleInfo(id);
if (!meta.omt) return;

const chunkRef = this.emitFile({
type: "chunk",
id: meta.omt.realId,
importer: meta.omt.importer,
});
return `export default import.meta.ROLLUP_FILE_URL_${chunkRef};`;
},

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"karma-safaritechpreview-launcher": "2.0.2",
"mocha": "6.1.4",
"prettier": "1.18.2",
"rollup": "2.2.0"
"rollup": "2.29.0"
},
"repository": {
"type": "git",
Expand Down