diff options
| -rw-r--r-- | lib/internal/bootstrap/node.js | 4 | ||||
| -rw-r--r-- | lib/internal/modules/cjs/loader.js | 2 | ||||
| -rw-r--r-- | src/node_options.cc | 4 | ||||
| -rw-r--r-- | src/node_options.h | 1 |
4 files changed, 3 insertions, 8 deletions
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index bb07bee6f4..86c0cf7aaf 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -180,10 +180,10 @@ function startup() { } // TODO(joyeecheung): move this down further to get better snapshotting - if (getOptionValue('[has_experimental_policy]')) { + const experimentalPolicy = getOptionValue('--experimental-policy'); + if (experimentalPolicy) { process.emitWarning('Policies are experimental.', 'ExperimentalWarning'); - const experimentalPolicy = getOptionValue('--experimental-policy'); const { pathToFileURL, URL } = NativeModule.require('url'); // URL here as it is slightly different parsing // no bare specifiers for now diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 1dcf5ef6ac..8b357e5254 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -45,7 +45,7 @@ const { getOptionValue } = require('internal/options'); const preserveSymlinks = getOptionValue('--preserve-symlinks'); const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main'); const experimentalModules = getOptionValue('--experimental-modules'); -const manifest = getOptionValue('[has_experimental_policy]') ? +const manifest = getOptionValue('--experimental-policy') ? require('internal/process/policy').manifest : null; diff --git a/src/node_options.cc b/src/node_options.cc index 6d141f52aa..9abd6c870a 100644 --- a/src/node_options.cc +++ b/src/node_options.cc @@ -143,15 +143,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { "experimental ES Module support and caching modules", &EnvironmentOptions::experimental_modules, kAllowedInEnvironment); - AddOption("[has_experimental_policy]", - "", - &EnvironmentOptions::has_experimental_policy); AddOption("--experimental-policy", "use the specified file as a " "security policy", &EnvironmentOptions::experimental_policy, kAllowedInEnvironment); - Implies("--experimental-policy", "[has_experimental_policy]"); AddOption("--experimental-repl-await", "experimental await keyword support in REPL", &EnvironmentOptions::experimental_repl_await, diff --git a/src/node_options.h b/src/node_options.h index d77c4fb808..82c2b6e385 100644 --- a/src/node_options.h +++ b/src/node_options.h @@ -95,7 +95,6 @@ class EnvironmentOptions : public Options { bool abort_on_uncaught_exception = false; bool experimental_modules = false; std::string experimental_policy; - bool has_experimental_policy; bool experimental_repl_await = false; bool experimental_vm_modules = false; bool expose_internals = false; |