fix: use @npmcli/redact for url cleaning (#7363)

I missed these calls when first moving to `@npmcli/redact`. This isn't a
performance specific PR but I assume it will help since there are now a
few places where we no longer need to require `npm-registry-fetch` at
all.

DEPENDENCIES.md

@@ -177,6 +177,7 @@ graph LR;
   npmcli-arborist-->npmcli-node-gyp["@npmcli/node-gyp"];
   npmcli-arborist-->npmcli-package-json["@npmcli/package-json"];
   npmcli-arborist-->npmcli-query["@npmcli/query"];
+  npmcli-arborist-->npmcli-redact["@npmcli/redact"];
   npmcli-arborist-->npmcli-run-script["@npmcli/run-script"];
   npmcli-arborist-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-arborist-->npmlog;
@@ -623,6 +624,7 @@ graph LR;
   npmcli-arborist-->npmcli-node-gyp["@npmcli/node-gyp"];
   npmcli-arborist-->npmcli-package-json["@npmcli/package-json"];
   npmcli-arborist-->npmcli-query["@npmcli/query"];
+  npmcli-arborist-->npmcli-redact["@npmcli/redact"];
   npmcli-arborist-->npmcli-run-script["@npmcli/run-script"];
   npmcli-arborist-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-arborist-->npmlog;

lib/commands/owner.js

@@ -5,6 +5,7 @@ const log = require('../utils/log-shim')
 const otplease = require('../utils/otplease.js')
 const pkgJson = require('@npmcli/package-json')
 const BaseCommand = require('../base-command.js')
+const { redact } = require('@npmcli/redact')
 
 const readJson = async (path) => {
   try {
@@ -119,7 +120,7 @@ class Owner extends BaseCommand {
         this.npm.output(maintainers.map(m => `${m.name} <${m.email}>`).join('\n'))
       }
     } catch (err) {
-      log.error('owner ls', "Couldn't get owner data", npmFetch.cleanUrl(pkg))
+      log.error('owner ls', "Couldn't get owner data", redact(pkg))
       throw err
     }
   }

lib/commands/ping.js

@@ -1,4 +1,4 @@
-const { cleanUrl } = require('npm-registry-fetch')
+const { redact } = require('@npmcli/redact')
 const log = require('../utils/log-shim')
 const pingUtil = require('../utils/ping.js')
 const BaseCommand = require('../base-command.js')
@@ -9,7 +9,7 @@ class Ping extends BaseCommand {
   static name = 'ping'
 
   async exec (args) {
-    const cleanRegistry = cleanUrl(this.npm.config.get('registry'))
+    const cleanRegistry = redact(this.npm.config.get('registry'))
     log.notice('PING', cleanRegistry)
     const start = Date.now()
     const details = await pingUtil({ ...this.npm.flatOptions })

package-lock.json

@@ -16130,6 +16130,7 @@
         "@npmcli/node-gyp": "^3.0.0",
         "@npmcli/package-json": "^5.0.0",
         "@npmcli/query": "^3.1.0",
+        "@npmcli/redact": "^1.1.0",
         "@npmcli/run-script": "^7.0.2",
         "bin-links": "^4.0.1",
         "cacache": "^18.0.0",

workspaces/arborist/lib/arborist/build-ideal-tree.js

@@ -12,7 +12,7 @@ const { readdirScoped } = require('@npmcli/fs')
 const { lstat, readlink } = require('fs/promises')
 const { depth } = require('treeverse')
 const log = require('proc-log')
-const { cleanUrl } = require('npm-registry-fetch')
+const { redact } = require('@npmcli/redact')
 
 const {
   OK,
@@ -1213,7 +1213,7 @@ This is a one-time fix-up, please be patient...
     if (this.#manifests.has(spec.raw)) {
       return this.#manifests.get(spec.raw)
     } else {
-      const cleanRawSpec = cleanUrl(spec.rawSpec)
+      const cleanRawSpec = redact(spec.rawSpec)
       log.silly('fetch manifest', spec.raw.replace(spec.rawSpec, cleanRawSpec))
       const o = {
         ...options,

workspaces/arborist/lib/place-dep.js

@@ -9,7 +9,7 @@
 
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const log = require('proc-log')
-const { cleanUrl } = require('npm-registry-fetch')
+const { redact } = require('@npmcli/redact')
 const deepestNestingTarget = require('./deepest-nesting-target.js')
 const CanPlaceDep = require('./can-place-dep.js')
 const {
@@ -188,7 +188,7 @@ class PlaceDep {
       `${this.dep.name}@${this.dep.version}`,
       this.canPlace.description,
       `for: ${this.edge.from.package._id || this.edge.from.location}`,
-      `want: ${cleanUrl(this.edge.spec || '*')}`
+      `want: ${redact(this.edge.spec || '*')}`
     )
 
     const placementType = this.canPlace.canPlace === CONFLICT

workspaces/arborist/package.json

@@ -12,6 +12,7 @@
     "@npmcli/node-gyp": "^3.0.0",
     "@npmcli/package-json": "^5.0.0",
     "@npmcli/query": "^3.1.0",
+    "@npmcli/redact": "^1.1.0",
     "@npmcli/run-script": "^7.0.2",
     "bin-links": "^4.0.1",
     "cacache": "^18.0.0",