Skip to content
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

Jump to bottom

esm: restore next<HookName>'s context as optional arg #43553

Merged
merged 3 commits into from
Jul 2, 2022
Merged

esm: restore next<HookName>'s context as optional arg #43553

merged 3 commits into from
Jul 2, 2022

Conversation

JakobJingleheimer
Copy link
Member

This PR ports some internal code improvements otherwise lost when #43363 was reverted. It also contains a small bugfix wherein the context argument of next<HookName>() (or default<HookName>() prior to chaining) was actually optional.

@JakobJingleheimer JakobJingleheimer added esm Issues and PRs related to the ECMAScript Modules implementation. loaders Issues and PRs related to ES module loaders labels Jun 23, 2022
@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/modules

@nodejs-github-bot nodejs-github-bot added the needs-ci PRs that need a full CI run. label Jun 23, 2022
aduh95
aduh95 reviewed Jun 23, 2022
View reviewed changes
lib/internal/modules/esm/loader.js Outdated Show resolved Hide resolved
lib/internal/modules/esm/loader.js Outdated Show resolved Hide resolved
aduh95
aduh95 reviewed Jun 24, 2022
View reviewed changes
test/fixtures/es-module-loaders/loader-load-null-return.mjs
@@ -0,0 +1,3 @@
export async function load(specifier, context, next) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also have a test for when the return value is null instead of Promise<null>?

Suggested change
export async function load(specifier, context, next) {
export function load(specifier, context, next) {

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep! Will do tomorrow (alternatively in the tidy follow-up I'm about to do)

PS gaah, yah killin me with the drip-feeding 😜

aduh95
aduh95 approved these changes Jun 24, 2022
View reviewed changes
Copy link
Contributor

@aduh95 aduh95 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming #43558 fixes the failing test

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/45037/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/45042/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/45043/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/45044/

@GeoffreyBooth GeoffreyBooth added commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. commit-queue Add this label to land a pull request using GitHub Actions. and removed needs-ci PRs that need a full CI run. labels Jul 2, 2022
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jul 2, 2022
@nodejs-github-bot nodejs-github-bot merged commit 1f6d005 into nodejs:main Jul 2, 2022
@nodejs-github-bot
Copy link
Collaborator

Landed in 1f6d005

@GeoffreyBooth GeoffreyBooth deleted the esm/fix-optional-context-arg branch July 2, 2022 04:53
This was referenced Jul 4, 2022
Open
Open
targos pushed a commit that referenced this pull request Jul 12, 2022
@JakobJingleheimer @targos
esm: restore next<HookName>'s context as optional arg
953fefe 
PR-URL: #43553
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@targos targos mentioned this pull request Jul 12, 2022
Merged
targos pushed a commit that referenced this pull request Jul 20, 2022
@JakobJingleheimer @targos
esm: restore next<HookName>'s context as optional arg
1cda175 
PR-URL: #43553
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
targos pushed a commit that referenced this pull request Jul 31, 2022
@JakobJingleheimer @targos
esm: restore next<HookName>'s context as optional arg
33a2902 
PR-URL: #43553
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@targos targos mentioned this pull request Aug 3, 2022
Merged
guangwong pushed a commit to noslate-project/node that referenced this pull request Oct 10, 2022
@JakobJingleheimer @guangwong
esm: restore next<HookName>'s context as optional arg
8430cf9 
PR-URL: nodejs/node#43553
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduh95 aduh95 aduh95 approved these changes

@GeoffreyBooth GeoffreyBooth GeoffreyBooth approved these changes

@jasnell jasnell jasnell approved these changes

Assignees
No one assigned
Labels
commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. esm Issues and PRs related to the ECMAScript Modules implementation. loaders Issues and PRs related to ES module loaders
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@JakobJingleheimer @nodejs-github-bot @jasnell @GeoffreyBooth @aduh95