diff options
author | Guy Bedford <guybedford@gmail.com> | 2019-10-12 00:57:13 +0300 |
---|---|---|
committer | Myles Borins <mylesborins@google.com> | 2019-11-17 11:39:55 +0300 |
commit | 3d8cdf191d89298d97a0bda20a2a2ceffc7cf3f0 (patch) | |
tree | f98d06ed094cfa0c82bcfb081642e1bf3bb40fda /src | |
parent | 26a9bdfca334644718212722afb908ce813544c7 (diff) |
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')
-rw-r--r-- | src/node_options.cc | 31 | ||||
-rw-r--r-- | src/node_options.h | 1 |
2 files changed, 3 insertions, 29 deletions
diff --git a/src/node_options.cc b/src/node_options.cc index 92ee79b5838..85256a7e0a8 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, diff --git a/src/node_options.h b/src/node_options.h index af69d67ce07..c36c0ad160c 100644 --- a/src/node_options.h +++ b/src/node_options.h @@ -103,7 +103,6 @@ class EnvironmentOptions : public Options { bool enable_source_maps = false; bool experimental_conditional_exports = false; bool experimental_json_modules = false; - bool experimental_modules = false; bool experimental_resolve_self = false; std::string es_module_specifier_resolution; bool experimental_wasm_modules = false; |