diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/run/mod.rs | 7 | ||||
| -rw-r--r-- | cli/tools/vendor/mod.rs | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cli/tools/run/mod.rs b/cli/tools/run/mod.rs index 1964cfdd9..9d1d5e78b 100644 --- a/cli/tools/run/mod.rs +++ b/cli/tools/run/mod.rs @@ -194,7 +194,12 @@ pub async fn eval_command( pub async fn maybe_npm_install(factory: &CliFactory) -> Result<(), AnyError> { // ensure an "npm install" is done if the user has explicitly // opted into using a managed node_modules directory - if factory.cli_options()?.node_modules_dir_enablement() == Some(true) { + if factory + .cli_options()? + .node_modules_mode()? + .map(|m| m.uses_node_modules_dir()) + .unwrap_or(false) + { if let Some(npm_resolver) = factory.npm_resolver().await?.as_managed() { npm_resolver.ensure_top_level_package_json_install().await?; } diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs index e14452372..d21d17529 100644 --- a/cli/tools/vendor/mod.rs +++ b/cli/tools/vendor/mod.rs @@ -88,7 +88,10 @@ pub async fn vendor( let graph = output.graph; let npm_package_count = graph.npm_packages.len(); let try_add_node_modules_dir = npm_package_count > 0 - && cli_options.node_modules_dir_enablement().unwrap_or(true); + && cli_options + .node_modules_mode()? + .map(|m| m.uses_node_modules_dir()) + .unwrap_or(true); log::info!( concat!("Vendored {} {} into {} directory.",), |