diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/run.rs | 10 | ||||
| -rw-r--r-- | cli/tools/vendor/test.rs | 13 |
2 files changed, 5 insertions, 18 deletions
diff --git a/cli/tools/run.rs b/cli/tools/run.rs index 6ded628ea..5fb31a4ad 100644 --- a/cli/tools/run.rs +++ b/cli/tools/run.rs @@ -186,13 +186,11 @@ pub async fn eval_command( async fn maybe_npm_install(factory: &CliFactory) -> Result<(), AnyError> { // ensure an "npm install" is done if the user has explicitly - // opted into using a node_modules directory + // opted into using a managed node_modules directory if factory.cli_options().node_modules_dir_enablement() == Some(true) { - factory - .package_json_deps_installer() - .await? - .ensure_top_level_install() - .await?; + if let Some(npm_resolver) = factory.npm_resolver().await?.as_managed() { + npm_resolver.ensure_top_level_package_json_install().await?; + } } Ok(()) } diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs index a8b83bb91..e13b8579b 100644 --- a/cli/tools/vendor/test.rs +++ b/cli/tools/vendor/test.rs @@ -23,8 +23,6 @@ use import_map::ImportMap; use crate::args::JsxImportSourceConfig; use crate::cache::ParsedSourceCache; -use crate::npm::CliNpmRegistryApi; -use crate::npm::NpmResolution; use crate::resolver::CliGraphResolver; use crate::resolver::CliGraphResolverOptions; @@ -295,22 +293,13 @@ fn build_resolver( maybe_jsx_import_source_config: Option<JsxImportSourceConfig>, original_import_map: Option<ImportMap>, ) -> CliGraphResolver { - let npm_registry_api = Arc::new(CliNpmRegistryApi::new_uninitialized()); - let npm_resolution = Arc::new(NpmResolution::from_serialized( - npm_registry_api.clone(), - None, - None, - )); CliGraphResolver::new( - npm_registry_api, - npm_resolution, - Default::default(), + None, Default::default(), CliGraphResolverOptions { maybe_jsx_import_source_config, maybe_import_map: original_import_map.map(Arc::new), maybe_vendor_dir: None, - no_npm: false, }, ) } |