Skip to content

Load data url with search correctly #51324

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

Closed
LongTengDao wants to merge 4 commits into from
Closed

Load data url with search correctly #51324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd7ee68
load data url with search correctly
LongTengDao Dec 31, 2023
4656da7
load data url with search correctly
LongTengDao Dec 31, 2023
1dff109
load data url with search correctly
LongTengDao Dec 31, 2023
2d1c351
load data url with search correctly
LongTengDao Dec 31, 2023
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
6 changes: 3 additions & 3 deletions lib/internal/modules/esm/load.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const {
ERR_UNSUPPORTED_ESM_URL_SCHEME,
} = require('internal/errors').codes;

const DATA_URL_PATTERN = /^[^/]+\/[^,;]+(?:[^,]*?)(;base64)?,([\s\S]*)$/;
const DATA_URL_PATTERN = /^data:[^/#]+\/[^,;#]+(?:[^,#]*?)(;base64)?,([^#]*)/;

/**
* @param {URL} url URL to the module
Expand All @@ -45,7 +45,7 @@ async function getSource(url, context) {
const { readFile: readFileAsync } = require('internal/fs/promises').exports;
source = await readFileAsync(url);
} else if (protocol === 'data:') {
const match = RegExpPrototypeExec(DATA_URL_PATTERN, url.pathname);
const match = RegExpPrototypeExec(DATA_URL_PATTERN, href);
if (!match) {
throw new ERR_INVALID_URL(responseURL);
}
Expand Down Expand Up @@ -84,7 +84,7 @@ function getSourceSync(url, context) {
if (protocol === 'file:') {
source = readFileSync(url);
} else if (protocol === 'data:') {
const match = RegExpPrototypeExec(DATA_URL_PATTERN, url.pathname);
const match = RegExpPrototypeExec(DATA_URL_PATTERN, href);
if (!match) {
throw new ERR_INVALID_URL(responseURL);
}
Expand Down
3 changes: 3 additions & 0 deletions test/es-module/test-esm-data-urls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,7 @@ function createBase64URL(mime, body) {
const plainESMURL = `data:text/javascript,${encodeURIComponent(`import ${JSON.stringify(fixtures.fileURL('es-module-url', 'empty.js'))}`)}`;
await import(plainESMURL);
}
{
await import('data:text/javascript,\'?\'#~');
}
})().then(common.mustCall());