Skip to content

esm: fix http(s) import via custom loader #43130

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
nodejs-github-bot merged 8 commits into from
May 25, 2022
Merged

esm: fix http(s) import via custom loader #43130

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e1ebe9a
esm: fix http(s) import via custom loader
JakobJingleheimer May 17, 2022
b1d06bd
fixup: add test case
JakobJingleheimer May 20, 2022
714f94e
fixup: expand code docs for `ESMLoader::getBaseURL` and update return…
JakobJingleheimer May 20, 2022
8aaa873
fixup: de-lint
JakobJingleheimer May 20, 2022
59a5de3
fixup: emphasis gotcha
JakobJingleheimer May 20, 2022
98d262d
use inFetchCache guard
guybedford May 20, 2022
12696a5
lint fixes
guybedford May 20, 2022
eec8253
Apply suggestions from code review
aduh95 May 24, 2022
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
Prev Previous commit
Next Next commit
fixup: expand code docs for ESMLoader::getBaseURL and update return… 
… doc
  • Loading branch information
@JakobJingleheimer
JakobJingleheimer committed May 20, 2022
commit 714f94ef0dfd1d882f89be2c986fd861aa79a1bf
18 changes: 10 additions & 8 deletions lib/internal/modules/esm/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,19 +338,21 @@ class ESMLoader {
* would have a cache key of https://example.com/foo and baseURL
* of https://example.com/bar
*
* MUST BE SYNCHRONOUS for import.meta initialization
* MUST BE CALLED AFTER receiving the url body due to I/O
* @param {string} url
* @returns {string}
* ! MUST BE SYNCHRONOUS for import.meta initialization
* ! MUST BE CALLED AFTER receiving the url body due to I/O
* @param {URL['href']} url
* @returns {string|Promise<URL['href']>}
*/
getBaseURL(url) {
if (
StringPrototypeStartsWith(url, 'http:') ||
StringPrototypeStartsWith(url, 'https:')
) {
// The request & response have already settled, so they are in
// fetchModule's cache, in which case, fetchModule returns
// When using network-imports, the request & response have already settled
// so they are in fetchModule's cache, in which case, fetchModule returns
// immediately and synchronously
// BUT, when a custom loader is used, the cache is bypassed and it hits an
// unsettled promise.
const module = fetchModule(new URL(url), { parentURL: url });

if (typeof module?.resolvedHREF === 'string') { // [2]
Expand All @@ -360,8 +362,8 @@ class ESMLoader {
throw new ERR_INTERNAL_ASSERTION(
`Base url for module ${url} not loaded.`
);
} else {
url = module;
} else { // a custom loader was used instead of network-imports
url = module; // ! this is an unsettled promise
}
}
}
Expand Down