From 049e703331409db8c4b4e2cc7d969f471c229df3 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 5 Apr 2024 10:34:51 -0400 Subject: FUTURE: override byonm with nodeModulesDir setting (#23222) Makes the `"nodeModulesDir"` setting take precedence over byonm when using `DENO_FUTURE`. --- cli/args/mod.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cli/args') diff --git a/cli/args/mod.rs b/cli/args/mod.rs index e138e9d0b..8a65514bf 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -1102,15 +1102,11 @@ impl CliOptions { } pub fn has_node_modules_dir(&self) -> bool { - if self.enable_future_features() { - self.maybe_node_modules_folder.is_some() - } else { - self.maybe_node_modules_folder.is_some() || self.unstable_byonm() - } + self.maybe_node_modules_folder.is_some() } - pub fn node_modules_dir_path(&self) -> Option { - self.maybe_node_modules_folder.clone() + pub fn node_modules_dir_path(&self) -> Option<&PathBuf> { + self.maybe_node_modules_folder.as_ref() } pub fn with_node_modules_dir_path(&self, path: PathBuf) -> Self { @@ -1595,10 +1591,14 @@ impl CliOptions { } pub fn use_byonm(&self) -> bool { - self.enable_future_features() - } + if self.enable_future_features() + && self.node_modules_dir_enablement().is_none() + && self.maybe_package_json.is_some() + { + return true; + } - pub fn unstable_byonm(&self) -> bool { + // check if enabled via unstable self.flags.unstable_config.byonm || NPM_PROCESS_STATE .as_ref() -- cgit v1.2.3