diff options
Diffstat (limited to 'cli/standalone')
| -rw-r--r-- | cli/standalone/binary.rs | 6 | ||||
| -rw-r--r-- | cli/standalone/mod.rs | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs index 143c1824d..042d3c3c6 100644 --- a/cli/standalone/binary.rs +++ b/cli/standalone/binary.rs @@ -537,7 +537,7 @@ impl<'a> DenoCompileBinaryWriter<'a> { self .client - .download_with_progress(download_url, &progress) + .download_with_progress(download_url, None, &progress) .await? }; let bytes = match maybe_bytes { @@ -670,9 +670,7 @@ impl<'a> DenoCompileBinaryWriter<'a> { } else { // DO NOT include the user's registry url as it may contain credentials, // but also don't make this dependent on the registry url - let registry_url = npm_resolver.registry_base_url(); - let root_path = - npm_resolver.registry_folder_in_global_cache(registry_url); + let root_path = npm_resolver.global_cache_root_folder(); let mut builder = VfsBuilder::new(root_path)?; for package in npm_resolver.all_system_packages(&self.npm_system_info) { diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 288618287..1c081bc86 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -1,5 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. +use crate::args::create_default_npmrc; use crate::args::get_root_cert_store; use crate::args::npm_pkg_req_ref_to_binary_command; use crate::args::CaData; @@ -349,7 +350,8 @@ pub async fn run( let root_path = std::env::temp_dir() .join(format!("deno-compile-{}", current_exe_name)) .join("node_modules"); - let npm_cache_dir = NpmCacheDir::new(root_path.clone()); + let npm_cache_dir = + NpmCacheDir::new(root_path.clone(), vec![npm_registry_url.clone()]); let npm_global_cache_dir = npm_cache_dir.get_cache_location(); let cache_setting = CacheSetting::Only; let (package_json_deps_provider, fs, npm_resolver, maybe_vfs_root) = @@ -363,7 +365,7 @@ pub async fn run( let vfs_root_dir_path = if node_modules_dir { root_path } else { - npm_cache_dir.registry_folder(&npm_registry_url) + npm_cache_dir.root_dir().to_owned() }; let vfs = load_npm_vfs(vfs_root_dir_path.clone()) .context("Failed to load npm vfs.")?; @@ -392,8 +394,10 @@ pub async fn run( CliNpmResolverManagedPackageJsonInstallerOption::ConditionalInstall( package_json_deps_provider.clone(), ), - npm_registry_url, npm_system_info: Default::default(), + // Packages from different registries are already inlined in the ESZip, + // so no need to create actual `.npmrc` configuration. + npmrc: create_default_npmrc(), }), ) .await?; @@ -448,8 +452,10 @@ pub async fn run( CliNpmResolverManagedPackageJsonInstallerOption::ConditionalInstall( package_json_deps_provider.clone(), ), - npm_registry_url, npm_system_info: Default::default(), + // Packages from different registries are already inlined in the ESZip, + // so no need to create actual `.npmrc` configuration. + npmrc: create_default_npmrc(), }), ) .await?; |