Skip to content

esm: convert resolve hook to synchronous #43363

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 15 commits into from
Jun 18, 2022
+216 −127
Merged

esm: convert resolve hook to synchronous #43363

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
37abe52
esm: convert `resolve` hook to synchronous
JakobJingleheimer Jun 6, 2022
edb6ba5
fixup: fix import.meta.resolve
JakobJingleheimer Jun 12, 2022
ae8ef63
fixup: correct `assert.throws()`
JakobJingleheimer Jun 12, 2022
8bf7965
fixup: support detecting when a resolve hook returns a promise
JakobJingleheimer Jun 12, 2022
ab935b6
fixup: change async/thenable detection
JakobJingleheimer Jun 12, 2022
28d813f
fixup: update ESM doc for resolve hook
JakobJingleheimer Jun 12, 2022
b332b97
fixup: revert back to arg destructuring
JakobJingleheimer Jun 12, 2022
640c91c
fixup: add perf caveat to `resolve` docs
JakobJingleheimer Jun 15, 2022
6c8de26
fixup: wordsmith resolve hook perf caveat
JakobJingleheimer Jun 15, 2022
6416e1d
fixup: re-connect async hook promise chain
JakobJingleheimer Jun 15, 2022
f02b869
fixup: de-lint
JakobJingleheimer Jun 15, 2022
57d6686
fixup: correct missed doc refs to `asynchronous`
JakobJingleheimer Jun 15, 2022
539f7a5
fixup: add browser-alignment note to `import.meta.resolve()`
JakobJingleheimer Jun 17, 2022
83c2072
fixup: account for `null` hook return & first assert `url` is nullish
JakobJingleheimer Jun 17, 2022
e0511b6
fixup: tidy docs changes
JakobJingleheimer Jun 17, 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: de-lint
  • Loading branch information
@JakobJingleheimer
JakobJingleheimer committed Jun 15, 2022
commit f02b8699e2a917b91819c26eea2f7d2fc214331b
6 changes: 3 additions & 3 deletions lib/internal/modules/esm/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ let emittedSpecifierResolutionWarning = false;
* @param {object} validators A wrapper function
* containing all validation of a custom loader hook's intermediary output. Any
* validation within MUST throw.
* @param {(hookErrIdentifier, hookArgs) => void} validateArgs
* @param {(hookErrIdentifier, output) => void} validateOutput
* @param {(hookErrIdentifier, hookArgs) => void} validators.validateArgs
* @param {(hookErrIdentifier, output) => void} validators.validateOutput
* @returns {function next<HookName>(...hookArgs)} The next hook in the chain.
*/
function nextHookFactory(chain, meta, { validateArgs, validateOutput }) {
Expand Down Expand Up @@ -164,7 +164,7 @@ function nextHookFactory(chain, meta, { validateArgs, validateOutput }) {
if (generatedHookIndex === 0) { meta.chainFinished = true; }

ArrayPrototypePush(args, nextNextHook);
let output = ReflectApply(hook, undefined, args);
const output = ReflectApply(hook, undefined, args);

validateOutput(outputErrIdentifier, output);

Expand Down