From 5f0bb3c6f4328003012e98ba70ce18e4e2e842de Mon Sep 17 00:00:00 2001
From: Marvin Hagemeister <marvin@deno.com>
Date: Thu, 24 Oct 2024 20:03:56 +0200
Subject: fix: `.npmrc` settings not being passed to install/add command
 (#26473)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We weren't passing the resolved npmrc settings to the install commands.
This lead us to always fall back to the default registry url instead of
using the one from npmrc.

Fixes https://github.com/denoland/deno/issues/26139
Fixes https://github.com/denoland/deno/issues/26033
Fixes https://github.com/denoland/deno/issues/25924
Fixes https://github.com/denoland/deno/issues/25822
Fixes https://github.com/denoland/deno/issues/26152

---------

Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
---
 cli/npm/managed/cache/mod.rs           |  2 +-
 cli/npm/managed/cache/registry_info.rs | 64 +++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'cli/npm/managed/cache')

diff --git a/cli/npm/managed/cache/mod.rs b/cli/npm/managed/cache/mod.rs
index fa0e8c8a5..aaec48668 100644
--- a/cli/npm/managed/cache/mod.rs
+++ b/cli/npm/managed/cache/mod.rs
@@ -26,7 +26,7 @@ use crate::cache::CACHE_PERM;
 use crate::util::fs::atomic_write_file_with_retries;
 use crate::util::fs::hard_link_dir_recursive;
 
-mod registry_info;
+pub mod registry_info;
 mod tarball;
 mod tarball_extract;
 
diff --git a/cli/npm/managed/cache/registry_info.rs b/cli/npm/managed/cache/registry_info.rs
index 6c4a7503b..6d39d3c13 100644
--- a/cli/npm/managed/cache/registry_info.rs
+++ b/cli/npm/managed/cache/registry_info.rs
@@ -84,7 +84,7 @@ impl RegistryInfoDownloader {
     self.load_package_info_inner(name).await.with_context(|| {
       format!(
         "Error getting response at {} for package \"{}\"",
-        self.get_package_url(name),
+        get_package_url(&self.npmrc, name),
         name
       )
     })
@@ -190,7 +190,7 @@ impl RegistryInfoDownloader {
 
   fn create_load_future(self: &Arc<Self>, name: &str) -> LoadFuture {
     let downloader = self.clone();
-    let package_url = self.get_package_url(name);
+    let package_url = get_package_url(&self.npmrc, name);
     let registry_config = self.npmrc.get_registry_config(name);
     let maybe_auth_header =
       match maybe_auth_header_for_npm_registry(registry_config) {
@@ -239,36 +239,36 @@ impl RegistryInfoDownloader {
     .map(|r| r.map_err(Arc::new))
     .boxed_local()
   }
+}
 
-  fn get_package_url(&self, name: &str) -> Url {
-    let registry_url = self.npmrc.get_registry_url(name);
-    // The '/' character in scoped package names "@scope/name" must be
-    // encoded for older third party registries. Newer registries and
-    // npm itself support both ways
-    //   - encoded: https://registry.npmjs.org/@rollup%2fplugin-json
-    //   - non-ecoded: https://registry.npmjs.org/@rollup/plugin-json
-    // To support as many third party registries as possible we'll
-    // always encode the '/' character.
+pub fn get_package_url(npmrc: &ResolvedNpmRc, name: &str) -> Url {
+  let registry_url = npmrc.get_registry_url(name);
+  // The '/' character in scoped package names "@scope/name" must be
+  // encoded for older third party registries. Newer registries and
+  // npm itself support both ways
+  //   - encoded: https://registry.npmjs.org/@rollup%2fplugin-json
+  //   - non-ecoded: https://registry.npmjs.org/@rollup/plugin-json
+  // To support as many third party registries as possible we'll
+  // always encode the '/' character.
 
-    // list of all characters used in npm packages:
-    //  !, ', (, ), *, -, ., /, [0-9], @, [A-Za-z], _, ~
-    const ASCII_SET: percent_encoding::AsciiSet =
-      percent_encoding::NON_ALPHANUMERIC
-        .remove(b'!')
-        .remove(b'\'')
-        .remove(b'(')
-        .remove(b')')
-        .remove(b'*')
-        .remove(b'-')
-        .remove(b'.')
-        .remove(b'@')
-        .remove(b'_')
-        .remove(b'~');
-    let name = percent_encoding::utf8_percent_encode(name, &ASCII_SET);
-    registry_url
-      // Ensure that scoped package name percent encoding is lower cased
-      // to match npm.
-      .join(&name.to_string().replace("%2F", "%2f"))
-      .unwrap()
-  }
+  // list of all characters used in npm packages:
+  //  !, ', (, ), *, -, ., /, [0-9], @, [A-Za-z], _, ~
+  const ASCII_SET: percent_encoding::AsciiSet =
+    percent_encoding::NON_ALPHANUMERIC
+      .remove(b'!')
+      .remove(b'\'')
+      .remove(b'(')
+      .remove(b')')
+      .remove(b'*')
+      .remove(b'-')
+      .remove(b'.')
+      .remove(b'@')
+      .remove(b'_')
+      .remove(b'~');
+  let name = percent_encoding::utf8_percent_encode(name, &ASCII_SET);
+  registry_url
+    // Ensure that scoped package name percent encoding is lower cased
+    // to match npm.
+    .join(&name.to_string().replace("%2F", "%2f"))
+    .unwrap()
 }
-- 
cgit v1.2.3