summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Aubuchon <alex@aub.dev>2019-09-28 12:51:15 -0400
committerRich Trott <rtrott@gmail.com>2019-09-30 21:47:01 -0700
commit15fb02a515bf937bb1045d415dd09bfe632a463b (patch)
tree01da2627ce115a9297f4b76c489fe1321183ab39 /src
parent1c5a3f0d091ef34b82f89dce4c87b431cab4c3ee (diff)
downloadandroid-node-v8-15fb02a515bf937bb1045d415dd09bfe632a463b.tar.gz
android-node-v8-15fb02a515bf937bb1045d415dd09bfe632a463b.tar.bz2
android-node-v8-15fb02a515bf937bb1045d415dd09bfe632a463b.zip
src: rename --loader to --experimental-loader
Renames the `--loader` cli argument to `--experimental-loader`. This is to clearly indicate the esm loader feature as experimental even after esm is no longer experimental. Also minorly alters the `--experimental-loader` docs to say that the passed loader can be an esm module. Refs: https://github.com/nodejs/modules/issues/351#issuecomment-535189524 PR-URL: https://github.com/nodejs/node/pull/29752 Reviewed-By: Guy Bedford <guybedford@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/node_options.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/node_options.cc b/src/node_options.cc
index 005f0d2e1e..34efe6336a 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -114,7 +114,8 @@ 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("--loader requires --experimental-modules be enabled");
+ errors->push_back("--experimental-loader requires "
+ "--experimental-modules be enabled");
}
if (has_policy_integrity_string && experimental_policy.empty()) {
errors->push_back("--policy-integrity requires "
@@ -311,6 +312,12 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
"experimental support for exports in package.json",
&EnvironmentOptions::experimental_exports,
kAllowedInEnvironment);
+ AddOption("--experimental-loader",
+ "(with --experimental-modules) use the specified file 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,
@@ -363,11 +370,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
"set module type for string input",
&EnvironmentOptions::module_type,
kAllowedInEnvironment);
- AddOption("--loader",
- "(with --experimental-modules) use the specified file as a "
- "custom loader",
- &EnvironmentOptions::userland_loader,
- kAllowedInEnvironment);
AddOption("--es-module-specifier-resolution",
"Select extension resolution algorithm for es modules; "
"either 'explicit' (default) or 'node'",