Skip to content

Commit

Permalink
module: improve support of data: URLs
Browse files Browse the repository at this point in the history
Add support for loading modules using percent-encoded URLs.

PR-URL: #37392
Backport-PR-URL: #37859
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
  • Loading branch information
aduh95 authored and richardlau committed Mar 29, 2021
1 parent 2da24ac commit 7b0ed4b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 5 additions & 2 deletions lib/internal/modules/esm/get_source.js
@@ -1,5 +1,8 @@
'use strict';

const {
decodeURIComponent,
} = primordials;
const { getOptionValue } = require('internal/options');
const manifest = getOptionValue('--experimental-policy') ?
require('internal/process/policy').manifest :
Expand Down Expand Up @@ -28,8 +31,8 @@ async function defaultGetSource(url, { format } = {}, defaultGetSource) {
if (!match) {
throw new ERR_INVALID_URL(url);
}
const [ , base64, body ] = match;
source = Buffer.from(body, base64 ? 'base64' : 'utf8');
const { 1: base64, 2: body } = match;
source = Buffer.from(decodeURIComponent(body), base64 ? 'base64' : 'utf8');
} else {
throw new ERR_INVALID_URL_SCHEME(['file', 'data']);
}
Expand Down
5 changes: 5 additions & 0 deletions test/es-module/test-esm-data-urls.js
Expand Up @@ -102,4 +102,9 @@ function createBase64URL(mime, body) {
assert.strictEqual(e.code, 'ERR_INVALID_RETURN_PROPERTY_VALUE');
}
}
{
const plainESMURL = 'data:text/javascript,export%20default%202';
const module = await import(plainESMURL);
assert.strictEqual(module.default, 2);
}
})().then(common.mustCall());

0 comments on commit 7b0ed4b

Please sign in to comment.