deps: upgrade npm to 8.5.3

PR-URL: #42205 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Mestery <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
nodejs · Mar 20, 2022 · 70c0758 · 70c0758
1 parent f3c6c00
commit 70c0758
Show file tree

Hide file tree

Showing 243 changed files with 2,363 additions and 2,447 deletions.
diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html
@@ -166,7 +166,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 lang="bash"><code>[email protected].2 /path/to/npm
+<pre lang="bash"><code>[email protected].3 /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
@@ -149,7 +149,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 <!-- raw HTML omitted -->
 <!-- raw HTML omitted -->
 <h3 id="version">Version</h3>
-<p>8.5.2</p>
+<p>8.5.3</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/lib/arborist-cmd.js b/deps/npm/lib/arborist-cmd.js
@@ -14,6 +14,8 @@ class ArboristCmd extends BaseCommand {
     'include-workspace-root',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async execWorkspaces (args, filters) {
     await this.setWorkspaces(filters)
     return this.exec(args)

diff --git a/deps/npm/lib/base-command.js b/deps/npm/lib/base-command.js
@@ -20,6 +20,10 @@ class BaseCommand {
     return this.constructor.description
   }
 
+  get ignoreImplicitWorkspace () {
+    return this.constructor.ignoreImplicitWorkspace
+  }
+
   get usage () {
     let usage = `npm ${this.constructor.name}\n\n`
     if (this.constructor.description) {

diff --git a/deps/npm/lib/commands/access.js b/deps/npm/lib/commands/access.js
@@ -27,6 +27,8 @@ class Access extends BaseCommand {
     'otp',
   ]
 
+  static ignoreImplicitWorkspace = true
+
   static usage = [
     'public [<package>]',
     'restricted [<package>]',

diff --git a/deps/npm/lib/commands/adduser.js b/deps/npm/lib/commands/adduser.js
@@ -16,6 +16,8 @@ class AddUser extends BaseCommand {
     'scope',
   ]
 
+  static ignoreImplicitWorkspace = true
+
   async exec (args) {
     const { scope } = this.npm.flatOptions
     const registry = this.getRegistry(this.npm.flatOptions)

diff --git a/deps/npm/lib/commands/bin.js b/deps/npm/lib/commands/bin.js
@@ -5,6 +5,7 @@ class Bin extends BaseCommand {
   static description = 'Display npm bin folder'
   static name = 'bin'
   static params = ['global']
+  static ignoreImplicitWorkspace = true
 
   async exec (args) {
     const b = this.npm.bin

diff --git a/deps/npm/lib/commands/birthday.js b/deps/npm/lib/commands/birthday.js
@@ -2,6 +2,8 @@ const BaseCommand = require('../base-command.js')
 
 class Birthday extends BaseCommand {
   static name = 'birthday'
+  static ignoreImplicitWorkspace = true
+
   async exec () {
     this.npm.config.set('yes', true)
     return this.npm.exec('exec', ['@npmcli/npm-birthday'])

diff --git a/deps/npm/lib/commands/bugs.js b/deps/npm/lib/commands/bugs.js
@@ -9,6 +9,7 @@ class Bugs extends BaseCommand {
   static name = 'bugs'
   static usage = ['[<pkgname>]']
   static params = ['browser', 'registry']
+  static ignoreImplicitWorkspace = true
 
   async exec (args) {
     if (!args || !args.length) {

diff --git a/deps/npm/lib/commands/cache.js b/deps/npm/lib/commands/cache.js
@@ -81,6 +81,8 @@ class Cache extends BaseCommand {
     'verify',
   ]
 
+  static ignoreImplicitWorkspace = true
+
   async completion (opts) {
     const argv = opts.conf.argv.remain
     if (argv.length === 2) {

diff --git a/deps/npm/lib/commands/completion.js b/deps/npm/lib/commands/completion.js
@@ -47,6 +47,7 @@ const BaseCommand = require('../base-command.js')
 class Completion extends BaseCommand {
   static description = 'Tab Completion for npm'
   static name = 'completion'
+  static ignoreImplicitWorkspace = false
 
   // completion for the completion command
   async completion (opts) {

diff --git a/deps/npm/lib/commands/config.js b/deps/npm/lib/commands/config.js
@@ -61,6 +61,8 @@ class Config extends BaseCommand {
     'long',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async completion (opts) {
     const argv = opts.conf.argv.remain
     if (argv[1] !== 'config') {

diff --git a/deps/npm/lib/commands/deprecate.js b/deps/npm/lib/commands/deprecate.js
@@ -15,6 +15,8 @@ class Deprecate extends BaseCommand {
     'otp',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async completion (opts) {
     if (opts.conf.argv.remain.length > 1) {
       return []

diff --git a/deps/npm/lib/commands/diff.js b/deps/npm/lib/commands/diff.js
@@ -32,6 +32,8 @@ class Diff extends BaseCommand {
     'include-workspace-root',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async exec (args) {
     const specs = this.npm.config.get('diff').filter(d => d)
     if (specs.length > 2) {

diff --git a/deps/npm/lib/commands/dist-tag.js b/deps/npm/lib/commands/dist-tag.js
@@ -16,6 +16,8 @@ class DistTag extends BaseCommand {
     'ls [<pkg>]',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async completion (opts) {
     const argv = opts.conf.argv.remain
     if (argv.length === 2) {

diff --git a/deps/npm/lib/commands/docs.js b/deps/npm/lib/commands/docs.js
@@ -15,6 +15,7 @@ class Docs extends BaseCommand {
   ]
 
   static usage = ['[<pkgname> [<pkgname> ...]]']
+  static ignoreImplicitWorkspace = false
 
   async exec (args) {
     if (!args || !args.length) {

diff --git a/deps/npm/lib/commands/doctor.js b/deps/npm/lib/commands/doctor.js
@@ -41,6 +41,7 @@ class Doctor extends BaseCommand {
   static description = 'Check your npm environment'
   static name = 'doctor'
   static params = ['registry']
+  static ignoreImplicitWorkspace = false
 
   async exec (args) {
     log.info('Running checkup')

diff --git a/deps/npm/lib/commands/edit.js b/deps/npm/lib/commands/edit.js
@@ -13,6 +13,7 @@ class Edit extends BaseCommand {
   static name = 'edit'
   static usage = ['<pkg>[/<subpkg>...]']
   static params = ['editor']
+  static ignoreImplicitWorkspace = false
 
   // TODO
   /* istanbul ignore next */

diff --git a/deps/npm/lib/commands/exec.js b/deps/npm/lib/commands/exec.js
@@ -45,6 +45,8 @@ class Exec extends BaseCommand {
     '--package=foo -c \'<cmd> [args...]\'',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async exec (_args, { locationMsg, path, runPath } = {}) {
     if (!path) {
       path = this.npm.localPrefix

diff --git a/deps/npm/lib/commands/explain.js b/deps/npm/lib/commands/explain.js
@@ -16,6 +16,8 @@ class Explain extends ArboristWorkspaceCmd {
     'workspace',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   // TODO
   /* istanbul ignore next */
   async completion (opts) {

diff --git a/deps/npm/lib/commands/explore.js b/deps/npm/lib/commands/explore.js
@@ -13,6 +13,7 @@ class Explore extends BaseCommand {
   static name = 'explore'
   static usage = ['<pkg> [ -- <command>]']
   static params = ['shell']
+  static ignoreImplicitWorkspace = false
 
   // TODO
   /* istanbul ignore next */

diff --git a/deps/npm/lib/commands/get.js b/deps/npm/lib/commands/get.js
@@ -4,6 +4,7 @@ class Get extends BaseCommand {
   static description = 'Get a value from the npm configuration'
   static name = 'get'
   static usage = ['[<key> ...] (See `npm config`)']
+  static ignoreImplicitWorkspace = false
 
   // TODO
   /* istanbul ignore next */

diff --git a/deps/npm/lib/commands/help-search.js b/deps/npm/lib/commands/help-search.js
@@ -11,6 +11,7 @@ class HelpSearch extends BaseCommand {
   static name = 'help-search'
   static usage = ['<text>']
   static params = ['long']
+  static ignoreImplicitWorkspace = true
 
   async exec (args) {
     if (!args.length) {

diff --git a/deps/npm/lib/commands/help.js b/deps/npm/lib/commands/help.js
@@ -17,6 +17,7 @@ class Help extends BaseCommand {
   static name = 'help'
   static usage = ['<term> [<terms..>]']
   static params = ['viewer']
+  static ignoreImplicitWorkspace = true
 
   async completion (opts) {
     if (opts.conf.argv.remain.length > 2) {

diff --git a/deps/npm/lib/commands/hook.js b/deps/npm/lib/commands/hook.js
@@ -19,6 +19,8 @@ class Hook extends BaseCommand {
     'update <id> <url> <secret>',
   ]
 
+  static ignoreImplicitWorkspace = true
+
   async exec (args) {
     return otplease({
       ...this.npm.flatOptions,

diff --git a/deps/npm/lib/commands/init.js b/deps/npm/lib/commands/init.js
@@ -22,6 +22,8 @@ class Init extends BaseCommand {
     '[<@scope>/]<name> (same as `npx [<@scope>/]create-<name>`)',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async exec (args) {
     // npm exec style
     if (args.length) {

diff --git a/deps/npm/lib/commands/logout.js b/deps/npm/lib/commands/logout.js
@@ -11,6 +11,8 @@ class Logout extends BaseCommand {
     'scope',
   ]
 
+  static ignoreImplicitWorkspace = true
+
   async exec (args) {
     const registry = this.npm.config.get('registry')
     const scope = this.npm.config.get('scope')

diff --git a/deps/npm/lib/commands/ls.js b/deps/npm/lib/commands/ls.js
@@ -95,10 +95,15 @@ class LS extends ArboristWorkspaceCmd {
         return true
       }
 
+      if (this.npm.flatOptions.includeWorkspaceRoot
+          && !edge.to.isWorkspace) {
+        return true
+      }
+
       if (edge.from.isProjectRoot) {
-        return edge.to &&
-          edge.to.isWorkspace &&
-          wsNodes.includes(edge.to.target)
+        return (edge.to
+          && edge.to.isWorkspace
+          && wsNodes.includes(edge.to.target))
       }
 
       return true

diff --git a/deps/npm/lib/commands/org.js b/deps/npm/lib/commands/org.js
@@ -13,6 +13,7 @@ class Org extends BaseCommand {
   ]
 
   static params = ['registry', 'otp', 'json', 'parseable']
+  static ignoreImplicitWorkspace = true
 
   async completion (opts) {
     const argv = opts.conf.argv.remain

diff --git a/deps/npm/lib/commands/owner.js b/deps/npm/lib/commands/owner.js
@@ -20,6 +20,8 @@ class Owner extends BaseCommand {
     'ls [<@scope>/]<pkg>',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async completion (opts) {
     const argv = opts.conf.argv.remain
     if (argv.length > 3) {

diff --git a/deps/npm/lib/commands/pack.js b/deps/npm/lib/commands/pack.js
@@ -18,6 +18,7 @@ class Pack extends BaseCommand {
   ]
 
   static usage = ['[[<@scope>/]<pkg>...]']
+  static ignoreImplicitWorkspace = false
 
   async exec (args) {
     if (args.length === 0) {

diff --git a/deps/npm/lib/commands/ping.js b/deps/npm/lib/commands/ping.js
@@ -6,6 +6,7 @@ class Ping extends BaseCommand {
   static description = 'Ping npm registry'
   static params = ['registry']
   static name = 'ping'
+  static ignoreImplicitWorkspace = true
 
   async exec (args) {
     log.notice('PING', this.npm.config.get('registry'))

diff --git a/deps/npm/lib/commands/pkg.js b/deps/npm/lib/commands/pkg.js
@@ -20,6 +20,8 @@ class Pkg extends BaseCommand {
     'workspaces',
   ]
 
+  static ignoreImplicitWorkspace = false
+
   async exec (args, { prefix } = {}) {
     if (!prefix) {
       this.prefix = this.npm.localPrefix

diff --git a/deps/npm/lib/commands/prefix.js b/deps/npm/lib/commands/prefix.js
@@ -5,6 +5,7 @@ class Prefix extends BaseCommand {
   static name = 'prefix'
   static params = ['global']
   static usage = ['[-g]']
+  static ignoreImplicitWorkspace = true
 
   async exec (args) {
     return this.npm.output(this.npm.prefix)

diff --git a/deps/npm/lib/commands/profile.js b/deps/npm/lib/commands/profile.js
@@ -54,6 +54,8 @@ class Profile extends BaseCommand {
     'otp',
   ]
 
+  static ignoreImplicitWorkspace = true
+
   async completion (opts) {
     var argv = opts.conf.argv.remain
 

diff --git a/deps/npm/lib/commands/publish.js b/deps/npm/lib/commands/publish.js
@@ -39,6 +39,7 @@ class Publish extends BaseCommand {
   ]
 
   static usage = ['[<folder>]']
+  static ignoreImplicitWorkspace = false
 
   async exec (args) {
     if (args.length === 0) {
@@ -195,7 +196,11 @@ class Publish extends BaseCommand {
     if (spec.type === 'directory') {
       return readJson(`${spec.fetchSpec}/package.json`)
     }
-    return pacote.manifest(spec, { ...opts, fullMetadata: true })
+    return pacote.manifest(spec, {
+      ...opts,
+      fullMetadata: true,
+      fullReadJson: true,
+    })
   }
 }
 module.exports = Publish
diff --git a/deps/npm/lib/commands/repo.js b/deps/npm/lib/commands/repo.js
@@ -10,6 +10,7 @@ class Repo extends BaseCommand {
   static name = 'repo'
   static params = ['browser', 'workspace', 'workspaces', 'include-workspace-root']
   static usage = ['[<pkgname> [<pkgname> ...]]']
+  static ignoreImplicitWorkspace = false
 
   async exec (args) {
     if (!args || !args.length) {

diff --git a/deps/npm/lib/commands/restart.js b/deps/npm/lib/commands/restart.js
@@ -8,5 +8,7 @@ class Restart extends LifecycleCmd {
     'ignore-scripts',
     'script-shell',
   ]
+
+  static ignoreImplicitWorkspace = false
 }
 module.exports = Restart
diff --git a/deps/npm/lib/commands/root.js b/deps/npm/lib/commands/root.js
@@ -3,6 +3,7 @@ class Root extends BaseCommand {
   static description = 'Display npm root'
   static name = 'root'
   static params = ['global']
+  static ignoreImplicitWorkspace = true
 
   async exec () {
     this.npm.output(this.npm.dir)

diff --git a/deps/npm/lib/commands/run-script.js b/deps/npm/lib/commands/run-script.js
@@ -40,6 +40,7 @@ class RunScript extends BaseCommand {
 
   static name = 'run-script'
   static usage = ['<command> [-- <args>]']
+  static ignoreImplicitWorkspace = false
 
   async completion (opts) {
     const argv = opts.conf.argv.remain

diff --git a/deps/npm/lib/commands/search.js b/deps/npm/lib/commands/search.js
@@ -44,6 +44,7 @@ class Search extends BaseCommand {
   ]
 
   static usage = ['[search terms ...]']
+  static ignoreImplicitWorkspace = true
 
   async exec (args) {
     const opts = {

diff --git a/deps/npm/lib/commands/set-script.js b/deps/npm/lib/commands/set-script.js
@@ -9,6 +9,7 @@ class SetScript extends BaseCommand {
   static params = ['workspace', 'workspaces', 'include-workspace-root']
   static name = 'set-script'
   static usage = ['[<script>] [<command>]']
+  static ignoreImplicitWorkspace = false
 
   async completion (opts) {
     const argv = opts.conf.argv.remain

diff --git a/deps/npm/lib/commands/set.js b/deps/npm/lib/commands/set.js
@@ -4,6 +4,7 @@ class Set extends BaseCommand {
   static description = 'Set a value in the npm configuration'
   static name = 'set'
   static usage = ['<key>=<value> [<key>=<value> ...] (See `npm config`)']
+  static ignoreImplicitWorkspace = false
 
   // TODO
   /* istanbul ignore next */

diff --git a/deps/npm/lib/commands/shrinkwrap.js b/deps/npm/lib/commands/shrinkwrap.js
@@ -6,6 +6,7 @@ const BaseCommand = require('../base-command.js')
 class Shrinkwrap extends BaseCommand {
   static description = 'Lock down dependency versions for publication'
   static name = 'shrinkwrap'
+  static ignoreImplicitWorkspace = false
 
   async exec () {
     // if has a npm-shrinkwrap.json, nothing to do