summaryrefslogtreecommitdiff
path: root/lib/internal/bootstrap/pre_execution.js
diff options
context:
space:
mode:
authorGuy Bedford <guybedford@gmail.com>2019-10-11 17:57:13 -0400
committerMyles Borins <mylesborins@google.com>2019-11-12 14:04:55 -0800
commit796f3d0af49164314868c4778af90eca356f1fef (patch)
treef1b8d619df36917b03ba035630f389e1da305712 /lib/internal/bootstrap/pre_execution.js
parentcc6f99de449beb0993db3647de4ef979bead804d (diff)
downloadandroid-node-v8-796f3d0af49164314868c4778af90eca356f1fef.tar.gz
android-node-v8-796f3d0af49164314868c4778af90eca356f1fef.tar.bz2
android-node-v8-796f3d0af49164314868c4778af90eca356f1fef.zip
esm: unflag --experimental-modules
PR-URL: https://github.com/nodejs/node/pull/29866 Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'lib/internal/bootstrap/pre_execution.js')
-rw-r--r--lib/internal/bootstrap/pre_execution.js30
1 files changed, 9 insertions, 21 deletions
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index 39bc128bf7..793ee18142 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -401,24 +401,15 @@ function initializeESMLoader() {
// Create this WeakMap in js-land because V8 has no C++ API for WeakMap.
internalBinding('module_wrap').callbackMap = new SafeWeakMap();
- const experimentalModules = getOptionValue('--experimental-modules');
- const experimentalVMModules = getOptionValue('--experimental-vm-modules');
- if (experimentalModules || experimentalVMModules) {
- if (experimentalModules) {
- process.emitWarning(
- 'The ESM module loader is experimental.',
- 'ExperimentalWarning', undefined);
- }
- const {
- setImportModuleDynamicallyCallback,
- setInitializeImportMetaObjectCallback
- } = internalBinding('module_wrap');
- const esm = require('internal/process/esm_loader');
- // Setup per-isolate callbacks that locate data or callbacks that we keep
- // track of for different ESM modules.
- setInitializeImportMetaObjectCallback(esm.initializeImportMetaObject);
- setImportModuleDynamicallyCallback(esm.importModuleDynamicallyCallback);
- }
+ const {
+ setImportModuleDynamicallyCallback,
+ setInitializeImportMetaObjectCallback
+ } = internalBinding('module_wrap');
+ const esm = require('internal/process/esm_loader');
+ // Setup per-isolate callbacks that locate data or callbacks that we keep
+ // track of for different ESM modules.
+ setInitializeImportMetaObjectCallback(esm.initializeImportMetaObject);
+ setImportModuleDynamicallyCallback(esm.importModuleDynamicallyCallback);
}
function initializeFrozenIntrinsics() {
@@ -460,9 +451,6 @@ function resolveMainPath(main) {
}
function shouldUseESMLoader(mainPath) {
- const experimentalModules = getOptionValue('--experimental-modules');
- if (!experimentalModules)
- return false;
const userLoader = getOptionValue('--experimental-loader');
if (userLoader)
return true;