Revert "vm: reject in importModuleDynamically without --experimental-…

…vm-modules"

This reverts commit 9853fd9.

doc/api/errors.md

@@ -3004,12 +3004,6 @@ An attempt was made to use something that was already closed.
 While using the Performance Timing API (`perf_hooks`), no valid performance
 entry types are found.
 
-<a id="ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG"></a>
-
-### `ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`
-
-A dynamic import callback was invoked without `--experimental-vm-modules`.
-
 <a id="ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING"></a>
 
 ### `ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`

doc/api/vm.md

@@ -98,9 +98,7 @@ changes:
     when `import()` is called. If this option is not specified, calls to
     `import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
     This option is part of the experimental modules API. We do not recommend
-    using it in a production environment. If `--experimental-vm-modules` isn't
-    set, this callback will be ignored and calls to `import()` will reject with
-    [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`][].
+    using it in a production environment.
     * `specifier` {string} specifier passed to `import()`
     * `script` {vm.Script}
     * `importAttributes` {Object} The `"with"` value passed to the
@@ -769,9 +767,6 @@ changes:
   * `importModuleDynamically` {Function} Called during evaluation of this module
     when `import()` is called. If this option is not specified, calls to
     `import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
-    If `--experimental-vm-modules` isn't set, this callback will be ignored
-    and calls to `import()` will reject with
-    [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`][].
     * `specifier` {string} specifier passed to `import()`
     * `module` {vm.Module}
     * `importAttributes` {Object} The `"with"` value passed to the
@@ -1030,9 +1025,7 @@ changes:
     when `import()` is called. If this option is not specified, calls to
     `import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
     This option is part of the experimental modules API, and should not be
-    considered stable.  If `--experimental-vm-modules` isn't
-    set, this callback will be ignored and calls to `import()` will reject with
-    [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`][].
+    considered stable.
     * `specifier` {string} specifier passed to `import()`
     * `function` {Function}
     * `importAttributes` {Object} The `"with"` value passed to the
@@ -1256,9 +1249,7 @@ changes:
     when `import()` is called. If this option is not specified, calls to
     `import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
     This option is part of the experimental modules API. We do not recommend
-    using it in a production environment.  If `--experimental-vm-modules` isn't
-    set, this callback will be ignored and calls to `import()` will reject with
-    [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`][].
+    using it in a production environment.
     * `specifier` {string} specifier passed to `import()`
     * `script` {vm.Script}
     * `importAttributes` {Object} The `"with"` value passed to the
@@ -1357,9 +1348,7 @@ changes:
     when `import()` is called. If this option is not specified, calls to
     `import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
     This option is part of the experimental modules API. We do not recommend
-    using it in a production environment. If `--experimental-vm-modules` isn't
-    set, this callback will be ignored and calls to `import()` will reject with
-    [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`][].
+    using it in a production environment.
     * `specifier` {string} specifier passed to `import()`
     * `script` {vm.Script}
     * `importAttributes` {Object} The `"with"` value passed to the
@@ -1439,9 +1428,7 @@ changes:
     when `import()` is called. If this option is not specified, calls to
     `import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
     This option is part of the experimental modules API. We do not recommend
-    using it in a production environment. If `--experimental-vm-modules` isn't
-    set, this callback will be ignored and calls to `import()` will reject with
-    [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`][].
+    using it in a production environment.
     * `specifier` {string} specifier passed to `import()`
     * `script` {vm.Script}
     * `importAttributes` {Object} The `"with"` value passed to the
@@ -1605,7 +1592,6 @@ are not controllable through the timeout either.
 [Source Text Module Record]: https://tc39.es/ecma262/#sec-source-text-module-records
 [Synthetic Module Record]: https://heycam.github.io/webidl/#synthetic-module-records
 [V8 Embedder's Guide]: https://v8.dev/docs/embed#contexts
-[`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG`]: errors.md#err_vm_dynamic_import_callback_missing_flag
 [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`]: errors.md#err_vm_dynamic_import_callback_missing
 [`ERR_VM_MODULE_STATUS`]: errors.md#err_vm_module_status
 [`Error`]: errors.md#class-error

lib/internal/errors.js

@@ -1836,9 +1836,6 @@ E('ERR_VALID_PERFORMANCE_ENTRY_TYPE',
   'At least one valid performance entry type is required', Error);
 E('ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING',
   'A dynamic import callback was not specified.', TypeError);
-E('ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG',
-  'A dynamic import callback was invoked without --experimental-vm-modules',
-  TypeError);
 E('ERR_VM_MODULE_ALREADY_LINKED', 'Module has already been linked', Error);
 E('ERR_VM_MODULE_CANNOT_CREATE_CACHED_DATA',
   'Cached data cannot be created for a module which has been evaluated', Error);

lib/internal/modules/esm/utils.js

@@ -14,11 +14,9 @@ const {
 } = internalBinding('util');
 const {
   default_host_defined_options,
-  vm_dynamic_import_missing_flag,
 } = internalBinding('symbols');
 
 const {
-  ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG,
   ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING,
   ERR_INVALID_ARG_VALUE,
 } = require('internal/errors').codes;
@@ -134,8 +132,7 @@ const moduleRegistries = new SafeWeakMap();
  */
 function registerModule(referrer, registry) {
   const idSymbol = referrer[host_defined_option_symbol];
-  if (idSymbol === default_host_defined_options ||
-      idSymbol === vm_dynamic_import_missing_flag) {
+  if (idSymbol === default_host_defined_options) {
     // The referrer is compiled without custom callbacks, so there is
     // no registry to hold on to. We'll throw
     // ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING when a callback is
@@ -176,9 +173,6 @@ async function importModuleDynamicallyCallback(symbol, specifier, attributes) {
       return importModuleDynamically(specifier, callbackReferrer, attributes);
     }
   }
-  if (symbol === vm_dynamic_import_missing_flag) {
-    throw new ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING_FLAG();
-  }
   throw new ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING();
 }
 

lib/internal/vm.js

@@ -15,19 +15,13 @@ const {
 } = ContextifyScript.prototype;
 const {
   default_host_defined_options,
-  vm_dynamic_import_missing_flag,
 } = internalBinding('symbols');
 const {
   validateFunction,
   validateObject,
   kValidateObjectAllowArray,
 } = require('internal/validators');
 
-const {
-  getOptionValue,
-} = require('internal/options');
-
-
 function isContext(object) {
   validateObject(object, 'object', kValidateObjectAllowArray);
 
@@ -47,16 +41,6 @@ function getHostDefinedOptionId(importModuleDynamically, filename) {
     // compilation cache can be hit.
     return default_host_defined_options;
   }
-  // We should've thrown here immediately when we introduced
-  // --experimental-vm-modules and importModuleDynamically, but since
-  // users are already using this callback to throw a similar error,
-  // we also defer the error to the time when an actual import() is called
-  // to avoid breaking them. To ensure that the isolate compilation
-  // cache can still be hit, use a constant sentinel symbol here.
-  if (!getOptionValue('--experimental-vm-modules')) {
-    return vm_dynamic_import_missing_flag;
-  }
-
   return Symbol(filename);
 }
 

src/env_properties.h

@@ -44,8 +44,7 @@
   V(owner_symbol, "owner_symbol")                                              \
   V(onpskexchange_symbol, "onpskexchange")                                     \
   V(resource_symbol, "resource_symbol")                                        \
-  V(trigger_async_id_symbol, "trigger_async_id_symbol")                        \
-  V(vm_dynamic_import_missing_flag, "vm_dynamic_import_missing_flag")
+  V(trigger_async_id_symbol, "trigger_async_id_symbol")
 
 // Strings are per-isolate primitives but Environment proxies them
 // for the sake of convenience.  Strings should be ASCII-only.