deps: upgrade npm to 9.6.7

PR-URL: #48062 Reviewed-By: Luke Karrys <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · May 30, 2023 · 03f67d6 · 03f67d6
1 parent 0e4a3b7
commit 03f67d6
Show file tree

Hide file tree

Showing 103 changed files with 1,702 additions and 623 deletions.
diff --git a/deps/npm/docs/content/commands/npm-ls.md b/deps/npm/docs/content/commands/npm-ls.md
@@ -27,7 +27,7 @@ packages will *also* show the paths to the specified packages.  For
 example, running `npm ls promzard` in npm's source tree will show:
 
 ```bash
-[email protected].6 /path/to/npm
+[email protected].7 /path/to/npm
 └─┬ [email protected]
   └── [email protected]
 ```

diff --git a/deps/npm/docs/content/commands/npm.md b/deps/npm/docs/content/commands/npm.md
@@ -14,7 +14,7 @@ Note: This command is unaware of workspaces.
 
 ### Version
 
-9.6.6
+9.6.7
 
 ### Description
 

diff --git a/deps/npm/docs/content/configuring-npm/package-json.md b/deps/npm/docs/content/configuring-npm/package-json.md
@@ -323,7 +323,7 @@ This should be a module relative to the root of your package folder.
 For most modules, it makes the most sense to have a main script and often
 not much else.
 
-If `main` is not set it defaults to `index.js` in the package's root folder.
+If `main` is not set, it defaults to `index.js` in the package's root folder.
 
 ### browser
 

diff --git a/deps/npm/docs/content/using-npm/config.md b/deps/npm/docs/content/using-npm/config.md
@@ -289,16 +289,6 @@ npm exec --package yo --package generator-node --call "yo node"
 ```
 
 
-#### `ci-name`
-
-* Default: The name of the current CI system, or `null` when not on a known CI
-  platform.
-* Type: null or String
-
-The name of a continuous integration system. If not set explicitly, npm will
-detect the current CI environment using the
-[`ci-info`](http://npm.im/ci-info) module.
-
 #### `cidr`
 
 * Default: null
@@ -1514,6 +1504,18 @@ It is _not_ the path to a certificate file, though you can set a
 registry-scoped "certfile" path like
 "//other-registry.tld/:certfile=/path/to/cert.pem".
 
+#### `ci-name`
+
+* Default: The name of the current CI system, or `null` when not on a known CI
+  platform.
+* Type: null or String
+* DEPRECATED: This config is deprecated and will not be changeable in future
+  version of npm.
+
+The name of a continuous integration system. If not set explicitly, npm will
+detect the current CI environment using the
+[`ci-info`](http://npm.im/ci-info) module.
+
 #### `dev`
 
 * Default: false

diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html
@@ -160,7 +160,7 @@ <h3 id="description">Description</h3>
 the results to only the paths to the packages named.  Note that nested
 packages will <em>also</em> show the paths to the specified packages.  For
 example, running <code>npm ls promzard</code> in npm's source tree will show:</p>
-<pre><code class="language-bash">[email protected].6 /path/to/npm
+<pre><code class="language-bash">[email protected].7 /path/to/npm
 └─┬ [email protected]
   └── [email protected]
 </code></pre>

diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
@@ -150,7 +150,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 </code></pre>
 <p>Note: This command is unaware of workspaces.</p>
 <h3 id="version">Version</h3>
-<p>9.6.6</p>
+<p>9.6.7</p>
 <h3 id="description">Description</h3>
 <p>npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency

diff --git a/deps/npm/docs/output/configuring-npm/package-json.html b/deps/npm/docs/output/configuring-npm/package-json.html
@@ -391,7 +391,7 @@ <h3 id="main">main</h3>
 <p>This should be a module relative to the root of your package folder.</p>
 <p>For most modules, it makes the most sense to have a main script and often
 not much else.</p>
-<p>If <code>main</code> is not set it defaults to <code>index.js</code> in the package's root folder.</p>
+<p>If <code>main</code> is not set, it defaults to <code>index.js</code> in the package's root folder.</p>
 <h3 id="browser">browser</h3>
 <p>If your module is meant to be used client-side the browser field should be
 used instead of the main field. This is helpful to hint users that it might

diff --git a/deps/npm/docs/output/using-npm/config.html b/deps/npm/docs/output/using-npm/config.html
diff --git a/deps/npm/lib/commands/cache.js b/deps/npm/lib/commands/cache.js
@@ -76,7 +76,7 @@ class Cache extends BaseCommand {
   async completion (opts) {
     const argv = opts.conf.argv.remain
     if (argv.length === 2) {
-      return ['add', 'clean', 'verify', 'ls', 'delete']
+      return ['add', 'clean', 'verify', 'ls']
     }
 
     // TODO - eventually...
@@ -85,7 +85,6 @@ class Cache extends BaseCommand {
       case 'clean':
       case 'add':
       case 'ls':
-      case 'delete':
         return []
     }
   }

diff --git a/deps/npm/lib/utils/config/definitions.js b/deps/npm/lib/utils/config/definitions.js
@@ -439,6 +439,9 @@ define('ci-name', {
     platform.
   `,
   type: [null, String],
+  deprecated: `
+    This config is deprecated and will not be changeable in future version of npm.
+  `,
   description: `
     The name of a continuous integration system.  If not set explicitly, npm
     will detect the current CI environment using the

diff --git a/deps/npm/lib/utils/exit-handler.js b/deps/npm/lib/utils/exit-handler.js
@@ -131,8 +131,8 @@ const exitHandler = err => {
     log.level = level
   }
 
-  let exitCode
-  let noLogMessage
+  let exitCode = process.exitCode || 0
+  let noLogMessage = exitCode !== 0
   let jsonError
 
   if (err) {

diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
@@ -20,7 +20,7 @@ Positional arguments are \fBname@version-range\fR identifiers, which will limit
 .P
 .RS 2
 .nf
-[email protected].6 /path/to/npm
+[email protected].7 /path/to/npm
 └─┬ [email protected]
   └── [email protected]
 .fi

diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
@@ -12,7 +12,7 @@ npm
 Note: This command is unaware of workspaces.
 .SS "Version"
 .P
-9.6.6
+9.6.7
 .SS "Description"
 .P
 npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency conflicts intelligently.

diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
@@ -303,7 +303,7 @@ This should be a module relative to the root of your package folder.
 .P
 For most modules, it makes the most sense to have a main script and often not much else.
 .P
-If \fBmain\fR is not set it defaults to \fBindex.js\fR in the package's root folder.
+If \fBmain\fR is not set, it defaults to \fBindex.js\fR in the package's root folder.
 .SS "browser"
 .P
 If your module is meant to be used client-side the browser field should be used instead of the main field. This is helpful to hint users that it might rely on primitives that aren't available in Node.js modules. (e.g. \fBwindow\fR)

diff --git a/deps/npm/man/man5/package-json.5 b/deps/npm/man/man5/package-json.5
@@ -303,7 +303,7 @@ This should be a module relative to the root of your package folder.
 .P
 For most modules, it makes the most sense to have a main script and often not much else.
 .P
-If \fBmain\fR is not set it defaults to \fBindex.js\fR in the package's root folder.
+If \fBmain\fR is not set, it defaults to \fBindex.js\fR in the package's root folder.
 .SS "browser"
 .P
 If your module is meant to be used client-side the browser field should be used instead of the main field. This is helpful to hint users that it might rely on primitives that aren't available in Node.js modules. (e.g. \fBwindow\fR)

diff --git a/deps/npm/man/man7/config.7 b/deps/npm/man/man7/config.7
@@ -320,16 +320,6 @@ Optional companion option for \fBnpm exec\fR, \fBnpx\fR that allows for specifyi
 npm exec --package yo --package generator-node --call "yo node"
 .fi
 .RE
-.SS "\fBci-name\fR"
-.RS 0
-.IP \(bu 4
-Default: The name of the current CI system, or \fBnull\fR when not on a known CI platform.
-.IP \(bu 4
-Type: null or String
-.RE 0
-
-.P
-The name of a continuous integration system. If not set explicitly, npm will detect the current CI environment using the \fB\fBci-info\fR\fR \fI\(lahttp://npm.im/ci-info\(ra\fR module.
 .SS "\fBcidr\fR"
 .RS 0
 .IP \(bu 4
@@ -1757,6 +1747,18 @@ cert="-----BEGIN CERTIFICATE-----\[rs]nXXXX\[rs]nXXXX\[rs]n-----END CERTIFICATE-
 .RE
 .P
 It is \fInot\fR the path to a certificate file, though you can set a registry-scoped "certfile" path like "//other-registry.tld/:certfile=/path/to/cert.pem".
+.SS "\fBci-name\fR"
+.RS 0
+.IP \(bu 4
+Default: The name of the current CI system, or \fBnull\fR when not on a known CI platform.
+.IP \(bu 4
+Type: null or String
+.IP \(bu 4
+DEPRECATED: This config is deprecated and will not be changeable in future version of npm.
+.RE 0
+
+.P
+The name of a continuous integration system. If not set explicitly, npm will detect the current CI environment using the \fB\fBci-info\fR\fR \fI\(lahttp://npm.im/ci-info\(ra\fR module.
 .SS "\fBdev\fR"
 .RS 0
 .IP \(bu 4

diff --git a/deps/npm/node_modules/@npmcli/config/lib/index.js b/deps/npm/node_modules/@npmcli/config/lib/index.js
diff --git a/deps/npm/node_modules/@npmcli/config/package.json b/deps/npm/node_modules/@npmcli/config/package.json