diff --git a/Cargo.lock b/Cargo.lock index c55b9f97ca..b55e2aeb39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1348,12 +1348,13 @@ dependencies = [ [[package]] name = "deno_cache_dir" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87900cfcd07bdbf3597bc36b77da0c0e7b6c2e65213faa2ed43d9a1ec12bd31d" +checksum = "186a102b13b4512841f5f40784cd25822042d22954afe3b5b070d406d15eb4f2" dependencies = [ "base32", "deno_media_type", + "deno_path_util", "indexmap", "log", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index ce333c728b..b15c1241b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,7 +110,7 @@ console_static_text = "=0.8.1" dashmap = "5.5.3" data-encoding = "2.3.3" data-url = "=0.3.0" -deno_cache_dir = "=0.12.0" +deno_cache_dir = "=0.13.0" deno_package_json = { version = "=0.1.1", default-features = false } dlopen2 = "0.6.1" ecb = "=0.1.2" diff --git a/cli/cache/deno_dir.rs b/cli/cache/deno_dir.rs index 88d8a31c04..7b7059c224 100644 --- a/cli/cache/deno_dir.rs +++ b/cli/cache/deno_dir.rs @@ -126,9 +126,9 @@ impl DenoDir { self.root.join("registries") } - /// Path to the dependencies cache folder. - pub fn deps_folder_path(&self) -> PathBuf { - self.root.join("deps") + /// Path to the remote cache folder. + pub fn remote_folder_path(&self) -> PathBuf { + self.root.join("remote") } /// Path to the origin data cache folder. diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs index 2296bce010..628502c506 100644 --- a/cli/cache/mod.rs +++ b/cli/cache/mod.rs @@ -87,10 +87,6 @@ impl deno_cache_dir::DenoCacheEnv for RealDenoCacheEnv { std::fs::create_dir_all(path) } - fn remove_file(&self, path: &Path) -> std::io::Result<()> { - std::fs::remove_file(path) - } - fn modified(&self, path: &Path) -> std::io::Result> { match std::fs::metadata(path) { Ok(metadata) => Ok(Some( @@ -149,13 +145,6 @@ impl<'a> deno_cache_dir::DenoCacheEnv for DenoCacheEnvFsAdapter<'a> { .map_err(|e| e.into_io_error()) } - fn remove_file(&self, path: &Path) -> std::io::Result<()> { - self - .0 - .remove_sync(path, false) - .map_err(|e| e.into_io_error()) - } - fn modified(&self, path: &Path) -> std::io::Result> { self .0 diff --git a/cli/factory.rs b/cli/factory.rs index 2cef875999..b96a133e98 100644 --- a/cli/factory.rs +++ b/cli/factory.rs @@ -301,7 +301,7 @@ impl CliFactory { pub fn global_http_cache(&self) -> Result<&Arc, AnyError> { self.services.global_http_cache.get_or_try_init(|| { Ok(Arc::new(GlobalHttpCache::new( - self.deno_dir()?.deps_folder_path(), + self.deno_dir()?.remote_folder_path(), crate::cache::RealDenoCacheEnv, ))) }) diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs index 1bf7635949..69daf14954 100644 --- a/cli/file_fetcher.rs +++ b/cli/file_fetcher.rs @@ -726,7 +726,7 @@ mod tests { maybe_temp_dir: Option, ) -> (FileFetcher, TempDir, Arc) { let temp_dir = maybe_temp_dir.unwrap_or_default(); - let location = temp_dir.path().join("deps").to_path_buf(); + let location = temp_dir.path().join("remote").to_path_buf(); let blob_store: Arc = Default::default(); let file_fetcher = FileFetcher::new( Arc::new(GlobalHttpCache::new(location, RealDenoCacheEnv)), @@ -964,7 +964,7 @@ mod tests { // This creates a totally new instance, simulating another Deno process // invocation and indicates to "cache bust". - let location = temp_dir.path().join("deps").to_path_buf(); + let location = temp_dir.path().join("remote").to_path_buf(); let file_fetcher = FileFetcher::new( Arc::new(GlobalHttpCache::new( location, @@ -990,7 +990,7 @@ mod tests { async fn test_fetch_uses_cache() { let _http_server_guard = test_util::http_server(); let temp_dir = TempDir::new(); - let location = temp_dir.path().join("deps").to_path_buf(); + let location = temp_dir.path().join("remote").to_path_buf(); let specifier = resolve_url("http://localhost:4545/subdir/mismatch_ext.ts").unwrap(); @@ -1156,7 +1156,7 @@ mod tests { async fn test_fetch_uses_cache_with_redirects() { let _http_server_guard = test_util::http_server(); let temp_dir = TempDir::new(); - let location = temp_dir.path().join("deps").to_path_buf(); + let location = temp_dir.path().join("remote").to_path_buf(); let specifier = resolve_url("http://localhost:4548/subdir/mismatch_ext.ts").unwrap(); let redirected_specifier = @@ -1324,7 +1324,7 @@ mod tests { async fn test_fetch_no_remote() { let _http_server_guard = test_util::http_server(); let temp_dir = TempDir::new(); - let location = temp_dir.path().join("deps").to_path_buf(); + let location = temp_dir.path().join("remote").to_path_buf(); let file_fetcher = FileFetcher::new( Arc::new(GlobalHttpCache::new( location, @@ -1350,7 +1350,7 @@ mod tests { async fn test_fetch_cache_only() { let _http_server_guard = test_util::http_server(); let temp_dir = TempDir::new(); - let location = temp_dir.path().join("deps").to_path_buf(); + let location = temp_dir.path().join("remote").to_path_buf(); let file_fetcher_01 = FileFetcher::new( Arc::new(GlobalHttpCache::new(location.clone(), RealDenoCacheEnv)), CacheSetting::Only, diff --git a/cli/lsp/cache.rs b/cli/lsp/cache.rs index db10dc9677..fbf9ea6f1b 100644 --- a/cli/lsp/cache.rs +++ b/cli/lsp/cache.rs @@ -94,7 +94,7 @@ impl LspCache { let deno_dir = DenoDir::new(global_cache_path) .expect("should be infallible with absolute custom root"); let global = Arc::new(GlobalHttpCache::new( - deno_dir.deps_folder_path(), + deno_dir.remote_folder_path(), crate::cache::RealDenoCacheEnv, )); Self { diff --git a/tests/integration/jsr_tests.rs b/tests/integration/jsr_tests.rs index af5b24fe41..c4812e6bfb 100644 --- a/tests/integration/jsr_tests.rs +++ b/tests/integration/jsr_tests.rs @@ -191,7 +191,7 @@ fn reload_info_not_found_cache_but_exists_remote() { Url::parse(&format!("http://127.0.0.1:4250/{}/meta.json", package)) .unwrap(); let cache = deno_cache_dir::GlobalHttpCache::new( - deno_dir.path().join("deps").to_path_buf(), + deno_dir.path().join("remote").to_path_buf(), deno_cache_dir::TestRealDenoCacheEnv, ); let entry = cache diff --git a/tests/specs/info/flag/041_info_flag.out b/tests/specs/info/flag/041_info_flag.out index 3506a29e48..72a00be303 100644 --- a/tests/specs/info/flag/041_info_flag.out +++ b/tests/specs/info/flag/041_info_flag.out @@ -1,5 +1,5 @@ DENO_DIR location: [WILDCARD] -Remote modules cache: [WILDCARD]deps +Remote modules cache: [WILDCARD]remote npm modules cache: [WILDCARD]npm Emitted modules cache: [WILDCARD]gen Language server registries cache: [WILDCARD]registries diff --git a/tests/specs/info/flag_location/041_info_flag_location.out b/tests/specs/info/flag_location/041_info_flag_location.out index b9e72f6590..684db2eec5 100644 --- a/tests/specs/info/flag_location/041_info_flag_location.out +++ b/tests/specs/info/flag_location/041_info_flag_location.out @@ -1,5 +1,5 @@ DENO_DIR location: [WILDCARD] -Remote modules cache: [WILDCARD]deps +Remote modules cache: [WILDCARD]remote npm modules cache: [WILDCARD]npm Emitted modules cache: [WILDCARD]gen Language server registries cache: [WILDCARD]registries diff --git a/tests/specs/info/json/info_json.out b/tests/specs/info/json/info_json.out index 607489ca39..551f61026d 100644 --- a/tests/specs/info/json/info_json.out +++ b/tests/specs/info/json/info_json.out @@ -1,7 +1,7 @@ { "version": 1, "denoDir": "[WILDCARD]", - "modulesCache": "[WILDCARD]deps", + "modulesCache": "[WILDCARD]remote", "npmCache": "[WILDCARD]npm", "typescriptCache": "[WILDCARD]gen", "registryCache": "[WILDCARD]registries", diff --git a/tests/specs/info/json_location/info_json_location.out b/tests/specs/info/json_location/info_json_location.out index 004bf03db1..6d01ba451d 100644 --- a/tests/specs/info/json_location/info_json_location.out +++ b/tests/specs/info/json_location/info_json_location.out @@ -1,7 +1,7 @@ { "version": 1, "denoDir": "[WILDCARD]", - "modulesCache": "[WILDCARD]deps", + "modulesCache": "[WILDCARD]remote", "npmCache": "[WILDCARD]npm", "typescriptCache": "[WILDCARD]gen", "registryCache": "[WILDCARD]registries",