diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/info.rs | 2 | ||||
| -rw-r--r-- | cli/tools/task.rs | 6 | ||||
| -rw-r--r-- | cli/tools/vendor/mod.rs | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/cli/tools/info.rs b/cli/tools/info.rs index e1972f08f..fa0ede437 100644 --- a/cli/tools/info.rs +++ b/cli/tools/info.rs @@ -98,7 +98,7 @@ fn print_cache_info( let dir = factory.deno_dir()?; #[allow(deprecated)] let modules_cache = factory.global_http_cache()?.get_global_cache_location(); - let npm_cache = factory.npm_cache()?.as_readonly().get_cache_location(); + let npm_cache = factory.deno_dir()?.npm_folder_path(); let typescript_cache = &dir.gen_cache.location; let registry_cache = dir.registries_folder_path(); let mut origin_dir = dir.origin_data_folder_path(); diff --git a/cli/tools/task.rs b/cli/tools/task.rs index d1513072a..93e78dc56 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -86,11 +86,7 @@ pub async fn execute_script( // install the npm packages if we're using a managed resolver if let Some(npm_resolver) = npm_resolver.as_managed() { - let package_json_deps_installer = - factory.package_json_deps_installer().await?; - package_json_deps_installer - .ensure_top_level_install() - .await?; + npm_resolver.ensure_top_level_package_json_install().await?; npm_resolver.resolve_pending().await?; } diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs index fdea5fc26..c324a56dd 100644 --- a/cli/tools/vendor/mod.rs +++ b/cli/tools/vendor/mod.rs @@ -107,11 +107,12 @@ pub async fn vendor( .map(|config_path| config_path.parent().unwrap().join("node_modules")) }); if let Some(node_modules_path) = node_modules_path { - factory - .create_node_modules_npm_fs_resolver(node_modules_path) - .await? - .cache_packages() - .await?; + let cli_options = + cli_options.with_node_modules_dir_path(node_modules_path); + let factory = CliFactory::from_cli_options(Arc::new(cli_options)); + if let Some(managed) = factory.npm_resolver().await?.as_managed() { + managed.cache_packages().await?; + } } log::info!( concat!( |