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

Show file tree
Hide file tree
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
lint fixes
  • Loading branch information
@guybedford
guybedford committed May 20, 2022
commit 12696a5ecef3508713bf0f98f2e0a6ab84e00096
4 changes: 2 additions & 2 deletions lib/internal/modules/esm/fetch_module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@ function fetchModule(parsed, { parentURL }) {
/**
* Checks if the given canonical URL exists in the fetch cache
*
* @param {url} string
* @returns {in_cache} boolean
* @param {string} key
* @returns {boolean}
*/
function inFetchCache(key) {
return cacheForGET.has(key);
Expand Down
9 changes: 4 additions & 5 deletions lib/internal/modules/esm/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,11 @@ class ESMLoader {
const module = fetchModule(new url("https://github.com/nodejs/node/pull/43130/commits/url"), { parentURL: url });
if (typeof module?.resolvedHREF === 'string') {
return module.resolvedHREF;
} else {
// Internal error
throw new ERR_INTERNAL_ASSERTION(
`Base url for module ${url} not loaded.`
);
}
// Internal error
throw new ERR_INTERNAL_ASSERTION(
`Base url for module ${url} not loaded.`
);
} else {
// A custom loader was used instead of network-imports.
// Adding support for a response URL resolve return in custom loaders is
Expand Down