module: ESM main top-level load handling#16147
Closed
guybedford wants to merge 1 commit intonodejs:masterfrom
Closed
module: ESM main top-level load handling#16147guybedford wants to merge 1 commit intonodejs:masterfrom
guybedford wants to merge 1 commit intonodejs:masterfrom
Conversation
nodejs-github-bot
added
the
module
guybedford
changed the title
guybedford
force-pushed
the
esm-main-handling
branch
from
8a243eb to
4e3bae0
Compare
hiroppy
reviewed
Oct 11, 2017
lib/module.js
Outdated
Contributor
Author
There was a problem hiding this comment.
To match the code beneath it goes with - this is just moving the existing line from https://github.com/nodejs/node/pull/16147/files#diff-d1234a869b3d648ebfcdce5a76747d71L424. Although it could be refactored in the process certainly.
mscdex
added
the
esm
Jessidhia
reviewed
Oct 12, 2017
lib/internal/loader/ModuleRequest.js
Outdated
There was a problem hiding this comment.
Why did this change to let real instead of staying const real? It's still only assigned once during its lifetime.
lib/internal/loader/ModuleRequest.js
Outdated
There was a problem hiding this comment.
Is Error the correct class, or is there a more precise subclass with a code?
Contributor
Author
There was a problem hiding this comment.
I've adjusted this to amend the code to the error thrown from C++. If there is a better way to throw the error with the right code in C++ let me know, but I wasn't able to find existing examples for this pattern.
guybedford
force-pushed
the
esm-main-handling
branch
2 times, most recently
from
7b40f86 to
3c36790
Compare
fhinkel
approved these changes
Oct 12, 2017
cjihrig
reviewed
Oct 15, 2017
Contributor
There was a problem hiding this comment.
Can you just use execFileSync() if it gets the job done. I think it would simplify the test.
3 tasks
jasnell
approved these changes
Oct 15, 2017
Contributor
Author
This simplifies the top-level load when ES modules are enabled as we can entirely delegate the module resolver, which will hand over to CommonJS where appropriate. All not found errors are made consistent to throw during resolve and have the MODULE_NOT_FOUND code. Includes the test case from nodejs#15736
guybedford
force-pushed
the
esm-main-handling
branch
from
3c36790 to
23381c7
Compare
Contributor
Author
|
I've updated this PR to use the sync tests, while working around the issue in #16060. Would be nice to get these fixes into the current release cycle if possible, but I understand if the timeline for that has passed already. |
targos
approved these changes
Oct 21, 2017
Member
cjihrig
approved these changes
Oct 21, 2017
Member
|
I'm fixing the linting errors and landing. |
targos
pushed a commit
that referenced
this pull request
Oct 21, 2017
This simplifies the top-level load when ES modules are enabled as we can entirely delegate the module resolver, which will hand over to CommonJS where appropriate. All not found errors are made consistent to throw during resolve and have the MODULE_NOT_FOUND code. Includes the test case from #15736. Fixes: #15732 PR-URL: #16147 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Member
|
Landed in fe4675b |
MylesBorins
pushed a commit
that referenced
this pull request
Oct 23, 2017
This simplifies the top-level load when ES modules are enabled as we can entirely delegate the module resolver, which will hand over to CommonJS where appropriate. All not found errors are made consistent to throw during resolve and have the MODULE_NOT_FOUND code. Includes the test case from #15736. Fixes: #15732 PR-URL: #16147 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
addaleax
pushed a commit
to ayojs/ayo
that referenced
this pull request
Oct 26, 2017
This simplifies the top-level load when ES modules are enabled as we can entirely delegate the module resolver, which will hand over to CommonJS where appropriate. All not found errors are made consistent to throw during resolve and have the MODULE_NOT_FOUND code. Includes the test case from nodejs/node#15736. Fixes: nodejs/node#15732 PR-URL: nodejs/node#16147 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
addaleax
pushed a commit
to ayojs/ayo
that referenced
this pull request
Dec 7, 2017
This simplifies the top-level load when ES modules are enabled as we can entirely delegate the module resolver, which will hand over to CommonJS where appropriate. All not found errors are made consistent to throw during resolve and have the MODULE_NOT_FOUND code. Includes the test case from nodejs/node#15736. Fixes: nodejs/node#15732 PR-URL: nodejs/node#16147 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an update to the top-level loading for ES module loading based on the latest master, including the fix and test (working async version) from #15736 by @targos.
Firstly we ensure that all resolver errors of code ENOENT are reported as MODULE_NOT_FOUND errors, and secondly, we can now delegate entirely to the ES module loader for resolution as it will internally delegate to the CommonJS loader based on extension rules so we can simplify the top-level logic quite nicely.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
esmodules