diff options
| author | Guy Bedford <guybedford@gmail.com> | 2019-10-11 17:57:13 -0400 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2019-11-12 14:04:55 -0800 |
| commit | 796f3d0af49164314868c4778af90eca356f1fef (patch) | |
| tree | f1b8d619df36917b03ba035630f389e1da305712 /src/node_options.cc | |
| parent | cc6f99de449beb0993db3647de4ef979bead804d (diff) | |
| download | android-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 'src/node_options.cc')
| -rw-r--r-- | src/node_options.cc | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/node_options.cc b/src/node_options.cc index 92ee79b583..85256a7e0a 100644 --- a/src/node_options.cc +++ b/src/node_options.cc @@ -113,10 +113,6 @@ void PerIsolateOptions::CheckOptions(std::vector<std::string>* errors) { } void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) { - if (!userland_loader.empty() && !experimental_modules) { - errors->push_back("--experimental-loader requires " - "--experimental-modules be enabled"); - } if (has_policy_integrity_string && experimental_policy.empty()) { errors->push_back("--policy-integrity requires " "--experimental-policy be enabled"); @@ -126,30 +122,12 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) { } if (!module_type.empty()) { - if (!experimental_modules) { - errors->push_back("--input-type requires " - "--experimental-modules to be enabled"); - } if (module_type != "commonjs" && module_type != "module") { errors->push_back("--input-type must be \"module\" or \"commonjs\""); } } - if (experimental_json_modules && !experimental_modules) { - errors->push_back("--experimental-json-modules requires " - "--experimental-modules be enabled"); - } - - if (experimental_wasm_modules && !experimental_modules) { - errors->push_back("--experimental-wasm-modules requires " - "--experimental-modules be enabled"); - } - if (!es_module_specifier_resolution.empty()) { - if (!experimental_modules) { - errors->push_back("--es-module-specifier-resolution requires " - "--experimental-modules be enabled"); - } if (es_module_specifier_resolution != "node" && es_module_specifier_resolution != "explicit") { errors->push_back("invalid value for --es-module-specifier-resolution"); @@ -322,15 +300,12 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { &EnvironmentOptions::experimental_json_modules, kAllowedInEnvironment); AddOption("--experimental-loader", - "(with --experimental-modules) use the specified file as a " - "custom loader", + "use the specified module as a custom loader", &EnvironmentOptions::userland_loader, kAllowedInEnvironment); AddAlias("--loader", "--experimental-loader"); - AddOption("--experimental-modules", - "experimental ES Module support and caching modules", - &EnvironmentOptions::experimental_modules, - kAllowedInEnvironment); + AddAlias("--experimental-modules", { "--experimental-conditional-exports", + "--experimental-resolve-self" }); AddOption("--experimental-conditional-exports", "experimental support for conditional exports targets", &EnvironmentOptions::experimental_conditional_exports, |