From 6b721d7103a479de53d8bab2757c4e77defd9bbd Mon Sep 17 00:00:00 2001 From: npm team Date: Thu, 3 Mar 2022 21:38:08 +0000 Subject: [PATCH] deps: upgrade npm to 8.5.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/42205 Reviewed-By: Rich Trott Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca Reviewed-By: Mestery Reviewed-By: Mohammed Keyvanzadeh Reviewed-By: Darshan Sen --- deps/npm/docs/output/commands/npm-ls.html | 2 +- deps/npm/docs/output/commands/npm.html | 2 +- deps/npm/lib/arborist-cmd.js | 2 + deps/npm/lib/base-command.js | 4 + deps/npm/lib/commands/access.js | 2 + deps/npm/lib/commands/adduser.js | 2 + deps/npm/lib/commands/bin.js | 1 + deps/npm/lib/commands/birthday.js | 2 + deps/npm/lib/commands/bugs.js | 1 + deps/npm/lib/commands/cache.js | 2 + deps/npm/lib/commands/completion.js | 1 + deps/npm/lib/commands/config.js | 2 + deps/npm/lib/commands/deprecate.js | 2 + deps/npm/lib/commands/diff.js | 2 + deps/npm/lib/commands/dist-tag.js | 2 + deps/npm/lib/commands/docs.js | 1 + deps/npm/lib/commands/doctor.js | 1 + deps/npm/lib/commands/edit.js | 1 + deps/npm/lib/commands/exec.js | 2 + deps/npm/lib/commands/explain.js | 2 + deps/npm/lib/commands/explore.js | 1 + deps/npm/lib/commands/get.js | 1 + deps/npm/lib/commands/help-search.js | 1 + deps/npm/lib/commands/help.js | 1 + deps/npm/lib/commands/hook.js | 2 + deps/npm/lib/commands/init.js | 2 + deps/npm/lib/commands/logout.js | 2 + deps/npm/lib/commands/ls.js | 11 +- deps/npm/lib/commands/org.js | 1 + deps/npm/lib/commands/owner.js | 2 + deps/npm/lib/commands/pack.js | 1 + deps/npm/lib/commands/ping.js | 1 + deps/npm/lib/commands/pkg.js | 2 + deps/npm/lib/commands/prefix.js | 1 + deps/npm/lib/commands/profile.js | 2 + deps/npm/lib/commands/publish.js | 7 +- deps/npm/lib/commands/repo.js | 1 + deps/npm/lib/commands/restart.js | 2 + deps/npm/lib/commands/root.js | 1 + deps/npm/lib/commands/run-script.js | 1 + deps/npm/lib/commands/search.js | 1 + deps/npm/lib/commands/set-script.js | 1 + deps/npm/lib/commands/set.js | 1 + deps/npm/lib/commands/shrinkwrap.js | 1 + deps/npm/lib/commands/star.js | 2 + deps/npm/lib/commands/stars.js | 1 + deps/npm/lib/commands/start.js | 2 + deps/npm/lib/commands/stop.js | 2 + deps/npm/lib/commands/team.js | 2 + deps/npm/lib/commands/test.js | 2 + deps/npm/lib/commands/token.js | 1 + deps/npm/lib/commands/uninstall.js | 1 + deps/npm/lib/commands/unpublish.js | 1 + deps/npm/lib/commands/version.js | 2 + deps/npm/lib/commands/view.js | 2 + deps/npm/lib/commands/whoami.js | 1 + deps/npm/lib/npm.js | 7 +- deps/npm/man/man1/npm-access.1 | 2 +- deps/npm/man/man1/npm-adduser.1 | 2 +- deps/npm/man/man1/npm-audit.1 | 2 +- deps/npm/man/man1/npm-bin.1 | 2 +- deps/npm/man/man1/npm-bugs.1 | 2 +- deps/npm/man/man1/npm-cache.1 | 2 +- deps/npm/man/man1/npm-ci.1 | 2 +- deps/npm/man/man1/npm-completion.1 | 2 +- deps/npm/man/man1/npm-config.1 | 2 +- deps/npm/man/man1/npm-dedupe.1 | 2 +- deps/npm/man/man1/npm-deprecate.1 | 2 +- deps/npm/man/man1/npm-diff.1 | 2 +- deps/npm/man/man1/npm-dist-tag.1 | 2 +- deps/npm/man/man1/npm-docs.1 | 2 +- deps/npm/man/man1/npm-doctor.1 | 2 +- deps/npm/man/man1/npm-edit.1 | 2 +- deps/npm/man/man1/npm-exec.1 | 2 +- deps/npm/man/man1/npm-explain.1 | 2 +- deps/npm/man/man1/npm-explore.1 | 2 +- deps/npm/man/man1/npm-find-dupes.1 | 2 +- deps/npm/man/man1/npm-fund.1 | 2 +- deps/npm/man/man1/npm-help-search.1 | 2 +- deps/npm/man/man1/npm-help.1 | 2 +- deps/npm/man/man1/npm-hook.1 | 2 +- deps/npm/man/man1/npm-init.1 | 2 +- deps/npm/man/man1/npm-install-ci-test.1 | 2 +- deps/npm/man/man1/npm-install-test.1 | 2 +- deps/npm/man/man1/npm-install.1 | 2 +- deps/npm/man/man1/npm-link.1 | 2 +- deps/npm/man/man1/npm-logout.1 | 2 +- deps/npm/man/man1/npm-ls.1 | 4 +- deps/npm/man/man1/npm-org.1 | 2 +- deps/npm/man/man1/npm-outdated.1 | 2 +- deps/npm/man/man1/npm-owner.1 | 2 +- deps/npm/man/man1/npm-pack.1 | 2 +- deps/npm/man/man1/npm-ping.1 | 2 +- deps/npm/man/man1/npm-pkg.1 | 2 +- deps/npm/man/man1/npm-prefix.1 | 2 +- deps/npm/man/man1/npm-profile.1 | 2 +- deps/npm/man/man1/npm-prune.1 | 2 +- deps/npm/man/man1/npm-publish.1 | 2 +- deps/npm/man/man1/npm-rebuild.1 | 2 +- deps/npm/man/man1/npm-repo.1 | 2 +- deps/npm/man/man1/npm-restart.1 | 2 +- deps/npm/man/man1/npm-root.1 | 2 +- deps/npm/man/man1/npm-run-script.1 | 2 +- deps/npm/man/man1/npm-search.1 | 2 +- deps/npm/man/man1/npm-set-script.1 | 2 +- deps/npm/man/man1/npm-shrinkwrap.1 | 2 +- deps/npm/man/man1/npm-star.1 | 2 +- deps/npm/man/man1/npm-stars.1 | 2 +- deps/npm/man/man1/npm-start.1 | 2 +- deps/npm/man/man1/npm-stop.1 | 2 +- deps/npm/man/man1/npm-team.1 | 2 +- deps/npm/man/man1/npm-test.1 | 2 +- deps/npm/man/man1/npm-token.1 | 2 +- deps/npm/man/man1/npm-uninstall.1 | 2 +- deps/npm/man/man1/npm-unpublish.1 | 2 +- deps/npm/man/man1/npm-unstar.1 | 2 +- deps/npm/man/man1/npm-update.1 | 2 +- deps/npm/man/man1/npm-version.1 | 2 +- deps/npm/man/man1/npm-view.1 | 2 +- deps/npm/man/man1/npm-whoami.1 | 2 +- deps/npm/man/man1/npm.1 | 4 +- deps/npm/man/man1/npx.1 | 2 +- deps/npm/man/man5/folders.5 | 2 +- deps/npm/man/man5/install.5 | 2 +- deps/npm/man/man5/npm-shrinkwrap-json.5 | 2 +- deps/npm/man/man5/npmrc.5 | 2 +- deps/npm/man/man5/package-json.5 | 2 +- deps/npm/man/man5/package-lock-json.5 | 2 +- deps/npm/man/man7/config.7 | 2 +- deps/npm/man/man7/developers.7 | 2 +- deps/npm/man/man7/logging.7 | 2 +- deps/npm/man/man7/orgs.7 | 2 +- deps/npm/man/man7/registry.7 | 2 +- deps/npm/man/man7/removal.7 | 2 +- deps/npm/man/man7/scope.7 | 2 +- deps/npm/man/man7/scripts.7 | 2 +- deps/npm/man/man7/workspaces.7 | 2 +- .../node_modules/@gar/promisify/LICENSE.md | 9 + .../node_modules/@gar/promisify/package.json | 2 +- .../@npmcli/arborist/package.json | 8 +- .../node_modules/@npmcli/config/lib/index.js | 5 +- .../node_modules/@npmcli/config/package.json | 8 +- .../git/node_modules/lru-cache/bundle/main.js | 1 + .../node_modules/lru-cache/bundle/main.mjs | 1 + .../git/node_modules/lru-cache/index.js | 38 +- .../git/node_modules/lru-cache/package.json | 26 +- .../@npmcli/map-workspaces/lib/index.js | 1 + .../node_modules/brace-expansion}/LICENSE | 12 +- .../node_modules/brace-expansion/index.js | 202 ++++ .../node_modules/brace-expansion/package.json | 46 + .../node_modules/minimatch/LICENSE | 15 + .../node_modules/minimatch/lib/path.js | 4 + .../node_modules/minimatch/minimatch.js | 901 ++++++++++++++++++ .../node_modules/minimatch/package.json | 32 + .../@npmcli/map-workspaces/package.json | 22 +- .../@npmcli/run-script/package.json | 10 +- .../node_modules/agentkeepalive/History.md | 6 + .../node_modules/agentkeepalive/index.d.ts | 10 +- .../node_modules/agentkeepalive/package.json | 2 +- deps/npm/node_modules/gauge/package.json | 12 +- .../npm/node_modules/is-typedarray/LICENSE.md | 18 - deps/npm/node_modules/is-typedarray/index.js | 41 - .../node_modules/is-typedarray/package.json | 30 - deps/npm/node_modules/is-typedarray/test.js | 34 - .../node_modules/libnpmaccess/package.json | 8 +- deps/npm/node_modules/libnpmdiff/package.json | 11 +- deps/npm/node_modules/libnpmexec/package.json | 11 +- deps/npm/node_modules/libnpmfund/package.json | 11 +- deps/npm/node_modules/libnpmhook/package.json | 11 +- deps/npm/node_modules/libnpmorg/package.json | 8 +- deps/npm/node_modules/libnpmpack/package.json | 8 +- .../node_modules/libnpmpublish/package.json | 8 +- .../node_modules/libnpmsearch/package.json | 8 +- deps/npm/node_modules/libnpmteam/package.json | 8 +- .../node_modules/libnpmversion/package.json | 8 +- .../node_modules/lru-cache/bundle/main.js | 1 + .../node_modules/lru-cache/bundle/main.mjs | 1 + .../node_modules/lru-cache/index.js | 38 +- .../node_modules/lru-cache/package.json | 26 +- .../make-fetch-happen/package.json | 14 +- deps/npm/node_modules/minimatch/minimatch.js | 162 ++-- deps/npm/node_modules/minimatch/package.json | 9 +- deps/npm/node_modules/minipass-fetch/index.js | 1 - .../node_modules/minipass-fetch/lib/blob.js | 8 +- .../node_modules/minipass-fetch/lib/body.js | 106 ++- .../minipass-fetch/lib/fetch-error.js | 3 +- .../minipass-fetch/lib/headers.js | 59 +- .../node_modules/minipass-fetch/lib/index.js | 225 +++-- .../minipass-fetch/lib/request.js | 74 +- .../minipass-fetch/lib/response.js | 5 +- .../node_modules/minipass-fetch/package.json | 36 +- deps/npm/node_modules/node-gyp/CHANGELOG.md | 33 + deps/npm/node_modules/node-gyp/README.md | 16 +- deps/npm/node_modules/node-gyp/SECURITY.md | 2 + .../node-gyp/docs/Common-issues.md | 13 - .../docs/Force-npm-to-use-global-node-gyp.md | 47 + deps/npm/node_modules/node-gyp/docs/README.md | 11 + .../docs/Updating-npm-bundled-node-gyp.md | 67 +- .../docs/binding.gyp-files-in-the-wild.md | 3 +- .../node_modules/node-gyp/lib/configure.js | 2 + .../node-gyp/lib/create-config-gypi.js | 3 +- .../npm/node_modules/node-gyp/lib/node-gyp.js | 4 + .../@tootallnate/once/dist/index.d.ts | 14 - .../@tootallnate/once/dist/index.js | 39 - .../@tootallnate/once/dist/index.js.map | 1 - .../@tootallnate/once/package.json | 45 - .../http-proxy-agent/dist/agent.d.ts | 32 - .../http-proxy-agent/dist/agent.js | 145 --- .../http-proxy-agent/dist/agent.js.map | 1 - .../http-proxy-agent/dist/index.d.ts | 21 - .../http-proxy-agent/dist/index.js | 14 - .../http-proxy-agent/dist/index.js.map | 1 - .../http-proxy-agent/package.json | 57 -- .../node_modules/make-fetch-happen/LICENSE | 16 - .../make-fetch-happen/lib/agent.js | 194 ---- .../make-fetch-happen/lib/cache/entry.js | 460 --------- .../make-fetch-happen/lib/cache/errors.js | 10 - .../make-fetch-happen/lib/cache/index.js | 45 - .../make-fetch-happen/lib/cache/key.js | 17 - .../make-fetch-happen/lib/cache/policy.js | 161 ---- .../make-fetch-happen/lib/fetch.js | 100 -- .../make-fetch-happen/lib/index.js | 40 - .../make-fetch-happen/lib/options.js | 44 - .../make-fetch-happen/lib/remote.js | 102 -- .../make-fetch-happen/package.json | 76 -- deps/npm/node_modules/node-gyp/package.json | 6 +- .../node-gyp/test/test-options.js | 11 + .../npm-registry-fetch/package.json | 10 +- deps/npm/node_modules/signal-exit/index.js | 6 +- .../npm/node_modules/signal-exit/package.json | 2 +- .../socks/build/client/socksclient.js | 17 +- .../socks/build/client/socksclient.js.map | 2 +- deps/npm/node_modules/socks/package.json | 20 +- .../typedarray-to-buffer/index.js | 18 - .../typedarray-to-buffer/package.json | 62 -- .../write-file-atomic/lib/index.js | 12 +- .../write-file-atomic/package.json | 13 +- deps/npm/package.json | 18 +- .../test/lib/commands/ls.js.test.cjs | 20 +- deps/npm/test/lib/commands/ls.js | 11 + deps/npm/test/lib/commands/publish.js | 4 + deps/npm/test/lib/load-all-commands.js | 1 + deps/npm/test/lib/npm.js | 104 +- 243 files changed, 2363 insertions(+), 2447 deletions(-) create mode 100644 deps/npm/node_modules/@gar/promisify/LICENSE.md create mode 100644 deps/npm/node_modules/@npmcli/git/node_modules/lru-cache/bundle/main.js create mode 100644 deps/npm/node_modules/@npmcli/git/node_modules/lru-cache/bundle/main.mjs rename deps/npm/node_modules/{typedarray-to-buffer => @npmcli/map-workspaces/node_modules/brace-expansion}/LICENSE (85%) create mode 100644 deps/npm/node_modules/@npmcli/map-workspaces/node_modules/brace-expansion/index.js create mode 100644 deps/npm/node_modules/@npmcli/map-workspaces/node_modules/brace-expansion/package.json create mode 100644 deps/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/LICENSE create mode 100644 deps/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/lib/path.js create mode 100644 deps/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/minimatch.js create mode 100644 deps/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/package.json delete mode 100644 deps/npm/node_modules/is-typedarray/LICENSE.md delete mode 100644 deps/npm/node_modules/is-typedarray/index.js delete mode 100644 deps/npm/node_modules/is-typedarray/package.json delete mode 100644 deps/npm/node_modules/is-typedarray/test.js create mode 100644 deps/npm/node_modules/make-fetch-happen/node_modules/lru-cache/bundle/main.js create mode 100644 deps/npm/node_modules/make-fetch-happen/node_modules/lru-cache/bundle/main.mjs delete mode 100644 deps/npm/node_modules/minipass-fetch/index.js create mode 100644 deps/npm/node_modules/node-gyp/SECURITY.md delete mode 100644 deps/npm/node_modules/node-gyp/docs/Common-issues.md create mode 100644 deps/npm/node_modules/node-gyp/docs/Force-npm-to-use-global-node-gyp.md create mode 100644 deps/npm/node_modules/node-gyp/docs/README.md delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/index.d.ts delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/index.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/index.js.map delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/@tootallnate/once/package.json delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/agent.d.ts delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/agent.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/agent.js.map delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/index.d.ts delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/index.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/index.js.map delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/http-proxy-agent/package.json delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/LICENSE delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/agent.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/entry.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/errors.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/index.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/key.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/policy.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/fetch.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/index.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/options.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/remote.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/make-fetch-happen/package.json delete mode 100644 deps/npm/node_modules/typedarray-to-buffer/index.js delete mode 100644 deps/npm/node_modules/typedarray-to-buffer/package.json diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html index 2f28ede781f550..3269bcc579a886 100644 --- a/deps/npm/docs/output/commands/npm-ls.html +++ b/deps/npm/docs/output/commands/npm-ls.html @@ -166,7 +166,7 @@

Description

the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

-
npm@8.5.2 /path/to/npm
+
npm@8.5.3 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 

diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
index 7059fa5d37a387..89bdc4f6d0b238 100644
--- a/deps/npm/docs/output/commands/npm.html
+++ b/deps/npm/docs/output/commands/npm.html
@@ -149,7 +149,7 @@ 
Table of contents

 
 
 
Version

-
8.5.2

+
8.5.3

 
Description

 
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
index 931ead8143dff9..6518e91e0ad9d7 100644
--- 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
index f67f99f36367c1..b6e3d6d2318606 100644
--- 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
index 206d6de9c22c43..bc8ce48bacdad5 100644
--- 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 []',
     'restricted []',
diff --git a/deps/npm/lib/commands/adduser.js b/deps/npm/lib/commands/adduser.js
index cbeaaaf0f28bed..755abea8eb9ebe 100644
--- 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
index bb700d45a8f1b4..77028f06dd49a8 100644
--- 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
index 27fe2c50cab021..e889b39f253779 100644
--- 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
index 5dfd1eb9189594..f6218f033f3d3d 100644
--- 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 = ['[]']
   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
index ecb34cb8916c43..b8f84abc1d9412 100644
--- 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
index 4ded2de385afba..0317753a15aaff 100644
--- 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
index 96524e00817f5d..690a69a3233e4f 100644
--- 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
index 839e974caf09b7..88eb320c32a523 100644
--- 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
index d737a58dc43d8d..ff942cc44e9460 100644
--- 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
index bb36f3f72bfb2d..3b82c5194cca82 100644
--- 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 []',
   ]
 
+  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
index 19cd7356422625..631615acc56b3d 100644
--- a/deps/npm/lib/commands/docs.js
+++ b/deps/npm/lib/commands/docs.js
@@ -15,6 +15,7 @@ class Docs extends BaseCommand {
   ]
 
   static usage = ['[ [ ...]]']
+  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
index 508faa57aa5e93..9af4c4cd6ffbfc 100644
--- 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
index 5f069c4f132e58..ce74ff79b2b7ea 100644
--- 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 = ['[/...]']
   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
index 52fb1f8eb72298..6b402c856ab1e9 100644
--- 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 \' [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
index fd62b87fc869d5..ca6ee7540bc916 100644
--- 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
index 90e6af69fe57ca..5b97673b90eaa9 100644
--- 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 = [' [ -- ]']
   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
index 7583ade23d600a..5e92e85a66382f 100644
--- 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 = ['[ ...] (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
index 6025a6dabd74b5..9422b83561cc89 100644
--- 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 = ['']
   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
index f94178dd5d1d6c..40f5ad9b300926 100644
--- 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 = [' []']
   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
index 2ff6ac01ce5272..a4619802d84298 100644
--- a/deps/npm/lib/commands/hook.js
+++ b/deps/npm/lib/commands/hook.js
@@ -19,6 +19,8 @@ class Hook extends BaseCommand {
     'update   ',
   ]
 
+  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
index 367533f8259f51..2a6b6aaddc7e65 100644
--- a/deps/npm/lib/commands/init.js
+++ b/deps/npm/lib/commands/init.js
@@ -22,6 +22,8 @@ class Init extends BaseCommand {
     '[<@scope>/] (same as `npx [<@scope>/]create-`)',
   ]
 
+  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
index aea5e93652b0e8..7c2a7f0b2f830d 100644
--- 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
index 8c338c0647586d..e56c90dae16eaf 100644
--- 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
index f3d344ca33e3d8..e2202a9e9cf3b4 100644
--- 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
index effaaa6a53d3a8..93e0a45ad1e274 100644
--- a/deps/npm/lib/commands/owner.js
+++ b/deps/npm/lib/commands/owner.js
@@ -20,6 +20,8 @@ class Owner extends BaseCommand {
     'ls [<@scope>/]',
   ]
 
+  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
index 74c29699a05c90..41fef5cb45a47c 100644
--- 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>/]...]']
+  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
index 5a651c4a6ab096..22039214689a96 100644
--- 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
index 6ca892293cebec..3a8e01f65bc921 100644
--- 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
index 264b819fc7692a..dd0e34c3d3bd95 100644
--- 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
index 6b4d1407f7919a..a82d31fd443a9e 100644
--- 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
index d1f0ee743cfcc3..1f26370e89a567 100644
--- a/deps/npm/lib/commands/publish.js
+++ b/deps/npm/lib/commands/publish.js
@@ -39,6 +39,7 @@ class Publish extends BaseCommand {
   ]
 
   static usage = ['[]']
+  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
index 8ac4178f261ee1..b8dccc209ff87a 100644
--- 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 = ['[ [ ...]]']
+  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
index a12368644a13b3..575928b2202cc8 100644
--- 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
index 7749c602456b77..b814034def5ab6 100644
--- 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
index edba95821b44c2..74757e984aeedd 100644
--- 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 = [' [-- ]']
+  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
index bdeeffe816980f..a06ba4031443b4 100644
--- 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
index 7c73ff01b9396e..a6b7c3a50cdafe 100644
--- 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 = ['[