From 1bb47805d6331ad048bd5e7ea2581aa230e8fc93 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Sat, 28 Sep 2024 08:50:16 -0400 Subject: refactor: move NpmCacheDir to deno_cache_dir (#25916) Part of the ongoing work to move more of Deno's resolution out of the CLI crate (for use in Wasm and other things) Includes: * https://github.com/denoland/deno_cache_dir/pull/60 --- cli/standalone/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cli/standalone/mod.rs') diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index c501d2d6b..93ac6002b 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -6,6 +6,7 @@ #![allow(unused_imports)] use deno_ast::MediaType; +use deno_cache_dir::npm::NpmCacheDir; use deno_config::workspace::MappedResolution; use deno_config::workspace::MappedResolutionError; use deno_config::workspace::ResolverWorkspaceJsrPackage; @@ -55,6 +56,7 @@ use crate::args::StorageKeyResolver; use crate::cache::Caches; use crate::cache::DenoDirProvider; use crate::cache::NodeAnalysisCache; +use crate::cache::RealDenoCacheEnv; use crate::http_util::HttpClientProvider; use crate::node::CliCjsCodeAnalyzer; use crate::npm::create_cli_npm_resolver; @@ -62,7 +64,6 @@ use crate::npm::CliNpmResolverByonmCreateOptions; use crate::npm::CliNpmResolverCreateOptions; use crate::npm::CliNpmResolverManagedCreateOptions; use crate::npm::CliNpmResolverManagedSnapshotOption; -use crate::npm::NpmCacheDir; use crate::resolver::CjsResolutionStore; use crate::resolver::CliNodeResolver; use crate::resolver::NpmModuleLoader; @@ -464,6 +465,7 @@ pub async fn run( let main_module = root_dir_url.join(&metadata.entrypoint_key).unwrap(); let root_node_modules_path = root_path.join("node_modules"); let npm_cache_dir = NpmCacheDir::new( + &RealDenoCacheEnv, root_node_modules_path.clone(), vec![npm_registry_url.clone()], ); -- cgit v1.2.3