-
Notifications
You must be signed in to change notification settings - Fork 29.6k
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.
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
lib: always initialize esm loader callbackMap #34127
Closed
Closed
Conversation
This file contains 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
nodejs-github-bot
added
the
lib / src
Issues and PRs related to general changes in the lib or src directory.
label
Jun 29, 2020
codebytere
force-pushed
the
move-callback-map
branch
from
June 29, 2020 23:52
5281e84
to
faa8083
Compare
codebytere
added
the
embedding
Issues and PRs related to embedding Node.js in another project.
label
Jun 30, 2020
Would it maybe make more sense to provide diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index a51dbf05ec4f..8d4c44922ac0 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -60,9 +60,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
initializeWASI();
initializeCJSLoader();
- if (!shouldNotRegisterESMLoader) {
- initializeESMLoader();
- }
+ initializeESMLoader();
const CJSLoader = require('internal/modules/cjs/loader');
assert(!CJSLoader.hasLoadedAnyUserCJSModule);
@@ -406,6 +404,8 @@ function initializeESMLoader() {
// Create this WeakMap in js-land because V8 has no C++ API for WeakMap.
internalBinding('module_wrap').callbackMap = new SafeWeakMap();
+ if (!shouldNotRegisterESMLoader) return;
+
const {
setImportModuleDynamicallyCallback,
setInitializeImportMetaObjectCallback That requires a smaller patch and would also make things easier in case we do figure out a good way to mix ESM loaders (e.g. by making them per-Context)? |
That also works! Will do :) |
codebytere
force-pushed
the
move-callback-map
branch
from
July 1, 2020 19:06
faa8083
to
35ea6de
Compare
codebytere
changed the title
lib: handle missing callbackMap in esm logic
lib: always initialize esm loader callbackMap
Jul 1, 2020
addaleax
approved these changes
Jul 1, 2020
devsnek
approved these changes
Jul 1, 2020
Landed in 37fc587 |
codebytere
added a commit
that referenced
this pull request
Jul 3, 2020
PR-URL: #34127 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gus Caplan <me@gus.host>
MylesBorins
pushed a commit
that referenced
this pull request
Jul 14, 2020
PR-URL: #34127 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gus Caplan <me@gus.host>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Jul 16, 2020
PR-URL: #34127 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gus Caplan <me@gus.host>
addaleax
pushed a commit
that referenced
this pull request
Sep 23, 2020
PR-URL: #34127 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gus Caplan <me@gus.host>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Refs #34060.
We should instead unilaterally initialize the
callbackMap
and return early if an embedder is choosing to not use the Node.js esm loader is in an embedder context.I also updated the corresponding tests to more directly check
importModuleDynamically
functionality affected by a decision to not use the esm loader provided by Node.js.cc @addaleax @joyeecheung
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passes