diff --git a/deps/npm/.eslintrc.json b/deps/npm/.eslintrc.json
index 6232a8f82187ff..139716eefd85a0 100644
--- a/deps/npm/.eslintrc.json
+++ b/deps/npm/.eslintrc.json
@@ -133,7 +133,7 @@
     "no-shadow-restricted-names": "error",
     "no-sparse-arrays": "error",
     "no-tabs": "error",
-    "no-template-curly-in-string": "error",
+    "no-template-curly-in-string": "off",
     "no-this-before-super": "error",
     "no-throw-literal": "off",
     "no-trailing-spaces": "error",
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index 4209517f2a0ff8..008d9099561199 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -730,3 +730,12 @@ Michele Azzolari <michele@azzolari.it>
 foxxyz <foxxyz@gmail.com>
 Dr <dr@dr.run>
 Jan Tojnar <jtojnar@gmail.com>
+Jason Attwood <jason_attwood@hotmail.co.uk>
+Vlad GURDIGA <gurdiga@gmail.com>
+Sébastien Puech <s.puech@tricentis.com>
+Jannis Hell <Primajin@users.noreply.github.com>
+Hollow Man <hollowman@hollowman.ml>
+kai zhu <kaizhu256@gmail.com>
+Alex Woollam <alexjhwoollam@gmail.com>
+Daniel Fischer <daniel@d-fischer.dev>
+Yash-Singh1 <saiansh2525@gmail.com>
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index 49d44ab10a09e0..0922176c6bacd3 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,3 +1,347 @@
+## 7.1.2 (2020-12-11)
+
+### DEPENDENCIES
+
+* [`c3ba1daf7`](https://github.com/npm/cli/commit/c3ba1daf7cd335d72aeba80ae0e9f9d215ca9ea5)
+  [#2033](https://github.com/npm/cli/issues/2033) `@npmcli/config@1.2.6`:
+    * Set `INIT_CWD` to initial current working directory
+    * Set `NODE` to initial process.execPath
+* [`8029608b9`](https://github.com/npm/cli/commit/8029608b914fe5ba35a7cd37ae95ab93b0532e2e)
+  `json-parse-even-better-errors@2.3.1`
+* [`0233818e6`](https://github.com/npm/cli/commit/0233818e606888b80881b17a2c6aca9f10a619b2)
+  [#2332](https://github.com/npm/cli/issues/2332) `treeverse@1.0.4`
+* [`e401d6bb3`](https://github.com/npm/cli/commit/e401d6bb37ffc767b4fefe89878dd3c3ef490b2c)
+  `ini@1.3.8`
+* [`011bb1220`](https://github.com/npm/cli/commit/011bb122035dcd43769ec35982662cca41635068)
+  [#2320](https://github.com/npm/cli/issues/2320) `@npmcli/arborist@2.0.1`:
+    * Do not save with `^` and no version
+
+### BUGFIXES
+
+* [`244c2069f`](https://github.com/npm/cli/commit/244c2069fd093f053d3061c85575ac13e72e2454)
+  [#2325](https://github.com/npm/cli/issues/2325) npm search
+  include/exclude ([@ruyadorno](https://github.com/ruyadorno))
+* [`d825e901e`](https://github.com/npm/cli/commit/d825e901eceea4cf8d860e35238dc30008eb4da4)
+  [#1905](https://github.com/npm/cli/issues/1905)
+  [#2316](https://github.com/npm/cli/issues/2316) run install scripts for
+  root project
+* [`315449142`](https://github.com/npm/cli/commit/31544914294948085a84097af7f0f5de2a2e8f7e)
+  [#2331](https://github.com/npm/cli/issues/2331)
+  [#2021](https://github.com/npm/cli/issues/2021) Set `NODE_ENV=production`
+  if 'dev' is on the omit list ([@isaacs](https://github.com/isaacs))
+
+### TESTING
+
+* [`c243e3b9d`](https://github.com/npm/cli/commit/c243e3b9d9bda0580a0fc1b3e230b4d47412176e)
+  [#2313](https://github.com/npm/cli/issues/2313) tests: completion
+  ([@nlf](https://github.com/nlf))
+* [`7ff6efbb8`](https://github.com/npm/cli/commit/7ff6efbb866591b2330b967215cef8146dff3ebf)
+  [#2314](https://github.com/npm/cli/issues/2314) npm team
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`7a4f0c96c`](https://github.com/npm/cli/commit/7a4f0c96c2ab9f264f7bda2caf7e72c881571270)
+  [#2323](https://github.com/npm/cli/issues/2323) npm doctor
+  ([@nlf](https://github.com/nlf))
+
+### DOCUMENTATION
+
+* [`e340cf64b`](https://github.com/npm/cli/commit/e340cf64ba31ef329a9049b60c32ffd0342cfb7d)
+  [#2330](https://github.com/npm/cli/issues/2330) explain through
+  run-script ([@isaacs](https://github.com/isaacs))
+
+## 7.1.1 (2020-12-08)
+
+### DEPENDENCIES
+
+* [`bf09e719c`](https://github.com/npm/cli/commit/bf09e719c7f563a255b1e9af6b1237ebc5598db6)
+  `@npmcli/arborist@2.0.0`
+    * Much stricter tree integrity guarantees
+    * Fix issues where the root project is a symlink, or linked as a
+      workspace
+* [`7ceb5b728`](https://github.com/npm/cli/commit/7ceb5b728b9f326c567f5ffe5831c9eccf013aa0)
+  `ini@1.3.6`
+* [`77c6ced2a`](https://github.com/npm/cli/commit/77c6ced2a6daaadbff715c8f05b2e61ba76e9bab)
+  `make-fetch-happen@8.0.11`
+    * Avoid caching headers that are hazardous or unnecessary to leave
+      lying around (authorization, npm-session, etc.)
+    * [#38](https://github.com/npm/make-fetch-happen/pull/38) Include query
+      string in cache key ([@jpb](https://github.com/jpb))
+* [`0ef25b6cd`](https://github.com/npm/cli/commit/0ef25b6cd2921794d36f066e2b11c406342cf167)
+  `libnpmsearch@3.1.0`:
+    * Update to accept query params as options, so we can paginate.
+      ([@nlf](https://github.com/nlf))
+* [`518a66450`](https://github.com/npm/cli/commit/518a664500bcde30475788e8c1c3e651f23e881b)
+  `@npmcli/config@1.2.4`:
+    * Do not allow path options to be set to a boolean `false` value
+* [`3d7aff9d8`](https://github.com/npm/cli/commit/3d7aff9d8dd1cf29956aa306464cd44fbc2af426)
+  update all dependencies using latest npm to install them
+
+### TESTS
+
+* [`2848f5940`](https://github.com/npm/cli/commit/2848f594034b87939bfc5546e3e603f123d98a01)
+  [npm/statusboard#173](https://github.com/npm/statusboard/issues/173)
+  [#2293](https://github.com/npm/cli/issues/2293) npm shrinkwrap
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`f6824459a`](https://github.com/npm/cli/commit/f6824459ae0c86e2fa9c84b3dcec85f572ae8e1b)
+  [#2302](https://github.com/npm/cli/issues/2302) npm deprecate
+  ([@nlf](https://github.com/nlf))
+* [`b7d74b627`](https://github.com/npm/cli/commit/b7d74b627859f08fca23209d6e0d3ec6657a4489)
+  [npm/statusboard#180](https://github.com/npm/statusboard/issues/180)
+  [#2304](https://github.com/npm/cli/issues/2304) npm unpublish
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+### FEATURES
+
+* [`3db90d944`](https://github.com/npm/cli/commit/3db90d94474f673591811fdab5eb6a5bfdeba261)
+  [#2303](https://github.com/npm/cli/issues/2303) allow for passing object
+  keys to searchopts to allow pagination ([@nlf](https://github.com/nlf))
+
+## 7.1.0 (2020-12-04)
+
+### FEATURES
+
+* [`6b1575110`](https://github.com/npm/cli/commit/6b15751106beb99234aa4bf39ae05cf40076d42a)
+  [#2237](https://github.com/npm/cli/pull/2237)
+  add `npm set-script` command
+  ([@Yash-Singh1](https://github.com/Yash-Singh1))
+* [`15d7333f8`](https://github.com/npm/cli/commit/15d7333f832e3d68ae16895569f27a27ef86573e)
+  add interactive `npm exec`
+  ([@isaacs](https://github.com/isaacs))
+
+### BUG FIXES
+
+* [`2a1192e4b`](https://github.com/npm/cli/commit/2a1192e4b03acdf6e6e24e58de68f736ab9bb35f)
+  [#2202](https://github.com/npm/cli/pull/2202)
+  Do not run interactive `npm exec` in CI when a TTY
+  ([@isaacs](https://github.com/isaacs))
+
+### DOCUMENTATION
+
+* [`0599cc37d`](https://github.com/npm/cli/commit/0599cc37df453bf79d47490eb4fca3cd63f67f80)
+  [#2271](https://github.com/npm/cli/pull/2271)
+  don't wrap code block
+  ([@ethomson](https://github.com/ethomson))
+
+### DEPENDENCIES
+
+* [`def85c726`](https://github.com/npm/cli/commit/def85c72640ffe2d27977c56b7aa06c6f6346ca9)
+  `@npmcli/arborist@1.0.14`
+    * fixes running `npm exec` from file system root folder
+* [`4c94673ab`](https://github.com/npm/cli/commit/4c94673ab5399d27e5a48e52f7a65b038a456265)
+  `semver@7.3.4`
+
+## 7.0.15 (2020-11-27)
+
+### DEPENDENCIES
+
+* [`00e6028ef`](https://github.com/npm/cli/commit/00e6028ef83bf76eaae10241fd7ba59e39768603)
+  `@npmcli/arborist@1.0.13`
+    * do not override user-defined shorthand values when saving `package.json`
+
+### BUG FIXES
+
+* [`9c3413fbc`](https://github.com/npm/cli/commit/9c3413fbcb37e79fc0b3d980e0b5810d7961277c)
+  [#2034](https://github.com/npm/cli/issues/2034)
+  [#2245](https://github.com/npm/cli/issues/2245)
+  `npm link <pkg>` should not save `package.json`
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+### DOCUMENTATION
+
+* [`1875347f9`](https://github.com/npm/cli/commit/1875347f9f4f2b50c28fe8857c5533eeebf42da2)
+  [#2196](https://github.com/npm/cli/issues/2196)
+  remove doc on obsolete `unsafe-perm` flag
+  ([@kaizhu256](https://github.com/kaizhu256))
+* [`f51e50603`](https://github.com/npm/cli/commit/f51e5060340c783a8a00dadd98e5786960caf43f)
+  [#2200](https://github.com/npm/cli/issues/2200)
+  `config.md` cleanup
+  ([@alexwoollam](https://github.com/alexwoollam))
+* [`997cbdb40`](https://github.com/npm/cli/commit/997cbdb400bcd22e457e8a06b69a7be697cfd66d)
+  [#2238](https://github.com/npm/cli/issues/2238)
+  Fix broken link to `package.json` documentation
+  ([@d-fischer](https://github.com/d-fischer))
+* [`9da972dc4`](https://github.com/npm/cli/commit/9da972dc44c21cf0e337f1c3fca44eb9df3e40d5)
+  [#2241](https://github.com/npm/cli/issues/2241)
+  `npm star` docs cleanup
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+## 7.0.14 (2020-11-23)
+
+### DEPENDENCIES
+* [`09d21ab90`](https://github.com/npm/cli/commit/09d21ab903dcfebdfd446b8b29ad46c425b6510e)
+  `@npmcli/run-script@1.8.1`
+    - fix a regression in how scripts are escaped
+
+## 7.0.13 (2020-11-20)
+
+### BUG FIXES
+* [`5fc56b6db`](https://github.com/npm/cli/commit/5fc56b6dbcc7d7d1463a761abb67d2fc16ad3657)
+  [npm/statusboard#174](https://github.com/npm/statusboard/issues/174)
+  [#2204](https://github.com/npm/cli/issues/2204)
+  fix npm unstar command
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`7842b4d4d`](https://github.com/npm/cli/commit/7842b4d4dca1e076b0d26d554f9dce67484cd7be)
+  [npm/statusboard#182](https://github.com/npm/statusboard/issues/182)
+  [#2205](https://github.com/npm/cli/issues/2205)
+  fix npm version usage output
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`a0adbf9f8`](https://github.com/npm/cli/commit/a0adbf9f8f77531fcf81ae31bbc7102698765ee3)
+  [#2206](https://github.com/npm/cli/issues/2206)
+  [#2213](https://github.com/npm/cli/issues/2213)
+  fix: fix flatOptions usage in npm init
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+### DEPENDENCIES
+
+* [`3daaf000a`](https://github.com/npm/cli/commit/3daaf000aee0ba81af855977d7011850e79099e6)
+  `@npmcli/arborist@1.0.12`
+    - fixes some windows specific bugs in how paths are handled and compared
+
+### DOCUMENTATION
+
+* [`084a7b6ad`](https://github.com/npm/cli/commit/084a7b6ad6eaf9f2d92eb05da93e745f5357cce2)
+  [#2210](https://github.com/npm/cli/issues/2210)
+  docs: Fix typo
+  ([@HollowMan6](https://github.com/HollowMan6))
+
+## 7.0.12 (2020-11-17)
+
+### BUG FIXES
+
+* [`7b89576bd`](https://github.com/npm/cli/commit/7b89576bd1fa557a312a841afa66b895558d1b12)
+  [#2174](https://github.com/npm/cli/issues/2174)
+  fix running empty scripts with `npm run-script`
+  ([@nlf](https://github.com/nlf))
+* [`bc9afb195`](https://github.com/npm/cli/commit/bc9afb195f5aad7c06bc96049c0f00dc8e752dee)
+  [#2002](https://github.com/npm/cli/issues/2002)
+  [#2184](https://github.com/npm/cli/issues/2184)
+  Preserve builtin conf when installing npm globally
+  ([@isaacs](https://github.com/isaacs))
+
+### DEPENDENCIES
+
+* [`b74c05d88`](https://github.com/npm/cli/commit/b74c05d88dc48fabef031ea66ffaa4e548845655)
+  `@npmcli/run-script@1.8.0`
+    * fix windows command-line argument escaping
+
+### DOCUMENTATION
+
+* [`4e522fdc9`](https://github.com/npm/cli/commit/4e522fdc917bc85af2ca8ff7669a0178e2f35123)
+  [#2179](https://github.com/npm/cli/issues/2179)
+  remove mention to --parseable option from `npm audit` docs
+  ([@Primajin](https://github.com/Primajin))
+
+## 7.0.11 (2020-11-13)
+
+### DEPENDENCIES
+
+* [`629a667a9`](https://github.com/npm/cli/commit/629a667a9b30b0b870075da965606979622a5e2e)
+  `eslint@7.13.0`
+* [`de9891bd2`](https://github.com/npm/cli/commit/de9891bd2a16fe890ff5cfb140c7b1209aeac0de)
+  `eslint-plugin-standard@4.1.0`
+* [`c3e7aa31c`](https://github.com/npm/cli/commit/c3e7aa31c565dfe21cd1f55a8433bfbcf58aa289)
+  [#2123](https://github.com/npm/cli/issues/2123)
+  [#1957](https://github.com/npm/cli/issues/1957)
+  `@npmcli/arborist@1.0.11`
+
+### BUG FIXES
+
+* [`a8aa38513`](https://github.com/npm/cli/commit/a8aa38513ad5c4ad44e6bb3e1499bfc40c31e213)
+  [#2134](https://github.com/npm/cli/issues/2134)
+  [#2156](https://github.com/npm/cli/issues/2156)
+  Fix `cannot read property length of undefined` in `ERESOLVE` explanation code
+  ([@isaacs](https://github.com/isaacs))
+* [`1dbf0f9bb`](https://github.com/npm/cli/commit/1dbf0f9bb26ba70f4c6d0a807701d7652c31d7d4)
+  [#2150](https://github.com/npm/cli/issues/2150)
+  [#2155](https://github.com/npm/cli/issues/2155)
+  send json errors to stderr, not stdout
+  ([@isaacs](https://github.com/isaacs))
+* [`fd1d7a21b`](https://github.com/npm/cli/commit/fd1d7a21b247bb35d112c51ff8d8a06fd83c8b44)
+  [#1927](https://github.com/npm/cli/issues/1927)
+  [#2154](https://github.com/npm/cli/issues/2154)
+  Set process.title a bit more usefully
+  ([@isaacs](https://github.com/isaacs))
+* [`2a80c67ef`](https://github.com/npm/cli/commit/2a80c67ef8c12c3d9d254f5be6293a6461067d99)
+  [#2008](https://github.com/npm/cli/issues/2008)
+  [#2153](https://github.com/npm/cli/issues/2153)
+  Support legacy auth tokens for registries that use them
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`786e36404`](https://github.com/npm/cli/commit/786e36404068fd51657ddac766e066a98754edbf)
+  [#2017](https://github.com/npm/cli/issues/2017)
+  [#2159](https://github.com/npm/cli/issues/2159)
+  pass all options to Arborist for `npm ci`
+  ([@darcyclarke](https://github.com/darcyclarke))
+* [`b47ada7d1`](https://github.com/npm/cli/commit/b47ada7d1623e9ee586ee0cf781ee3ac5ea3c223)
+  [#2161](https://github.com/npm/cli/issues/2161)
+  fixed typo
+  ([@scarabedore](https://github.com/scarabedore))
+
+## 7.0.10 (2020-11-10)
+
+### DOCUMENTATION
+
+* [`e48badb03`](https://github.com/npm/cli/commit/e48badb03058286a557584d7319db4143049cc6b)
+  [#2148](https://github.com/npm/cli/issues/2148)
+  Fix link in documentation
+  ([@gurdiga](https://github.com/gurdiga))
+
+### BUG FIXES
+
+* [`8edbbdc70`](https://github.com/npm/cli/commit/8edbbdc706694fa32f52d0991c76ae9f207b7bbc)
+  [#1972](https://github.com/npm/cli/issues/1972)
+  Support exec auto pick bin when all bin is alias
+  ([@dr-js](https://github.com/dr-js))
+
+### DEPENDENCIES
+
+* [`04a3e8c10`](https://github.com/npm/cli/commit/04a3e8c10c3f38e1c7a35976d77c2929bdc39868)
+  [#1962](https://github.com/npm/cli/issues/1962)
+  `@npmcli/arborist@1.0.10`:
+    * prevent self-assignment of parent/fsParent
+    * Support update options in global package space
+
+## 7.0.9 (2020-11-06)
+
+### BUG FIXES
+
+* [`96a0d2802`](https://github.com/npm/cli/commit/96a0d2802d3e619c6ea47290f5c460edfe94070a)
+  default the 'start' script when server.js present
+  ([@isaacs](https://github.com/isaacs))
+* [`7716e423e`](https://github.com/npm/cli/commit/7716e423ee92a81730c0dfe5b9ecb4bb41a3f947)
+  [#2075](https://github.com/npm/cli/issues/2075)
+  [#2071](https://github.com/npm/cli/issues/2071) print the registry when
+  using 'npm login' ([@Wicked7000](https://github.com/Wicked7000))
+* [`7046fe10c`](https://github.com/npm/cli/commit/7046fe10c5035ac57246a31ca8a6b09e3f5562bf)
+  [#2122](https://github.com/npm/cli/issues/2122) tests for `npm cache`
+  command ([@nlf](https://github.com/nlf))
+
+### DEPENDENCIES
+
+* [`74325f53b`](https://github.com/npm/cli/commit/74325f53b9d813b0e42203c037189418fad2f64a)
+  [#2124](https://github.com/npm/cli/issues/2124)
+  `@npmcli/run-script@1.7.5`:
+    * Export the `isServerPackage` method
+    * Proxy signals to and from foreground child processes
+* [`0e58e6f6b`](https://github.com/npm/cli/commit/0e58e6f6b8f0cd62294642a502c17561aaf46553)
+  [#1984](https://github.com/npm/cli/issues/1984)
+  [#2079](https://github.com/npm/cli/issues/2079)
+  [#1923](https://github.com/npm/cli/issues/1923)
+  [#606](https://github.com/npm/cli/issues/606)
+  [#2031](https://github.com/npm/cli/issues/2031) `@npmcli/arborist@1.0.9`:
+    * Process deps for all link nodes
+    * Use junctions instead of symlinks
+    * Use @npmcli/move-file instead of fs.rename
+* [`1dad328a1`](https://github.com/npm/cli/commit/1dad328a17d93def7799545596b4eba9833b35aa)
+  [#1865](https://github.com/npm/cli/issues/1865)
+  [#2106](https://github.com/npm/cli/issues/2106)
+  [#2084](https://github.com/npm/cli/issues/2084) `pacote@11.1.13`:
+    * Properly set the installation command for `prepare` scripts when
+      installing git/dir deps
+* [`e090d706c`](https://github.com/npm/cli/commit/e090d706ca637d4df96d28bff1660590aa3f3b62)
+  [#2097](https://github.com/npm/cli/issues/2097) `libnpmversion@1.0.7`:
+    * Do not crash when the package.json file lacks a 'version' field
+* [`8fa541a10`](https://github.com/npm/cli/commit/8fa541a10dbdc09376175db7a378cc9b33e8b17b)
+  `cmark-gfm@0.8.4`
+
 ## 7.0.8 (2020-11-03)
 
 ### DOCUMENTATION
diff --git a/deps/npm/docs/content/commands/npm-audit.md b/deps/npm/docs/content/commands/npm-audit.md
index 645ab87b157e17..2c0a8f58047ca2 100644
--- a/deps/npm/docs/content/commands/npm-audit.md
+++ b/deps/npm/docs/content/commands/npm-audit.md
@@ -7,8 +7,8 @@ description: Run a security audit
 ### Synopsis
 
 ```bash
-npm audit [--json|--parseable|--audit-level=(low|moderate|high|critical)]
-npm audit fix [--force|--package-lock-only|--dry-run]
+npm audit [--json] [--production] [--audit-level=(low|moderate|high|critical)]
+npm audit fix [--force|--package-lock-only|--dry-run|--production|--only=(dev|prod)]
 
 common options: [--production] [--only=(dev|prod)]
 ```
diff --git a/deps/npm/docs/content/commands/npm-dist-tag.md b/deps/npm/docs/content/commands/npm-dist-tag.md
index 65ce22a179fc7f..585da16ad2d2c4 100644
--- a/deps/npm/docs/content/commands/npm-dist-tag.md
+++ b/deps/npm/docs/content/commands/npm-dist-tag.md
@@ -78,8 +78,8 @@ This command used to be known as `npm tag`, which only created new tags,
 and so had a different syntax.
 
 Tags must share a namespace with version numbers, because they are
-specified in the same slot: `npm install <pkg>@<version>` vs `npm install
-<pkg>@<tag>`.
+specified in the same slot: `npm install <pkg>@<version>` vs
+`npm install <pkg>@<tag>`.
 
 Tags that can be interpreted as valid semver ranges will be rejected. For
 example, `v1.4` cannot be used as a tag, because it is interpreted by
diff --git a/deps/npm/docs/content/commands/npm-exec.md b/deps/npm/docs/content/commands/npm-exec.md
index 38fb1bf25af4be..3ae30fa0cba9a7 100644
--- a/deps/npm/docs/content/commands/npm-exec.md
+++ b/deps/npm/docs/content/commands/npm-exec.md
@@ -16,9 +16,11 @@ npx <pkg>[@<specifier>] [args...]
 npx -p <pkg>[@<specifier>] <cmd> [args...]
 npx -c '<cmd> [args...]'
 npx -p <pkg>[@<specifier>] -c '<cmd> [args...]'
+Run without --call or positional args to open interactive subshell
 
 alias: npm x, npx
 
+common options:
 --package=<pkg> (may be specified multiple times)
 -p is a shorthand for --package only when using npx executable
 -c <cmd> --call=<cmd> (may not be mixed with positional arguments)
@@ -30,6 +32,11 @@ This command allows you to run an arbitrary command from an npm package
 (either one installed locally, or fetched remotely), in a similar context
 as running it via `npm run`.
 
+Run without positional arguments or `--call`, this allows you to
+interactively run commands in the same sort of shell environment that
+`package.json` scripts are run.  Interactive mode is not supported in CI
+environments when standard input is a TTY, to prevent hangs.
+
 Whatever packages are specified by the `--package` option will be
 provided in the `PATH` of the executed command, along with any locally
 installed package executables.  The `--package` option may be
@@ -54,7 +61,8 @@ the package specifier provided as the first positional argument according
 to the following heuristic:
 
 - If the package has a single entry in its `bin` field in `package.json`,
-  then that command will be used.
+  or if all entries are aliases of the same command, then that command
+  will be used.
 - If the package has multiple `bin` entries, and one of them matches the
   unscoped portion of the `name` field, then that command will be used.
 - If this does not result in exactly one option (either because there are
diff --git a/deps/npm/docs/content/commands/npm-explain.md b/deps/npm/docs/content/commands/npm-explain.md
index a68bd7d1c252f9..ec63ec34f26d8a 100644
--- a/deps/npm/docs/content/commands/npm-explain.md
+++ b/deps/npm/docs/content/commands/npm-explain.md
@@ -8,6 +8,8 @@ description: Explain installed packages
 
 ```bash
 npm explain <folder | specifier>
+
+alias: why
 ```
 
 ### Description
@@ -56,7 +58,7 @@ node_modules/nyc/node_modules/find-up
 #### json
 
 * Default: false
-* Type: Bolean
+* Type: Boolean
 
 Show information in JSON format.
 
diff --git a/deps/npm/docs/content/commands/npm-link.md b/deps/npm/docs/content/commands/npm-link.md
index 7c55f18c5a431d..1a835001fc64f8 100644
--- a/deps/npm/docs/content/commands/npm-link.md
+++ b/deps/npm/docs/content/commands/npm-link.md
@@ -15,41 +15,44 @@ alias: npm ln
 
 ### Description
 
+This is handy for installing your own stuff, so that you can work on it and
+test iteratively without having to continually rebuild.
+
 Package linking is a two-step process.
 
-First, `npm link` in a package folder will create a symlink in the global folder
-`{prefix}/lib/node_modules/<package>` that links to the package where the `npm
-link` command was executed. It will also link any bins in the package to `{prefix}/bin/{name}`.
-Note that `npm link` uses the global prefix (see `npm prefix -g` for its value).
+First, `npm link` in a package folder will create a symlink in the global
+folder `{prefix}/lib/node_modules/<package>` that links to the package
+where the `npm link` command was executed. It will also link any bins in
+the package to `{prefix}/bin/{name}`.  Note that `npm link` uses the global
+prefix (see `npm prefix -g` for its value).
 
 Next, in some other location, `npm link package-name` will create a
-symbolic link from globally-installed `package-name` to `node_modules/`
-of the current folder.
+symbolic link from globally-installed `package-name` to `node_modules/` of
+the current folder.
 
-Note that `package-name` is taken from `package.json`,
-not from directory name.
+Note that `package-name` is taken from `package.json`, _not_ from the
+directory name.
 
-The package name can be optionally prefixed with a scope. See [`scope`](/using-npm/scope).
-The scope must be preceded by an @-symbol and followed by a slash.
+The package name can be optionally prefixed with a scope. See
+[`scope`](/using-npm/scope).  The scope must be preceded by an @-symbol and
+followed by a slash.
 
 When creating tarballs for `npm publish`, the linked packages are
-"snapshotted" to their current state by resolving the symbolic links.
-
-This is handy for installing your own stuff, so that you can work on it and
-test it iteratively without having to continually rebuild.
+"snapshotted" to their current state by resolving the symbolic links, if
+they are included in `bundleDependencies`.
 
 For example:
 
 ```bash
-    cd ~/projects/node-redis    # go into the package directory
-    npm link                    # creates global link
-    cd ~/projects/node-bloggy   # go into some other package directory.
-    npm link redis              # link-install the package
+cd ~/projects/node-redis    # go into the package directory
+npm link                    # creates global link
+cd ~/projects/node-bloggy   # go into some other package directory.
+npm link redis              # link-install the package
 ```
 
-Now, any changes to ~/projects/node-redis will be reflected in
-~/projects/node-bloggy/node_modules/node-redis/. Note that the link should
-be to the package name, not the directory name for that package.
+Now, any changes to `~/projects/node-redis` will be reflected in
+`~/projects/node-bloggy/node_modules/node-redis/`. Note that the link
+should be to the package name, not the directory name for that package.
 
 You may also shortcut the two steps in one.  For example, to do the
 above use-case in a shorter way:
@@ -69,15 +72,33 @@ npm link redis
 That is, it first creates a global link, and then links the global
 installation target into your project's `node_modules` folder.
 
-Note that in this case, you are referring to the directory name, `node-redis`,
-rather than the package name `redis`.
+Note that in this case, you are referring to the directory name,
+`node-redis`, rather than the package name `redis`.
 
-If your linked package is scoped (see [`scope`](/using-npm/scope)) your link command must include that scope, e.g.
+If your linked package is scoped (see [`scope`](/using-npm/scope)) your
+link command must include that scope, e.g.
 
 ```bash
 npm link @myorg/privatepackage
 ```
 
+### Caveat
+
+Note that package dependencies linked in this way are _not_ saved to
+`package.json` by default, on the assumption that the intention is to have
+a link stand in for a regular non-link dependency.  Otherwise, for example,
+if you depend on `redis@^3.0.1`, and ran `npm link redis`, it would replace
+the `^3.0.1` dependency with `file:../path/to/node-redis`, which you
+probably don't want!  Additionally, other users or developers on your
+project would run into issues if they do not have their folders set up
+exactly the same as yours.
+
+If you are adding a _new_ dependency as a link, you should add it to the
+relevant metadata by running `npm install <dep> --package-lock-only`.
+
+If you _want_ to save the `file:` reference in your `package.json` and
+`package-lock.json` files, you can use `npm link <dep> --save` to do so.
+
 ### See Also
 
 * [npm developers](/using-npm/developers)
diff --git a/deps/npm/docs/content/commands/npm-logout.md b/deps/npm/docs/content/commands/npm-logout.md
index b1f344af576f34..7fa858a99993d2 100644
--- a/deps/npm/docs/content/commands/npm-logout.md
+++ b/deps/npm/docs/content/commands/npm-logout.md
@@ -12,13 +12,13 @@ npm logout [--registry=<url>] [--scope=<@scope>]
 
 ### Description
 
-When logged into a registry that supports token-based authentication, tell the
-server to end this token's session. This will invalidate the token everywhere
-you're using it, not just for the current environment.
+When logged into a registry that supports token-based authentication, tell
+the server to end this token's session. This will invalidate the token
+everywhere you're using it, not just for the current environment.
 
-When logged into a legacy registry that uses username and password authentication, this will
-clear the credentials in your user configuration. In this case, it will _only_ affect
-the current environment.
+When logged into a legacy registry that uses username and password
+authentication, this will clear the credentials in your user configuration.
+In this case, it will _only_ affect the current environment.
 
 If `--scope` is provided, this will find the credentials for the registry
 connected to that scope, if set.
diff --git a/deps/npm/docs/content/commands/npm-ls.md b/deps/npm/docs/content/commands/npm-ls.md
index c6e2af3314bfbd..54787bd6389c6c 100644
--- a/deps/npm/docs/content/commands/npm-ls.md
+++ b/deps/npm/docs/content/commands/npm-ls.md
@@ -15,17 +15,21 @@ aliases: list, la, ll
 ### Description
 
 This command will print to stdout all the versions of packages that are
-installed, as well as their dependencies, in a tree-structure.
+installed, as well as their dependencies when `--all` is specified, in a
+tree structure.
 
-Positional arguments are `name@version-range` identifiers, which will
-limit 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:
+Note: to get a "bottoms up" view of why a given package is included in the
+tree at all, use [`npm explain`](/commands/npm-explain).
+
+Positional arguments are `name@version-range` identifiers, which will limit
+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:
 
 ```bash
-    npm@@VERSION@ /path/to/npm
-    └─┬ init-package-json@0.0.4
-      └── promzard@0.1.5
+npm@@VERSION@ /path/to/npm
+└─┬ init-package-json@0.0.4
+  └── promzard@0.1.5
 ```
 
 It will print out extraneous, missing, and invalid packages.
@@ -35,12 +39,49 @@ in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project.
 
 The tree shown is the logical dependency tree, based on package
-dependencies, not the physical layout of your node_modules folder.
+dependencies, not the physical layout of your `node_modules` folder.
 
 When run as `ll` or `la`, it shows extended information by default.
 
+### Note: Design Changes Pending
+
+The `npm ls` command's output and behavior made a _ton_ of sense when npm
+created a `node_modules` folder that naively nested every dependency.  In
+such a case, the logical dependency graph and physical tree of packages on
+disk would be roughly identical.
+
+With the advent of automatic install-time deduplication of dependencies in
+npm v3, the `ls` output was modified to display the logical dependency
+graph as a tree structure, since this was more useful to most users.
+However, without using `npm ls -l`, it became impossible show _where_ a
+package was actually installed much of the time!
+
+With the advent of automatic installation of `peerDependencies` in npm v7,
+this gets even more curious, as `peerDependencies` are logically
+"underneath" their dependents in the dependency graph, but are always
+physically at or above their location on disk.
+
+Also, in the years since npm got an `ls` command (in version 0.0.2!),
+dependency graphs have gotten much larger as a general rule.  Therefor, in
+order to avoid dumping an excessive amount of content to the terminal, `npm
+ls` now only shows the _top_ level dependencies, unless `--all` is
+provided.
+
+A thorough re-examination of the use cases, intention, behavior, and output
+of this command, is currently underway.  Expect significant changes to at
+least the default human-readable `npm ls` output in npm v8.
+
 ### Configuration
 
+#### all
+
+* Default: `false`
+* Type: Boolean
+
+When running `npm outdated` and `npm ls`, setting `--all` will show all
+outdated or installed packages, rather than only those directly depended
+upon by the current project.
+
 #### json
 
 * Default: false
@@ -115,6 +156,7 @@ Set it to false in order to use all-ansi output.
 
 ### See Also
 
+* [npm explain](/commands/npm-explain)
 * [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm folders](/configuring-npm/folders)
diff --git a/deps/npm/docs/content/commands/npm-org.md b/deps/npm/docs/content/commands/npm-org.md
index 2f3c6b48088669..18047d109cc0b0 100644
--- a/deps/npm/docs/content/commands/npm-org.md
+++ b/deps/npm/docs/content/commands/npm-org.md
@@ -52,10 +52,11 @@ $ npm org ls my-org @mx-santos
 
 ### Description
 
-You can use the `npm org` commands to manage and view users of an organization.
-It supports adding and removing users, changing their roles, listing them, and
-finding specific ones and their roles.
+You can use the `npm org` commands to manage and view users of an
+organization.  It supports adding and removing users, changing their roles,
+listing them, and finding specific ones and their roles.
 
 ### See Also
 
+* [using orgs](/using-npm/orgs)
 * [Documentation on npm Orgs](https://docs.npmjs.com/orgs/)
diff --git a/deps/npm/docs/content/commands/npm-outdated.md b/deps/npm/docs/content/commands/npm-outdated.md
index 01ad780867d057..ee1157f332de08 100644
--- a/deps/npm/docs/content/commands/npm-outdated.md
+++ b/deps/npm/docs/content/commands/npm-outdated.md
@@ -15,25 +15,34 @@ npm outdated [[<@scope>/]<pkg> ...]
 This command will check the registry to see if any (or, specific) installed
 packages are currently outdated.
 
+By default, only the direct dependencies of the root project are shown.
+Use `--all` to find all outdated meta-dependencies as well.
+
 In the output:
 
 * `wanted` is the maximum version of the package that satisfies the semver
-  range specified in `package.json`. If there's no available semver range (i.e.
-  you're running `npm outdated --global`, or the package isn't included in
-  `package.json`), then `wanted` shows the currently-installed version.
+  range specified in `package.json`. If there's no available semver range
+  (i.e.  you're running `npm outdated --global`, or the package isn't
+  included in `package.json`), then `wanted` shows the currently-installed
+  version.
 * `latest` is the version of the package tagged as latest in the registry.
-  Running `npm publish` with no special configuration will publish the package
-  with a dist-tag of `latest`. This may or may not be the maximum version of
-  the package, or the most-recently published version of the package, depending
-  on how the package's developer manages the latest [dist-tag](npm-dist-tag).
+  Running `npm publish` with no special configuration will publish the
+  package with a dist-tag of `latest`. This may or may not be the maximum
+  version of the package, or the most-recently published version of the
+  package, depending on how the package's developer manages the latest
+  [dist-tag](/commands/npm-dist-tag).
 * `location` is where in the physical tree the package is located.
 * `depended by` shows which package depends on the displayed dependency
-* `package type` (when using `--long` / `-l`) tells you whether this package is
-  a `dependency` or a dev/peer/optional dependency. Packages not included in `package.json`
-  are always marked `dependencies`.
-* `homepage` (when using `--long` / `-l`) is the `homepage` value contained in the package's packument
-* Red means there's a newer version matching your semver requirements, so you should update now.
-* Yellow indicates that there's a newer version above your semver requirements (usually new major, or new 0.x minor) so proceed with caution.
+* `package type` (when using `--long` / `-l`) tells you whether this
+  package is a `dependency` or a dev/peer/optional dependency. Packages not
+  included in `package.json` are always marked `dependencies`.
+* `homepage` (when using `--long` / `-l`) is the `homepage` value contained
+  in the package's packument
+* Red means there's a newer version matching your semver requirements, so
+  you should update now.
+* Yellow indicates that there's a newer version _above_ your semver
+  requirements (usually new major, or new 0.x minor) so proceed with
+  caution.
 
 ### An example
 
@@ -59,19 +68,20 @@ With these `dependencies`:
 
 A few things to note:
 
-* `glob` requires `^5`, which prevents npm from installing `glob@6`, which is
-  outside the semver range.
-* Git dependencies will always be reinstalled, because of how they're specified.
-  The installed committish might satisfy the dependency specifier (if it's
-  something immutable, like a commit SHA), or it might not, so `npm outdated` and
-  `npm update` have to fetch Git repos to check. This is why currently doing a
-  reinstall of a Git dependency always forces a new clone and install.
-* `npm@3.5.2` is marked as "wanted", but "latest" is `npm@3.5.1` because npm
-  uses dist-tags to manage its `latest` and `next` release channels. `npm update`
-  will install the _newest_ version, but `npm install npm` (with no semver range)
-  will install whatever's tagged as `latest`.
-* `once` is just plain out of date. Reinstalling `node_modules` from scratch or
-  running `npm update` will bring it up to spec.
+* `glob` requires `^5`, which prevents npm from installing `glob@6`, which
+  is outside the semver range.
+* Git dependencies will always be reinstalled, because of how they're
+  specified.  The installed committish might satisfy the dependency
+  specifier (if it's something immutable, like a commit SHA), or it might
+  not, so `npm outdated` and `npm update` have to fetch Git repos to check.
+  This is why currently doing a reinstall of a Git dependency always forces
+  a new clone and install.
+* `npm@3.5.2` is marked as "wanted", but "latest" is `npm@3.5.1` because
+  npm uses dist-tags to manage its `latest` and `next` release channels.
+  `npm update` will install the _newest_ version, but `npm install npm`
+  (with no semver range) will install whatever's tagged as `latest`.
+* `once` is just plain out of date. Reinstalling `node_modules` from
+  scratch or running `npm update` will bring it up to spec.
 
 ### Configuration
 
diff --git a/deps/npm/docs/content/commands/npm-owner.md b/deps/npm/docs/content/commands/npm-owner.md
index 3c984ebd856201..6479f3bdd11f42 100644
--- a/deps/npm/docs/content/commands/npm-owner.md
+++ b/deps/npm/docs/content/commands/npm-owner.md
@@ -18,26 +18,24 @@ aliases: author
 
 Manage ownership of published packages.
 
-* ls:
-  List all the users who have access to modify a package and push new versions.
-  Handy when you need to know who to bug for help.
-* add:
-  Add a new user as a maintainer of a package.  This user is enabled to modify
-  metadata, publish new versions, and add other owners.
-* rm:
-  Remove a user from the package owner list.  This immediately revokes their
-  privileges.
+* ls: List all the users who have access to modify a package and push new
+  versions.  Handy when you need to know who to bug for help.
+* add: Add a new user as a maintainer of a package.  This user is enabled
+  to modify metadata, publish new versions, and add other owners.
+* rm: Remove a user from the package owner list.  This immediately revokes
+  their privileges.
 
 Note that there is only one level of access.  Either you can modify a package,
 or you can't.  Future versions may contain more fine-grained access levels, but
 that is not implemented at this time.
 
-If you have two-factor authentication enabled with `auth-and-writes` then
-you'll need to include an otp on the command line when changing ownership
-with `--otp`.
+If you have two-factor authentication enabled with `auth-and-writes` (see
+[`npm-profile`](/commands/npm-profile)) then you'll need to include an otp
+on the command line when changing ownership with `--otp`.
 
 ### See Also
 
+* [npm profile](/commands/npm-profile)
 * [npm publish](/commands/npm-publish)
 * [npm registry](/using-npm/registry)
 * [npm adduser](/commands/npm-adduser)
diff --git a/deps/npm/docs/content/commands/npm-pack.md b/deps/npm/docs/content/commands/npm-pack.md
index adb5d30832cb8f..cc6b669efb1ef6 100644
--- a/deps/npm/docs/content/commands/npm-pack.md
+++ b/deps/npm/docs/content/commands/npm-pack.md
@@ -13,10 +13,10 @@ npm pack [[<@scope>/]<pkg>...] [--dry-run]
 ### Description
 
 For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, name, or scoped name), this
-command will fetch it to the cache, and then copy the tarball to the
-current working directory as `<name>-<version>.tgz`, and then write
-the filenames out to stdout.
+tarball url, git url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, copy the tarball to the current working
+directory as `<name>-<version>.tgz`, and then write the filenames out to
+stdout.
 
 If the same package is specified multiple times, then the file will be
 overwritten the second time.
@@ -24,10 +24,12 @@ overwritten the second time.
 If no arguments are supplied, then npm packs the current package folder.
 
 The `--dry-run` argument will do everything that pack usually does without
-actually packing anything. Reports on what would have gone into the tarball.
+actually packing anything.  That is, it reports on what would have gone
+into the tarball, but nothing else.
 
 ### See Also
 
+* [npm-packlist package](http://npm.im/npm-packlist)
 * [npm cache](/commands/npm-cache)
 * [npm publish](/commands/npm-publish)
 * [npm config](/commands/npm-config)
diff --git a/deps/npm/docs/content/commands/npm-ping.md b/deps/npm/docs/content/commands/npm-ping.md
index bc2233da74f0c2..8de06aa1848361 100644
--- a/deps/npm/docs/content/commands/npm-ping.md
+++ b/deps/npm/docs/content/commands/npm-ping.md
@@ -25,5 +25,6 @@ Ping error: {*Detail about error}
 
 ### See Also
 
+* [npm doctor](/commands/npm-doctor)
 * [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/commands/npm-profile.md b/deps/npm/docs/content/commands/npm-profile.md
index d44c994167f053..88edf26d87c410 100644
--- a/deps/npm/docs/content/commands/npm-profile.md
+++ b/deps/npm/docs/content/commands/npm-profile.md
@@ -16,12 +16,12 @@ npm profile disable-2fa
 
 ### Description
 
-Change your profile information on the registry.  This not be available if
-you're using a non-npmjs registry.
+Change your profile information on the registry.  Note that this command
+depends on the registry implementation, so third-party registries may not
+support this interface.
 
-* `npm profile get [<property>]`:
-  Display all of the properties of your profile, or one or more specific
-  properties.  It looks like:
+* `npm profile get [<property>]`: Display all of the properties of your
+  profile, or one or more specific properties.  It looks like:
 
 ```bash
 +-----------------+---------------------------+
@@ -46,27 +46,26 @@ you're using a non-npmjs registry.
 | updated         | 2017-10-02T21:29:45.922Z  |
 +-----------------+---------------------------+
 ```
-  
-* `npm profile set <property> <value>`:
-  Set the value of a profile property. You can set the following properties this way:
-    email, fullname, homepage, freenode, twitter, github
 
-* `npm profile set password`:
-  Change your password.  This is interactive, you'll be prompted for your
-  current password and a new password.  You'll also be prompted for an OTP
-  if you have two-factor authentication enabled.
+* `npm profile set <property> <value>`: Set the value of a profile
+  property. You can set the following properties this way: email, fullname,
+  homepage, freenode, twitter, github
 
-* `npm profile enable-2fa [auth-and-writes|auth-only]`:
-  Enables two-factor authentication. Defaults to `auth-and-writes` mode. Modes are:
+* `npm profile set password`: Change your password.  This is interactive,
+  you'll be prompted for your current password and a new password.  You'll
+  also be prompted for an OTP if you have two-factor authentication
+  enabled.
+
+* `npm profile enable-2fa [auth-and-writes|auth-only]`: Enables two-factor
+  authentication. Defaults to `auth-and-writes` mode. Modes are:
   * `auth-only`: Require an OTP when logging in or making changes to your
     account's authentication.  The OTP will be required on both the website
     and the command line.
-  * `auth-and-writes`: Requires an OTP at all the times `auth-only` does, and also requires one when
-    publishing a module, setting the `latest` dist-tag, or changing access
-    via `npm access` and `npm owner`.
+  * `auth-and-writes`: Requires an OTP at all the times `auth-only` does,
+    and also requires one when publishing a module, setting the `latest`
+    dist-tag, or changing access via `npm access` and `npm owner`.
 
-* `npm profile disable-2fa`:
-  Disables two-factor authentication.
+* `npm profile disable-2fa`: Disables two-factor authentication.
 
 ### Details
 
@@ -76,4 +75,6 @@ available on non npmjs.com registries.
 
 ### See Also
 
+* [npm adduser](/commands/npm-adduser)
+* [npm logout](/commands/npm-logout)
 * [npm config](/commands/npm-config)
diff --git a/deps/npm/docs/content/commands/npm-prune.md b/deps/npm/docs/content/commands/npm-prune.md
index 1a100e9d88ad75..088c1c3470fafa 100644
--- a/deps/npm/docs/content/commands/npm-prune.md
+++ b/deps/npm/docs/content/commands/npm-prune.md
@@ -12,29 +12,26 @@ npm prune [[<@scope>/]<pkg>...] [--production] [--dry-run] [--json]
 
 ### Description
 
-This command removes "extraneous" packages.  If a package name is
-provided, then only packages matching one of the supplied names are
-removed.
+This command removes "extraneous" packages.  If a package name is provided,
+then only packages matching one of the supplied names are removed.
 
-Extraneous packages are packages that are not listed on the parent
-package's dependencies list.
+Extraneous packages are those present in the `node_modules` folder that are
+not listed as any package's dependency list.
 
 If the `--production` flag is specified or the `NODE_ENV` environment
 variable is set to `production`, this command will remove the packages
-specified in your `devDependencies`. Setting `--no-production` will
-negate `NODE_ENV` being set to `production`.
+specified in your `devDependencies`. Setting `--no-production` will negate
+`NODE_ENV` being set to `production`.
 
 If the `--dry-run` flag is used then no changes will actually be made.
 
-If the `--json` flag is used then the changes `npm prune` made (or would
+If the `--json` flag is used, then the changes `npm prune` made (or would
 have made with `--dry-run`) are printed as a JSON object.
 
-In normal operation with package-locks enabled, extraneous modules are
-pruned automatically when modules are installed and you'll only need
-this command with the `--production` flag.
-
-If you've disabled package-locks then extraneous modules will not be removed
-and it's up to you to run `npm prune` from time-to-time to remove them.
+In normal operation, extraneous modules are pruned automatically, so you'll
+only need this command with the `--production` flag.  However, in the real
+world, operation is not always "normal".  When crashes or mistakes happen,
+this command can help clean up any resulting garbage.
 
 ### See Also
 
diff --git a/deps/npm/docs/content/commands/npm-publish.md b/deps/npm/docs/content/commands/npm-publish.md
index 3dcdc6f3022ed4..fc13e672223589 100644
--- a/deps/npm/docs/content/commands/npm-publish.md
+++ b/deps/npm/docs/content/commands/npm-publish.md
@@ -15,59 +15,91 @@ Sets tag 'latest' if no --tag specified
 
 ### Description
 
-Publishes a package to the registry so that it can be installed by name. All
-files in the package directory are included if no local `.gitignore` or
-`.npmignore` file exists. If both files exist and a file is ignored by
-`.gitignore` but not by `.npmignore` then it will be included.  See
-[`developers`](/using-npm/developers) for full details on what's included in the published package, as well as details on how the package is built.
+Publishes a package to the registry so that it can be installed by name.
 
-By default npm will publish to the public registry. This can be overridden by
-specifying a different default registry or using a [`scope`](/using-npm/scope) in the name (see [`package.json`](/configuring-npm/package-json)).
+By default npm will publish to the public registry. This can be overridden
+by specifying a different default registry or using a
+[`scope`](/using-npm/scope) in the name (see
+[`package.json`](/configuring-npm/package-json)).
 
-* `<folder>`:
-  A folder containing a package.json file
+* `<folder>`: A folder containing a package.json file
 
-* `<tarball>`:
-  A url or file path to a gzipped tar archive containing a single folder
-  with a package.json file inside.
+* `<tarball>`: A url or file path to a gzipped tar archive containing a
+  single folder with a package.json file inside.
 
-* `[--tag <tag>]`
-  Registers the published package with the given tag, such that
-  `npm install <name>@<tag>` will install this version.  By default,
+* `[--tag <tag>]`: Registers the published package with the given tag, such
+  that `npm install <name>@<tag>` will install this version.  By default,
   `npm publish` updates and `npm install` installs the `latest` tag. See
   [`npm-dist-tag`](npm-dist-tag) for details about tags.
 
-* `[--access <public|restricted>]`
-  Tells the registry whether this package should be published as public or
-  restricted. Only applies to scoped packages, which default to `restricted`.
-  If you don't have a paid account, you must publish with `--access public`
-  to publish scoped packages.
+* `[--access <public|restricted>]`: Tells the registry whether this package
+  should be published as public or restricted. Only applies to scoped
+  packages, which default to `restricted`.  If you don't have a paid
+  account, you must publish with `--access public` to publish scoped
+  packages.
 
-* `[--otp <otpcode>]`
-  If you have two-factor authentication enabled in `auth-and-writes` mode
-  then you can provide a code from your authenticator with this. If you
-  don't include this and you're running from a TTY then you'll be prompted.
+* `[--otp <otpcode>]`: If you have two-factor authentication enabled in
+  `auth-and-writes` mode then you can provide a code from your
+  authenticator with this. If you don't include this and you're running
+  from a TTY then you'll be prompted.
 
-* `[--dry-run]`
-  As of `npm@6`, does everything publish would do except actually publishing
-  to the registry. Reports the details of what would have been published.
+* `[--dry-run]`: As of `npm@6`, does everything publish would do except
+  actually publishing to the registry. Reports the details of what would
+  have been published.
 
-Fails if the package name and version combination already exists in
-the specified registry.
+The publish will fail if the package name and version combination already
+exists in the specified registry.
 
-Once a package is published with a given name and version, that
-specific name and version combination can never be used again, even if
-it is removed with [`npm unpublish`](/commands/npm-unpublish).
+Once a package is published with a given name and version, that specific
+name and version combination can never be used again, even if it is removed
+with [`npm unpublish`](/commands/npm-unpublish).
 
 As of `npm@5`, both a sha1sum and an integrity field with a sha512sum of the
 tarball will be submitted to the registry during publication. Subsequent
 installs will use the strongest supported algorithm to verify downloads.
 
-Similar to `--dry-run` see [`npm pack`](/commands/npm-pack), which figures out the files to be
-included and packs them into a tarball to be uploaded to the registry.
+Similar to `--dry-run` see [`npm pack`](/commands/npm-pack), which figures
+out the files to be included and packs them into a tarball to be uploaded
+to the registry.
+
+### Files included in package
+
+To see what will be included in your package, run `npx npm-packlist`.  All
+files are included by default, with the following exceptions:
+
+- Certain files that are relevant to package installation and distribution
+  are always included.  For example, `package.json`, `README.md`,
+  `LICENSE`, and so on.
+
+- If there is a "files" list in
+  [`package.json`](/configuring-npm/package-json), then only the files
+  specified will be included.  (If directories are specified, then they
+  will be walked recursively and their contents included, subject to the
+  same ignore rules.)
+
+- If there is a `.gitignore` or `.npmignore` file, then ignored files in
+  that and all child directories will be excluded from the package.  If
+  _both_ files exist, then the `.gitignore` is ignored, and only the
+  `.npmignore` is used.
+
+  `.npmignore` files follow the [same pattern
+  rules](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#_ignoring)
+  as `.gitignore` files
+
+- If the file matches certain patterns, then it will _never_ be included,
+  unless explicitly added to the `"files"` list in `package.json`, or
+  un-ignored with a `!` rule in a `.npmignore` or `.gitignore` file.
+
+- Symbolic links are never included in npm packages.
+
+
+See [`developers`](/using-npm/developers) for full details on what's
+included in the published package, as well as details on how the package is
+built.
 
 ### See Also
 
+* [npm-packlist package](http://npm.im/npm-packlist)
 * [npm registry](/using-npm/registry)
 * [npm scope](/using-npm/scope)
 * [npm adduser](/commands/npm-adduser)
diff --git a/deps/npm/docs/content/commands/npm-rebuild.md b/deps/npm/docs/content/commands/npm-rebuild.md
index 5b6b816f68bd96..0a7ade6b165b46 100644
--- a/deps/npm/docs/content/commands/npm-rebuild.md
+++ b/deps/npm/docs/content/commands/npm-rebuild.md
@@ -7,16 +7,23 @@ description: Rebuild a package
 ### Synopsis
 
 ```bash
-npm rebuild [[<@scope>/<name>]...]
+npm rebuild [[<@scope>/]<name>[@<version>] ...]
 
-alias: npm rb
+alias: rb
 ```
 
 ### Description
 
-This command runs the `npm build` command on the matched folders.  This is useful when you install a new version of node, and must recompile all your C++ addons with the new binary.
+This command runs the `npm build` command on the matched folders.  This is
+useful when you install a new version of node, and must recompile all your
+C++ addons with the new binary.  It is also useful when installing with
+`--ignore-scripts` and `--no-bin-links`, to explicitly choose which
+packages to build and/or link bins.
+
+If one or more package names (and optionally version ranges) are provided,
+then only packages with a name and version matching one of the specifiers
+will be rebuilt.
 
 ### See Also
 
-* [npm build](/commands/npm-build)
 * [npm install](/commands/npm-install)
diff --git a/deps/npm/docs/content/commands/npm-repo.md b/deps/npm/docs/content/commands/npm-repo.md
index c6fdf36f1d0c44..670345bece5c59 100644
--- a/deps/npm/docs/content/commands/npm-repo.md
+++ b/deps/npm/docs/content/commands/npm-repo.md
@@ -13,9 +13,9 @@ npm repo [<pkgname> [<pkgname> ...]]
 ### Description
 
 This command tries to guess at the likely location of a package's
-repository URL, and then tries to open it using the `--browser`
-config param. If no package name is provided, it will search for
-a `package.json` in the current folder and use the `name` property.
+repository URL, and then tries to open it using the `--browser` config
+param. If no package name is provided, it will search for a `package.json`
+in the current folder and use the `repository` property.
 
 ### Configuration
 
diff --git a/deps/npm/docs/content/commands/npm-restart.md b/deps/npm/docs/content/commands/npm-restart.md
index a80c54273df970..097c9fee7c9c3b 100644
--- a/deps/npm/docs/content/commands/npm-restart.md
+++ b/deps/npm/docs/content/commands/npm-restart.md
@@ -12,29 +12,28 @@ npm restart [-- <args>]
 
 ### Description
 
-This restarts a package.
+This restarts a project.  It is equivalent to running `npm run-script
+restart`.
 
-This runs a package's "stop", "restart", and "start" scripts, and associated
-pre- and post- scripts, in the order given below:
+If the current project has a `"restart"` script specified in
+`package.json`, then the following scripts will be run:
+
+1. prerestart
+2. restart
+3. postrestart
+
+If it does _not_ have a `"restart"` script specified, but it does have
+`stop` and/or `start` scripts, then the following scripts will be run:
 
 1. prerestart
 2. prestop
 3. stop
 4. poststop
-5. restart
 6. prestart
 7. start
 8. poststart
 9. postrestart
 
-### Note
-
-Note that the "restart" script is run **in addition to** the "stop"
-and "start" scripts, not instead of them.
-
-This is the behavior as of `npm` major version 2.  A change in this
-behavior will be accompanied by an increase in major version number
-
 ### See Also
 
 * [npm run-script](/commands/npm-run-script)
diff --git a/deps/npm/docs/content/commands/npm-root.md b/deps/npm/docs/content/commands/npm-root.md
index 317ef9d85a5066..0d694ac876e92b 100644
--- a/deps/npm/docs/content/commands/npm-root.md
+++ b/deps/npm/docs/content/commands/npm-root.md
@@ -5,6 +5,7 @@ description: Display npm root
 ---
 
 ### Synopsis
+
 ```bash
 npm root [-g]
 ```
@@ -13,6 +14,15 @@ npm root [-g]
 
 Print the effective `node_modules` folder to standard out.
 
+Useful for using npm in shell scripts that do things with the
+`node_modules` folder.  For example:
+
+```bash
+#!/bin/bash
+global_node_modules="$(npm root --global)"
+echo "Global packages installed in: ${global_node_modules}"
+```
+
 ### See Also
 
 * [npm prefix](/commands/npm-prefix)
diff --git a/deps/npm/docs/content/commands/npm-run-script.md b/deps/npm/docs/content/commands/npm-run-script.md
index 06b6e9383e7fe6..05f6380c2b3268 100644
--- a/deps/npm/docs/content/commands/npm-run-script.md
+++ b/deps/npm/docs/content/commands/npm-run-script.md
@@ -7,23 +7,25 @@ description: Run arbitrary package scripts
 ### Synopsis
 
 ```bash
-npm run-script <command> [--silent] [-- <args>...]
+npm run-script <command> [--if-present] [--silent] [-- <args>]
 
-alias: npm run
+aliases: run, rum, urn
 ```
 
 ### Description
 
 This runs an arbitrary command from a package's `"scripts"` object.  If no
-`"command"` is provided, it will list the available scripts.  `run[-script]` is
-used by the test, start, restart, and stop commands, but can be called
-directly, as well. When the scripts in the package are printed out, they're
-separated into lifecycle (test, start, restart) and directly-run scripts.
+`"command"` is provided, it will list the available scripts.
 
-As of [`npm@2.0.0`](https://blog.npmjs.org/post/98131109725/npm-2-0-0), you can
-use custom arguments when executing scripts. The special option `--` is used by
-[getopt](https://goo.gl/KxMmtG) to delimit the end of the options. npm will pass
-all the arguments after the `--` directly to your script:
+`run[-script]` is used by the test, start, restart, and stop commands, but
+can be called directly, as well. When the scripts in the package are
+printed out, they're separated into lifecycle (test, start, restart) and
+directly-run scripts.
+
+Any positional arguments are passed to the specified script.  Use `--` to
+pass `-`-prefixed flags and options which would otherwise be parsed by npm.
+
+For example:
 
 ```bash
 npm run test -- --grep="pattern"
@@ -38,31 +40,28 @@ environment variables that will be available to the script at runtime. If an
 built-in.
 
 In addition to the shell's pre-existing `PATH`, `npm run` adds
-`node_modules/.bin` to the `PATH` provided to scripts. Any binaries provided by
-locally-installed dependencies can be used without the `node_modules/.bin`
-prefix. For example, if there is a `devDependency` on `tap` in your package,
-you should write:
+`node_modules/.bin` to the `PATH` provided to scripts. Any binaries
+provided by locally-installed dependencies can be used without the
+`node_modules/.bin` prefix. For example, if there is a `devDependency` on
+`tap` in your package, you should write:
 
 ```bash
-"scripts": {"test": "tap test/\*.js"}
+"scripts": {"test": "tap test/*.js"}
 ```
 
 instead of
 
 ```bash
-"scripts": {"test": "node_modules/.bin/tap test/\*.js"}
+"scripts": {"test": "node_modules/.bin/tap test/*.js"}
 ```
 
-to run your tests.
-
 The actual shell your script is run within is platform dependent. By default,
 on Unix-like systems it is the `/bin/sh` command, on Windows it is the `cmd.exe`.
 The actual shell referred to by `/bin/sh` also depends on the system.
-As of [`npm@5.1.0`](https://github.com/npm/npm/releases/tag/v5.1.0) you can
-customize the shell with the `script-shell` configuration.
+You can customize the shell with the `script-shell` configuration.
 
-Scripts are run from the root of the module, regardless of what your current
-working directory is when you call `npm run`. If you want your script to
+Scripts are run from the root of the module, regardless of what the current
+working directory is when `npm run` is called. If you want your script to
 use different behavior based on what subdirectory you're in, you can use the
 `INIT_CWD` environment variable, which holds the full path you were in when
 you ran `npm run`.
diff --git a/deps/npm/docs/content/commands/npm-set-script.md b/deps/npm/docs/content/commands/npm-set-script.md
new file mode 100644
index 00000000000000..7bc8f75d236537
--- /dev/null
+++ b/deps/npm/docs/content/commands/npm-set-script.md
@@ -0,0 +1,34 @@
+---
+title: npm-set-script
+section: 1
+description: Set tasks in the scripts section of package.json
+---
+
+### Synopsis
+An npm command that lets you create a task in the scripts section of the package.json.
+
+```bash
+npm set-script [<script>] [<command>]
+```
+
+
+**Example:**
+
+* `npm set-script start "http-server ."`
+
+```json
+{
+  "name": "my-project",
+  "scripts": {
+    "start": "http-server .",
+    "test": "some existing value"
+  }
+}
+```
+
+### See Also
+
+* [npm run-script](/commands/npm-run-script)
+* [npm install](/commands/npm-install)
+* [npm test](/commands/npm-test)
+* [npm start](/commands/npm-start)
diff --git a/deps/npm/docs/content/commands/npm-star.md b/deps/npm/docs/content/commands/npm-star.md
index c68a057aa08d29..aab6e107747fd9 100644
--- a/deps/npm/docs/content/commands/npm-star.md
+++ b/deps/npm/docs/content/commands/npm-star.md
@@ -8,7 +8,6 @@ description: Mark your favorite packages
 
 ```bash
 npm star [<pkg>...]
-npm unstar [<pkg>...]
 ```
 
 ### Description
@@ -16,12 +15,26 @@ npm unstar [<pkg>...]
 "Starring" a package means that you have some interest in it.  It's
 a vaguely positive way to show that you care.
 
+It's a boolean thing. Starring repeatedly has no additional effect.
+
+### More
+
+There's also these extra commands to help you manage your favorite packages:
+
+#### Unstar
+
+You can also "unstar" a package using [`npm unstar`](/commands/npm-unstar)
+
 "Unstarring" is the same thing, but in reverse.
 
-It's a boolean thing.  Starring repeatedly has no additional effect.
+#### Listing stars
+
+You can see all your starred packages using [`npm stars`](/commands/npm-stars)
 
 ### See Also
 
+* [npm unstar](/commands/npm-unstar)
+* [npm stars](/commands/npm-stars)
 * [npm view](/commands/npm-view)
 * [npm whoami](/commands/npm-whoami)
 * [npm adduser](/commands/npm-adduser)
diff --git a/deps/npm/docs/content/commands/npm-stars.md b/deps/npm/docs/content/commands/npm-stars.md
index 706134398f3b12..dab11bc669d1a7 100644
--- a/deps/npm/docs/content/commands/npm-stars.md
+++ b/deps/npm/docs/content/commands/npm-stars.md
@@ -20,6 +20,7 @@ you will most certainly enjoy this command.
 ### See Also
 
 * [npm star](/commands/npm-star)
+* [npm unstar](/commands/npm-unstar)
 * [npm view](/commands/npm-view)
 * [npm whoami](/commands/npm-whoami)
 * [npm adduser](/commands/npm-adduser)
diff --git a/deps/npm/docs/content/commands/npm-unstar.md b/deps/npm/docs/content/commands/npm-unstar.md
new file mode 100644
index 00000000000000..5471d908004e16
--- /dev/null
+++ b/deps/npm/docs/content/commands/npm-unstar.md
@@ -0,0 +1,37 @@
+---
+title: npm-unstar
+section: 1
+description: Remove an item from your favorite packages
+---
+
+### Synopsis
+
+```bash
+npm unstar [<pkg>...]
+```
+
+### Description
+
+"Unstarring" a package is the opposite of [`npm star`](/commands/npm-star),
+it removes an item from your list of favorite packages.
+
+### More
+
+There's also these extra commands to help you manage your favorite packages:
+
+#### Star
+
+You can "star" a package using [`npm star`](/commands/npm-star)
+
+#### Listing stars
+
+You can see all your starred packages using [`npm stars`](/commands/npm-stars)
+
+### See Also
+
+* [npm star](/commands/npm-star)
+* [npm stars](/commands/npm-stars)
+* [npm view](/commands/npm-view)
+* [npm whoami](/commands/npm-whoami)
+* [npm adduser](/commands/npm-adduser)
+
diff --git a/deps/npm/docs/content/commands/npx.md b/deps/npm/docs/content/commands/npx.md
index a5522c66e85aa4..625ac3d8cd6025 100644
--- a/deps/npm/docs/content/commands/npx.md
+++ b/deps/npm/docs/content/commands/npx.md
@@ -8,9 +8,9 @@ description: Run a command from a local or remote npm package
 
 ```bash
 npm exec -- <pkg>[@<version>] [args...]
-npm exec -p <pkg>[@<version>] -- <cmd> [args...]
+npm exec --package=<pkg>[@<version>] -- <cmd> [args...]
 npm exec -c '<cmd> [args...]'
-npm exec -p foo -c '<cmd> [args...]'
+npm exec --package=foo -c '<cmd> [args...]'
 
 npx <pkg>[@<specifier>] [args...]
 npx -p <pkg>[@<specifier>] <cmd> [args...]
@@ -19,7 +19,8 @@ npx -p <pkg>[@<specifier>] -c '<cmd> [args...]'
 
 alias: npm x, npx
 
--p <pkg> --package=<pkg> (may be specified multiple times)
+--package=<pkg> (may be specified multiple times)
+-p is a shorthand for --package only when using npx executable
 -c <cmd> --call=<cmd> (may not be mixed with positional arguments)
 ```
 
@@ -29,9 +30,9 @@ This command allows you to run an arbitrary command from an npm package
 (either one installed locally, or fetched remotely), in a similar context
 as running it via `npm run`.
 
-Whatever packages are specified by the `--package` or `-p` option will be
+Whatever packages are specified by the `--package` option will be
 provided in the `PATH` of the executed command, along with any locally
-installed package executables.  The `--package` or `-p` option may be
+installed package executables.  The `--package` option may be
 specified multiple times, to execute the supplied command in an environment
 where all specified packages are available.
 
@@ -47,13 +48,14 @@ only be considered a match if they have the exact same name and version as
 the local dependency.
 
 If no `-c` or `--call` option is provided, then the positional arguments
-are used to generate the command string.  If no `-p` or `--package` options
+are used to generate the command string.  If no `--package` options
 are provided, then npm will attempt to determine the executable name from
 the package specifier provided as the first positional argument according
 to the following heuristic:
 
 - If the package has a single entry in its `bin` field in `package.json`,
-  then that command will be used.
+  or if all entries are aliases of the same command, then that command
+  will be used.
 - If the package has multiple `bin` entries, and one of them matches the
   unscoped portion of the `name` field, then that command will be used.
 - If this does not result in exactly one option (either because there are
diff --git a/deps/npm/docs/content/using-npm/config.md b/deps/npm/docs/content/using-npm/config.md
index 52aa07f1704853..71102d2e204ea0 100644
--- a/deps/npm/docs/content/using-npm/config.md
+++ b/deps/npm/docs/content/using-npm/config.md
@@ -432,7 +432,7 @@ Format `package-lock.json` or `npm-shrinkwrap.json` as a human readable file.
 * Type: Boolean
 
 When "true" displays the message at the end of each `npm install`
-aknowledging the number of dependencies looking for funding.
+acknowledging the number of dependencies looking for funding.
 See [`npm fund`](/commands/npm-fund) for details.
 
 #### fetch-retries
@@ -1096,7 +1096,7 @@ using legacy search endpoint.
 
 If true, success/failure metrics will be reported to the registry stored in
 `metrics-registry`.  These requests contain the number of successful and
-failing runs of the npm CLI and the time period overwhich those counts were
+failing runs of the npm CLI and the time period over which those counts were
 gathered. No identifying information is included in these requests.
 
 #### shell
diff --git a/deps/npm/docs/content/using-npm/developers.md b/deps/npm/docs/content/using-npm/developers.md
index d42c759d42cf1e..bce615cfeb3d14 100644
--- a/deps/npm/docs/content/using-npm/developers.md
+++ b/deps/npm/docs/content/using-npm/developers.md
@@ -47,69 +47,64 @@ git+https://user@hostname/project/blah.git#commit-ish
 ```
 
 The `commit-ish` can be any tag, sha, or branch which can be supplied as
-an argument to `git checkout`.  The default is `master`.
+an argument to `git checkout`.  The default is whatever the repository uses
+as its default branch.
 
 ### The package.json File
 
 You need to have a `package.json` file in the root of your project to do
 much of anything with npm.  That is basically the whole interface.
 
-See [`package.json`](/configuring-npm/package-json) for details about what goes in that file.  At the very
-least, you need:
+See [`package.json`](/configuring-npm/package-json) for details about what
+goes in that file.  At the very least, you need:
 
-* name:
-  This should be a string that identifies your project.  Please do not
-  use the name to specify that it runs on node, or is in JavaScript.
-  You can use the "engines" field to explicitly state the versions of
-  node (or whatever else) that your program requires, and it's pretty
-  well assumed that it's JavaScript.
+* name: This should be a string that identifies your project.  Please do
+  not use the name to specify that it runs on node, or is in JavaScript.
+  You can use the "engines" field to explicitly state the versions of node
+  (or whatever else) that your program requires, and it's pretty well
+  assumed that it's JavaScript.
 
   It does not necessarily need to match your github repository name.
 
   So, `node-foo` and `bar-js` are bad names.  `foo` or `bar` are better.
 
-* version:
-  A semver-compatible version.
+* version: A semver-compatible version.
 
-* engines:
-  Specify the versions of node (or whatever else) that your program
-  runs on.  The node API changes a lot, and there may be bugs or new
-  functionality that you depend on.  Be explicit.
+* engines: Specify the versions of node (or whatever else) that your
+  program runs on.  The node API changes a lot, and there may be bugs or
+  new functionality that you depend on.  Be explicit.
 
-* author:
-  Take some credit.
+* author: Take some credit.
 
-* scripts:
-  If you have a special compilation or installation script, then you
-  should put it in the `scripts` object.  You should definitely have at
-  least a basic smoke-test command as the "scripts.test" field.
-  See [scripts](/using-npm/scripts).
+* scripts: If you have a special compilation or installation script, then
+  you should put it in the `scripts` object.  You should definitely have at
+  least a basic smoke-test command as the "scripts.test" field.  See
+  [scripts](/using-npm/scripts).
 
-* main:
-  If you have a single module that serves as the entry point to your
-  program (like what the "foo" package gives you at require("foo")),
-  then you need to specify that in the "main" field.
+* main: If you have a single module that serves as the entry point to your
+  program (like what the "foo" package gives you at require("foo")), then
+  you need to specify that in the "main" field.
 
-* directories:
-  This is an object mapping names to folders.  The best ones to include are
-  "lib" and "doc", but if you use "man" to specify a folder full of man pages,
-  they'll get installed just like these ones.
+* directories: This is an object mapping names to folders.  The best ones
+  to include are "lib" and "doc", but if you use "man" to specify a folder
+  full of man pages, they'll get installed just like these ones.
 
 You can use `npm init` in the root of your package in order to get you
-started with a pretty basic package.json file.  See
-[`npm init`](/commands/npm-init) for more info.
+started with a pretty basic package.json file.  See [`npm
+init`](/commands/npm-init) for more info.
 
 ### Keeping files *out* of your package
 
-Use a `.npmignore` file to keep stuff out of your package.  If there's
-no `.npmignore` file, but there *is* a `.gitignore` file, then npm will
-ignore the stuff matched by the `.gitignore` file.  If you *want* to
-include something that is excluded by your `.gitignore` file, you can
-create an empty `.npmignore` file to override it. Like `git`, `npm` looks
-for `.npmignore` and `.gitignore` files in all subdirectories of your
-package, not only the root directory.
+Use a `.npmignore` file to keep stuff out of your package.  If there's no
+`.npmignore` file, but there *is* a `.gitignore` file, then npm will ignore
+the stuff matched by the `.gitignore` file.  If you *want* to include
+something that is excluded by your `.gitignore` file, you can create an
+empty `.npmignore` file to override it. Like `git`, `npm` looks for
+`.npmignore` and `.gitignore` files in all subdirectories of your package,
+not only the root directory.
 
-`.npmignore` files follow the [same pattern rules](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files)
+`.npmignore` files follow the [same pattern
+rules](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#_ignoring)
 as `.gitignore` files:
 
 * Blank lines or lines starting with `#` are ignored.
diff --git a/deps/npm/docs/content/using-npm/scripts.md b/deps/npm/docs/content/using-npm/scripts.md
index f86f9e88bc9ddf..cf274e44de3ac7 100644
--- a/deps/npm/docs/content/using-npm/scripts.md
+++ b/deps/npm/docs/content/using-npm/scripts.md
@@ -6,7 +6,7 @@ description: How npm handles the "scripts" field
 
 ### Description
 
-The `"scripts"` property of of your `package.json` file supports a number of built-in scripts and their preset life cycle events as well as arbitrary scripts. These all can be executed by running `npm run-script <stage>` or `npm run <stage>` for short. *Pre* and *post* commands with matching names will be run for those as well (e.g. `premyscript`, `myscript`, `postmyscript`). Scripts from dependencies can be run with `npm explore <pkg> -- npm run <stage>`.
+The `"scripts"` property of your `package.json` file supports a number of built-in scripts and their preset life cycle events as well as arbitrary scripts. These all can be executed by running `npm run-script <stage>` or `npm run <stage>` for short. *Pre* and *post* commands with matching names will be run for those as well (e.g. `premyscript`, `myscript`, `postmyscript`). Scripts from dependencies can be run with `npm explore <pkg> -- npm run <stage>`.
 
 ### Pre & Post Scripts
 
@@ -122,10 +122,8 @@ npm will default some script values based on package contents.
 
 ### User
 
-If npm was invoked with root privileges, then it will change the uid
-to the user account or uid specified by the `user` config, which
-defaults to `nobody`.  Set the `unsafe-perm` flag to run scripts with
-root privileges.
+When npm is run as root, scripts are always run with the effective uid
+and gid of the working directory owner.
 
 ### Environment
 
diff --git a/deps/npm/docs/content/using-npm/workspaces.md b/deps/npm/docs/content/using-npm/workspaces.md
index 0379bd1549062e..2024627c758679 100644
--- a/deps/npm/docs/content/using-npm/workspaces.md
+++ b/deps/npm/docs/content/using-npm/workspaces.md
@@ -18,13 +18,13 @@ order to add references to packages that should be symlinked into the current
 
 We also refer to these packages being auto-symlinked during `npm install` as a
 single **workspace**, meaning it's a nested package within the current local
-file system that is explicitly defined in the [`package.json`](/using-npm/package-json)
+file system that is explicitly defined in the [`package.json`](/configuring-npm/package-json#workspaces)
 `workspaces` configuration.
 
 ### Installing workspaces
 
 Workspaces are usually defined via the `workspaces` property of the
-[`package.json`](/using-npm/package-json) file, e.g:
+[`package.json`](/configuring-npm/package-json#workspaces) file, e.g:
 
 ```json
 {
diff --git a/deps/npm/docs/output/commands/npm-audit.html b/deps/npm/docs/output/commands/npm-audit.html
index 4dd59417e82713..4482f6608999f2 100644
--- a/deps/npm/docs/output/commands/npm-audit.html
+++ b/deps/npm/docs/output/commands/npm-audit.html
@@ -145,8 +145,8 @@ <h2 id="table-of-contents">Table of contents</h2>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
-<pre lang="bash"><code>npm audit [--json|--parseable|--audit-level=(low|moderate|high|critical)]
-npm audit fix [--force|--package-lock-only|--dry-run]
+<pre lang="bash"><code>npm audit [--json] [--production] [--audit-level=(low|moderate|high|critical)]
+npm audit fix [--force|--package-lock-only|--dry-run|--production|--only=(dev|prod)]
 
 common options: [--production] [--only=(dev|prod)]
 </code></pre>
diff --git a/deps/npm/docs/output/commands/npm-dist-tag.html b/deps/npm/docs/output/commands/npm-dist-tag.html
index 39d3310ecd9d65..41d39176fabd47 100644
--- a/deps/npm/docs/output/commands/npm-dist-tag.html
+++ b/deps/npm/docs/output/commands/npm-dist-tag.html
@@ -201,7 +201,8 @@ <h3 id="caveats">Caveats</h3>
 <p>This command used to be known as <code>npm tag</code>, which only created new tags,
 and so had a different syntax.</p>
 <p>Tags must share a namespace with version numbers, because they are
-specified in the same slot: <code>npm install &lt;pkg&gt;@&lt;version&gt;</code> vs <code>npm install &lt;pkg&gt;@&lt;tag&gt;</code>.</p>
+specified in the same slot: <code>npm install &lt;pkg&gt;@&lt;version&gt;</code> vs
+<code>npm install &lt;pkg&gt;@&lt;tag&gt;</code>.</p>
 <p>Tags that can be interpreted as valid semver ranges will be rejected. For
 example, <code>v1.4</code> cannot be used as a tag, because it is interpreted by
 semver as <code>&gt;=1.4.0 &lt;1.5.0</code>.  See <a href="https://github.com/npm/npm/issues/6082">https://github.com/npm/npm/issues/6082</a>.</p>
diff --git a/deps/npm/docs/output/commands/npm-exec.html b/deps/npm/docs/output/commands/npm-exec.html
index 6bd59f7a8ed674..ecee5f014341af 100644
--- a/deps/npm/docs/output/commands/npm-exec.html
+++ b/deps/npm/docs/output/commands/npm-exec.html
@@ -154,9 +154,11 @@ <h2 id="table-of-contents">Table of contents</h2>
 npx -p &lt;pkg&gt;[@&lt;specifier&gt;] &lt;cmd&gt; [args...]
 npx -c '&lt;cmd&gt; [args...]'
 npx -p &lt;pkg&gt;[@&lt;specifier&gt;] -c '&lt;cmd&gt; [args...]'
+Run without --call or positional args to open interactive subshell
 
 alias: npm x, npx
 
+common options:
 --package=&lt;pkg&gt; (may be specified multiple times)
 -p is a shorthand for --package only when using npx executable
 -c &lt;cmd&gt; --call=&lt;cmd&gt; (may not be mixed with positional arguments)
@@ -165,6 +167,10 @@ <h3 id="description">Description</h3>
 <p>This command allows you to run an arbitrary command from an npm package
 (either one installed locally, or fetched remotely), in a similar context
 as running it via <code>npm run</code>.</p>
+<p>Run without positional arguments or <code>--call</code>, this allows you to
+interactively run commands in the same sort of shell environment that
+<code>package.json</code> scripts are run.  Interactive mode is not supported in CI
+environments when standard input is a TTY, to prevent hangs.</p>
 <p>Whatever packages are specified by the <code>--package</code> option will be
 provided in the <code>PATH</code> of the executed command, along with any locally
 installed package executables.  The <code>--package</code> option may be
@@ -186,7 +192,8 @@ <h3 id="description">Description</h3>
 to the following heuristic:</p>
 <ul>
 <li>If the package has a single entry in its <code>bin</code> field in <code>package.json</code>,
-then that command will be used.</li>
+or if all entries are aliases of the same command, then that command
+will be used.</li>
 <li>If the package has multiple <code>bin</code> entries, and one of them matches the
 unscoped portion of the <code>name</code> field, then that command will be used.</li>
 <li>If this does not result in exactly one option (either because there are
diff --git a/deps/npm/docs/output/commands/npm-explain.html b/deps/npm/docs/output/commands/npm-explain.html
index 009332da9f2540..32fc0160255fa4 100644
--- a/deps/npm/docs/output/commands/npm-explain.html
+++ b/deps/npm/docs/output/commands/npm-explain.html
@@ -146,6 +146,8 @@ <h2 id="table-of-contents">Table of contents</h2>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
 <pre lang="bash"><code>npm explain &lt;folder | specifier&gt;
+
+alias: why
 </code></pre>
 <h3 id="description">Description</h3>
 <p>This command will print the chain of dependencies causing a given package
@@ -183,7 +185,7 @@ <h3 id="configuration">Configuration</h3>
 <h4 id="json">json</h4>
 <ul>
 <li>Default: false</li>
-<li>Type: Bolean</li>
+<li>Type: Boolean</li>
 </ul>
 <p>Show information in JSON format.</p>
 <h3 id="see-also">See Also</h3>
diff --git a/deps/npm/docs/output/commands/npm-link.html b/deps/npm/docs/output/commands/npm-link.html
index b9890bc459768c..6d26a109a3ebf2 100644
--- a/deps/npm/docs/output/commands/npm-link.html
+++ b/deps/npm/docs/output/commands/npm-link.html
@@ -141,7 +141,7 @@ <h1 id="npm-link">npm-link</h1>
 
 <section id="table_of_contents">
 <h2 id="table-of-contents">Table of contents</h2>
-<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#see-also">See Also</a></li></ul></div>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#caveat">Caveat</a></li><li><a href="#see-also">See Also</a></li></ul></div>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
@@ -151,30 +151,34 @@ <h2 id="table-of-contents">Table of contents</h2>
 alias: npm ln
 </code></pre>
 <h3 id="description">Description</h3>
+<p>This is handy for installing your own stuff, so that you can work on it and
+test iteratively without having to continually rebuild.</p>
 <p>Package linking is a two-step process.</p>
-<p>First, <code>npm link</code> in a package folder will create a symlink in the global folder
-<code>{prefix}/lib/node_modules/&lt;package&gt;</code> that links to the package where the <code>npm link</code> command was executed. It will also link any bins in the package to <code>{prefix}/bin/{name}</code>.
-Note that <code>npm link</code> uses the global prefix (see <code>npm prefix -g</code> for its value).</p>
+<p>First, <code>npm link</code> in a package folder will create a symlink in the global
+folder <code>{prefix}/lib/node_modules/&lt;package&gt;</code> that links to the package
+where the <code>npm link</code> command was executed. It will also link any bins in
+the package to <code>{prefix}/bin/{name}</code>.  Note that <code>npm link</code> uses the global
+prefix (see <code>npm prefix -g</code> for its value).</p>
 <p>Next, in some other location, <code>npm link package-name</code> will create a
-symbolic link from globally-installed <code>package-name</code> to <code>node_modules/</code>
-of the current folder.</p>
-<p>Note that <code>package-name</code> is taken from <code>package.json</code>,
-not from directory name.</p>
-<p>The package name can be optionally prefixed with a scope. See <a href="../using-npm/scope.html"><code>scope</code></a>.
-The scope must be preceded by an @-symbol and followed by a slash.</p>
+symbolic link from globally-installed <code>package-name</code> to <code>node_modules/</code> of
+the current folder.</p>
+<p>Note that <code>package-name</code> is taken from <code>package.json</code>, <em>not</em> from the
+directory name.</p>
+<p>The package name can be optionally prefixed with a scope. See
+<a href="../using-npm/scope.html"><code>scope</code></a>.  The scope must be preceded by an @-symbol and
+followed by a slash.</p>
 <p>When creating tarballs for <code>npm publish</code>, the linked packages are
-“snapshotted” to their current state by resolving the symbolic links.</p>
-<p>This is handy for installing your own stuff, so that you can work on it and
-test it iteratively without having to continually rebuild.</p>
+“snapshotted” to their current state by resolving the symbolic links, if
+they are included in <code>bundleDependencies</code>.</p>
 <p>For example:</p>
-<pre lang="bash"><code>    cd ~/projects/node-redis    # go into the package directory
-    npm link                    # creates global link
-    cd ~/projects/node-bloggy   # go into some other package directory.
-    npm link redis              # link-install the package
+<pre lang="bash"><code>cd ~/projects/node-redis    # go into the package directory
+npm link                    # creates global link
+cd ~/projects/node-bloggy   # go into some other package directory.
+npm link redis              # link-install the package
 </code></pre>
-<p>Now, any changes to ~/projects/node-redis will be reflected in
-~/projects/node-bloggy/node_modules/node-redis/. Note that the link should
-be to the package name, not the directory name for that package.</p>
+<p>Now, any changes to <code>~/projects/node-redis</code> will be reflected in
+<code>~/projects/node-bloggy/node_modules/node-redis/</code>. Note that the link
+should be to the package name, not the directory name for that package.</p>
 <p>You may also shortcut the two steps in one.  For example, to do the
 above use-case in a shorter way:</p>
 <pre lang="bash"><code>cd ~/projects/node-bloggy  # go into the dir of your main project
@@ -186,11 +190,25 @@ <h3 id="description">Description</h3>
 </code></pre>
 <p>That is, it first creates a global link, and then links the global
 installation target into your project’s <code>node_modules</code> folder.</p>
-<p>Note that in this case, you are referring to the directory name, <code>node-redis</code>,
-rather than the package name <code>redis</code>.</p>
-<p>If your linked package is scoped (see <a href="../using-npm/scope.html"><code>scope</code></a>) your link command must include that scope, e.g.</p>
+<p>Note that in this case, you are referring to the directory name,
+<code>node-redis</code>, rather than the package name <code>redis</code>.</p>
+<p>If your linked package is scoped (see <a href="../using-npm/scope.html"><code>scope</code></a>) your
+link command must include that scope, e.g.</p>
 <pre lang="bash"><code>npm link @myorg/privatepackage
 </code></pre>
+<h3 id="caveat">Caveat</h3>
+<p>Note that package dependencies linked in this way are <em>not</em> saved to
+<code>package.json</code> by default, on the assumption that the intention is to have
+a link stand in for a regular non-link dependency.  Otherwise, for example,
+if you depend on <code>redis@^3.0.1</code>, and ran <code>npm link redis</code>, it would replace
+the <code>^3.0.1</code> dependency with <code>file:../path/to/node-redis</code>, which you
+probably don’t want!  Additionally, other users or developers on your
+project would run into issues if they do not have their folders set up
+exactly the same as yours.</p>
+<p>If you are adding a <em>new</em> dependency as a link, you should add it to the
+relevant metadata by running <code>npm install &lt;dep&gt; --package-lock-only</code>.</p>
+<p>If you <em>want</em> to save the <code>file:</code> reference in your <code>package.json</code> and
+<code>package-lock.json</code> files, you can use <code>npm link &lt;dep&gt; --save</code> to do so.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
 <li><a href="../using-npm/developers.html">npm developers</a></li>
diff --git a/deps/npm/docs/output/commands/npm-logout.html b/deps/npm/docs/output/commands/npm-logout.html
index 31c6fcff06f428..02de412c7310e0 100644
--- a/deps/npm/docs/output/commands/npm-logout.html
+++ b/deps/npm/docs/output/commands/npm-logout.html
@@ -148,12 +148,12 @@ <h2 id="table-of-contents">Table of contents</h2>
 <pre lang="bash"><code>npm logout [--registry=&lt;url&gt;] [--scope=&lt;@scope&gt;]
 </code></pre>
 <h3 id="description">Description</h3>
-<p>When logged into a registry that supports token-based authentication, tell the
-server to end this token’s session. This will invalidate the token everywhere
-you’re using it, not just for the current environment.</p>
-<p>When logged into a legacy registry that uses username and password authentication, this will
-clear the credentials in your user configuration. In this case, it will <em>only</em> affect
-the current environment.</p>
+<p>When logged into a registry that supports token-based authentication, tell
+the server to end this token’s session. This will invalidate the token
+everywhere you’re using it, not just for the current environment.</p>
+<p>When logged into a legacy registry that uses username and password
+authentication, this will clear the credentials in your user configuration.
+In this case, it will <em>only</em> affect the current environment.</p>
 <p>If <code>--scope</code> is provided, this will find the credentials for the registry
 connected to that scope, if set.</p>
 <h3 id="configuration">Configuration</h3>
diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html
index 55722b8f1ce325..3963629acc90b9 100644
--- a/deps/npm/docs/output/commands/npm-ls.html
+++ b/deps/npm/docs/output/commands/npm-ls.html
@@ -141,7 +141,7 @@ <h1 id="npm-ls">npm-ls</h1>
 
 <section id="table_of_contents">
 <h2 id="table-of-contents">Table of contents</h2>
-<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#configuration">Configuration</a></li><ul><li><a href="#json">json</a></li><li><a href="#long">long</a></li><li><a href="#parseable">parseable</a></li><li><a href="#global">global</a></li><li><a href="#depth">depth</a></li><li><a href="#prod--production">prod / production</a></li><li><a href="#dev--development">dev / development</a></li><li><a href="#only">only</a></li><li><a href="#link">link</a></li><li><a href="#unicode">unicode</a></li></ul><li><a href="#see-also">See Also</a></li></ul></div>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#note-design-changes-pending">Note: Design Changes Pending</a></li><li><a href="#configuration">Configuration</a></li><ul><li><a href="#all">all</a></li><li><a href="#json">json</a></li><li><a href="#long">long</a></li><li><a href="#parseable">parseable</a></li><li><a href="#global">global</a></li><li><a href="#depth">depth</a></li><li><a href="#prod--production">prod / production</a></li><li><a href="#dev--development">dev / development</a></li><li><a href="#only">only</a></li><li><a href="#link">link</a></li><li><a href="#unicode">unicode</a></li></ul><li><a href="#see-also">See Also</a></li></ul></div>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
@@ -151,23 +151,55 @@ <h2 id="table-of-contents">Table of contents</h2>
 </code></pre>
 <h3 id="description">Description</h3>
 <p>This command will print to stdout all the versions of packages that are
-installed, as well as their dependencies, in a tree-structure.</p>
-<p>Positional arguments are <code>name@version-range</code> identifiers, which will
-limit 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>    npm@7.0.8 /path/to/npm
-    └─┬ init-package-json@0.0.4
-      └── promzard@0.1.5
+installed, as well as their dependencies when <code>--all</code> is specified, in a
+tree structure.</p>
+<p>Note: to get a “bottoms up” view of why a given package is included in the
+tree at all, use <a href="../commands/npm-explain.html"><code>npm explain</code></a>.</p>
+<p>Positional arguments are <code>name@version-range</code> identifiers, which will limit
+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>npm@7.1.2 /path/to/npm
+└─┬ init-package-json@0.0.4
+  └── promzard@0.1.5
 </code></pre>
 <p>It will print out extraneous, missing, and invalid packages.</p>
 <p>If a project specifies git urls for dependencies these are shown
 in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project.</p>
 <p>The tree shown is the logical dependency tree, based on package
-dependencies, not the physical layout of your node_modules folder.</p>
+dependencies, not the physical layout of your <code>node_modules</code> folder.</p>
 <p>When run as <code>ll</code> or <code>la</code>, it shows extended information by default.</p>
+<h3 id="note-design-changes-pending">Note: Design Changes Pending</h3>
+<p>The <code>npm ls</code> command’s output and behavior made a <em>ton</em> of sense when npm
+created a <code>node_modules</code> folder that naively nested every dependency.  In
+such a case, the logical dependency graph and physical tree of packages on
+disk would be roughly identical.</p>
+<p>With the advent of automatic install-time deduplication of dependencies in
+npm v3, the <code>ls</code> output was modified to display the logical dependency
+graph as a tree structure, since this was more useful to most users.
+However, without using <code>npm ls -l</code>, it became impossible show <em>where</em> a
+package was actually installed much of the time!</p>
+<p>With the advent of automatic installation of <code>peerDependencies</code> in npm v7,
+this gets even more curious, as <code>peerDependencies</code> are logically
+“underneath” their dependents in the dependency graph, but are always
+physically at or above their location on disk.</p>
+<p>Also, in the years since npm got an <code>ls</code> command (in version 0.0.2!),
+dependency graphs have gotten much larger as a general rule.  Therefor, in
+order to avoid dumping an excessive amount of content to the terminal, <code>npm ls</code> now only shows the <em>top</em> level dependencies, unless <code>--all</code> is
+provided.</p>
+<p>A thorough re-examination of the use cases, intention, behavior, and output
+of this command, is currently underway.  Expect significant changes to at
+least the default human-readable <code>npm ls</code> output in npm v8.</p>
 <h3 id="configuration">Configuration</h3>
+<h4 id="all">all</h4>
+<ul>
+<li>Default: <code>false</code></li>
+<li>Type: Boolean</li>
+</ul>
+<p>When running <code>npm outdated</code> and <code>npm ls</code>, setting <code>--all</code> will show all
+outdated or installed packages, rather than only those directly depended
+upon by the current project.</p>
 <h4 id="json">json</h4>
 <ul>
 <li>Default: false</li>
@@ -231,6 +263,7 @@ <h4 id="unicode">unicode</h4>
 Set it to false in order to use all-ansi output.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="../commands/npm-explain.html">npm explain</a></li>
 <li><a href="../commands/npm-config.html">npm config</a></li>
 <li><a href="../configuring-npm/npmrc.html">npmrc</a></li>
 <li><a href="../configuring-npm/folders.html">npm folders</a></li>
diff --git a/deps/npm/docs/output/commands/npm-org.html b/deps/npm/docs/output/commands/npm-org.html
index b607a0035d1d87..d97f638b22d0b8 100644
--- a/deps/npm/docs/output/commands/npm-org.html
+++ b/deps/npm/docs/output/commands/npm-org.html
@@ -169,11 +169,12 @@ <h3 id="example">Example</h3>
 <pre lang="bash"><code>$ npm org ls my-org @mx-santos
 </code></pre>
 <h3 id="description">Description</h3>
-<p>You can use the <code>npm org</code> commands to manage and view users of an organization.
-It supports adding and removing users, changing their roles, listing them, and
-finding specific ones and their roles.</p>
+<p>You can use the <code>npm org</code> commands to manage and view users of an
+organization.  It supports adding and removing users, changing their roles,
+listing them, and finding specific ones and their roles.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="../using-npm/orgs.html">using orgs</a></li>
 <li><a href="https://docs.npmjs.com/orgs/">Documentation on npm Orgs</a></li>
 </ul>
 </div>
diff --git a/deps/npm/docs/output/commands/npm-outdated.html b/deps/npm/docs/output/commands/npm-outdated.html
index eaffd7dd8ea282..dba4025b3ccc12 100644
--- a/deps/npm/docs/output/commands/npm-outdated.html
+++ b/deps/npm/docs/output/commands/npm-outdated.html
@@ -150,25 +150,33 @@ <h2 id="table-of-contents">Table of contents</h2>
 <h3 id="description">Description</h3>
 <p>This command will check the registry to see if any (or, specific) installed
 packages are currently outdated.</p>
+<p>By default, only the direct dependencies of the root project are shown.
+Use <code>--all</code> to find all outdated meta-dependencies as well.</p>
 <p>In the output:</p>
 <ul>
 <li><code>wanted</code> is the maximum version of the package that satisfies the semver
-range specified in <code>package.json</code>. If there’s no available semver range (i.e.
-you’re running <code>npm outdated --global</code>, or the package isn’t included in
-<code>package.json</code>), then <code>wanted</code> shows the currently-installed version.</li>
+range specified in <code>package.json</code>. If there’s no available semver range
+(i.e.  you’re running <code>npm outdated --global</code>, or the package isn’t
+included in <code>package.json</code>), then <code>wanted</code> shows the currently-installed
+version.</li>
 <li><code>latest</code> is the version of the package tagged as latest in the registry.
-Running <code>npm publish</code> with no special configuration will publish the package
-with a dist-tag of <code>latest</code>. This may or may not be the maximum version of
-the package, or the most-recently published version of the package, depending
-on how the package’s developer manages the latest <a href="npm-dist-tag">dist-tag</a>.</li>
+Running <code>npm publish</code> with no special configuration will publish the
+package with a dist-tag of <code>latest</code>. This may or may not be the maximum
+version of the package, or the most-recently published version of the
+package, depending on how the package’s developer manages the latest
+<a href="../commands/npm-dist-tag.html">dist-tag</a>.</li>
 <li><code>location</code> is where in the physical tree the package is located.</li>
 <li><code>depended by</code> shows which package depends on the displayed dependency</li>
-<li><code>package type</code> (when using <code>--long</code> / <code>-l</code>) tells you whether this package is
-a <code>dependency</code> or a dev/peer/optional dependency. Packages not included in <code>package.json</code>
-are always marked <code>dependencies</code>.</li>
-<li><code>homepage</code> (when using <code>--long</code> / <code>-l</code>) is the <code>homepage</code> value contained in the package’s packument</li>
-<li>Red means there’s a newer version matching your semver requirements, so you should update now.</li>
-<li>Yellow indicates that there’s a newer version above your semver requirements (usually new major, or new 0.x minor) so proceed with caution.</li>
+<li><code>package type</code> (when using <code>--long</code> / <code>-l</code>) tells you whether this
+package is a <code>dependency</code> or a dev/peer/optional dependency. Packages not
+included in <code>package.json</code> are always marked <code>dependencies</code>.</li>
+<li><code>homepage</code> (when using <code>--long</code> / <code>-l</code>) is the <code>homepage</code> value contained
+in the package’s packument</li>
+<li>Red means there’s a newer version matching your semver requirements, so
+you should update now.</li>
+<li>Yellow indicates that there’s a newer version <em>above</em> your semver
+requirements (usually new major, or new 0.x minor) so proceed with
+caution.</li>
 </ul>
 <h3 id="an-example">An example</h3>
 <pre lang="bash"><code>$ npm outdated
@@ -189,19 +197,20 @@ <h3 id="an-example">An example</h3>
 </code></pre>
 <p>A few things to note:</p>
 <ul>
-<li><code>glob</code> requires <code>^5</code>, which prevents npm from installing <code>glob@6</code>, which is
-outside the semver range.</li>
-<li>Git dependencies will always be reinstalled, because of how they’re specified.
-The installed committish might satisfy the dependency specifier (if it’s
-something immutable, like a commit SHA), or it might not, so <code>npm outdated</code> and
-<code>npm update</code> have to fetch Git repos to check. This is why currently doing a
-reinstall of a Git dependency always forces a new clone and install.</li>
-<li><code>npm@3.5.2</code> is marked as “wanted”, but “latest” is <code>npm@3.5.1</code> because npm
-uses dist-tags to manage its <code>latest</code> and <code>next</code> release channels. <code>npm update</code>
-will install the <em>newest</em> version, but <code>npm install npm</code> (with no semver range)
-will install whatever’s tagged as <code>latest</code>.</li>
-<li><code>once</code> is just plain out of date. Reinstalling <code>node_modules</code> from scratch or
-running <code>npm update</code> will bring it up to spec.</li>
+<li><code>glob</code> requires <code>^5</code>, which prevents npm from installing <code>glob@6</code>, which
+is outside the semver range.</li>
+<li>Git dependencies will always be reinstalled, because of how they’re
+specified.  The installed committish might satisfy the dependency
+specifier (if it’s something immutable, like a commit SHA), or it might
+not, so <code>npm outdated</code> and <code>npm update</code> have to fetch Git repos to check.
+This is why currently doing a reinstall of a Git dependency always forces
+a new clone and install.</li>
+<li><code>npm@3.5.2</code> is marked as “wanted”, but “latest” is <code>npm@3.5.1</code> because
+npm uses dist-tags to manage its <code>latest</code> and <code>next</code> release channels.
+<code>npm update</code> will install the <em>newest</em> version, but <code>npm install npm</code>
+(with no semver range) will install whatever’s tagged as <code>latest</code>.</li>
+<li><code>once</code> is just plain out of date. Reinstalling <code>node_modules</code> from
+scratch or running <code>npm update</code> will bring it up to spec.</li>
 </ul>
 <h3 id="configuration">Configuration</h3>
 <h4 id="json">json</h4>
diff --git a/deps/npm/docs/output/commands/npm-owner.html b/deps/npm/docs/output/commands/npm-owner.html
index 3b3e24029d1bc6..625d3be234be80 100644
--- a/deps/npm/docs/output/commands/npm-owner.html
+++ b/deps/npm/docs/output/commands/npm-owner.html
@@ -154,24 +154,22 @@ <h2 id="table-of-contents">Table of contents</h2>
 <h3 id="description">Description</h3>
 <p>Manage ownership of published packages.</p>
 <ul>
-<li>ls:
-List all the users who have access to modify a package and push new versions.
-Handy when you need to know who to bug for help.</li>
-<li>add:
-Add a new user as a maintainer of a package.  This user is enabled to modify
-metadata, publish new versions, and add other owners.</li>
-<li>rm:
-Remove a user from the package owner list.  This immediately revokes their
-privileges.</li>
+<li>ls: List all the users who have access to modify a package and push new
+versions.  Handy when you need to know who to bug for help.</li>
+<li>add: Add a new user as a maintainer of a package.  This user is enabled
+to modify metadata, publish new versions, and add other owners.</li>
+<li>rm: Remove a user from the package owner list.  This immediately revokes
+their privileges.</li>
 </ul>
 <p>Note that there is only one level of access.  Either you can modify a package,
 or you can’t.  Future versions may contain more fine-grained access levels, but
 that is not implemented at this time.</p>
-<p>If you have two-factor authentication enabled with <code>auth-and-writes</code> then
-you’ll need to include an otp on the command line when changing ownership
-with <code>--otp</code>.</p>
+<p>If you have two-factor authentication enabled with <code>auth-and-writes</code> (see
+<a href="../commands/npm-profile.html"><code>npm-profile</code></a>) then you’ll need to include an otp
+on the command line when changing ownership with <code>--otp</code>.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="../commands/npm-profile.html">npm profile</a></li>
 <li><a href="../commands/npm-publish.html">npm publish</a></li>
 <li><a href="../using-npm/registry.html">npm registry</a></li>
 <li><a href="../commands/npm-adduser.html">npm adduser</a></li>
diff --git a/deps/npm/docs/output/commands/npm-pack.html b/deps/npm/docs/output/commands/npm-pack.html
index cc274c10ac1c77..5c1d8f8df01d58 100644
--- a/deps/npm/docs/output/commands/npm-pack.html
+++ b/deps/npm/docs/output/commands/npm-pack.html
@@ -149,17 +149,19 @@ <h2 id="table-of-contents">Table of contents</h2>
 </code></pre>
 <h3 id="description">Description</h3>
 <p>For anything that’s installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, name, or scoped name), this
-command will fetch it to the cache, and then copy the tarball to the
-current working directory as <code>&lt;name&gt;-&lt;version&gt;.tgz</code>, and then write
-the filenames out to stdout.</p>
+tarball url, git url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, copy the tarball to the current working
+directory as <code>&lt;name&gt;-&lt;version&gt;.tgz</code>, and then write the filenames out to
+stdout.</p>
 <p>If the same package is specified multiple times, then the file will be
 overwritten the second time.</p>
 <p>If no arguments are supplied, then npm packs the current package folder.</p>
 <p>The <code>--dry-run</code> argument will do everything that pack usually does without
-actually packing anything. Reports on what would have gone into the tarball.</p>
+actually packing anything.  That is, it reports on what would have gone
+into the tarball, but nothing else.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="http://npm.im/npm-packlist">npm-packlist package</a></li>
 <li><a href="../commands/npm-cache.html">npm cache</a></li>
 <li><a href="../commands/npm-publish.html">npm publish</a></li>
 <li><a href="../commands/npm-config.html">npm config</a></li>
diff --git a/deps/npm/docs/output/commands/npm-ping.html b/deps/npm/docs/output/commands/npm-ping.html
index 64f207a3b3b939..e00fb30a01c351 100644
--- a/deps/npm/docs/output/commands/npm-ping.html
+++ b/deps/npm/docs/output/commands/npm-ping.html
@@ -157,6 +157,7 @@ <h3 id="description">Description</h3>
 </code></pre>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="../commands/npm-doctor.html">npm doctor</a></li>
 <li><a href="../commands/npm-config.html">npm config</a></li>
 <li><a href="../configuring-npm/npmrc.html">npmrc</a></li>
 </ul>
diff --git a/deps/npm/docs/output/commands/npm-profile.html b/deps/npm/docs/output/commands/npm-profile.html
index 369cbd67d69813..91013567a206e1 100644
--- a/deps/npm/docs/output/commands/npm-profile.html
+++ b/deps/npm/docs/output/commands/npm-profile.html
@@ -152,12 +152,12 @@ <h2 id="table-of-contents">Table of contents</h2>
 npm profile disable-2fa
 </code></pre>
 <h3 id="description">Description</h3>
-<p>Change your profile information on the registry.  This not be available if
-you’re using a non-npmjs registry.</p>
+<p>Change your profile information on the registry.  Note that this command
+depends on the registry implementation, so third-party registries may not
+support this interface.</p>
 <ul>
-<li><code>npm profile get [&lt;property&gt;]</code>:
-Display all of the properties of your profile, or one or more specific
-properties.  It looks like:</li>
+<li><code>npm profile get [&lt;property&gt;]</code>: Display all of the properties of your
+profile, or one or more specific properties.  It looks like:</li>
 </ul>
 <pre lang="bash"><code>+-----------------+---------------------------+
 | name            | example                   |
@@ -183,31 +183,30 @@ <h3 id="description">Description</h3>
 </code></pre>
 <ul>
 <li>
-<p><code>npm profile set &lt;property&gt; &lt;value&gt;</code>:
-Set the value of a profile property. You can set the following properties this way:
-email, fullname, homepage, freenode, twitter, github</p>
+<p><code>npm profile set &lt;property&gt; &lt;value&gt;</code>: Set the value of a profile
+property. You can set the following properties this way: email, fullname,
+homepage, freenode, twitter, github</p>
 </li>
 <li>
-<p><code>npm profile set password</code>:
-Change your password.  This is interactive, you’ll be prompted for your
-current password and a new password.  You’ll also be prompted for an OTP
-if you have two-factor authentication enabled.</p>
+<p><code>npm profile set password</code>: Change your password.  This is interactive,
+you’ll be prompted for your current password and a new password.  You’ll
+also be prompted for an OTP if you have two-factor authentication
+enabled.</p>
 </li>
 <li>
-<p><code>npm profile enable-2fa [auth-and-writes|auth-only]</code>:
-Enables two-factor authentication. Defaults to <code>auth-and-writes</code> mode. Modes are:</p>
+<p><code>npm profile enable-2fa [auth-and-writes|auth-only]</code>: Enables two-factor
+authentication. Defaults to <code>auth-and-writes</code> mode. Modes are:</p>
 <ul>
 <li><code>auth-only</code>: Require an OTP when logging in or making changes to your
 account’s authentication.  The OTP will be required on both the website
 and the command line.</li>
-<li><code>auth-and-writes</code>: Requires an OTP at all the times <code>auth-only</code> does, and also requires one when
-publishing a module, setting the <code>latest</code> dist-tag, or changing access
-via <code>npm access</code> and <code>npm owner</code>.</li>
+<li><code>auth-and-writes</code>: Requires an OTP at all the times <code>auth-only</code> does,
+and also requires one when publishing a module, setting the <code>latest</code>
+dist-tag, or changing access via <code>npm access</code> and <code>npm owner</code>.</li>
 </ul>
 </li>
 <li>
-<p><code>npm profile disable-2fa</code>:
-Disables two-factor authentication.</p>
+<p><code>npm profile disable-2fa</code>: Disables two-factor authentication.</p>
 </li>
 </ul>
 <h3 id="details">Details</h3>
@@ -216,6 +215,8 @@ <h3 id="details">Details</h3>
 available on non npmjs.com registries.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="../commands/npm-adduser.html">npm adduser</a></li>
+<li><a href="../commands/npm-logout.html">npm logout</a></li>
 <li><a href="../commands/npm-config.html">npm config</a></li>
 </ul>
 </div>
diff --git a/deps/npm/docs/output/commands/npm-prune.html b/deps/npm/docs/output/commands/npm-prune.html
index 4520cfbf7ad2f8..d18755110a1b4a 100644
--- a/deps/npm/docs/output/commands/npm-prune.html
+++ b/deps/npm/docs/output/commands/npm-prune.html
@@ -148,23 +148,21 @@ <h2 id="table-of-contents">Table of contents</h2>
 <pre lang="bash"><code>npm prune [[&lt;@scope&gt;/]&lt;pkg&gt;...] [--production] [--dry-run] [--json]
 </code></pre>
 <h3 id="description">Description</h3>
-<p>This command removes “extraneous” packages.  If a package name is
-provided, then only packages matching one of the supplied names are
-removed.</p>
-<p>Extraneous packages are packages that are not listed on the parent
-package’s dependencies list.</p>
+<p>This command removes “extraneous” packages.  If a package name is provided,
+then only packages matching one of the supplied names are removed.</p>
+<p>Extraneous packages are those present in the <code>node_modules</code> folder that are
+not listed as any package’s dependency list.</p>
 <p>If the <code>--production</code> flag is specified or the <code>NODE_ENV</code> environment
 variable is set to <code>production</code>, this command will remove the packages
-specified in your <code>devDependencies</code>. Setting <code>--no-production</code> will
-negate <code>NODE_ENV</code> being set to <code>production</code>.</p>
+specified in your <code>devDependencies</code>. Setting <code>--no-production</code> will negate
+<code>NODE_ENV</code> being set to <code>production</code>.</p>
 <p>If the <code>--dry-run</code> flag is used then no changes will actually be made.</p>
-<p>If the <code>--json</code> flag is used then the changes <code>npm prune</code> made (or would
+<p>If the <code>--json</code> flag is used, then the changes <code>npm prune</code> made (or would
 have made with <code>--dry-run</code>) are printed as a JSON object.</p>
-<p>In normal operation with package-locks enabled, extraneous modules are
-pruned automatically when modules are installed and you’ll only need
-this command with the <code>--production</code> flag.</p>
-<p>If you’ve disabled package-locks then extraneous modules will not be removed
-and it’s up to you to run <code>npm prune</code> from time-to-time to remove them.</p>
+<p>In normal operation, extraneous modules are pruned automatically, so you’ll
+only need this command with the <code>--production</code> flag.  However, in the real
+world, operation is not always “normal”.  When crashes or mistakes happen,
+this command can help clean up any resulting garbage.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
 <li><a href="../commands/npm-uninstall.html">npm uninstall</a></li>
diff --git a/deps/npm/docs/output/commands/npm-publish.html b/deps/npm/docs/output/commands/npm-publish.html
index 65107608ba0618..fc9136d356b481 100644
--- a/deps/npm/docs/output/commands/npm-publish.html
+++ b/deps/npm/docs/output/commands/npm-publish.html
@@ -141,7 +141,7 @@ <h1 id="npm-publish">npm-publish</h1>
 
 <section id="table_of_contents">
 <h2 id="table-of-contents">Table of contents</h2>
-<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#see-also">See Also</a></li></ul></div>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#files-included-in-package">Files included in package</a></li><li><a href="#see-also">See Also</a></li></ul></div>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
@@ -151,61 +151,95 @@ <h2 id="table-of-contents">Table of contents</h2>
 Sets tag 'latest' if no --tag specified
 </code></pre>
 <h3 id="description">Description</h3>
-<p>Publishes a package to the registry so that it can be installed by name. All
-files in the package directory are included if no local <code>.gitignore</code> or
-<code>.npmignore</code> file exists. If both files exist and a file is ignored by
-<code>.gitignore</code> but not by <code>.npmignore</code> then it will be included.  See
-<a href="../using-npm/developers.html"><code>developers</code></a> for full details on what’s included in the published package, as well as details on how the package is built.</p>
-<p>By default npm will publish to the public registry. This can be overridden by
-specifying a different default registry or using a <a href="../using-npm/scope.html"><code>scope</code></a> in the name (see <a href="../configuring-npm/package-json.html"><code>package.json</code></a>).</p>
+<p>Publishes a package to the registry so that it can be installed by name.</p>
+<p>By default npm will publish to the public registry. This can be overridden
+by specifying a different default registry or using a
+<a href="../using-npm/scope.html"><code>scope</code></a> in the name (see
+<a href="../configuring-npm/package-json.html"><code>package.json</code></a>).</p>
 <ul>
 <li>
-<p><code>&lt;folder&gt;</code>:
-A folder containing a package.json file</p>
+<p><code>&lt;folder&gt;</code>: A folder containing a package.json file</p>
 </li>
 <li>
-<p><code>&lt;tarball&gt;</code>:
-A url or file path to a gzipped tar archive containing a single folder
-with a package.json file inside.</p>
+<p><code>&lt;tarball&gt;</code>: A url or file path to a gzipped tar archive containing a
+single folder with a package.json file inside.</p>
 </li>
 <li>
-<p><code>[--tag &lt;tag&gt;]</code>
-Registers the published package with the given tag, such that
-<code>npm install &lt;name&gt;@&lt;tag&gt;</code> will install this version.  By default,
+<p><code>[--tag &lt;tag&gt;]</code>: Registers the published package with the given tag, such
+that <code>npm install &lt;name&gt;@&lt;tag&gt;</code> will install this version.  By default,
 <code>npm publish</code> updates and <code>npm install</code> installs the <code>latest</code> tag. See
 <a href="npm-dist-tag"><code>npm-dist-tag</code></a> for details about tags.</p>
 </li>
 <li>
-<p><code>[--access &lt;public|restricted&gt;]</code>
-Tells the registry whether this package should be published as public or
-restricted. Only applies to scoped packages, which default to <code>restricted</code>.
-If you don’t have a paid account, you must publish with <code>--access public</code>
-to publish scoped packages.</p>
+<p><code>[--access &lt;public|restricted&gt;]</code>: Tells the registry whether this package
+should be published as public or restricted. Only applies to scoped
+packages, which default to <code>restricted</code>.  If you don’t have a paid
+account, you must publish with <code>--access public</code> to publish scoped
+packages.</p>
 </li>
 <li>
-<p><code>[--otp &lt;otpcode&gt;]</code>
-If you have two-factor authentication enabled in <code>auth-and-writes</code> mode
-then you can provide a code from your authenticator with this. If you
-don’t include this and you’re running from a TTY then you’ll be prompted.</p>
+<p><code>[--otp &lt;otpcode&gt;]</code>: If you have two-factor authentication enabled in
+<code>auth-and-writes</code> mode then you can provide a code from your
+authenticator with this. If you don’t include this and you’re running
+from a TTY then you’ll be prompted.</p>
 </li>
 <li>
-<p><code>[--dry-run]</code>
-As of <code>npm@6</code>, does everything publish would do except actually publishing
-to the registry. Reports the details of what would have been published.</p>
+<p><code>[--dry-run]</code>: As of <code>npm@6</code>, does everything publish would do except
+actually publishing to the registry. Reports the details of what would
+have been published.</p>
 </li>
 </ul>
-<p>Fails if the package name and version combination already exists in
-the specified registry.</p>
-<p>Once a package is published with a given name and version, that
-specific name and version combination can never be used again, even if
-it is removed with <a href="../commands/npm-unpublish.html"><code>npm unpublish</code></a>.</p>
+<p>The publish will fail if the package name and version combination already
+exists in the specified registry.</p>
+<p>Once a package is published with a given name and version, that specific
+name and version combination can never be used again, even if it is removed
+with <a href="../commands/npm-unpublish.html"><code>npm unpublish</code></a>.</p>
 <p>As of <code>npm@5</code>, both a sha1sum and an integrity field with a sha512sum of the
 tarball will be submitted to the registry during publication. Subsequent
 installs will use the strongest supported algorithm to verify downloads.</p>
-<p>Similar to <code>--dry-run</code> see <a href="../commands/npm-pack.html"><code>npm pack</code></a>, which figures out the files to be
-included and packs them into a tarball to be uploaded to the registry.</p>
+<p>Similar to <code>--dry-run</code> see <a href="../commands/npm-pack.html"><code>npm pack</code></a>, which figures
+out the files to be included and packs them into a tarball to be uploaded
+to the registry.</p>
+<h3 id="files-included-in-package">Files included in package</h3>
+<p>To see what will be included in your package, run <code>npx npm-packlist</code>.  All
+files are included by default, with the following exceptions:</p>
+<ul>
+<li>
+<p>Certain files that are relevant to package installation and distribution
+are always included.  For example, <code>package.json</code>, <code>README.md</code>,
+<code>LICENSE</code>, and so on.</p>
+</li>
+<li>
+<p>If there is a “files” list in
+<a href="../configuring-npm/package-json.html"><code>package.json</code></a>, then only the files
+specified will be included.  (If directories are specified, then they
+will be walked recursively and their contents included, subject to the
+same ignore rules.)</p>
+</li>
+<li>
+<p>If there is a <code>.gitignore</code> or <code>.npmignore</code> file, then ignored files in
+that and all child directories will be excluded from the package.  If
+<em>both</em> files exist, then the <code>.gitignore</code> is ignored, and only the
+<code>.npmignore</code> is used.</p>
+<p><code>.npmignore</code> files follow the <a href="https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#_ignoring">same pattern
+rules</a>
+as <code>.gitignore</code> files</p>
+</li>
+<li>
+<p>If the file matches certain patterns, then it will <em>never</em> be included,
+unless explicitly added to the <code>"files"</code> list in <code>package.json</code>, or
+un-ignored with a <code>!</code> rule in a <code>.npmignore</code> or <code>.gitignore</code> file.</p>
+</li>
+<li>
+<p>Symbolic links are never included in npm packages.</p>
+</li>
+</ul>
+<p>See <a href="../using-npm/developers.html"><code>developers</code></a> for full details on what’s
+included in the published package, as well as details on how the package is
+built.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="http://npm.im/npm-packlist">npm-packlist package</a></li>
 <li><a href="../using-npm/registry.html">npm registry</a></li>
 <li><a href="../using-npm/scope.html">npm scope</a></li>
 <li><a href="../commands/npm-adduser.html">npm adduser</a></li>
diff --git a/deps/npm/docs/output/commands/npm-rebuild.html b/deps/npm/docs/output/commands/npm-rebuild.html
index c33e01e0ae5ff6..e8a329ece8fbca 100644
--- a/deps/npm/docs/output/commands/npm-rebuild.html
+++ b/deps/npm/docs/output/commands/npm-rebuild.html
@@ -145,15 +145,21 @@ <h2 id="table-of-contents">Table of contents</h2>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
-<pre lang="bash"><code>npm rebuild [[&lt;@scope&gt;/&lt;name&gt;]...]
+<pre lang="bash"><code>npm rebuild [[&lt;@scope&gt;/]&lt;name&gt;[@&lt;version&gt;] ...]
 
-alias: npm rb
+alias: rb
 </code></pre>
 <h3 id="description">Description</h3>
-<p>This command runs the <code>npm build</code> command on the matched folders.  This is useful when you install a new version of node, and must recompile all your C++ addons with the new binary.</p>
+<p>This command runs the <code>npm build</code> command on the matched folders.  This is
+useful when you install a new version of node, and must recompile all your
+C++ addons with the new binary.  It is also useful when installing with
+<code>--ignore-scripts</code> and <code>--no-bin-links</code>, to explicitly choose which
+packages to build and/or link bins.</p>
+<p>If one or more package names (and optionally version ranges) are provided,
+then only packages with a name and version matching one of the specifiers
+will be rebuilt.</p>
 <h3 id="see-also">See Also</h3>
 <ul>
-<li><a href="../commands/npm-build.html">npm build</a></li>
 <li><a href="../commands/npm-install.html">npm install</a></li>
 </ul>
 </div>
diff --git a/deps/npm/docs/output/commands/npm-repo.html b/deps/npm/docs/output/commands/npm-repo.html
index c0403b4b492eae..969880491e74ae 100644
--- a/deps/npm/docs/output/commands/npm-repo.html
+++ b/deps/npm/docs/output/commands/npm-repo.html
@@ -149,9 +149,9 @@ <h2 id="table-of-contents">Table of contents</h2>
 </code></pre>
 <h3 id="description">Description</h3>
 <p>This command tries to guess at the likely location of a package’s
-repository URL, and then tries to open it using the <code>--browser</code>
-config param. If no package name is provided, it will search for
-a <code>package.json</code> in the current folder and use the <code>name</code> property.</p>
+repository URL, and then tries to open it using the <code>--browser</code> config
+param. If no package name is provided, it will search for a <code>package.json</code>
+in the current folder and use the <code>repository</code> property.</p>
 <h3 id="configuration">Configuration</h3>
 <h4 id="browser">browser</h4>
 <ul>
diff --git a/deps/npm/docs/output/commands/npm-restart.html b/deps/npm/docs/output/commands/npm-restart.html
index 44bb7cd04dac03..a6296b1fede86f 100644
--- a/deps/npm/docs/output/commands/npm-restart.html
+++ b/deps/npm/docs/output/commands/npm-restart.html
@@ -141,32 +141,33 @@ <h1 id="npm-restart">npm-restart</h1>
 
 <section id="table_of_contents">
 <h2 id="table-of-contents">Table of contents</h2>
-<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#note">Note</a></li><li><a href="#see-also">See Also</a></li></ul></div>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#see-also">See Also</a></li></ul></div>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
 <pre lang="bash"><code>npm restart [-- &lt;args&gt;]
 </code></pre>
 <h3 id="description">Description</h3>
-<p>This restarts a package.</p>
-<p>This runs a package’s “stop”, “restart”, and “start” scripts, and associated
-pre- and post- scripts, in the order given below:</p>
+<p>This restarts a project.  It is equivalent to running <code>npm run-script restart</code>.</p>
+<p>If the current project has a <code>"restart"</code> script specified in
+<code>package.json</code>, then the following scripts will be run:</p>
+<ol>
+<li>prerestart</li>
+<li>restart</li>
+<li>postrestart</li>
+</ol>
+<p>If it does <em>not</em> have a <code>"restart"</code> script specified, but it does have
+<code>stop</code> and/or <code>start</code> scripts, then the following scripts will be run:</p>
 <ol>
 <li>prerestart</li>
 <li>prestop</li>
 <li>stop</li>
 <li>poststop</li>
-<li>restart</li>
 <li>prestart</li>
 <li>start</li>
 <li>poststart</li>
 <li>postrestart</li>
 </ol>
-<h3 id="note">Note</h3>
-<p>Note that the “restart” script is run <strong>in addition to</strong> the “stop”
-and “start” scripts, not instead of them.</p>
-<p>This is the behavior as of <code>npm</code> major version 2.  A change in this
-behavior will be accompanied by an increase in major version number</p>
 <h3 id="see-also">See Also</h3>
 <ul>
 <li><a href="../commands/npm-run-script.html">npm run-script</a></li>
diff --git a/deps/npm/docs/output/commands/npm-root.html b/deps/npm/docs/output/commands/npm-root.html
index 0755eed56bd0a7..f333a53d5508ed 100644
--- a/deps/npm/docs/output/commands/npm-root.html
+++ b/deps/npm/docs/output/commands/npm-root.html
@@ -149,6 +149,12 @@ <h2 id="table-of-contents">Table of contents</h2>
 </code></pre>
 <h3 id="description">Description</h3>
 <p>Print the effective <code>node_modules</code> folder to standard out.</p>
+<p>Useful for using npm in shell scripts that do things with the
+<code>node_modules</code> folder.  For example:</p>
+<pre lang="bash"><code>#!/bin/bash
+global_node_modules="$(npm root --global)"
+echo "Global packages installed in: ${global_node_modules}"
+</code></pre>
 <h3 id="see-also">See Also</h3>
 <ul>
 <li><a href="../commands/npm-prefix.html">npm prefix</a></li>
diff --git a/deps/npm/docs/output/commands/npm-run-script.html b/deps/npm/docs/output/commands/npm-run-script.html
index c7d873673c1548..8f80a761d638c9 100644
--- a/deps/npm/docs/output/commands/npm-run-script.html
+++ b/deps/npm/docs/output/commands/npm-run-script.html
@@ -145,20 +145,20 @@ <h2 id="table-of-contents">Table of contents</h2>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
-<pre lang="bash"><code>npm run-script &lt;command&gt; [--silent] [-- &lt;args&gt;...]
+<pre lang="bash"><code>npm run-script &lt;command&gt; [--if-present] [--silent] [-- &lt;args&gt;]
 
-alias: npm run
+aliases: run, rum, urn
 </code></pre>
 <h3 id="description">Description</h3>
 <p>This runs an arbitrary command from a package’s <code>"scripts"</code> object.  If no
-<code>"command"</code> is provided, it will list the available scripts.  <code>run[-script]</code> is
-used by the test, start, restart, and stop commands, but can be called
-directly, as well. When the scripts in the package are printed out, they’re
-separated into lifecycle (test, start, restart) and directly-run scripts.</p>
-<p>As of <a href="https://blog.npmjs.org/post/98131109725/npm-2-0-0"><code>npm@2.0.0</code></a>, you can
-use custom arguments when executing scripts. The special option <code>--</code> is used by
-<a href="https://goo.gl/KxMmtG">getopt</a> to delimit the end of the options. npm will pass
-all the arguments after the <code>--</code> directly to your script:</p>
+<code>"command"</code> is provided, it will list the available scripts.</p>
+<p><code>run[-script]</code> is used by the test, start, restart, and stop commands, but
+can be called directly, as well. When the scripts in the package are
+printed out, they’re separated into lifecycle (test, start, restart) and
+directly-run scripts.</p>
+<p>Any positional arguments are passed to the specified script.  Use <code>--</code> to
+pass <code>-</code>-prefixed flags and options which would otherwise be parsed by npm.</p>
+<p>For example:</p>
 <pre lang="bash"><code>npm run test -- --grep="pattern"
 </code></pre>
 <p>The arguments will only be passed to the script specified after <code>npm run</code>
@@ -168,23 +168,21 @@ <h3 id="description">Description</h3>
 “env” command is defined in your package, it will take precedence over the
 built-in.</p>
 <p>In addition to the shell’s pre-existing <code>PATH</code>, <code>npm run</code> adds
-<code>node_modules/.bin</code> to the <code>PATH</code> provided to scripts. Any binaries provided by
-locally-installed dependencies can be used without the <code>node_modules/.bin</code>
-prefix. For example, if there is a <code>devDependency</code> on <code>tap</code> in your package,
-you should write:</p>
-<pre lang="bash"><code>"scripts": {"test": "tap test/\*.js"}
+<code>node_modules/.bin</code> to the <code>PATH</code> provided to scripts. Any binaries
+provided by locally-installed dependencies can be used without the
+<code>node_modules/.bin</code> prefix. For example, if there is a <code>devDependency</code> on
+<code>tap</code> in your package, you should write:</p>
+<pre lang="bash"><code>"scripts": {"test": "tap test/*.js"}
 </code></pre>
 <p>instead of</p>
-<pre lang="bash"><code>"scripts": {"test": "node_modules/.bin/tap test/\*.js"}
+<pre lang="bash"><code>"scripts": {"test": "node_modules/.bin/tap test/*.js"}
 </code></pre>
-<p>to run your tests.</p>
 <p>The actual shell your script is run within is platform dependent. By default,
 on Unix-like systems it is the <code>/bin/sh</code> command, on Windows it is the <code>cmd.exe</code>.
 The actual shell referred to by <code>/bin/sh</code> also depends on the system.
-As of <a href="https://github.com/npm/npm/releases/tag/v5.1.0"><code>npm@5.1.0</code></a> you can
-customize the shell with the <code>script-shell</code> configuration.</p>
-<p>Scripts are run from the root of the module, regardless of what your current
-working directory is when you call <code>npm run</code>. If you want your script to
+You can customize the shell with the <code>script-shell</code> configuration.</p>
+<p>Scripts are run from the root of the module, regardless of what the current
+working directory is when <code>npm run</code> is called. If you want your script to
 use different behavior based on what subdirectory you’re in, you can use the
 <code>INIT_CWD</code> environment variable, which holds the full path you were in when
 you ran <code>npm run</code>.</p>
diff --git a/deps/npm/docs/output/commands/npm-set-script.html b/deps/npm/docs/output/commands/npm-set-script.html
new file mode 100644
index 00000000000000..8594e62b6a17d4
--- /dev/null
+++ b/deps/npm/docs/output/commands/npm-set-script.html
@@ -0,0 +1,184 @@
+<html><head>
+<title>npm-set-script</title>
+<style>
+body {
+    background-color: #ffffff;
+    color: #24292e;
+
+    margin: 0;
+
+    line-height: 1.5;
+
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+}
+#rainbar {
+    height: 10px;
+    background-image: linear-gradient(139deg, #fb8817, #ff4b01, #c12127, #e02aff);
+}
+
+a {
+    text-decoration: none;
+    color: #0366d6;
+}
+a:hover {
+    text-decoration: underline;
+}
+
+pre {
+    margin: 1em 0px;
+    padding: 1em;
+    border: solid 1px #e1e4e8;
+    border-radius: 6px;
+
+    display: block;
+    overflow: auto;
+
+    white-space: pre;
+
+    background-color: #f6f8fa;
+    color: #393a34;
+}
+code {
+    font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    font-size: 85%;
+    padding: 0.2em 0.4em;
+    background-color: #f6f8fa;
+    color: #393a34;
+}
+pre > code {
+    padding: 0;
+    background-color: inherit;
+    color: inherit;
+}
+h1, h2, h3 {
+    font-weight: 600;
+}
+
+#logobar {
+    background-color: #333333;
+    margin: 0 auto;
+    padding: 1em 4em;
+}
+#logobar .logo {
+    float: left;
+}
+#logobar .title {
+    font-weight: 600;
+    color: #dddddd;
+    float: left;
+    margin: 5px 0 0 1em;
+}
+#logobar:after {
+    content: "";
+    display: block;
+    clear: both;
+}
+
+#content {
+    margin: 0 auto;
+    padding: 0 4em;
+}
+
+#table_of_contents > h2 {
+    font-size: 1.17em;
+}
+#table_of_contents ul:first-child {
+    border: solid 1px #e1e4e8;
+    border-radius: 6px;
+    padding: 1em;
+    background-color: #f6f8fa;
+    color: #393a34;
+}
+#table_of_contents ul {
+    list-style-type: none;
+    padding-left: 1.5em;
+}
+#table_of_contents li {
+    font-size: 0.9em;
+}
+#table_of_contents li a {
+    color: #000000;
+}
+
+header.title {
+    border-bottom: solid 1px #e1e4e8;
+}
+header.title > h1 {
+    margin-bottom: 0.25em;
+}
+header.title > .description {
+    display: block;
+    margin-bottom: 0.5em;
+    line-height: 1;
+}
+
+footer#edit {
+    border-top: solid 1px #e1e4e8;
+    margin: 3em 0 4em 0;
+    padding-top: 2em;
+}
+</style>
+</head>
+<body>
+<div id="banner">
+<div id="rainbar"></div>
+<div id="logobar">
+<svg class="logo" role="img" height="32" width="32" viewBox="0 0 700 700">
+<polygon fill="#cb0000" points="0,700 700,700 700,0 0,0"></polygon>
+<polygon fill="#ffffff" points="150,550 350,550 350,250 450,250 450,550 550,550 550,150 150,150"></polygon>
+</svg>
+<div class="title">
+npm command-line interface
+</div>
+</div>
+</div>
+
+<section id="content">
+<header class="title">
+<h1 id="npm-set-script">npm-set-script</h1>
+<span class="description">Set tasks in the scripts section of package.json</span>
+</header>
+
+<section id="table_of_contents">
+<h2 id="table-of-contents">Table of contents</h2>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#see-also">See Also</a></li></ul></div>
+</section>
+
+<div id="_content"><h3 id="synopsis">Synopsis</h3>
+<p>An npm command that lets you create a task in the scripts section of the package.json.</p>
+<pre lang="bash"><code>npm set-script [&lt;script&gt;] [&lt;command&gt;]
+</code></pre>
+<p><strong>Example:</strong></p>
+<ul>
+<li><code>npm set-script start "http-server ."</code></li>
+</ul>
+<pre lang="json"><code>{
+  "name": "my-project",
+  "scripts": {
+    "start": "http-server .",
+    "test": "some existing value"
+  }
+}
+</code></pre>
+<h3 id="see-also">See Also</h3>
+<ul>
+<li><a href="../commands/npm-run-script.html">npm run-script</a></li>
+<li><a href="../commands/npm-install.html">npm install</a></li>
+<li><a href="../commands/npm-test.html">npm test</a></li>
+<li><a href="../commands/npm-start.html">npm start</a></li>
+</ul>
+</div>
+
+<footer id="edit">
+<a href="https://github.com/npm/cli/edit/latest/docs/content/commands/npm-set-script.md">
+<svg role="img" viewBox="0 0 16 16" width="16" height="16" fill="currentcolor" style="vertical-align: text-bottom; margin-right: 0.3em;">
+<path fill-rule="evenodd" d="M11.013 1.427a1.75 1.75 0 012.474 0l1.086 1.086a1.75 1.75 0 010 2.474l-8.61 8.61c-.21.21-.47.364-.756.445l-3.251.93a.75.75 0 01-.927-.928l.929-3.25a1.75 1.75 0 01.445-.758l8.61-8.61zm1.414 1.06a.25.25 0 00-.354 0L10.811 3.75l1.439 1.44 1.263-1.263a.25.25 0 000-.354l-1.086-1.086zM11.189 6.25L9.75 4.81l-6.286 6.287a.25.25 0 00-.064.108l-.558 1.953 1.953-.558a.249.249 0 00.108-.064l6.286-6.286z"></path>
+</svg>
+Edit this page on GitHub
+</a>
+</footer>
+</section>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/deps/npm/docs/output/commands/npm-star.html b/deps/npm/docs/output/commands/npm-star.html
index b1f2f014f06ff8..1f92bc2697d437 100644
--- a/deps/npm/docs/output/commands/npm-star.html
+++ b/deps/npm/docs/output/commands/npm-star.html
@@ -141,20 +141,27 @@ <h1 id="npm-star">npm-star</h1>
 
 <section id="table_of_contents">
 <h2 id="table-of-contents">Table of contents</h2>
-<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#see-also">See Also</a></li></ul></div>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#more">More</a></li><ul><li><a href="#unstar">Unstar</a></li><li><a href="#listing-stars">Listing stars</a></li></ul><li><a href="#see-also">See Also</a></li></ul></div>
 </section>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
 <pre lang="bash"><code>npm star [&lt;pkg&gt;...]
-npm unstar [&lt;pkg&gt;...]
 </code></pre>
 <h3 id="description">Description</h3>
 <p>“Starring” a package means that you have some interest in it.  It’s
 a vaguely positive way to show that you care.</p>
+<p>It’s a boolean thing. Starring repeatedly has no additional effect.</p>
+<h3 id="more">More</h3>
+<p>There’s also these extra commands to help you manage your favorite packages:</p>
+<h4 id="unstar">Unstar</h4>
+<p>You can also “unstar” a package using <a href="../commands/npm-unstar.html"><code>npm unstar</code></a></p>
 <p>“Unstarring” is the same thing, but in reverse.</p>
-<p>It’s a boolean thing.  Starring repeatedly has no additional effect.</p>
+<h4 id="listing-stars">Listing stars</h4>
+<p>You can see all your starred packages using <a href="../commands/npm-stars.html"><code>npm stars</code></a></p>
 <h3 id="see-also">See Also</h3>
 <ul>
+<li><a href="../commands/npm-unstar.html">npm unstar</a></li>
+<li><a href="../commands/npm-stars.html">npm stars</a></li>
 <li><a href="../commands/npm-view.html">npm view</a></li>
 <li><a href="../commands/npm-whoami.html">npm whoami</a></li>
 <li><a href="../commands/npm-adduser.html">npm adduser</a></li>
diff --git a/deps/npm/docs/output/commands/npm-stars.html b/deps/npm/docs/output/commands/npm-stars.html
index 4c105fcfe39b09..fb80fc0cdee12f 100644
--- a/deps/npm/docs/output/commands/npm-stars.html
+++ b/deps/npm/docs/output/commands/npm-stars.html
@@ -155,6 +155,7 @@ <h3 id="description">Description</h3>
 <h3 id="see-also">See Also</h3>
 <ul>
 <li><a href="../commands/npm-star.html">npm star</a></li>
+<li><a href="../commands/npm-unstar.html">npm unstar</a></li>
 <li><a href="../commands/npm-view.html">npm view</a></li>
 <li><a href="../commands/npm-whoami.html">npm whoami</a></li>
 <li><a href="../commands/npm-adduser.html">npm adduser</a></li>
diff --git a/deps/npm/docs/output/commands/npm-unstar.html b/deps/npm/docs/output/commands/npm-unstar.html
new file mode 100644
index 00000000000000..77c7cd3495c4b1
--- /dev/null
+++ b/deps/npm/docs/output/commands/npm-unstar.html
@@ -0,0 +1,181 @@
+<html><head>
+<title>npm-unstar</title>
+<style>
+body {
+    background-color: #ffffff;
+    color: #24292e;
+
+    margin: 0;
+
+    line-height: 1.5;
+
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+}
+#rainbar {
+    height: 10px;
+    background-image: linear-gradient(139deg, #fb8817, #ff4b01, #c12127, #e02aff);
+}
+
+a {
+    text-decoration: none;
+    color: #0366d6;
+}
+a:hover {
+    text-decoration: underline;
+}
+
+pre {
+    margin: 1em 0px;
+    padding: 1em;
+    border: solid 1px #e1e4e8;
+    border-radius: 6px;
+
+    display: block;
+    overflow: auto;
+
+    white-space: pre;
+
+    background-color: #f6f8fa;
+    color: #393a34;
+}
+code {
+    font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    font-size: 85%;
+    padding: 0.2em 0.4em;
+    background-color: #f6f8fa;
+    color: #393a34;
+}
+pre > code {
+    padding: 0;
+    background-color: inherit;
+    color: inherit;
+}
+h1, h2, h3 {
+    font-weight: 600;
+}
+
+#logobar {
+    background-color: #333333;
+    margin: 0 auto;
+    padding: 1em 4em;
+}
+#logobar .logo {
+    float: left;
+}
+#logobar .title {
+    font-weight: 600;
+    color: #dddddd;
+    float: left;
+    margin: 5px 0 0 1em;
+}
+#logobar:after {
+    content: "";
+    display: block;
+    clear: both;
+}
+
+#content {
+    margin: 0 auto;
+    padding: 0 4em;
+}
+
+#table_of_contents > h2 {
+    font-size: 1.17em;
+}
+#table_of_contents ul:first-child {
+    border: solid 1px #e1e4e8;
+    border-radius: 6px;
+    padding: 1em;
+    background-color: #f6f8fa;
+    color: #393a34;
+}
+#table_of_contents ul {
+    list-style-type: none;
+    padding-left: 1.5em;
+}
+#table_of_contents li {
+    font-size: 0.9em;
+}
+#table_of_contents li a {
+    color: #000000;
+}
+
+header.title {
+    border-bottom: solid 1px #e1e4e8;
+}
+header.title > h1 {
+    margin-bottom: 0.25em;
+}
+header.title > .description {
+    display: block;
+    margin-bottom: 0.5em;
+    line-height: 1;
+}
+
+footer#edit {
+    border-top: solid 1px #e1e4e8;
+    margin: 3em 0 4em 0;
+    padding-top: 2em;
+}
+</style>
+</head>
+<body>
+<div id="banner">
+<div id="rainbar"></div>
+<div id="logobar">
+<svg class="logo" role="img" height="32" width="32" viewBox="0 0 700 700">
+<polygon fill="#cb0000" points="0,700 700,700 700,0 0,0"></polygon>
+<polygon fill="#ffffff" points="150,550 350,550 350,250 450,250 450,550 550,550 550,150 150,150"></polygon>
+</svg>
+<div class="title">
+npm command-line interface
+</div>
+</div>
+</div>
+
+<section id="content">
+<header class="title">
+<h1 id="npm-unstar">npm-unstar</h1>
+<span class="description">Remove an item from your favorite packages</span>
+</header>
+
+<section id="table_of_contents">
+<h2 id="table-of-contents">Table of contents</h2>
+<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#more">More</a></li><ul><li><a href="#star">Star</a></li><li><a href="#listing-stars">Listing stars</a></li></ul><li><a href="#see-also">See Also</a></li></ul></div>
+</section>
+
+<div id="_content"><h3 id="synopsis">Synopsis</h3>
+<pre lang="bash"><code>npm unstar [&lt;pkg&gt;...]
+</code></pre>
+<h3 id="description">Description</h3>
+<p>“Unstarring” a package is the opposite of <a href="../commands/npm-star.html"><code>npm star</code></a>,
+it removes an item from your list of favorite packages.</p>
+<h3 id="more">More</h3>
+<p>There’s also these extra commands to help you manage your favorite packages:</p>
+<h4 id="star">Star</h4>
+<p>You can “star” a package using <a href="../commands/npm-star.html"><code>npm star</code></a></p>
+<h4 id="listing-stars">Listing stars</h4>
+<p>You can see all your starred packages using <a href="../commands/npm-stars.html"><code>npm stars</code></a></p>
+<h3 id="see-also">See Also</h3>
+<ul>
+<li><a href="../commands/npm-star.html">npm star</a></li>
+<li><a href="../commands/npm-stars.html">npm stars</a></li>
+<li><a href="../commands/npm-view.html">npm view</a></li>
+<li><a href="../commands/npm-whoami.html">npm whoami</a></li>
+<li><a href="../commands/npm-adduser.html">npm adduser</a></li>
+</ul>
+</div>
+
+<footer id="edit">
+<a href="https://github.com/npm/cli/edit/latest/docs/content/commands/npm-unstar.md">
+<svg role="img" viewBox="0 0 16 16" width="16" height="16" fill="currentcolor" style="vertical-align: text-bottom; margin-right: 0.3em;">
+<path fill-rule="evenodd" d="M11.013 1.427a1.75 1.75 0 012.474 0l1.086 1.086a1.75 1.75 0 010 2.474l-8.61 8.61c-.21.21-.47.364-.756.445l-3.251.93a.75.75 0 01-.927-.928l.929-3.25a1.75 1.75 0 01.445-.758l8.61-8.61zm1.414 1.06a.25.25 0 00-.354 0L10.811 3.75l1.439 1.44 1.263-1.263a.25.25 0 000-.354l-1.086-1.086zM11.189 6.25L9.75 4.81l-6.286 6.287a.25.25 0 00-.064.108l-.558 1.953 1.953-.558a.249.249 0 00.108-.064l6.286-6.286z"></path>
+</svg>
+Edit this page on GitHub
+</a>
+</footer>
+</section>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
index e3f5ce28afc480..92ed591092a0a1 100644
--- a/deps/npm/docs/output/commands/npm.html
+++ b/deps/npm/docs/output/commands/npm.html
@@ -148,7 +148,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 <pre lang="bash"><code>npm &lt;command&gt; [args]
 </code></pre>
 <h3 id="version">Version</h3>
-<p>7.0.8</p>
+<p>7.1.2</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/commands/npx.html b/deps/npm/docs/output/commands/npx.html
index 61194a0aa31f12..36aad9f701fe8e 100644
--- a/deps/npm/docs/output/commands/npx.html
+++ b/deps/npm/docs/output/commands/npx.html
@@ -146,9 +146,9 @@ <h2 id="table-of-contents">Table of contents</h2>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
 <pre lang="bash"><code>npm exec -- &lt;pkg&gt;[@&lt;version&gt;] [args...]
-npm exec -p &lt;pkg&gt;[@&lt;version&gt;] -- &lt;cmd&gt; [args...]
+npm exec --package=&lt;pkg&gt;[@&lt;version&gt;] -- &lt;cmd&gt; [args...]
 npm exec -c '&lt;cmd&gt; [args...]'
-npm exec -p foo -c '&lt;cmd&gt; [args...]'
+npm exec --package=foo -c '&lt;cmd&gt; [args...]'
 
 npx &lt;pkg&gt;[@&lt;specifier&gt;] [args...]
 npx -p &lt;pkg&gt;[@&lt;specifier&gt;] &lt;cmd&gt; [args...]
@@ -157,16 +157,17 @@ <h2 id="table-of-contents">Table of contents</h2>
 
 alias: npm x, npx
 
--p &lt;pkg&gt; --package=&lt;pkg&gt; (may be specified multiple times)
+--package=&lt;pkg&gt; (may be specified multiple times)
+-p is a shorthand for --package only when using npx executable
 -c &lt;cmd&gt; --call=&lt;cmd&gt; (may not be mixed with positional arguments)
 </code></pre>
 <h3 id="description">Description</h3>
 <p>This command allows you to run an arbitrary command from an npm package
 (either one installed locally, or fetched remotely), in a similar context
 as running it via <code>npm run</code>.</p>
-<p>Whatever packages are specified by the <code>--package</code> or <code>-p</code> option will be
+<p>Whatever packages are specified by the <code>--package</code> option will be
 provided in the <code>PATH</code> of the executed command, along with any locally
-installed package executables.  The <code>--package</code> or <code>-p</code> option may be
+installed package executables.  The <code>--package</code> option may be
 specified multiple times, to execute the supplied command in an environment
 where all specified packages are available.</p>
 <p>If any requested packages are not present in the local project
@@ -179,13 +180,14 @@ <h3 id="description">Description</h3>
 only be considered a match if they have the exact same name and version as
 the local dependency.</p>
 <p>If no <code>-c</code> or <code>--call</code> option is provided, then the positional arguments
-are used to generate the command string.  If no <code>-p</code> or <code>--package</code> options
+are used to generate the command string.  If no <code>--package</code> options
 are provided, then npm will attempt to determine the executable name from
 the package specifier provided as the first positional argument according
 to the following heuristic:</p>
 <ul>
 <li>If the package has a single entry in its <code>bin</code> field in <code>package.json</code>,
-then that command will be used.</li>
+or if all entries are aliases of the same command, then that command
+will be used.</li>
 <li>If the package has multiple <code>bin</code> entries, and one of them matches the
 unscoped portion of the <code>name</code> field, then that command will be used.</li>
 <li>If this does not result in exactly one option (either because there are
diff --git a/deps/npm/docs/output/using-npm/config.html b/deps/npm/docs/output/using-npm/config.html
index 6298e2f7d61cb8..e3fbeaae8c89c7 100644
--- a/deps/npm/docs/output/using-npm/config.html
+++ b/deps/npm/docs/output/using-npm/config.html
@@ -500,7 +500,7 @@ <h4 id="fund">fund</h4>
 <li>Type: Boolean</li>
 </ul>
 <p>When “true” displays the message at the end of each <code>npm install</code>
-aknowledging the number of dependencies looking for funding.
+acknowledging the number of dependencies looking for funding.
 See <a href="../commands/npm-fund.html"><code>npm fund</code></a> for details.</p>
 <h4 id="fetch-retries">fetch-retries</h4>
 <ul>
@@ -1069,7 +1069,7 @@ <h4 id="send-metrics">send-metrics</h4>
 </ul>
 <p>If true, success/failure metrics will be reported to the registry stored in
 <code>metrics-registry</code>.  These requests contain the number of successful and
-failing runs of the npm CLI and the time period overwhich those counts were
+failing runs of the npm CLI and the time period over which those counts were
 gathered. No identifying information is included in these requests.</p>
 <h4 id="shell">shell</h4>
 <ul>
diff --git a/deps/npm/docs/output/using-npm/developers.html b/deps/npm/docs/output/using-npm/developers.html
index c0e7d4b95c558c..05545060cf9b22 100644
--- a/deps/npm/docs/output/using-npm/developers.html
+++ b/deps/npm/docs/output/using-npm/developers.html
@@ -176,69 +176,63 @@ <h3 id="what-is-a-package">What is a package</h3>
 git+https://user@hostname/project/blah.git#commit-ish
 </code></pre>
 <p>The <code>commit-ish</code> can be any tag, sha, or branch which can be supplied as
-an argument to <code>git checkout</code>.  The default is <code>master</code>.</p>
+an argument to <code>git checkout</code>.  The default is whatever the repository uses
+as its default branch.</p>
 <h3 id="the-packagejson-file">The package.json File</h3>
 <p>You need to have a <code>package.json</code> file in the root of your project to do
 much of anything with npm.  That is basically the whole interface.</p>
-<p>See <a href="../configuring-npm/package-json.html"><code>package.json</code></a> for details about what goes in that file.  At the very
-least, you need:</p>
+<p>See <a href="../configuring-npm/package-json.html"><code>package.json</code></a> for details about what
+goes in that file.  At the very least, you need:</p>
 <ul>
 <li>
-<p>name:
-This should be a string that identifies your project.  Please do not
-use the name to specify that it runs on node, or is in JavaScript.
-You can use the “engines” field to explicitly state the versions of
-node (or whatever else) that your program requires, and it’s pretty
-well assumed that it’s JavaScript.</p>
+<p>name: This should be a string that identifies your project.  Please do
+not use the name to specify that it runs on node, or is in JavaScript.
+You can use the “engines” field to explicitly state the versions of node
+(or whatever else) that your program requires, and it’s pretty well
+assumed that it’s JavaScript.</p>
 <p>It does not necessarily need to match your github repository name.</p>
 <p>So, <code>node-foo</code> and <code>bar-js</code> are bad names.  <code>foo</code> or <code>bar</code> are better.</p>
 </li>
 <li>
-<p>version:
-A semver-compatible version.</p>
+<p>version: A semver-compatible version.</p>
 </li>
 <li>
-<p>engines:
-Specify the versions of node (or whatever else) that your program
-runs on.  The node API changes a lot, and there may be bugs or new
-functionality that you depend on.  Be explicit.</p>
+<p>engines: Specify the versions of node (or whatever else) that your
+program runs on.  The node API changes a lot, and there may be bugs or
+new functionality that you depend on.  Be explicit.</p>
 </li>
 <li>
-<p>author:
-Take some credit.</p>
+<p>author: Take some credit.</p>
 </li>
 <li>
-<p>scripts:
-If you have a special compilation or installation script, then you
-should put it in the <code>scripts</code> object.  You should definitely have at
-least a basic smoke-test command as the “scripts.test” field.
-See <a href="../using-npm/scripts.html">scripts</a>.</p>
+<p>scripts: If you have a special compilation or installation script, then
+you should put it in the <code>scripts</code> object.  You should definitely have at
+least a basic smoke-test command as the “scripts.test” field.  See
+<a href="../using-npm/scripts.html">scripts</a>.</p>
 </li>
 <li>
-<p>main:
-If you have a single module that serves as the entry point to your
-program (like what the “foo” package gives you at require(“foo”)),
-then you need to specify that in the “main” field.</p>
+<p>main: If you have a single module that serves as the entry point to your
+program (like what the “foo” package gives you at require(“foo”)), then
+you need to specify that in the “main” field.</p>
 </li>
 <li>
-<p>directories:
-This is an object mapping names to folders.  The best ones to include are
-“lib” and “doc”, but if you use “man” to specify a folder full of man pages,
-they’ll get installed just like these ones.</p>
+<p>directories: This is an object mapping names to folders.  The best ones
+to include are “lib” and “doc”, but if you use “man” to specify a folder
+full of man pages, they’ll get installed just like these ones.</p>
 </li>
 </ul>
 <p>You can use <code>npm init</code> in the root of your package in order to get you
-started with a pretty basic package.json file.  See
-<a href="../commands/npm-init.html"><code>npm init</code></a> for more info.</p>
+started with a pretty basic package.json file.  See <a href="../commands/npm-init.html"><code>npm init</code></a> for more info.</p>
 <h3 id="keeping-files-out-of-your-package">Keeping files <em>out</em> of your package</h3>
-<p>Use a <code>.npmignore</code> file to keep stuff out of your package.  If there’s
-no <code>.npmignore</code> file, but there <em>is</em> a <code>.gitignore</code> file, then npm will
-ignore the stuff matched by the <code>.gitignore</code> file.  If you <em>want</em> to
-include something that is excluded by your <code>.gitignore</code> file, you can
-create an empty <code>.npmignore</code> file to override it. Like <code>git</code>, <code>npm</code> looks
-for <code>.npmignore</code> and <code>.gitignore</code> files in all subdirectories of your
-package, not only the root directory.</p>
-<p><code>.npmignore</code> files follow the <a href="https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files">same pattern rules</a>
+<p>Use a <code>.npmignore</code> file to keep stuff out of your package.  If there’s no
+<code>.npmignore</code> file, but there <em>is</em> a <code>.gitignore</code> file, then npm will ignore
+the stuff matched by the <code>.gitignore</code> file.  If you <em>want</em> to include
+something that is excluded by your <code>.gitignore</code> file, you can create an
+empty <code>.npmignore</code> file to override it. Like <code>git</code>, <code>npm</code> looks for
+<code>.npmignore</code> and <code>.gitignore</code> files in all subdirectories of your package,
+not only the root directory.</p>
+<p><code>.npmignore</code> files follow the <a href="https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#_ignoring">same pattern
+rules</a>
 as <code>.gitignore</code> files:</p>
 <ul>
 <li>Blank lines or lines starting with <code>#</code> are ignored.</li>
diff --git a/deps/npm/docs/output/using-npm/scripts.html b/deps/npm/docs/output/using-npm/scripts.html
index dc9d952142dfd9..91814fb58fba5b 100644
--- a/deps/npm/docs/output/using-npm/scripts.html
+++ b/deps/npm/docs/output/using-npm/scripts.html
@@ -145,7 +145,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 </section>
 
 <div id="_content"><h3 id="description">Description</h3>
-<p>The <code>"scripts"</code> property of of your <code>package.json</code> file supports a number of built-in scripts and their preset life cycle events as well as arbitrary scripts. These all can be executed by running <code>npm run-script &lt;stage&gt;</code> or <code>npm run &lt;stage&gt;</code> for short. <em>Pre</em> and <em>post</em> commands with matching names will be run for those as well (e.g. <code>premyscript</code>, <code>myscript</code>, <code>postmyscript</code>). Scripts from dependencies can be run with <code>npm explore &lt;pkg&gt; -- npm run &lt;stage&gt;</code>.</p>
+<p>The <code>"scripts"</code> property of your <code>package.json</code> file supports a number of built-in scripts and their preset life cycle events as well as arbitrary scripts. These all can be executed by running <code>npm run-script &lt;stage&gt;</code> or <code>npm run &lt;stage&gt;</code> for short. <em>Pre</em> and <em>post</em> commands with matching names will be run for those as well (e.g. <code>premyscript</code>, <code>myscript</code>, <code>postmyscript</code>). Scripts from dependencies can be run with <code>npm explore &lt;pkg&gt; -- npm run &lt;stage&gt;</code>.</p>
 <h3 id="pre--post-scripts">Pre &amp; Post Scripts</h3>
 <p>To create “pre” or “post” scripts for any scripts defined in the <code>"scripts"</code> section of the <code>package.json</code>, simply create another script <em>with a matching name</em> and add “pre” or “post” to the beginning of them.</p>
 <pre lang="json"><code>{
@@ -254,10 +254,8 @@ <h3 id="default-values">Default Values</h3>
 </li>
 </ul>
 <h3 id="user">User</h3>
-<p>If npm was invoked with root privileges, then it will change the uid
-to the user account or uid specified by the <code>user</code> config, which
-defaults to <code>nobody</code>.  Set the <code>unsafe-perm</code> flag to run scripts with
-root privileges.</p>
+<p>When npm is run as root, scripts are always run with the effective uid
+and gid of the working directory owner.</p>
 <h3 id="environment">Environment</h3>
 <p>Package scripts run in an environment where many pieces of information
 are made available regarding the setup of npm and the current state of
diff --git a/deps/npm/docs/output/using-npm/workspaces.html b/deps/npm/docs/output/using-npm/workspaces.html
index 3da7e2371f9c25..ffec6467c4a515 100644
--- a/deps/npm/docs/output/using-npm/workspaces.html
+++ b/deps/npm/docs/output/using-npm/workspaces.html
@@ -155,11 +155,11 @@ <h2 id="table-of-contents">Table of contents</h2>
 <code>node_modules</code> folder.</p>
 <p>We also refer to these packages being auto-symlinked during <code>npm install</code> as a
 single <strong>workspace</strong>, meaning it’s a nested package within the current local
-file system that is explicitly defined in the <a href="../using-npm/package-json.html"><code>package.json</code></a>
+file system that is explicitly defined in the <a href="../configuring-npm/package-json#workspaces.html"><code>package.json</code></a>
 <code>workspaces</code> configuration.</p>
 <h3 id="installing-workspaces">Installing workspaces</h3>
 <p>Workspaces are usually defined via the <code>workspaces</code> property of the
-<a href="../using-npm/package-json.html"><code>package.json</code></a> file, e.g:</p>
+<a href="../configuring-npm/package-json#workspaces.html"><code>package.json</code></a> file, e.g:</p>
 <pre lang="json"><code>{
   "name": "my-workspaces-powered-project",
   "workspaces": [
diff --git a/deps/npm/lib/access.js b/deps/npm/lib/access.js
index 73228cae037dd3..68c6e628d01870 100644
--- a/deps/npm/lib/access.js
+++ b/deps/npm/lib/access.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const path = require('path')
 
 const libaccess = require('libnpmaccess')
diff --git a/deps/npm/lib/adduser.js b/deps/npm/lib/adduser.js
index 895a677c019de3..4b9fdf1f5f1664 100644
--- a/deps/npm/lib/adduser.js
+++ b/deps/npm/lib/adduser.js
@@ -1,9 +1,8 @@
-'use strict'
-
 const log = require('npmlog')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
 const usageUtil = require('./utils/usage.js')
+const replaceInfo = require('./utils/replace-info.js')
 const authTypes = {
   legacy: require('./auth/legacy.js'),
   oauth: require('./auth/oauth.js'),
@@ -57,6 +56,8 @@ const adduser = async (args) => {
 
   log.disableProgress()
 
+  log.notice('', `Log in on ${replaceInfo(registry)}`)
+
   const { message, newCreds } = await auth({
     creds,
     registry,
diff --git a/deps/npm/lib/audit.js b/deps/npm/lib/audit.js
index e77beab1eff61e..cb8ab5b3a43f5d 100644
--- a/deps/npm/lib/audit.js
+++ b/deps/npm/lib/audit.js
@@ -2,7 +2,7 @@ const Arborist = require('@npmcli/arborist')
 const auditReport = require('npm-audit-report')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
 const auditError = require('./utils/audit-error.js')
 
 const audit = async args => {
@@ -14,7 +14,7 @@ const audit = async args => {
   const fix = args[0] === 'fix'
   await arb.audit({ fix })
   if (fix)
-    reifyOutput(arb)
+    await reifyFinish(arb)
   else {
     // will throw if there's an error, because this is an audit command
     auditError(arb.auditReport)
diff --git a/deps/npm/lib/auth/legacy.js b/deps/npm/lib/auth/legacy.js
index 4178c40b950cac..f291ca794e7f1b 100644
--- a/deps/npm/lib/auth/legacy.js
+++ b/deps/npm/lib/auth/legacy.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const log = require('npmlog')
 const profile = require('npm-profile')
 
diff --git a/deps/npm/lib/auth/sso.js b/deps/npm/lib/auth/sso.js
index 8e4c345316d647..378295f5f606f2 100644
--- a/deps/npm/lib/auth/sso.js
+++ b/deps/npm/lib/auth/sso.js
@@ -1,5 +1,3 @@
-'use strict'
-
 // XXX: To date, npm Enterprise Legacy is the only system that ever
 // implemented support for this type of login.  A better way to do
 // SSO is to use the WebLogin type of login supported by the npm-login
diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js
index bf788043ab6e68..30d6aef863ac29 100644
--- a/deps/npm/lib/cache.js
+++ b/deps/npm/lib/cache.js
@@ -22,10 +22,11 @@ const usage = usageUtil('cache',
 const completion = (opts, cb) => {
   const argv = opts.conf.argv.remain
   if (argv.length === 2)
-    return cb(null, ['add', 'clean'])
+    return cb(null, ['add', 'clean', 'verify'])
 
   // TODO - eventually...
   switch (argv[2]) {
+    case 'verify':
     case 'clean':
     case 'add':
       return cb(null, [])
@@ -40,11 +41,11 @@ const cache = async (args) => {
     case 'rm': case 'clear': case 'clean':
       return await clean(args)
     case 'add':
-      return await add(args, npm.prefix)
+      return await add(args)
     case 'verify': case 'check':
       return await verify()
     default:
-      throw usage
+      throw Object.assign(new Error(usage), { code: 'EUSAGE' })
   }
 }
 
@@ -77,22 +78,21 @@ with --force.`)
 // npm cache add <pkg> <ver>
 // npm cache add <tarball>
 // npm cache add <folder>
-const add = async (args, where) => {
+const add = async (args) => {
   const usage = 'Usage:\n' +
     '    npm cache add <tarball-url>\n' +
     '    npm cache add <pkg>@<ver>\n' +
     '    npm cache add <tarball>\n' +
     '    npm cache add <folder>\n'
   log.silly('cache add', 'args', args)
-  const spec = args[0] +
+  const spec = args[0] && args[0] +
     (args[1] === undefined || args[1] === null ? '' : `@${args[1]}`)
 
-  log.verbose('cache add', 'spec', spec)
   if (!spec)
-    throw new Error(usage)
+    throw Object.assign(new Error(usage), { code: 'EUSAGE' })
 
-  log.silly('cache add', 'parsed spec', spec)
-  const opts = { ...npm.flatOptions, where }
+  log.silly('cache add', 'spec', spec)
+  const opts = { ...npm.flatOptions }
 
   // we ask pacote for the thing, and then just throw the data
   // away so that it tee-pipes it into the cache like it does
@@ -109,7 +109,7 @@ const verify = async () => {
     ? `~${cache.substr(process.env.HOME.length)}`
     : cache
   const stats = await cacache.verify(cache)
-  output(`Cache verified and compressed (${prefix}):`)
+  output(`Cache verified and compressed (${prefix})`)
   output(`Content verified: ${stats.verifiedContent} (${stats.keptSize} bytes)`)
   stats.badContentCount && output(`Corrupted content removed: ${stats.badContentCount}`)
   stats.reclaimedCount && output(`Content garbage-collected: ${stats.reclaimedCount} (${stats.reclaimedSize} bytes)`)
diff --git a/deps/npm/lib/ci.js b/deps/npm/lib/ci.js
index a72e1c0cffba61..2917899c82551d 100644
--- a/deps/npm/lib/ci.js
+++ b/deps/npm/lib/ci.js
@@ -1,7 +1,8 @@
 const util = require('util')
 const Arborist = require('@npmcli/arborist')
 const rimraf = util.promisify(require('rimraf'))
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
+const runScript = require('@npmcli/run-script')
 
 const log = require('npmlog')
 const npm = require('./npm.js')
@@ -20,6 +21,7 @@ const ci = async () => {
   }
 
   const where = npm.prefix
+  const { scriptShell } = npm.flatOptions
   const arb = new Arborist({ ...npm.flatOptions, path: where })
 
   await Promise.all([
@@ -34,8 +36,29 @@ const ci = async () => {
     rimraf(`${where}/node_modules/*`, { glob: { dot: true, nosort: true, silent: true } }),
   ])
   // npm ci should never modify the lockfile or package.json
-  await arb.reify({ save: false })
-  reifyOutput(arb)
+  await arb.reify({ ...npm.flatOptions, save: false })
+
+  // run the same set of scripts that `npm install` runs.
+  const scripts = [
+    'preinstall',
+    'install',
+    'postinstall',
+    'prepublish', // XXX should we remove this finally??
+    'preprepare',
+    'prepare',
+    'postprepare',
+  ]
+  for (const event of scripts) {
+    await runScript({
+      path: where,
+      args: [],
+      scriptShell,
+      stdio: 'inherit',
+      stdioString: true,
+      event,
+    })
+  }
+  await reifyFinish(arb)
 }
 
 module.exports = Object.assign(cmd, { completion, usage })
diff --git a/deps/npm/lib/cli.js b/deps/npm/lib/cli.js
index f06abcd186f966..910b674eaa790f 100644
--- a/deps/npm/lib/cli.js
+++ b/deps/npm/lib/cli.js
@@ -1,5 +1,7 @@
 // Separated out for easier unit testing
 module.exports = (process) => {
+  // set it here so that regardless of what happens later, we don't
+  // leak any private CLI configs to other programs
   process.title = 'npm'
 
   const {
diff --git a/deps/npm/lib/completion.js b/deps/npm/lib/completion.js
index dda7a9ebd240cb..bdea338ff2c4b9 100644
--- a/deps/npm/lib/completion.js
+++ b/deps/npm/lib/completion.js
@@ -53,7 +53,7 @@ const cmd = (args, cb) => compl(args).then(() => cb()).catch(cb)
 
 // completion for the completion command
 const completion = async (opts, cb) => {
-  if (opts.w > 3)
+  if (opts.w > 2)
     return cb()
 
   const { resolve } = require('path')
@@ -63,12 +63,12 @@ const completion = async (opts, cb) => {
   ])
   const out = []
   if (zshExists)
-    out.push('~/.zshrc')
+    out.push(['>>', '~/.zshrc'])
 
   if (bashExists)
-    out.push('~/.bashrc')
+    out.push(['>>', '~/.bashrc'])
 
-  cb(null, opts.w === 2 ? out.map(m => ['>>', m]) : out)
+  cb(null, out)
 }
 
 const compl = async args => {
@@ -88,14 +88,11 @@ const compl = async args => {
     return dumpScript()
 
   // ok we're actually looking at the envs and outputting the suggestions
-  console.error({ COMP_CWORD, COMP_LINE, COMP_POINT })
-
   // get the partial line and partial word,
   // if the point isn't at the end.
   // ie, tabbing at: npm foo b|ar
   const w = +COMP_CWORD
   const words = args.map(unescape)
-  console.error({ words, args, w })
   const word = words[w]
   const line = COMP_LINE
   const point = +COMP_POINT
@@ -104,8 +101,6 @@ const compl = async args => {
 
   // figure out where in that last word the point is.
   const partialWordRaw = args[w]
-  console.error('partial word (args[%i])', w, partialWordRaw, args)
-
   let i = partialWordRaw.length
   while (partialWordRaw.substr(0, i) !== partialLine.substr(-1 * i) && i > 0)
     i--
@@ -126,7 +121,6 @@ const compl = async args => {
     raw: args,
   }
 
-  console.error(opts)
   const wrap = getWrap(opts)
 
   if (partialWords.slice(0, -1).indexOf('--') === -1) {
@@ -138,7 +132,6 @@ const compl = async args => {
         !isFlag(words[w - 1])) {
       // awaiting a value for a non-bool config.
       // don't even try to do this for now
-      console.error('configValueCompl')
       return wrap(configValueCompl(opts))
     }
   }
@@ -151,9 +144,7 @@ const compl = async args => {
   const parsed = opts.conf =
     nopt(types, shorthands, partialWords.slice(0, -1), 0)
   // check if there's a command already.
-  console.error('PARSED', parsed)
   const cmd = parsed.argv.remain[1]
-  console.error('CMD', cmd)
   if (!cmd)
     return wrap(cmdCompl(opts))
 
@@ -225,20 +216,15 @@ const escape = w => !/\s+/.test(w) ? w
 // Ie, returning ['a', 'b c', ['d', 'e']] would allow it to expand
 // to: 'a', 'b c', or 'd' 'e'
 const getWrap = opts => compls => {
-  console.error('WRAP', opts, compls)
-
   if (!Array.isArray(compls))
     compls = compls ? [compls] : []
 
   compls = compls.map(c =>
     Array.isArray(c) ? c.map(escape).join(' ') : escape(c))
 
-  if (opts.partialWord) {
-    console.error('HAS PARTIAL WORD', opts.partialWord, compls)
+  if (opts.partialWord)
     compls = compls.filter(c => c.startsWith(opts.partialWord))
-  }
 
-  console.error(compls, opts.partialWord)
   if (compls.length > 0)
     output(compls.join('\n'))
 }
@@ -251,7 +237,6 @@ const configCompl = opts => {
   const dashes = split[1]
   const no = split[2]
   const flags = configNames.filter(isFlag)
-  console.error(flags)
   return allConfs.map(c => dashes + c)
     .concat(flags.map(f => dashes + (no || 'no-') + f))
 }
@@ -276,17 +261,14 @@ const isFlag = word => {
 // complete against the npm commands
 // if they all resolve to the same thing, just return the thing it already is
 const cmdCompl = opts => {
-  console.error('CMD COMPL', opts.partialWord)
   const matches = fullList.filter(c => c.startsWith(opts.partialWord))
-  console.error('MATCHES', matches)
   if (!matches.length)
     return matches
 
   const derefs = new Set([...matches.map(c => deref(c))])
-  if (derefs.size === 1) {
-    console.error('ONLY ONE MATCH', derefs)
+  if (derefs.size === 1)
     return [...derefs]
-  }
+
   return fullList
 }
 
diff --git a/deps/npm/lib/dedupe.js b/deps/npm/lib/dedupe.js
index a08c9f3f8f3349..fe8243e21e43d2 100644
--- a/deps/npm/lib/dedupe.js
+++ b/deps/npm/lib/dedupe.js
@@ -2,7 +2,7 @@
 const npm = require('./npm.js')
 const Arborist = require('@npmcli/arborist')
 const usageUtil = require('./utils/usage.js')
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
 
 const usage = usageUtil('dedupe', 'npm dedupe')
 const completion = require('./utils/completion/none.js')
@@ -18,7 +18,7 @@ const dedupe = async (args) => {
     dryRun,
   })
   await arb.dedupe(npm.flatOptions)
-  reifyOutput(arb)
+  await reifyFinish(arb)
 }
 
 module.exports = Object.assign(cmd, { usage, completion })
diff --git a/deps/npm/lib/deprecate.js b/deps/npm/lib/deprecate.js
index 9f8911dddd0674..fbaad54b7fde3d 100644
--- a/deps/npm/lib/deprecate.js
+++ b/deps/npm/lib/deprecate.js
@@ -1,72 +1,74 @@
-'use strict'
-
 const npm = require('./npm.js')
 const fetch = require('npm-registry-fetch')
 const otplease = require('./utils/otplease.js')
 const npa = require('npm-package-arg')
 const semver = require('semver')
-const getItentity = require('./utils/get-identity')
+const getIdentity = require('./utils/get-identity.js')
+const libaccess = require('libnpmaccess')
+const usageUtil = require('./utils/usage.js')
+
+const UsageError = () =>
+  Object.assign(new Error(`\nUsage: ${usage}`), {
+    code: 'EUSAGE',
+  })
 
-module.exports = deprecate
+const usage = usageUtil(
+  'deprecate',
+  'npm deprecate <pkg>[@<version>] <message>'
+)
 
-deprecate.usage = 'npm deprecate <pkg>[@<version>] <message>'
+const completion = (opts, cb) => {
+  if (opts.conf.argv.remain.length > 1)
+    return cb(null, [])
 
-deprecate.completion = function (opts, cb) {
-  return Promise.resolve().then(() => {
-    if (opts.conf.argv.remain.length > 2)
-      return
-    return getItentity(npm.flatOptions).then(username => {
-      if (username) {
-        // first, get a list of remote packages this user owns.
-        // once we have a user account, then don't complete anything.
-        // get the list of packages by user
-        return fetch(
-          `/-/by-user/${encodeURIComponent(username)}`,
-          npm.flatOptions
-        ).then(list => list[username])
-      }
+  return getIdentity(npm.flatOptions).then((username) => {
+    return libaccess.lsPackages(username, npm.flatOptions).then((packages) => {
+      return Object.keys(packages)
+        .filter((name) => packages[name] === 'write' &&
+          (opts.conf.argv.remain.length === 0 || name.startsWith(opts.conf.argv.remain[0]))
+        )
     })
-  }).then(() => cb(), er => cb(er))
+  }).then((list) => cb(null, list), (err) => cb(err))
 }
 
-function deprecate ([pkg, msg], opts, cb) {
-  if (typeof cb !== 'function') {
-    cb = opts
-    opts = null
-  }
-  opts = opts || npm.flatOptions
-  return Promise.resolve().then(() => {
-    if (msg == null)
-      throw new Error(`Usage: ${deprecate.usage}`)
-    // fetch the data and make sure it exists.
-    const p = npa(pkg)
+const cmd = (args, cb) =>
+  deprecate(args)
+    .then(() => cb())
+    .catch(err => cb(err.code === 'EUSAGE' ? err.message : err))
+
+const deprecate = async ([pkg, msg]) => {
+  if (!pkg || !msg)
+    throw UsageError()
 
-    // npa makes the default spec "latest", but for deprecation
-    // "*" is the appropriate default.
-    const spec = p.rawSpec === '' ? '*' : p.fetchSpec
+  // fetch the data and make sure it exists.
+  const p = npa(pkg)
+  // npa makes the default spec "latest", but for deprecation
+  // "*" is the appropriate default.
+  const spec = p.rawSpec === '' ? '*' : p.fetchSpec
 
-    if (semver.validRange(spec, true) === null)
-      throw new Error('invalid version range: ' + spec)
+  if (semver.validRange(spec, true) === null)
+    throw new Error(`invalid version range: ${spec}`)
 
-    const uri = '/' + p.escapedName
-    return fetch.json(uri, {
-      ...opts,
-      spec: p,
-      query: { write: true },
-    }).then(packument => {
-      // filter all the versions that match
-      Object.keys(packument.versions)
-        .filter(v => semver.satisfies(v, spec))
-        .forEach(v => {
-          packument.versions[v].deprecated = msg
-        })
-      return otplease(opts, opts => fetch(uri, {
-        ...opts,
-        spec: p,
-        method: 'PUT',
-        body: packument,
-        ignoreBody: true,
-      }))
+  const uri = '/' + p.escapedName
+  const packument = await fetch.json(uri, {
+    ...npm.flatOptions,
+    spec: p,
+    query: { write: true },
+  })
+
+  Object.keys(packument.versions)
+    .filter(v => semver.satisfies(v, spec))
+    .forEach(v => {
+      packument.versions[v].deprecated = msg
     })
-  }).then(() => cb(), cb)
+
+  return otplease(npm.flatOptions, opts => fetch(uri, {
+    ...opts,
+    spec: p,
+    method: 'PUT',
+    body: packument,
+    ignoreBody: true,
+  }))
 }
+
+module.exports = Object.assign(cmd, { completion, usage })
diff --git a/deps/npm/lib/dist-tag.js b/deps/npm/lib/dist-tag.js
index bd7ccc9e0a2184..ae4b33ce864122 100644
--- a/deps/npm/lib/dist-tag.js
+++ b/deps/npm/lib/dist-tag.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const log = require('npmlog')
 const npa = require('npm-package-arg')
 const regFetch = require('npm-registry-fetch')
diff --git a/deps/npm/lib/doctor.js b/deps/npm/lib/doctor.js
index a596f1f4b50d3d..0b29936bb4d1f8 100644
--- a/deps/npm/lib/doctor.js
+++ b/deps/npm/lib/doctor.js
@@ -20,7 +20,7 @@ const checkPing = async () => {
     if (/^E\d{3}$/.test(er.code || ''))
       throw er.code.substr(1) + ' ' + er.message
     else
-      throw er
+      throw er.message
   } finally {
     tracker.finish()
   }
@@ -92,7 +92,7 @@ const lstat = promisify(fs.lstat)
 const readdir = promisify(fs.readdir)
 const access = promisify(fs.access)
 const isWindows = require('./utils/is-windows.js')
-const checkFilesPermission = async (root, shouldOwn = true, mask = null) => {
+const checkFilesPermission = async (root, shouldOwn, mask = null) => {
   if (mask === null)
     mask = shouldOwn ? R_OK | W_OK : R_OK
 
diff --git a/deps/npm/lib/exec.js b/deps/npm/lib/exec.js
index 088a7c00eba314..d4bcac0252b2dd 100644
--- a/deps/npm/lib/exec.js
+++ b/deps/npm/lib/exec.js
@@ -1,7 +1,6 @@
 const npm = require('./npm.js')
-
+const output = require('./utils/output.js')
 const usageUtil = require('./utils/usage.js')
-
 const usage = usageUtil('exec',
   'Run a command from a local or remote npm package.\n\n' +
 
@@ -13,7 +12,9 @@ const usage = usageUtil('exec',
   'npx <pkg>[@<specifier>] [args...]\n' +
   'npx -p <pkg>[@<specifier>] <cmd> [args...]\n' +
   'npx -c \'<cmd> [args...]\'\n' +
-  'npx -p <pkg>[@<specifier>] -c \'<cmd> [args...]\'',
+  'npx -p <pkg>[@<specifier>] -c \'<cmd> [args...]\'' +
+  '\n' +
+  'Run without --call or positional args to open interactive subshell\n',
 
   '\n--package=<pkg> (may be specified multiple times)\n' +
   '-p is a shorthand for --package only when using npx executable\n' +
@@ -59,15 +60,14 @@ const ciDetect = require('@npmcli/ci-detect')
 const crypto = require('crypto')
 const pacote = require('pacote')
 const npa = require('npm-package-arg')
-const escapeArg = require('./utils/escape-arg.js')
 const fileExists = require('./utils/file-exists.js')
 const PATH = require('./utils/path.js')
 
 const cmd = (args, cb) => exec(args).then(() => cb()).catch(cb)
 
-const run = async ({ args, call, pathArr }) => {
+const run = async ({ args, call, pathArr, shell }) => {
   // turn list of args into command string
-  const script = call || args.map(escapeArg).join(' ').trim()
+  const script = call || args.join(' ').trim() || shell
 
   // do the fakey runScript dance
   // still should work if no package.json in cwd
@@ -83,7 +83,15 @@ const run = async ({ args, call, pathArr }) => {
 
   npm.log.disableProgress()
   try {
+    if (script === shell) {
+      if (process.stdin.isTTY) {
+        if (ciDetect())
+          return npm.log.warn('exec', 'Interactive mode disabled in CI environment')
+        output(`\nEntering npm script environment\nType 'exit' or ^D when finished\n`)
+      }
+    }
     return await runScript({
+      ...npm.flatOptions,
       pkg,
       banner: false,
       // we always run in cwd, not --prefix
@@ -101,13 +109,23 @@ const run = async ({ args, call, pathArr }) => {
 }
 
 const exec = async args => {
-  const { package: packages, call } = npm.flatOptions
+  const { package: packages, call, shell } = npm.flatOptions
 
   if (call && args.length)
     throw usage
 
   const pathArr = [...PATH]
 
+  // nothing to maybe install, skip the arborist dance
+  if (!call && !args.length && !packages.length) {
+    return await run({
+      args,
+      call,
+      shell,
+      pathArr,
+    })
+  }
+
   const needPackageCommandSwap = args.length && !packages.length
   // if there's an argument and no package has been explicitly asked for
   // check the local and global bin paths for a binary named the same as
@@ -126,8 +144,9 @@ const exec = async args => {
     if (binExists) {
       return await run({
         args,
-        call: [args[0], ...args.slice(1).map(escapeArg)].join(' ').trim(),
+        call: [args[0], ...args.slice(1)].join(' ').trim(),
         pathArr,
+        shell,
       })
     }
 
@@ -181,15 +200,18 @@ const exec = async args => {
 
     // no need to install if already present
     if (add.length) {
-      const isTTY = process.stdin.isTTY && process.stdout.isTTY
       if (!npm.flatOptions.yes) {
         // set -n to always say no
         if (npm.flatOptions.yes === false)
           throw 'canceled'
 
-        if (!isTTY || ciDetect())
-          npm.log.warn('exec', `The following package${add.length === 1 ? ' was' : 's were'} not found and will be installed: ${add.map((pkg) => pkg.replace(/@$/, '')).join(', ')}`)
-        else {
+        if (!process.stdin.isTTY || ciDetect()) {
+          npm.log.warn('exec', `The following package${
+            add.length === 1 ? ' was' : 's were'
+          } not found and will be installed: ${
+            add.map((pkg) => pkg.replace(/@$/, '')).join(', ')
+          }`)
+        } else {
           const addList = add.map(a => `  ${a.replace(/@$/, '')}`)
             .join('\n') + '\n'
           const prompt = `Need to install the following packages:\n${
@@ -205,7 +227,7 @@ const exec = async args => {
     pathArr.unshift(resolve(installDir, 'node_modules/.bin'))
   }
 
-  return await run({ args, call, pathArr })
+  return await run({ args, call, pathArr, shell })
 }
 
 const manifestMissing = (tree, mani) => {
@@ -226,15 +248,15 @@ const manifestMissing = (tree, mani) => {
 
 const getBinFromManifest = mani => {
   // if we have a bin matching (unscoped portion of) packagename, use that
-  // otherwise if there's 1 bin, use that,
+  // otherwise if there's 1 bin or all bin value is the same (alias), use that,
   // otherwise fail
-  const bins = Object.entries(mani.bin || {})
-  if (bins.length === 1)
-    return bins[0][0]
+  const bin = mani.bin || {}
+  if (new Set(Object.values(bin)).size === 1)
+    return Object.keys(bin)[0]
 
   // XXX probably a util to parse this better?
   const name = mani.name.replace(/^@[^/]+\//, '')
-  if (mani.bin && mani.bin[name])
+  if (bin[name])
     return name
 
   // XXX need better error message
diff --git a/deps/npm/lib/explore.js b/deps/npm/lib/explore.js
index 96221cb4973d72..e9b09707ec63bc 100644
--- a/deps/npm/lib/explore.js
+++ b/deps/npm/lib/explore.js
@@ -4,59 +4,65 @@
 const usageUtil = require('./utils/usage.js')
 const completion = require('./utils/completion/installed-shallow.js')
 const usage = usageUtil('explore', 'npm explore <pkg> [ -- <command>]')
+const rpj = require('read-package-json-fast')
 
 const cmd = (args, cb) => explore(args).then(() => cb()).catch(cb)
 
 const output = require('./utils/output.js')
 const npm = require('./npm.js')
-const isWindows = require('./utils/is-windows.js')
-const escapeArg = require('./utils/escape-arg.js')
-const escapeExecPath = require('./utils/escape-exec-path.js')
-const log = require('npmlog')
 
-const spawn = require('@npmcli/promise-spawn')
-
-const { resolve } = require('path')
-const { promisify } = require('util')
-const stat = promisify(require('fs').stat)
+const runScript = require('@npmcli/run-script')
+const { join, resolve, relative } = require('path')
 
 const explore = async args => {
   if (args.length < 1 || !args[0])
     throw usage
 
-  const pkg = args.shift()
-  const cwd = resolve(npm.dir, pkg)
-  const opts = { cwd, stdio: 'inherit', stdioString: true }
-
-  const shellArgs = []
-  if (args.length) {
-    if (isWindows) {
-      const execCmd = escapeExecPath(args.shift())
-      opts.windowsVerbatimArguments = true
-      shellArgs.push('/d', '/s', '/c', execCmd, ...args.map(escapeArg))
-    } else
-      shellArgs.push('-c', args.map(escapeArg).join(' ').trim())
-  }
+  const pkgname = args.shift()
 
-  await stat(cwd).catch(er => {
-    throw new Error(`It doesn't look like ${pkg} is installed.`)
-  })
+  // detect and prevent any .. shenanigans
+  const path = join(npm.dir, join('/', pkgname))
+  if (relative(path, npm.dir) === '')
+    throw usage
 
-  const sh = npm.flatOptions.shell
-  log.disableProgress()
+  // run as if running a script named '_explore', which we set to either
+  // the set of arguments, or the shell config, and let @npmcli/run-script
+  // handle all the escaping and PATH setup stuff.
 
-  if (!shellArgs.length)
-    output(`\nExploring ${cwd}\nType 'exit' or ^D when finished\n`)
+  const pkg = await rpj(resolve(path, 'package.json')).catch(er => {
+    npm.log.error('explore', `It doesn't look like ${pkgname} is installed.`)
+    throw er
+  })
 
-  log.silly('explore', { sh, shellArgs, opts })
+  const { shell } = npm.flatOptions
+  pkg.scripts = {
+    ...(pkg.scripts || {}),
+    _explore: args.join(' ').trim() || shell,
+  }
 
-  // only noisily fail if non-interactive, but still keep exit code intact
-  const proc = spawn(sh, shellArgs, opts)
+  if (!args.length)
+    output(`\nExploring ${path}\nType 'exit' or ^D when finished\n`)
+  npm.log.disableProgress()
   try {
-    const res = await (shellArgs.length ? proc : proc.catch(er => er))
-    process.exitCode = res.code
+    return await runScript({
+      ...npm.flatOptions,
+      pkg,
+      banner: false,
+      path,
+      stdioString: true,
+      event: '_explore',
+      stdio: 'inherit',
+    }).catch(er => {
+      process.exitCode = typeof er.code === 'number' && er.code !== 0 ? er.code
+        : 1
+      // if it's not an exit error, or non-interactive, throw it
+      const isProcExit = er.message === 'command failed' &&
+        (typeof er.code === 'number' || /^SIG/.test(er.signal || ''))
+      if (args.length || !isProcExit)
+        throw er
+    })
   } finally {
-    log.enableProgress()
+    npm.log.enableProgress()
   }
 }
 
diff --git a/deps/npm/lib/init.js b/deps/npm/lib/init.js
index e805a2eda7796c..6e4213c28ff6f6 100644
--- a/deps/npm/lib/init.js
+++ b/deps/npm/lib/init.js
@@ -1,11 +1,9 @@
-// initialize a package.json file
+const initJson = require('init-package-json')
+const npa = require('npm-package-arg')
 
+const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
 const completion = require('./utils/completion/none.js')
-
-const npa = require('npm-package-arg')
-const npm = require('./npm.js')
-const initJson = require('init-package-json')
 const output = require('./utils/output.js')
 
 const usage = usageUtil(
@@ -43,7 +41,6 @@ const init = async args => {
       }
     }
     npm.config.set('package', [])
-    npm.flatOptions = { ...npm.flatOptions, package: [] }
     return new Promise((res, rej) => {
       npm.commands.exec([packageName, ...args.slice(1)], er => er ? rej(er) : res())
     })
@@ -78,11 +75,12 @@ const init = async args => {
         npm.log.warn('init', 'canceled')
         return res()
       }
-      npm.log.info('init', 'written successfully')
       if (er)
         rej(er)
-      else
+      else {
+        npm.log.info('init', 'written successfully')
         res(data)
+      }
     })
   })
 }
diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js
index 5f04fcd4f9d6be..303370594a0623 100644
--- a/deps/npm/lib/install.js
+++ b/deps/npm/lib/install.js
@@ -1,4 +1,3 @@
-'use strict'
 /* eslint-disable camelcase */
 /* eslint-disable standard/no-callback-literal */
 const fs = require('fs')
@@ -6,13 +5,15 @@ const util = require('util')
 const readdir = util.promisify(fs.readdir)
 const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
 const log = require('npmlog')
 const { resolve, join } = require('path')
 const Arborist = require('@npmcli/arborist')
 const runScript = require('@npmcli/run-script')
 
-const install = async (args, cb) => {
+const cmd = async (args, cb) => install(args).then(() => cb()).catch(cb)
+
+const install = async args => {
   // the /path/to/node_modules/..
   const globalTop = resolve(npm.globalDir, '..')
   const { ignoreScripts, global: isGlobalInstall } = npm.flatOptions
@@ -34,38 +35,33 @@ const install = async (args, cb) => {
     path: where,
   })
 
-  try {
-    await arb.reify({
-      ...npm.flatOptions,
-      add: args,
-    })
-    if (!args.length && !isGlobalInstall && !ignoreScripts) {
-      const { scriptShell } = npm.flatOptions
-      const scripts = [
-        'preinstall',
-        'install',
-        'postinstall',
-        'prepublish', // XXX should we remove this finally??
-        'preprepare',
-        'prepare',
-        'postprepare',
-      ]
-      for (const event of scripts) {
-        await runScript({
-          path: where,
-          args: [],
-          scriptShell,
-          stdio: 'inherit',
-          stdioString: true,
-          event,
-        })
-      }
+  await arb.reify({
+    ...npm.flatOptions,
+    add: args,
+  })
+  if (!args.length && !isGlobalInstall && !ignoreScripts) {
+    const { scriptShell } = npm.flatOptions
+    const scripts = [
+      'preinstall',
+      'install',
+      'postinstall',
+      'prepublish', // XXX should we remove this finally??
+      'preprepare',
+      'prepare',
+      'postprepare',
+    ]
+    for (const event of scripts) {
+      await runScript({
+        path: where,
+        args: [],
+        scriptShell,
+        stdio: 'inherit',
+        stdioString: true,
+        event,
+      })
     }
-    reifyOutput(arb)
-    cb()
-  } catch (er) {
-    cb(er)
   }
+  await reifyFinish(arb)
 }
 
 const usage = usageUtil(
@@ -144,4 +140,4 @@ const completion = async (opts, cb) => {
   cb()
 }
 
-module.exports = Object.assign(install, { usage, completion })
+module.exports = Object.assign(cmd, { usage, completion })
diff --git a/deps/npm/lib/link.js b/deps/npm/lib/link.js
index d7303fd086cdd9..f7e13369c86a25 100644
--- a/deps/npm/lib/link.js
+++ b/deps/npm/lib/link.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const { readdir } = require('fs')
 const { resolve } = require('path')
 
@@ -10,7 +8,7 @@ const semver = require('semver')
 
 const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
 
 const completion = (opts, cb) => {
   const dir = npm.globalDir
@@ -112,17 +110,26 @@ const linkInstall = async args => {
     )
   }
 
+  // npm link should not save=true by default unless you're
+  // using any of --save-dev or other types
+  const save =
+    Boolean(npm.config.find('save') !== 'default' || npm.flatOptions.saveType)
+
   // create a new arborist instance for the local prefix and
   // reify all the pending names as symlinks there
   const localArb = new Arborist({
     ...npm.flatOptions,
     path: npm.prefix,
+    save,
   })
   await localArb.reify({
+    ...npm.flatOptions,
+    path: npm.prefix,
     add: names.map(l => `file:${resolve(globalTop, 'node_modules', l)}`),
+    save,
   })
 
-  reifyOutput(localArb)
+  await reifyFinish(localArb)
 }
 
 const linkPkg = async () => {
@@ -133,7 +140,7 @@ const linkPkg = async () => {
     global: true,
   })
   await arb.reify({ add: [`file:${npm.prefix}`] })
-  reifyOutput(arb)
+  await reifyFinish(arb)
 }
 
 module.exports = Object.assign(cmd, { completion, usage })
diff --git a/deps/npm/lib/logout.js b/deps/npm/lib/logout.js
index 32f74831d474dd..ba2eb92fee853f 100644
--- a/deps/npm/lib/logout.js
+++ b/deps/npm/lib/logout.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const eu = encodeURIComponent
 const log = require('npmlog')
 const getAuth = require('npm-registry-fetch/auth.js')
diff --git a/deps/npm/lib/ls.js b/deps/npm/lib/ls.js
index 99de6bfe36e83d..362dacad3dc30c 100644
--- a/deps/npm/lib/ls.js
+++ b/deps/npm/lib/ls.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const { resolve } = require('path')
 const { EOL } = require('os')
 
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index d6eab9674fe186..4430b80539d031 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -54,6 +54,7 @@ const _runCmd = Symbol('_runCmd')
 const _load = Symbol('_load')
 const _flatOptions = Symbol('_flatOptions')
 const _tmpFolder = Symbol('_tmpFolder')
+const _title = Symbol('_title')
 const npm = module.exports = new class extends EventEmitter {
   constructor () {
     super()
@@ -75,6 +76,7 @@ const npm = module.exports = new class extends EventEmitter {
       defaults,
       shorthands,
     })
+    this[_title] = process.title
     this.updateNotification = null
   }
 
@@ -156,6 +158,15 @@ const npm = module.exports = new class extends EventEmitter {
     return this.config.loaded
   }
 
+  get title () {
+    return this[_title]
+  }
+
+  set title (t) {
+    process.title = t
+    this[_title] = t
+  }
+
   async [_load] () {
     const node = await which(process.argv[0]).catch(er => null)
     if (node && node.toUpperCase() !== process.execPath.toUpperCase()) {
@@ -166,6 +177,15 @@ const npm = module.exports = new class extends EventEmitter {
 
     await this.config.load()
     this.argv = this.config.parsedArgv.remain
+    // note: this MUST be shorter than the actual argv length, because it
+    // uses the same memory, so node will truncate it if it's too long.
+    // if it's a token revocation, then the argv contains a secret, so
+    // don't show that.  (Regrettable historical choice to put it there.)
+    // Any other secrets are configs only, so showing only the positional
+    // args keeps those from being leaked.
+    const tokrev = deref(this.argv[0]) === 'token' && this.argv[1] === 'revoke'
+    this.title = tokrev ? 'npm token revoke' + (this.argv[2] ? ' ***' : '')
+      : ['npm', ...this.argv].join(' ')
 
     this.color = setupLog(this.config, this)
     process.env.COLOR = this.color ? '1' : '0'
diff --git a/deps/npm/lib/org.js b/deps/npm/lib/org.js
index 12e46dd8e86ea4..d430131f837506 100644
--- a/deps/npm/lib/org.js
+++ b/deps/npm/lib/org.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const liborg = require('libnpmorg')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
diff --git a/deps/npm/lib/outdated.js b/deps/npm/lib/outdated.js
index 06bdc4c2d9ffcd..f0ec7a72f40ee9 100644
--- a/deps/npm/lib/outdated.js
+++ b/deps/npm/lib/outdated.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const os = require('os')
 const path = require('path')
 const pacote = require('pacote')
diff --git a/deps/npm/lib/owner.js b/deps/npm/lib/owner.js
index dcc1ff63013005..0bfb0a6a5464a6 100644
--- a/deps/npm/lib/owner.js
+++ b/deps/npm/lib/owner.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const log = require('npmlog')
 const npa = require('npm-package-arg')
 const npmFetch = require('npm-registry-fetch')
diff --git a/deps/npm/lib/profile.js b/deps/npm/lib/profile.js
index cdecef3af962ae..50d7ddd7d22e6d 100644
--- a/deps/npm/lib/profile.js
+++ b/deps/npm/lib/profile.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const ansistyles = require('ansistyles')
 const inspect = require('util').inspect
 const log = require('npmlog')
diff --git a/deps/npm/lib/prune.js b/deps/npm/lib/prune.js
index aa2ed378088e37..ea6ed4108aba28 100644
--- a/deps/npm/lib/prune.js
+++ b/deps/npm/lib/prune.js
@@ -3,7 +3,7 @@ const npm = require('./npm.js')
 const Arborist = require('@npmcli/arborist')
 const usageUtil = require('./utils/usage.js')
 
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
 
 const usage = usageUtil('prune',
   'npm prune [[<@scope>/]<pkg>...] [--production]'
@@ -19,7 +19,7 @@ const prune = async () => {
     path: where,
   })
   await arb.prune(npm.flatOptions)
-  reifyOutput(arb)
+  await reifyFinish(arb)
 }
 
 module.exports = Object.assign(cmd, { usage, completion })
diff --git a/deps/npm/lib/publish.js b/deps/npm/lib/publish.js
index da58134f7c2501..da07a703878dd7 100644
--- a/deps/npm/lib/publish.js
+++ b/deps/npm/lib/publish.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const util = require('util')
 const log = require('npmlog')
 const semver = require('semver')
diff --git a/deps/npm/lib/rebuild.js b/deps/npm/lib/rebuild.js
index 076cfc699f85f5..e02c89bd79f28a 100644
--- a/deps/npm/lib/rebuild.js
+++ b/deps/npm/lib/rebuild.js
@@ -1,10 +1,11 @@
+const { resolve } = require('path')
 const Arborist = require('@npmcli/arborist')
+const npa = require('npm-package-arg')
+const semver = require('semver')
+
 const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
-const { resolve } = require('path')
 const output = require('./utils/output.js')
-const npa = require('npm-package-arg')
-const semver = require('semver')
 
 const cmd = (args, cb) => rebuild(args).then(() => cb()).catch(cb)
 
diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js
index 4d27e8eed965e8..c095e6decd4032 100644
--- a/deps/npm/lib/run-script.js
+++ b/deps/npm/lib/run-script.js
@@ -1,4 +1,5 @@
 const run = require('@npmcli/run-script')
+const { isServerPackage } = run
 const npm = require('./npm.js')
 const readJson = require('read-package-json-fast')
 const { resolve } = require('path')
@@ -45,7 +46,7 @@ const runScript = async (args) => {
 
   pkg.scripts = scripts
 
-  if (!scripts[event]) {
+  if (!Object.prototype.hasOwnProperty.call(scripts, event) && !(event === 'start' && await isServerPackage(path))) {
     if (npm.config.get('if-present'))
       return
 
diff --git a/deps/npm/lib/search.js b/deps/npm/lib/search.js
index 5c25bd715ba606..38f5a1d77b3226 100644
--- a/deps/npm/lib/search.js
+++ b/deps/npm/lib/search.js
@@ -1,27 +1,23 @@
-'use strict'
-
-module.exports = exports = search
-
+const Minipass = require('minipass')
 const Pipeline = require('minipass-pipeline')
-
-const npm = require('./npm.js')
-const formatPackageStream = require('./search/format-package-stream.js')
-
 const libSearch = require('libnpmsearch')
 const log = require('npmlog')
+
+const formatPackageStream = require('./search/format-package-stream.js')
+const packageFilter = require('./search/package-filter.js')
+const npm = require('./npm.js')
 const output = require('./utils/output.js')
-const usage = require('./utils/usage')
+const usageUtil = require('./utils/usage.js')
+const completion = require('./utils/completion/none.js')
 
-search.usage = usage(
+const usage = usageUtil(
   'search',
   'npm search [--long] [search terms ...]'
 )
 
-search.completion = function (opts, cb) {
-  cb(null, [])
-}
+const cmd = (args, cb) => search(args).then(() => cb()).catch(cb)
 
-function search (args, cb) {
+const search = async (args) => {
   const opts = {
     ...npm.flatOptions,
     ...npm.flatOptions.search,
@@ -30,22 +26,33 @@ function search (args, cb) {
   }
 
   if (opts.include.length === 0)
-    return cb(new Error('search must be called with arguments'))
+    throw new Error('search must be called with arguments')
 
   // Used later to figure out whether we had any packages go out
   let anyOutput = false
 
+  class FilterStream extends Minipass {
+    write (pkg) {
+      if (packageFilter(pkg, opts.include, opts.exclude))
+        super.write(pkg)
+    }
+  }
+
+  const filterStream = new FilterStream()
+
   // Grab a configured output stream that will spit out packages in the
   // desired format.
-  //
-  // This is a text minipass stream
-  var outputStream = formatPackageStream({
+  const outputStream = formatPackageStream({
     args, // --searchinclude options are not highlighted
     ...opts,
   })
 
   log.silly('search', 'searching packages')
-  const p = new Pipeline(libSearch.stream(opts.include, opts), outputStream)
+  const p = new Pipeline(
+    libSearch.stream(opts.include, opts),
+    filterStream,
+    outputStream
+  )
 
   p.on('data', chunk => {
     if (!anyOutput)
@@ -53,24 +60,18 @@ function search (args, cb) {
     output(chunk.toString('utf8'))
   })
 
-  p.promise().then(() => {
-    if (!anyOutput && !opts.json && !opts.parseable)
-      output('No matches found for ' + (args.map(JSON.stringify).join(' ')))
+  await p.promise()
+  if (!anyOutput && !opts.json && !opts.parseable)
+    output('No matches found for ' + (args.map(JSON.stringify).join(' ')))
 
-    log.silly('search', 'search completed')
-    log.clearProgress()
-    cb(null, {})
-  }, err => cb(err))
+  log.silly('search', 'search completed')
+  log.clearProgress()
 }
 
 function prepareIncludes (args, searchopts) {
-  if (typeof searchopts !== 'string')
-    searchopts = ''
-  return searchopts.split(/\s+/).concat(args).map(function (s) {
-    return s.toLowerCase()
-  }).filter(function (s) {
-    return s
-  })
+  return args
+    .map(s => s.toLowerCase())
+    .filter(s => s)
 }
 
 function prepareExcludes (searchexclude) {
@@ -80,7 +81,9 @@ function prepareExcludes (searchexclude) {
   else
     exclude = []
 
-  return exclude.map(function (s) {
-    return s.toLowerCase()
-  })
+  return exclude
+    .map(s => s.toLowerCase())
+    .filter(s => s)
 }
+
+module.exports = Object.assign(cmd, { completion, usage })
diff --git a/deps/npm/lib/search/format-package-stream.js b/deps/npm/lib/search/format-package-stream.js
index 0f75bbff7cf5bd..c908601144c235 100644
--- a/deps/npm/lib/search/format-package-stream.js
+++ b/deps/npm/lib/search/format-package-stream.js
@@ -1,5 +1,3 @@
-'use strict'
-
 // XXX these output classes should not live in here forever.  it'd be good to
 // split them out, perhaps to libnpmsearch
 
diff --git a/deps/npm/lib/search/package-filter.js b/deps/npm/lib/search/package-filter.js
index e3d427a4a08f9e..2e7d8e82ae3e7b 100644
--- a/deps/npm/lib/search/package-filter.js
+++ b/deps/npm/lib/search/package-filter.js
@@ -1,5 +1,3 @@
-'use strict'
-
 module.exports = filter
 function filter (data, include, exclude, opts) {
   return typeof data === 'object' &&
diff --git a/deps/npm/lib/set-script.js b/deps/npm/lib/set-script.js
new file mode 100644
index 00000000000000..f655c221078942
--- /dev/null
+++ b/deps/npm/lib/set-script.js
@@ -0,0 +1,53 @@
+const log = require('npmlog')
+const usageUtil = require('./utils/usage.js')
+const { localPrefix } = require('./npm.js')
+const fs = require('fs')
+const usage = usageUtil('set-script', 'npm set-script [<script>] [<command>]')
+const completion = require('./utils/completion/none.js')
+const parseJSON = require('json-parse-even-better-errors')
+const rpj = require('read-package-json-fast')
+
+const cmd = (args, cb) => set(args).then(() => cb()).catch(cb)
+
+const set = async function (args) {
+  if (process.env.npm_lifecycle_event === 'postinstall')
+    throw new Error('Scripts can’t set from the postinstall script')
+
+  // Parse arguments
+  if (args.length !== 2)
+    throw new Error(`Expected 2 arguments: got ${args.length}`)
+
+  // Set the script
+  let manifest
+  let warn = false
+  try {
+    manifest = fs.readFileSync(localPrefix + '/package.json', 'utf-8')
+  } catch (error) {
+    throw new Error('package.json not found')
+  }
+  try {
+    manifest = parseJSON(manifest)
+  } catch (error) {
+    throw new Error(`Invalid package.json: ${error}`)
+  }
+  if (!manifest.scripts)
+    manifest.scripts = {}
+  if (manifest.scripts[args[0]] && manifest.scripts[args[0]] !== args[1])
+    warn = true
+  manifest.scripts[args[0]] = args[1]
+  // format content
+  const packageJsonInfo = await rpj(localPrefix + '/package.json')
+  const {
+    [Symbol.for('indent')]: indent,
+    [Symbol.for('newline')]: newline,
+  } = packageJsonInfo
+  const format = indent === undefined ? '  ' : indent
+  const eol = newline === undefined ? '\n' : newline
+  const content = (JSON.stringify(manifest, null, format) + '\n')
+    .replace(/\n/g, eol)
+  fs.writeFileSync(localPrefix + '/package.json', content)
+  if (warn)
+    log.warn('set-script', `Script "${args[0]}" was overwritten`)
+}
+
+module.exports = Object.assign(cmd, { usage, completion })
diff --git a/deps/npm/lib/shrinkwrap.js b/deps/npm/lib/shrinkwrap.js
index 0dff6b2ba2bf6a..74e129297b6cf8 100644
--- a/deps/npm/lib/shrinkwrap.js
+++ b/deps/npm/lib/shrinkwrap.js
@@ -1,14 +1,15 @@
+const { resolve, basename } = require('path')
+const { promises: { unlink } } = require('fs')
 const Arborist = require('@npmcli/arborist')
+const log = require('npmlog')
+
 const npm = require('./npm.js')
+const completion = require('./utils/completion/none.js')
 const usageUtil = require('./utils/usage.js')
 const usage = usageUtil('shrinkwrap', 'npm shrinkwrap')
-const { resolve, basename } = require('path')
-const log = require('npmlog')
 
 const cmd = (args, cb) => shrinkwrap().then(() => cb()).catch(cb)
 
-const completion = require('./utils/completion/none.js')
-
 const shrinkwrap = async () => {
   // if has a npm-shrinkwrap.json, nothing to do
   // if has a package-lock.json, rename to npm-shrinkwrap.json
@@ -31,7 +32,6 @@ const shrinkwrap = async () => {
   const newFile = meta.hiddenLockfile || !meta.loadedFromDisk
   const oldFilename = meta.filename
   const notSW = !newFile && basename(oldFilename) !== 'npm-shrinkwrap.json'
-  const { promises: { unlink } } = require('fs')
 
   meta.hiddenLockfile = false
   meta.filename = sw
diff --git a/deps/npm/lib/star.js b/deps/npm/lib/star.js
index 15beef37352c28..b3e72d7da301df 100644
--- a/deps/npm/lib/star.js
+++ b/deps/npm/lib/star.js
@@ -1,75 +1,75 @@
-'use strict'
-
 const fetch = require('npm-registry-fetch')
 const log = require('npmlog')
 const npa = require('npm-package-arg')
+
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
-const usage = require('./utils/usage.js')
-const getItentity = require('./utils/get-identity')
+const usageUtil = require('./utils/usage.js')
+const getIdentity = require('./utils/get-identity')
+const completion = require('./utils/completion/none.js')
 
-star.usage = usage(
+const usage = usageUtil(
   'star',
   'npm star [<pkg>...]\n' +
   'npm unstar [<pkg>...]'
 )
 
-star.completion = function (opts, cb) {
-  // FIXME: there used to be registry completion here, but it stopped making
-  // sense somewhere around 50,000 packages on the registry
-  cb()
-}
+const cmd = (args, cb) => star(args).then(() => cb()).catch(cb)
+
+const star = async args => {
+  if (!args.length)
+    throw new Error(usage)
+
+  // if we're unstarring, then show an empty star image
+  // otherwise, show the full star image
+  const { unicode } = npm.flatOptions
+  const unstar = npm.config.get('star.unstar')
+  const full = unicode ? '\u2605 ' : '(*)'
+  const empty = unicode ? '\u2606 ' : '( )'
+  const show = unstar ? empty : full
 
-module.exports = star
-function star (args, cb) {
-  const opts = npm.flatOptions
-  return Promise.resolve().then(() => {
-    if (!args.length)
-      throw new Error(star.usage)
-    // if we're unstarring, then show an empty star image
-    // otherwise, show the full star image
-    const unstar = /^un/.test(npm.command)
-    const full = opts.unicode ? '\u2605 ' : '(*)'
-    const empty = opts.unicode ? '\u2606 ' : '( )'
-    const show = unstar ? empty : full
-    return Promise.all(args.map(npa).map(pkg => {
-      return Promise.all([
-        getItentity(opts),
-        fetch.json(pkg.escapedName, {
-          ...opts,
-          spec: pkg,
-          query: { write: true },
-          preferOnline: true,
-        }),
-      ]).then(([username, fullData]) => {
-        if (!username)
-          throw new Error('You need to be logged in!')
-        const body = {
-          _id: fullData._id,
-          _rev: fullData._rev,
-          users: fullData.users || {},
-        }
+  const pkgs = args.map(npa)
+  for (const pkg of pkgs) {
+    const [username, fullData] = await Promise.all([
+      getIdentity(npm.flatOptions),
+      fetch.json(pkg.escapedName, {
+        ...npm.flatOptions,
+        spec: pkg,
+        query: { write: true },
+        preferOnline: true,
+      }),
+    ])
 
-        if (!unstar) {
-          log.info('star', 'starring', body._id)
-          body.users[username] = true
-          log.verbose('star', 'starring', body)
-        } else {
-          delete body.users[username]
-          log.info('star', 'unstarring', body._id)
-          log.verbose('star', 'unstarring', body)
-        }
-        return fetch.json(pkg.escapedName, {
-          ...opts,
-          spec: pkg,
-          method: 'PUT',
-          body,
-        })
-      }).then(data => {
-        output(show + ' ' + pkg.name)
-        log.verbose('star', data)
-        return data
-      })
-    }))
-  }).then(() => cb(), cb)
+    if (!username)
+      throw new Error('You need to be logged in!')
+
+    const body = {
+      _id: fullData._id,
+      _rev: fullData._rev,
+      users: fullData.users || {},
+    }
+
+    if (!unstar) {
+      log.info('star', 'starring', body._id)
+      body.users[username] = true
+      log.verbose('star', 'starring', body)
+    } else {
+      delete body.users[username]
+      log.info('unstar', 'unstarring', body._id)
+      log.verbose('unstar', 'unstarring', body)
+    }
+
+    const data = await fetch.json(pkg.escapedName, {
+      ...npm.flatOptions,
+      spec: pkg,
+      method: 'PUT',
+      body,
+    })
+
+    output(show + ' ' + pkg.name)
+    log.verbose('star', data)
+    return data
+  }
 }
+
+module.exports = Object.assign(cmd, { completion, usage })
diff --git a/deps/npm/lib/stars.js b/deps/npm/lib/stars.js
index bd443d09a593cf..c09ca6003ea146 100644
--- a/deps/npm/lib/stars.js
+++ b/deps/npm/lib/stars.js
@@ -1,20 +1,20 @@
-'use strict'
+const log = require('npmlog')
+const fetch = require('npm-registry-fetch')
 
 const npm = require('./npm.js')
-const fetch = require('npm-registry-fetch')
-const log = require('npmlog')
 const output = require('./utils/output.js')
 const getIdentity = require('./utils/get-identity.js')
 const usageUtil = require('./utils/usage.js')
-const usage = usageUtil('stars', 'npm stars [<user>]')
 const completion = require('./utils/completion/none.js')
 
+const usage = usageUtil('stars', 'npm stars [<user>]')
+
 const cmd = (args, cb) => stars(args).then(() => cb()).catch(cb)
 
 const stars = (args) => {
   return stars_(args).catch(er => {
     if (er.code === 'ENEEDAUTH')
-      log.warn('star', 'auth is required to look up your username')
+      log.warn('stars', 'auth is required to look up your username')
 
     throw er
   })
@@ -25,6 +25,7 @@ const stars_ = async ([user = getIdentity(npm.flatOptions)]) => {
     ...npm.flatOptions,
     query: { key: `"${await user}"` },
   })
+
   if (rows.length === 0)
     log.warn('stars', 'user has not starred any packages')
 
diff --git a/deps/npm/lib/team.js b/deps/npm/lib/team.js
index 582dadb3f33393..5e88011cfe1e21 100644
--- a/deps/npm/lib/team.js
+++ b/deps/npm/lib/team.js
@@ -1,11 +1,12 @@
 const columns = require('cli-columns')
 const libteam = require('libnpmteam')
+
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const usageUtil = require('./utils/usage')
 
-const subcommands = ['create', 'destroy', 'add', 'rm', 'ls', 'edit']
+const subcommands = ['create', 'destroy', 'add', 'rm', 'ls']
 
 const usage = usageUtil(
   'team',
@@ -13,8 +14,7 @@ const usage = usageUtil(
   'npm team destroy <scope:team> [--otp <otpcode>]\n' +
   'npm team add <scope:team> <user> [--otp <otpcode>]\n' +
   'npm team rm <scope:team> <user> [--otp <otpcode>]\n' +
-  'npm team ls <scope>|<scope:team>\n' +
-  'npm team edit <scope:team>'
+  'npm team ls <scope>|<scope:team>\n'
 )
 
 const completion = (opts, cb) => {
@@ -28,7 +28,6 @@ const completion = (opts, cb) => {
     case 'destroy':
     case 'add':
     case 'rm':
-    case 'edit':
       return cb(null, [])
     default:
       return cb(new Error(argv[2] + ' not recognized'))
@@ -56,8 +55,6 @@ const team = async ([cmd, entity = '', user = '']) => {
         else
           return teamListTeams(entity, opts)
       }
-      case 'edit':
-        throw new Error('`npm team edit` is not implemented yet.')
       default:
         throw usage
     }
@@ -125,7 +122,9 @@ const teamListUsers = async (entity, opts) => {
   else if (opts.parseable)
     output(users.join('\n'))
   else if (!opts.silent && opts.loglevel !== 'silent') {
-    output(`\n@${entity} has ${users.length} user${users.length === 1 ? '' : 's'}:\n`)
+    const plural = users.length === 1 ? '' : 's'
+    const more = users.length === 0 ? '' : ':\n'
+    output(`\n@${entity} has ${users.length} user${plural}${more}`)
     output(columns(users, { padding: 1 }))
   }
 }
@@ -137,7 +136,9 @@ const teamListTeams = async (entity, opts) => {
   else if (opts.parseable)
     output(teams.join('\n'))
   else if (!opts.silent && opts.loglevel !== 'silent') {
-    output(`\n@${entity} has ${teams.length} team${teams.length === 1 ? '' : 's'}:\n`)
+    const plural = teams.length === 1 ? '' : 's'
+    const more = teams.length === 0 ? '' : ':\n'
+    output(`\n@${entity} has ${teams.length} team${plural}${more}`)
     output(columns(teams.map(t => `@${t}`), { padding: 1 }))
   }
 }
diff --git a/deps/npm/lib/token.js b/deps/npm/lib/token.js
index 7e53bd6120f6e1..8809e4412f8576 100644
--- a/deps/npm/lib/token.js
+++ b/deps/npm/lib/token.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const profile = require('npm-profile')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
diff --git a/deps/npm/lib/uninstall.js b/deps/npm/lib/uninstall.js
index ec997ae6457ab6..83a0b009699eb6 100644
--- a/deps/npm/lib/uninstall.js
+++ b/deps/npm/lib/uninstall.js
@@ -1,11 +1,16 @@
-// remove a package.
-
+const { resolve } = require('path')
 const Arborist = require('@npmcli/arborist')
-const npm = require('./npm.js')
 const rpj = require('read-package-json-fast')
-const { resolve } = require('path')
+
+const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
+const completion = require('./utils/completion/installed-shallow.js')
+
+const usage = usageUtil(
+  'uninstall',
+  'npm uninstall [<@scope>/]<pkg>[@<version>]... [--save-prod|--save-dev|--save-optional] [--no-save]'
+)
 
 const cmd = (args, cb) => rm(args).then(() => cb()).catch(cb)
 
@@ -16,12 +21,19 @@ const rm = async args => {
 
   if (!args.length) {
     if (!global)
-      throw new Error('must provide a package name to remove')
+      throw new Error('Must provide a package name to remove')
     else {
-      const pkg = await rpj(resolve(npm.localPrefix, 'package.json'))
-        .catch(er => {
-          throw er.code !== 'ENOENT' && er.code !== 'ENOTDIR' ? er : usage()
-        })
+      let pkg
+
+      try {
+        pkg = await rpj(resolve(npm.localPrefix, 'package.json'))
+      } catch (er) {
+        if (er.code !== 'ENOENT' && er.code !== 'ENOTDIR')
+          throw er
+        else
+          throw usage
+      }
+
       args.push(pkg.name)
     }
   }
@@ -32,14 +44,7 @@ const rm = async args => {
     ...npm.flatOptions,
     rm: args,
   })
-  reifyOutput(arb)
+  await reifyFinish(arb)
 }
 
-const usage = usageUtil(
-  'uninstall',
-  'npm uninstall [<@scope>/]<pkg>[@<version>]... [--save-prod|--save-dev|--save-optional] [--no-save]'
-)
-
-const completion = require('./utils/completion/installed-shallow.js')
-
 module.exports = Object.assign(cmd, { usage, completion })
diff --git a/deps/npm/lib/unpublish.js b/deps/npm/lib/unpublish.js
index 4d05627d269e25..1d7601b60cd84a 100644
--- a/deps/npm/lib/unpublish.js
+++ b/deps/npm/lib/unpublish.js
@@ -11,7 +11,7 @@ const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
-const whoami = util.promisify(require('./whoami.js'))
+const getIdentity = require('./utils/get-identity.js')
 
 const usage = usageUtil('unpublish', 'npm unpublish [<@scope>/]<pkg>[@<version>]')
 
@@ -25,18 +25,18 @@ const completionFn = async (args) => {
   const { partialWord, conf } = args
 
   if (conf.argv.remain.length >= 3)
-    return
+    return []
 
-  const username = await whoami([], true)
+  const opts = npm.flatOptions
+  const username = await getIdentity({ ...opts }).catch(() => null)
   if (!username)
     return []
-  const opts = npm.flatOptions
 
   const access = await libaccess.lsPackages(username, opts)
   // do a bit of filtering at this point, so that we don't need
   // to fetch versions for more than one thing, but also don't
   // accidentally a whole project
-  let pkgs = Object.keys(access)
+  let pkgs = Object.keys(access || {})
   if (!partialWord || !pkgs.length)
     return pkgs
 
@@ -55,18 +55,20 @@ const completionFn = async (args) => {
 
 async function unpublish (args) {
   if (args.length > 1)
-    throw usage
+    throw new Error(usage)
 
   const spec = args.length && npa(args[0])
   const opts = npm.flatOptions
   const { force, silent, loglevel } = opts
-  let ret
+  let res
+  let pkgName
+  let pkgVersion
 
   log.silly('unpublish', 'args[0]', args[0])
   log.silly('unpublish', 'spec', spec)
 
   if (!spec.rawSpec && !force) {
-    throw (
+    throw new Error(
       'Refusing to delete entire project.\n' +
       'Run with --force to do this.\n' +
       usage
@@ -77,31 +79,34 @@ async function unpublish (args) {
     // if there's a package.json in the current folder, then
     // read the package name and version out of that.
     const pkgJson = path.join(npm.localPrefix, 'package.json')
-    const manifest = await readJson(pkgJson)
-
-    log.verbose('unpublish', manifest)
-
-    const { name, version, publishConfig } = manifest
-    const pkgJsonSpec = npa.resolve(name, version)
-
+    let manifest
     try {
-      ret = await otplease(opts, opts => libunpub(pkgJsonSpec, { ...opts, publishConfig }))
+      manifest = await readJson(pkgJson)
     } catch (err) {
       if (err && err.code !== 'ENOENT' && err.code !== 'ENOTDIR')
         throw err
       else
-        throw `Usage: ${usage}`
+        throw new Error(`Usage: ${usage}`)
     }
-  } else
-    ret = await otplease(opts, opts => libunpub(spec, opts))
 
-  if (!silent && loglevel !== 'silent') {
-    output(`- ${spec.name}${
-      spec.type === 'version' ? `@${spec.rawSpec}` : ''
-    }`)
+    log.verbose('unpublish', manifest)
+
+    const { name, version, publishConfig } = manifest
+    const pkgJsonSpec = npa.resolve(name, version)
+
+    res = await otplease(opts, opts => libunpub(pkgJsonSpec, { ...opts, publishConfig }))
+    pkgName = name
+    pkgVersion = version ? `@${version}` : ''
+  } else {
+    res = await otplease(opts, opts => libunpub(spec, opts))
+    pkgName = spec.name
+    pkgVersion = spec.type === 'version' ? `@${spec.rawSpec}` : ''
   }
 
-  return ret
+  if (!silent && loglevel !== 'silent')
+    output(`- ${pkgName}${pkgVersion}`)
+
+  return res
 }
 
 module.exports = Object.assign(cmd, { completion, usage })
diff --git a/deps/npm/lib/unstar.js b/deps/npm/lib/unstar.js
new file mode 100644
index 00000000000000..5dea5bcab0e9cb
--- /dev/null
+++ b/deps/npm/lib/unstar.js
@@ -0,0 +1,9 @@
+const { usage, completion } = require('./star.js')
+const npm = require('./npm.js')
+
+const unstar = (args, cb) => {
+  npm.config.set('star.unstar', true)
+  return npm.commands.star(args, cb)
+}
+
+module.exports = Object.assign(unstar, { usage, completion })
diff --git a/deps/npm/lib/update.js b/deps/npm/lib/update.js
index 791e67e407643a..bbc6732dba6d0d 100644
--- a/deps/npm/lib/update.js
+++ b/deps/npm/lib/update.js
@@ -1,10 +1,11 @@
 const path = require('path')
-const Arborist = require('@npmcli/arborist')
 
+const Arborist = require('@npmcli/arborist')
 const log = require('npmlog')
+
 const npm = require('./npm.js')
 const usageUtil = require('./utils/usage.js')
-const reifyOutput = require('./utils/reify-output.js')
+const reifyFinish = require('./utils/reify-finish.js')
 const completion = require('./utils/completion/installed-deep.js')
 
 const usage = usageUtil(
@@ -32,7 +33,7 @@ const update = async args => {
   })
 
   await arb.reify({ update })
-  reifyOutput(arb)
+  await reifyFinish(arb)
 }
 
 module.exports = Object.assign(cmd, { usage, completion })
diff --git a/deps/npm/lib/utils/child-path.js b/deps/npm/lib/utils/child-path.js
index 4594f43221ff62..38b9df13802670 100644
--- a/deps/npm/lib/utils/child-path.js
+++ b/deps/npm/lib/utils/child-path.js
@@ -1,4 +1,3 @@
-'use strict'
 var path = require('path')
 var validate = require('aproba')
 var moduleName = require('../utils/module-name.js')
diff --git a/deps/npm/lib/utils/cmd-list.js b/deps/npm/lib/utils/cmd-list.js
index 5c188a8e92ad51..8c092e719c05c1 100644
--- a/deps/npm/lib/utils/cmd-list.js
+++ b/deps/npm/lib/utils/cmd-list.js
@@ -12,7 +12,6 @@ const shorthands = {
   c: 'config',
   s: 'search',
   se: 'search',
-  unstar: 'star', // same function
   tst: 'test',
   t: 'test',
   ddp: 'dedupe',
@@ -88,6 +87,7 @@ const cmdList = [
   'publish',
   'star',
   'stars',
+  'unstar',
   'adduser',
   'login', // This is an alias for `adduser` but it can be confusing
   'logout',
@@ -127,6 +127,7 @@ const cmdList = [
   'start',
   'restart',
   'run-script',
+  'set-script',
   'completion',
   'doctor',
   'exec',
diff --git a/deps/npm/lib/utils/completion/installed-deep.js b/deps/npm/lib/utils/completion/installed-deep.js
index 0513ef9f838726..793f3b3e9a66ea 100644
--- a/deps/npm/lib/utils/completion/installed-deep.js
+++ b/deps/npm/lib/utils/completion/installed-deep.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const { resolve } = require('path')
 const Arborist = require('@npmcli/arborist')
 const npm = require('../../npm.js')
@@ -13,6 +11,7 @@ const readNames = async () => {
 
   const getValues = (tree) =>
     [...tree.inventory.values()]
+      .filter(i => i.location !== '' && !i.isRoot)
       .map(i => {
         return i
       })
diff --git a/deps/npm/lib/utils/config.js b/deps/npm/lib/utils/config.js
index f9de6e9a79220c..6abb502e205724 100644
--- a/deps/npm/lib/utils/config.js
+++ b/deps/npm/lib/utils/config.js
@@ -52,6 +52,7 @@ const defaults = {
   'always-auth': false,
   audit: true,
   'audit-level': null,
+  _auth: null,
   'auth-type': 'legacy',
   before: null,
   'bin-links': true,
@@ -191,6 +192,7 @@ const types = {
   all: Boolean,
   'allow-same-version': Boolean,
   also: [null, 'dev', 'development'],
+  _auth: [null, String],
   'always-auth': Boolean,
   audit: Boolean,
   'audit-level': ['low', 'moderate', 'high', 'critical', 'none', null],
diff --git a/deps/npm/lib/utils/deep-sort-object.js b/deps/npm/lib/utils/deep-sort-object.js
index e7bb7365b2f1c5..56f1854f1e2f65 100644
--- a/deps/npm/lib/utils/deep-sort-object.js
+++ b/deps/npm/lib/utils/deep-sort-object.js
@@ -1,4 +1,3 @@
-'use strict'
 var sortedObject = require('sorted-object')
 
 module.exports = function deepSortObject (obj) {
diff --git a/deps/npm/lib/utils/depr-check.js b/deps/npm/lib/utils/depr-check.js
deleted file mode 100644
index aa728a33637eff..00000000000000
--- a/deps/npm/lib/utils/depr-check.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict'
-
-const log = require('npmlog')
-
-const deprecated = {}
-const deprWarned = {}
-
-module.exports = deprCheck
-function deprCheck (data) {
-  if (deprecated[data._id])
-    data.deprecated = deprecated[data._id]
-
-  if (data.deprecated) {
-    deprecated[data._id] = data.deprecated
-    if (!deprWarned[data._id]) {
-      deprWarned[data._id] = true
-      log.warn('deprecated', '%s: %s', data._id, data.deprecated)
-    }
-  }
-
-  return data
-}
diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js
index dc9e2a26bcfa59..cb339523dbc671 100644
--- a/deps/npm/lib/utils/error-handler.js
+++ b/deps/npm/lib/utils/error-handler.js
@@ -1,5 +1,3 @@
-'use strict'
-
 let cbCalled = false
 const log = require('npmlog')
 const npm = require('../npm.js')
@@ -182,7 +180,7 @@ const errorHandler = (er) => {
         detail: messageText(msg.detail),
       },
     }
-    console.log(JSON.stringify(error, null, 2))
+    console.error(JSON.stringify(error, null, 2))
   }
 
   exit(typeof er.errno === 'number' ? er.errno : typeof er.code === 'number' ? er.code : 1)
diff --git a/deps/npm/lib/utils/error-message.js b/deps/npm/lib/utils/error-message.js
index 04034243fb5e5d..695b497ab64b73 100644
--- a/deps/npm/lib/utils/error-message.js
+++ b/deps/npm/lib/utils/error-message.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const npm = require('../npm.js')
 const { format } = require('util')
 const { resolve } = require('path')
diff --git a/deps/npm/lib/utils/escape-arg.js b/deps/npm/lib/utils/escape-arg.js
deleted file mode 100644
index 135d380fc2d5a7..00000000000000
--- a/deps/npm/lib/utils/escape-arg.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { normalize } = require('path')
-const isWindows = require('./is-windows.js')
-
-/*
-Escape the name of an executable suitable for passing to the system shell.
-
-Windows is easy, wrap in double quotes and you're done, as there's no
-facility to create files with quotes in their names.
-
-Unix-likes are a little more complicated, wrap in single quotes and escape
-any single quotes in the filename.  The '"'"' construction ends the quoted
-block, creates a new " quoted string with ' in it.  So, `foo'bar` becomes
-`'foo'"'"'bar'`, which is the bash way of saying `'foo' + "'" + 'bar'`.
-*/
-
-module.exports = str => isWindows ? '"' + normalize(str) + '"'
-  : /[^-_.~/\w]/.test(str) ? "'" + str.replace(/'/g, '\'"\'"\'') + "'"
-  : str
diff --git a/deps/npm/lib/utils/escape-exec-path.js b/deps/npm/lib/utils/escape-exec-path.js
deleted file mode 100644
index 83c70680b4da2d..00000000000000
--- a/deps/npm/lib/utils/escape-exec-path.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const { normalize } = require('path')
-const isWindows = require('./is-windows.js')
-
-/*
-Escape the name of an executable suitable for passing to the system shell.
-
-Windows is easy, wrap in double quotes and you're done, as there's no
-facility to create files with quotes in their names.
-
-Unix-likes are a little more complicated, wrap in single quotes and escape
-any single quotes in the filename.  The '"'"' construction ends the quoted
-block, creates a new " quoted string with ' in it.  So, `foo'bar` becomes
-`'foo'"'"'bar'`, which is the bash way of saying `'foo' + "'" + 'bar'`.
-*/
-
-const winQuote = str => !/ /.test(str) ? str : '"' + str + '"'
-const winEsc = str => normalize(str).split(/\\/).map(winQuote).join('\\')
-
-module.exports = str => isWindows ? winEsc(str)
-  : /[^-_.~/\w]/.test(str) ? "'" + str.replace(/'/g, '\'"\'"\'') + "'"
-  : str
diff --git a/deps/npm/lib/utils/explain-dep.js b/deps/npm/lib/utils/explain-dep.js
index 096df97edfda32..ed69a02c143c0b 100644
--- a/deps/npm/lib/utils/explain-dep.js
+++ b/deps/npm/lib/utils/explain-dep.js
@@ -64,7 +64,7 @@ const explainDependents = ({ name, dependents }, depth, color) => {
     const maxLen = 50
     const showNames = []
     for (let i = max; i < dependents.length; i++) {
-      const { from: { name } } = dependents[i]
+      const { from: { name = 'the root project' } } = dependents[i]
       len += name.length
       if (len >= maxLen && i < dependents.length - 1) {
         showNames.push('...')
diff --git a/deps/npm/lib/utils/flat-options.js b/deps/npm/lib/utils/flat-options.js
index be62c5a4cdb589..71edca0718c783 100644
--- a/deps/npm/lib/utils/flat-options.js
+++ b/deps/npm/lib/utils/flat-options.js
@@ -3,6 +3,7 @@
 
 const log = require('npmlog')
 const crypto = require('crypto')
+const querystring = require('querystring')
 const npmSession = crypto.randomBytes(8).toString('hex')
 log.verbose('npm-session', npmSession)
 const { join } = require('path')
@@ -26,6 +27,13 @@ const buildOmitList = obj => {
     omit.add('optional')
 
   obj.omit = [...omit]
+
+  // it would perhaps make more sense to put this in @npmcli/config, but
+  // since we can set dev to be omitted in multiple various legacy ways,
+  // it's better to set it here once it's all resolved.
+  if (obj.omit.includes('dev'))
+    process.env.NODE_ENV = 'production'
+
   return [...omit]
 }
 
@@ -50,6 +58,7 @@ const flatten = obj => ({
   alwaysAuth: obj['always-auth'],
   audit: obj.audit,
   auditLevel: obj['audit-level'],
+  _auth: obj._auth,
   authType: obj['auth-type'],
   ssoType: obj['sso-type'],
   ssoPollFrequency: obj['sso-poll-frequency'],
@@ -91,7 +100,7 @@ const flatten = obj => ({
     description: obj.description,
     exclude: obj.searchexclude,
     limit: obj.searchlimit || 20,
-    opts: obj.searchopts,
+    opts: querystring.parse(obj.searchopts),
     staleness: obj.searchstaleness,
   },
 
diff --git a/deps/npm/lib/utils/git.js b/deps/npm/lib/utils/git.js
index 369f1589084b10..299302b277eea1 100644
--- a/deps/npm/lib/utils/git.js
+++ b/deps/npm/lib/utils/git.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const exec = require('child_process').execFile
 const spawn = require('./spawn')
 const npm = require('../npm.js')
diff --git a/deps/npm/lib/utils/is-windows-bash.js b/deps/npm/lib/utils/is-windows-bash.js
index 420b4c2d49da78..0ae99e212cc08d 100644
--- a/deps/npm/lib/utils/is-windows-bash.js
+++ b/deps/npm/lib/utils/is-windows-bash.js
@@ -1,4 +1,3 @@
-'use strict'
 const isWindows = require('./is-windows.js')
 module.exports = isWindows &&
   (/^MINGW(32|64)$/.test(process.env.MSYSTEM) || process.env.TERM === 'cygwin')
diff --git a/deps/npm/lib/utils/is-windows-shell.js b/deps/npm/lib/utils/is-windows-shell.js
index 5f2f95e2e364a7..477bd43cc10cc5 100644
--- a/deps/npm/lib/utils/is-windows-shell.js
+++ b/deps/npm/lib/utils/is-windows-shell.js
@@ -1,4 +1,3 @@
-'use strict'
 const isWindows = require('./is-windows.js')
 const isWindowsBash = require('./is-windows-bash.js')
 module.exports = isWindows && !isWindowsBash
diff --git a/deps/npm/lib/utils/is-windows.js b/deps/npm/lib/utils/is-windows.js
index 8a991d54f5de6c..fbece90ad74964 100644
--- a/deps/npm/lib/utils/is-windows.js
+++ b/deps/npm/lib/utils/is-windows.js
@@ -1,2 +1 @@
-'use strict'
 module.exports = process.platform === 'win32'
diff --git a/deps/npm/lib/utils/metrics-launch.js b/deps/npm/lib/utils/metrics-launch.js
index c39c3fec93ae49..4a3dcde1ab9236 100644
--- a/deps/npm/lib/utils/metrics-launch.js
+++ b/deps/npm/lib/utils/metrics-launch.js
@@ -1,4 +1,3 @@
-'use strict'
 /* eslint-disable camelcase */
 module.exports = launchSendMetrics
 var fs = require('graceful-fs')
diff --git a/deps/npm/lib/utils/metrics.js b/deps/npm/lib/utils/metrics.js
index c394f1d34f6783..432f8dc703477b 100644
--- a/deps/npm/lib/utils/metrics.js
+++ b/deps/npm/lib/utils/metrics.js
@@ -1,4 +1,3 @@
-'use strict'
 exports.start = startMetrics
 exports.stop = stopMetrics
 exports.save = saveMetrics
diff --git a/deps/npm/lib/utils/module-name.js b/deps/npm/lib/utils/module-name.js
index 6152f1258c985c..c58050e55e574e 100644
--- a/deps/npm/lib/utils/module-name.js
+++ b/deps/npm/lib/utils/module-name.js
@@ -1,4 +1,3 @@
-'use strict'
 var path = require('path')
 
 module.exports = moduleName
diff --git a/deps/npm/lib/utils/no-progress-while-running.js b/deps/npm/lib/utils/no-progress-while-running.js
index 13c2c50e110b92..c2e6a01b2396dd 100644
--- a/deps/npm/lib/utils/no-progress-while-running.js
+++ b/deps/npm/lib/utils/no-progress-while-running.js
@@ -1,4 +1,3 @@
-'use strict'
 var log = require('npmlog')
 var progressEnabled
 var running = 0
diff --git a/deps/npm/lib/utils/open-url.js b/deps/npm/lib/utils/open-url.js
index 4d9de4f57fab6f..28c2d038a47f33 100644
--- a/deps/npm/lib/utils/open-url.js
+++ b/deps/npm/lib/utils/open-url.js
@@ -1,4 +1,3 @@
-'use strict'
 const npm = require('../npm.js')
 const output = require('./output.js')
 const opener = require('opener')
diff --git a/deps/npm/lib/utils/otplease.js b/deps/npm/lib/utils/otplease.js
index 3210f3e9123921..ca271526ccb5c6 100644
--- a/deps/npm/lib/utils/otplease.js
+++ b/deps/npm/lib/utils/otplease.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const prompt = 'This operation requires a one-time password.\nEnter OTP:'
 const readUserInfo = require('./read-user-info.js')
 
diff --git a/deps/npm/lib/utils/package-id.js b/deps/npm/lib/utils/package-id.js
deleted file mode 100644
index 4048aee4f73807..00000000000000
--- a/deps/npm/lib/utils/package-id.js
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict'
-var moduleName = require('./module-name.js')
-
-module.exports = function (tree) {
-  var pkg = tree.package || tree
-  // FIXME: Excluding the '@' here is cleaning up after the mess that
-  // read-package-json makes. =(
-  if (pkg._id && pkg._id !== '@')
-    return pkg._id
-  var name = moduleName(tree)
-  if (pkg.version)
-    return name + '@' + pkg.version
-  else
-    return name
-}
diff --git a/deps/npm/lib/utils/pick-manifest-from-registry-metadata.js b/deps/npm/lib/utils/pick-manifest-from-registry-metadata.js
deleted file mode 100644
index a92e30b73b6754..00000000000000
--- a/deps/npm/lib/utils/pick-manifest-from-registry-metadata.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict'
-module.exports = pickManifestFromRegistryMetadata
-
-var log = require('npmlog')
-var semver = require('semver')
-
-function pickManifestFromRegistryMetadata (spec, tag, versions, metadata) {
-  log.silly('pickManifestFromRegistryMetadata', 'spec', spec, 'tag', tag, 'versions', versions)
-
-  // if the tagged version satisfies, then use that.
-  var tagged = metadata['dist-tags'][tag]
-  if (tagged &&
-      metadata.versions[tagged] &&
-      semver.satisfies(tagged, spec, true))
-    return { resolvedTo: tag, manifest: metadata.versions[tagged] }
-
-  // find the max satisfying version.
-  var ms = semver.maxSatisfying(versions, spec, true)
-  if (ms)
-    return { resolvedTo: ms, manifest: metadata.versions[ms] }
-  else if (spec === '*' && versions.length && tagged && metadata.versions[tagged])
-    return { resolvedTo: tag, manifest: metadata.versions[tagged] }
-  else {
-
-  }
-}
diff --git a/deps/npm/lib/utils/pulse-till-done.js b/deps/npm/lib/utils/pulse-till-done.js
index 215a514c8d3144..9d145eee976e16 100644
--- a/deps/npm/lib/utils/pulse-till-done.js
+++ b/deps/npm/lib/utils/pulse-till-done.js
@@ -1,4 +1,3 @@
-'use strict'
 const validate = require('aproba')
 const log = require('npmlog')
 
diff --git a/deps/npm/lib/utils/read-local-package.js b/deps/npm/lib/utils/read-local-package.js
index 91a1e3a5b124f4..7ab130c1f31b03 100644
--- a/deps/npm/lib/utils/read-local-package.js
+++ b/deps/npm/lib/utils/read-local-package.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const { resolve } = require('path')
 const readJson = require('read-package-json-fast')
 const npm = require('../npm.js')
diff --git a/deps/npm/lib/utils/read-user-info.js b/deps/npm/lib/utils/read-user-info.js
index 9977d2d60bb9a1..b0166e18c90df2 100644
--- a/deps/npm/lib/utils/read-user-info.js
+++ b/deps/npm/lib/utils/read-user-info.js
@@ -1,4 +1,3 @@
-'use strict'
 const { promisify } = require('util')
 const readAsync = promisify(require('read'))
 const userValidate = require('npm-user-validate')
diff --git a/deps/npm/lib/utils/reify-finish.js b/deps/npm/lib/utils/reify-finish.js
new file mode 100644
index 00000000000000..76dba06cb570c8
--- /dev/null
+++ b/deps/npm/lib/utils/reify-finish.js
@@ -0,0 +1,31 @@
+const reifyOutput = require('./reify-output.js')
+const npm = require('../npm.js')
+const ini = require('ini')
+const {writeFile} = require('fs').promises
+const {resolve} = require('path')
+
+const reifyFinish = async arb => {
+  await saveBuiltinConfig(arb)
+  reifyOutput(arb)
+}
+
+const saveBuiltinConfig = async arb => {
+  const { options: { global }, actualTree } = arb
+  if (!global)
+    return
+
+  // if we are using a builtin config, and just installed npm as
+  // a top-level global package, we have to preserve that config.
+  const npmNode = actualTree.inventory.get('node_modules/npm')
+  if (!npmNode)
+    return
+
+  const builtinConf = npm.config.data.get('builtin')
+  if (builtinConf.loadError)
+    return
+
+  const content = ini.stringify(builtinConf.raw).trim() + '\n'
+  await writeFile(resolve(npmNode.path, 'npmrc'), content)
+}
+
+module.exports = reifyFinish
diff --git a/deps/npm/lib/utils/replace-info.js b/deps/npm/lib/utils/replace-info.js
index e3e324c885a065..7c7489bc17b16a 100644
--- a/deps/npm/lib/utils/replace-info.js
+++ b/deps/npm/lib/utils/replace-info.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const URL = require('url').URL
 
 // replaces auth info in an array of arguments or in a strings
diff --git a/deps/npm/lib/utils/save-stack.js b/deps/npm/lib/utils/save-stack.js
deleted file mode 100644
index 42c4aab5f94483..00000000000000
--- a/deps/npm/lib/utils/save-stack.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict'
-var inherits = require('inherits')
-
-module.exports = SaveStack
-
-function SaveStack (fn) {
-  Error.call(this)
-  Error.captureStackTrace(this, fn || SaveStack)
-}
-inherits(SaveStack, Error)
-
-SaveStack.prototype.completeWith = function (er) {
-  this['__' + 'proto' + '__'] = er
-  this.stack = this.stack + '\n\n' + er.stack
-  return this
-}
diff --git a/deps/npm/lib/utils/unix-format-path.js b/deps/npm/lib/utils/unix-format-path.js
deleted file mode 100644
index a82cd7135cc2c9..00000000000000
--- a/deps/npm/lib/utils/unix-format-path.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict'
-
-module.exports = function (path) {
-  return path.replace(/\\/g, '/')
-}
diff --git a/deps/npm/lib/utils/usage.js b/deps/npm/lib/utils/usage.js
index 63691406133cfd..ddcbd708b7e84a 100644
--- a/deps/npm/lib/utils/usage.js
+++ b/deps/npm/lib/utils/usage.js
@@ -1,4 +1,3 @@
-'use strict'
 var aliases = require('../utils/cmd-list').aliases
 
 module.exports = function usage (cmd, txt, opt) {
diff --git a/deps/npm/lib/utils/warn-deprecated.js b/deps/npm/lib/utils/warn-deprecated.js
deleted file mode 100644
index ce690f78eb1f67..00000000000000
--- a/deps/npm/lib/utils/warn-deprecated.js
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = warnDeprecated
-
-var log = require('npmlog')
-
-var deprecations = {}
-
-function warnDeprecated (type) {
-  return function warn (messages, instance) {
-    if (!instance) {
-      if (!deprecations[type]) {
-        deprecations[type] = {}
-        messages.forEach(function (m) {
-          log.warn(type, m)
-        })
-      }
-    } else {
-      if (!deprecations[type])
-        deprecations[type] = {}
-
-      if (!deprecations[type][instance]) {
-        deprecations[type][instance] = true
-        messages.forEach(function (m) {
-          log.warn(type, m)
-        })
-      }
-    }
-  }
-}
diff --git a/deps/npm/lib/version.js b/deps/npm/lib/version.js
index 98068490d85b1a..a96f5d6051fafb 100644
--- a/deps/npm/lib/version.js
+++ b/deps/npm/lib/version.js
@@ -42,7 +42,7 @@ const version = async args => {
         path: npm.prefix,
       }))
     default:
-      throw version.usage
+      throw usage
   }
 }
 
diff --git a/deps/npm/man/man1/npm-access.1 b/deps/npm/man/man1/npm-access.1
index 918f9afe5262cb..9d7e11f24ea024 100644
--- a/deps/npm/man/man1/npm-access.1
+++ b/deps/npm/man/man1/npm-access.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ACCESS" "1" "November 2020" "" ""
+.TH "NPM\-ACCESS" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-access\fR \- Set access level on published packages
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-adduser.1 b/deps/npm/man/man1/npm-adduser.1
index 7f6b8d3dfc389f..2ca265c5388954 100644
--- a/deps/npm/man/man1/npm-adduser.1
+++ b/deps/npm/man/man1/npm-adduser.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ADDUSER" "1" "November 2020" "" ""
+.TH "NPM\-ADDUSER" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-adduser\fR \- Add a registry user account
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-audit.1 b/deps/npm/man/man1/npm-audit.1
index ebd91e8198d554..a7ec23cf49fb68 100644
--- a/deps/npm/man/man1/npm-audit.1
+++ b/deps/npm/man/man1/npm-audit.1
@@ -1,12 +1,12 @@
-.TH "NPM\-AUDIT" "1" "November 2020" "" ""
+.TH "NPM\-AUDIT" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-audit\fR \- Run a security audit
 .SS Synopsis
 .P
 .RS 2
 .nf
-npm audit [\-\-json|\-\-parseable|\-\-audit\-level=(low|moderate|high|critical)]
-npm audit fix [\-\-force|\-\-package\-lock\-only|\-\-dry\-run]
+npm audit [\-\-json] [\-\-production] [\-\-audit\-level=(low|moderate|high|critical)]
+npm audit fix [\-\-force|\-\-package\-lock\-only|\-\-dry\-run|\-\-production|\-\-only=(dev|prod)]
 
 common options: [\-\-production] [\-\-only=(dev|prod)]
 .fi
diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1
index ac116c9d5875dc..36c609858c3811 100644
--- a/deps/npm/man/man1/npm-bin.1
+++ b/deps/npm/man/man1/npm-bin.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BIN" "1" "November 2020" "" ""
+.TH "NPM\-BIN" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-bin\fR \- Display npm bin folder
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1
index 7ae89cf6ba66f0..4abbb02740825c 100644
--- a/deps/npm/man/man1/npm-bugs.1
+++ b/deps/npm/man/man1/npm-bugs.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUGS" "1" "November 2020" "" ""
+.TH "NPM\-BUGS" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-bugs\fR \- Report bugs for a package in a web browser
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-cache.1 b/deps/npm/man/man1/npm-cache.1
index b222b0b07b388e..09f9b1c225b899 100644
--- a/deps/npm/man/man1/npm-cache.1
+++ b/deps/npm/man/man1/npm-cache.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CACHE" "1" "November 2020" "" ""
+.TH "NPM\-CACHE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-cache\fR \- Manipulates packages cache
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-ci.1 b/deps/npm/man/man1/npm-ci.1
index a37956df80f708..fee1a3a78871e4 100644
--- a/deps/npm/man/man1/npm-ci.1
+++ b/deps/npm/man/man1/npm-ci.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CI" "1" "November 2020" "" ""
+.TH "NPM\-CI" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-ci\fR \- Install a project with a clean slate
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1
index 1b2f72dcabe5fc..26ca627f899c15 100644
--- a/deps/npm/man/man1/npm-completion.1
+++ b/deps/npm/man/man1/npm-completion.1
@@ -1,4 +1,4 @@
-.TH "NPM\-COMPLETION" "1" "November 2020" "" ""
+.TH "NPM\-COMPLETION" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-completion\fR \- Tab Completion for npm
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1
index 7745167245b5d5..46e4342644699b 100644
--- a/deps/npm/man/man1/npm-config.1
+++ b/deps/npm/man/man1/npm-config.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "1" "November 2020" "" ""
+.TH "NPM\-CONFIG" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- Manage the npm configuration files
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1
index bd93629e0b29d2..5e4ef93d9030c6 100644
--- a/deps/npm/man/man1/npm-dedupe.1
+++ b/deps/npm/man/man1/npm-dedupe.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DEDUPE" "1" "November 2020" "" ""
+.TH "NPM\-DEDUPE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-dedupe\fR \- Reduce duplication
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1
index 1c282e1dff73c5..6be05b311c3740 100644
--- a/deps/npm/man/man1/npm-deprecate.1
+++ b/deps/npm/man/man1/npm-deprecate.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DEPRECATE" "1" "November 2020" "" ""
+.TH "NPM\-DEPRECATE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-deprecate\fR \- Deprecate a version of a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-dist-tag.1 b/deps/npm/man/man1/npm-dist-tag.1
index d11e09bc2716a8..bc70f7dc80bfc6 100644
--- a/deps/npm/man/man1/npm-dist-tag.1
+++ b/deps/npm/man/man1/npm-dist-tag.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DIST\-TAG" "1" "November 2020" "" ""
+.TH "NPM\-DIST\-TAG" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-dist-tag\fR \- Modify package distribution tags
 .SS Synopsis
@@ -81,8 +81,8 @@ This command used to be known as \fBnpm tag\fP, which only created new tags,
 and so had a different syntax\.
 .P
 Tags must share a namespace with version numbers, because they are
-specified in the same slot: \fBnpm install <pkg>@<version>\fP vs \fBnpm install
-<pkg>@<tag>\fP\|\.
+specified in the same slot: \fBnpm install <pkg>@<version>\fP vs
+\fBnpm install <pkg>@<tag>\fP\|\.
 .P
 Tags that can be interpreted as valid semver ranges will be rejected\. For
 example, \fBv1\.4\fP cannot be used as a tag, because it is interpreted by
diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1
index bb145a6daf91ce..a53481b7ba7168 100644
--- a/deps/npm/man/man1/npm-docs.1
+++ b/deps/npm/man/man1/npm-docs.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCS" "1" "November 2020" "" ""
+.TH "NPM\-DOCS" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-docs\fR \- Open documentation for a package in a web browser
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-doctor.1 b/deps/npm/man/man1/npm-doctor.1
index 5d96b27fabe10d..96772d5c7e2706 100644
--- a/deps/npm/man/man1/npm-doctor.1
+++ b/deps/npm/man/man1/npm-doctor.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCTOR" "1" "November 2020" "" ""
+.TH "NPM\-DOCTOR" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-doctor\fR \- Check your npm environment
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1
index 53acbb98a87a37..14e28635a91b42 100644
--- a/deps/npm/man/man1/npm-edit.1
+++ b/deps/npm/man/man1/npm-edit.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EDIT" "1" "November 2020" "" ""
+.TH "NPM\-EDIT" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-edit\fR \- Edit an installed package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-exec.1 b/deps/npm/man/man1/npm-exec.1
index 6048388fd6e262..5628bda39d4143 100644
--- a/deps/npm/man/man1/npm-exec.1
+++ b/deps/npm/man/man1/npm-exec.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EXEC" "1" "November 2020" "" ""
+.TH "NPM\-EXEC" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-exec\fR \- Run a command from a local or remote npm package
 .SS Synopsis
@@ -14,9 +14,11 @@ npx <pkg>[@<specifier>] [args\.\.\.]
 npx \-p <pkg>[@<specifier>] <cmd> [args\.\.\.]
 npx \-c '<cmd> [args\.\.\.]'
 npx \-p <pkg>[@<specifier>] \-c '<cmd> [args\.\.\.]'
+Run without \-\-call or positional args to open interactive subshell
 
 alias: npm x, npx
 
+common options:
 \-\-package=<pkg> (may be specified multiple times)
 \-p is a shorthand for \-\-package only when using npx executable
 \-c <cmd> \-\-call=<cmd> (may not be mixed with positional arguments)
@@ -28,6 +30,11 @@ This command allows you to run an arbitrary command from an npm package
 (either one installed locally, or fetched remotely), in a similar context
 as running it via \fBnpm run\fP\|\.
 .P
+Run without positional arguments or \fB\-\-call\fP, this allows you to
+interactively run commands in the same sort of shell environment that
+\fBpackage\.json\fP scripts are run\.  Interactive mode is not supported in CI
+environments when standard input is a TTY, to prevent hangs\.
+.P
 Whatever packages are specified by the \fB\-\-package\fP option will be
 provided in the \fBPATH\fP of the executed command, along with any locally
 installed package executables\.  The \fB\-\-package\fP option may be
@@ -53,7 +60,8 @@ to the following heuristic:
 .RS 0
 .IP \(bu 2
 If the package has a single entry in its \fBbin\fP field in \fBpackage\.json\fP,
-then that command will be used\.
+or if all entries are aliases of the same command, then that command
+will be used\.
 .IP \(bu 2
 If the package has multiple \fBbin\fP entries, and one of them matches the
 unscoped portion of the \fBname\fP field, then that command will be used\.
diff --git a/deps/npm/man/man1/npm-explain.1 b/deps/npm/man/man1/npm-explain.1
index dfbe283f2bccbf..17d8b35a2da796 100644
--- a/deps/npm/man/man1/npm-explain.1
+++ b/deps/npm/man/man1/npm-explain.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EXPLAIN" "1" "November 2020" "" ""
+.TH "NPM\-EXPLAIN" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-explain\fR \- Explain installed packages
 .SS Synopsis
@@ -6,6 +6,8 @@
 .RS 2
 .nf
 npm explain <folder | specifier>
+
+alias: why
 .fi
 .RE
 .SS Description
@@ -58,7 +60,7 @@ node_modules/nyc/node_modules/find\-up
 .IP \(bu 2
 Default: false
 .IP \(bu 2
-Type: Bolean
+Type: Boolean
 
 .RE
 .P
diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1
index d16c16530a2bf0..1d58315a08708e 100644
--- a/deps/npm/man/man1/npm-explore.1
+++ b/deps/npm/man/man1/npm-explore.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EXPLORE" "1" "November 2020" "" ""
+.TH "NPM\-EXPLORE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-explore\fR \- Browse an installed package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-fund.1 b/deps/npm/man/man1/npm-fund.1
index c6ad3f2928c30c..25871805d9aea1 100644
--- a/deps/npm/man/man1/npm-fund.1
+++ b/deps/npm/man/man1/npm-fund.1
@@ -1,4 +1,4 @@
-.TH "NPM\-FUND" "1" "November 2020" "" ""
+.TH "NPM\-FUND" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-fund\fR \- Retrieve funding information
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1
index a798297a1dfa8d..737aab6e131113 100644
--- a/deps/npm/man/man1/npm-help-search.1
+++ b/deps/npm/man/man1/npm-help-search.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP\-SEARCH" "1" "November 2020" "" ""
+.TH "NPM\-HELP\-SEARCH" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-help-search\fR \- Search npm help documentation
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1
index f042ba517361ed..ef5f950c95f90d 100644
--- a/deps/npm/man/man1/npm-help.1
+++ b/deps/npm/man/man1/npm-help.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP" "1" "November 2020" "" ""
+.TH "NPM\-HELP" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-help\fR \- Get help on npm
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-hook.1 b/deps/npm/man/man1/npm-hook.1
index 63bc52fcacfd98..c3ed5ac6c043b1 100644
--- a/deps/npm/man/man1/npm-hook.1
+++ b/deps/npm/man/man1/npm-hook.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HOOK" "1" "November 2020" "" ""
+.TH "NPM\-HOOK" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-hook\fR \- Manage registry hooks
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1
index 4e75b3e5e9f9c1..bf0b98145a214b 100644
--- a/deps/npm/man/man1/npm-init.1
+++ b/deps/npm/man/man1/npm-init.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INIT" "1" "November 2020" "" ""
+.TH "NPM\-INIT" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-init\fR \- create a package\.json file
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-install-ci-test.1 b/deps/npm/man/man1/npm-install-ci-test.1
index 86605c13daf281..48e2956f3ff941 100644
--- a/deps/npm/man/man1/npm-install-ci-test.1
+++ b/deps/npm/man/man1/npm-install-ci-test.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL\-CI\-TEST" "1" "November 2020" "" ""
+.TH "NPM\-INSTALL\-CI\-TEST" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-install-ci-test\fR \- Install a project with a clean slate and run tests
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-install-test.1 b/deps/npm/man/man1/npm-install-test.1
index 836fbfce157c97..e9bd0501e75187 100644
--- a/deps/npm/man/man1/npm-install-test.1
+++ b/deps/npm/man/man1/npm-install-test.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL\-TEST" "1" "November 2020" "" ""
+.TH "NPM\-INSTALL\-TEST" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-install-test\fR \- Install package(s) and run tests
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index a133668f476b15..95ab212127ebe7 100644
--- a/deps/npm/man/man1/npm-install.1
+++ b/deps/npm/man/man1/npm-install.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL" "1" "November 2020" "" ""
+.TH "NPM\-INSTALL" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-install\fR \- Install a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1
index 9930a6c3375015..4d055aab4f1a70 100644
--- a/deps/npm/man/man1/npm-link.1
+++ b/deps/npm/man/man1/npm-link.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LINK" "1" "November 2020" "" ""
+.TH "NPM\-LINK" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-link\fR \- Symlink a package folder
 .SS Synopsis
@@ -13,43 +13,46 @@ alias: npm ln
 .RE
 .SS Description
 .P
+This is handy for installing your own stuff, so that you can work on it and
+test iteratively without having to continually rebuild\.
+.P
 Package linking is a two\-step process\.
 .P
-First, \fBnpm link\fP in a package folder will create a symlink in the global folder
-\fB{prefix}/lib/node_modules/<package>\fP that links to the package where the \fBnpm
-link\fP command was executed\. It will also link any bins in the package to \fB{prefix}/bin/{name}\fP\|\.
-Note that \fBnpm link\fP uses the global prefix (see \fBnpm prefix \-g\fP for its value)\.
+First, \fBnpm link\fP in a package folder will create a symlink in the global
+folder \fB{prefix}/lib/node_modules/<package>\fP that links to the package
+where the \fBnpm link\fP command was executed\. It will also link any bins in
+the package to \fB{prefix}/bin/{name}\fP\|\.  Note that \fBnpm link\fP uses the global
+prefix (see \fBnpm prefix \-g\fP for its value)\.
 .P
 Next, in some other location, \fBnpm link package\-name\fP will create a
-symbolic link from globally\-installed \fBpackage\-name\fP to \fBnode_modules/\fP
-of the current folder\.
+symbolic link from globally\-installed \fBpackage\-name\fP to \fBnode_modules/\fP of
+the current folder\.
 .P
-Note that \fBpackage\-name\fP is taken from \fBpackage\.json\fP,
-not from directory name\.
+Note that \fBpackage\-name\fP is taken from \fBpackage\.json\fP, \fInot\fR from the
+directory name\.
 .P
-The package name can be optionally prefixed with a scope\. See npm help \fBscope\fP\|\.
-The scope must be preceded by an @\-symbol and followed by a slash\.
+The package name can be optionally prefixed with a scope\. See
+npm help \fBscope\fP\|\.  The scope must be preceded by an @\-symbol and
+followed by a slash\.
 .P
 When creating tarballs for \fBnpm publish\fP, the linked packages are
-"snapshotted" to their current state by resolving the symbolic links\.
-.P
-This is handy for installing your own stuff, so that you can work on it and
-test it iteratively without having to continually rebuild\.
+"snapshotted" to their current state by resolving the symbolic links, if
+they are included in \fBbundleDependencies\fP\|\.
 .P
 For example:
 .P
 .RS 2
 .nf
-    cd ~/projects/node\-redis    # go into the package directory
-    npm link                    # creates global link
-    cd ~/projects/node\-bloggy   # go into some other package directory\.
-    npm link redis              # link\-install the package
+cd ~/projects/node\-redis    # go into the package directory
+npm link                    # creates global link
+cd ~/projects/node\-bloggy   # go into some other package directory\.
+npm link redis              # link\-install the package
 .fi
 .RE
 .P
-Now, any changes to ~/projects/node\-redis will be reflected in
-~/projects/node\-bloggy/node_modules/node\-redis/\. Note that the link should
-be to the package name, not the directory name for that package\.
+Now, any changes to \fB~/projects/node\-redis\fP will be reflected in
+\fB~/projects/node\-bloggy/node_modules/node\-redis/\fP\|\. Note that the link
+should be to the package name, not the directory name for that package\.
 .P
 You may also shortcut the two steps in one\.  For example, to do the
 above use\-case in a shorter way:
@@ -73,16 +76,33 @@ npm link redis
 That is, it first creates a global link, and then links the global
 installation target into your project's \fBnode_modules\fP folder\.
 .P
-Note that in this case, you are referring to the directory name, \fBnode\-redis\fP,
-rather than the package name \fBredis\fP\|\.
+Note that in this case, you are referring to the directory name,
+\fBnode\-redis\fP, rather than the package name \fBredis\fP\|\.
 .P
-If your linked package is scoped (see npm help \fBscope\fP) your link command must include that scope, e\.g\.
+If your linked package is scoped (see npm help \fBscope\fP) your
+link command must include that scope, e\.g\.
 .P
 .RS 2
 .nf
 npm link @myorg/privatepackage
 .fi
 .RE
+.SS Caveat
+.P
+Note that package dependencies linked in this way are \fInot\fR saved to
+\fBpackage\.json\fP by default, on the assumption that the intention is to have
+a link stand in for a regular non\-link dependency\.  Otherwise, for example,
+if you depend on \fBredis@^3\.0\.1\fP, and ran \fBnpm link redis\fP, it would replace
+the \fB^3\.0\.1\fP dependency with \fBfile:\.\./path/to/node\-redis\fP, which you
+probably don't want!  Additionally, other users or developers on your
+project would run into issues if they do not have their folders set up
+exactly the same as yours\.
+.P
+If you are adding a \fInew\fR dependency as a link, you should add it to the
+relevant metadata by running \fBnpm install <dep> \-\-package\-lock\-only\fP\|\.
+.P
+If you \fIwant\fR to save the \fBfile:\fP reference in your \fBpackage\.json\fP and
+\fBpackage\-lock\.json\fP files, you can use \fBnpm link <dep> \-\-save\fP to do so\.
 .SS See Also
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-logout.1 b/deps/npm/man/man1/npm-logout.1
index 9715a8754dab8d..5fd41d2ced4777 100644
--- a/deps/npm/man/man1/npm-logout.1
+++ b/deps/npm/man/man1/npm-logout.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LOGOUT" "1" "November 2020" "" ""
+.TH "NPM\-LOGOUT" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-logout\fR \- Log out of the registry
 .SS Synopsis
@@ -10,13 +10,13 @@ npm logout [\-\-registry=<url>] [\-\-scope=<@scope>]
 .RE
 .SS Description
 .P
-When logged into a registry that supports token\-based authentication, tell the
-server to end this token's session\. This will invalidate the token everywhere
-you're using it, not just for the current environment\.
+When logged into a registry that supports token\-based authentication, tell
+the server to end this token's session\. This will invalidate the token
+everywhere you're using it, not just for the current environment\.
 .P
-When logged into a legacy registry that uses username and password authentication, this will
-clear the credentials in your user configuration\. In this case, it will \fIonly\fR affect
-the current environment\.
+When logged into a legacy registry that uses username and password
+authentication, this will clear the credentials in your user configuration\.
+In this case, it will \fIonly\fR affect the current environment\.
 .P
 If \fB\-\-scope\fP is provided, this will find the credentials for the registry
 connected to that scope, if set\.
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index afa7913b743853..0f486c67cc4bca 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LS" "1" "November 2020" "" ""
+.TH "NPM\-LS" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-ls\fR \- List installed packages
 .SS Synopsis
@@ -13,18 +13,22 @@ aliases: list, la, ll
 .SS Description
 .P
 This command will print to stdout all the versions of packages that are
-installed, as well as their dependencies, in a tree\-structure\.
+installed, as well as their dependencies when \fB\-\-all\fP is specified, in a
+tree structure\.
 .P
-Positional arguments are \fBname@version\-range\fP identifiers, which will
-limit the results to only the paths to the packages named\.  Note that
-nested packages will \fIalso\fR show the paths to the specified packages\.
-For example, running \fBnpm ls promzard\fP in npm's source tree will show:
+Note: to get a "bottoms up" view of why a given package is included in the
+tree at all, use npm help \fBexplain\fP\|\.
+.P
+Positional arguments are \fBname@version\-range\fP identifiers, which will limit
+the results to only the paths to the packages named\.  Note that nested
+packages will \fIalso\fR show the paths to the specified packages\.  For
+example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-    npm@7\.0\.8 /path/to/npm
-    └─┬ init\-package\-json@0\.0\.4
-      └── promzard@0\.1\.5
+npm@7\.1\.2 /path/to/npm
+└─┬ init\-package\-json@0\.0\.4
+  └── promzard@0\.1\.5
 .fi
 .RE
 .P
@@ -35,10 +39,49 @@ in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project\.
 .P
 The tree shown is the logical dependency tree, based on package
-dependencies, not the physical layout of your node_modules folder\.
+dependencies, not the physical layout of your \fBnode_modules\fP folder\.
 .P
 When run as \fBll\fP or \fBla\fP, it shows extended information by default\.
+.SS Note: Design Changes Pending
+.P
+The \fBnpm ls\fP command's output and behavior made a \fIton\fR of sense when npm
+created a \fBnode_modules\fP folder that naively nested every dependency\.  In
+such a case, the logical dependency graph and physical tree of packages on
+disk would be roughly identical\.
+.P
+With the advent of automatic install\-time deduplication of dependencies in
+npm v3, the \fBls\fP output was modified to display the logical dependency
+graph as a tree structure, since this was more useful to most users\.
+However, without using \fBnpm ls \-l\fP, it became impossible show \fIwhere\fR a
+package was actually installed much of the time!
+.P
+With the advent of automatic installation of \fBpeerDependencies\fP in npm v7,
+this gets even more curious, as \fBpeerDependencies\fP are logically
+"underneath" their dependents in the dependency graph, but are always
+physically at or above their location on disk\.
+.P
+Also, in the years since npm got an \fBls\fP command (in version 0\.0\.2!),
+dependency graphs have gotten much larger as a general rule\.  Therefor, in
+order to avoid dumping an excessive amount of content to the terminal, \fBnpm
+ls\fP now only shows the \fItop\fR level dependencies, unless \fB\-\-all\fP is
+provided\.
+.P
+A thorough re\-examination of the use cases, intention, behavior, and output
+of this command, is currently underway\.  Expect significant changes to at
+least the default human\-readable \fBnpm ls\fP output in npm v8\.
 .SS Configuration
+.SS all
+.RS 0
+.IP \(bu 2
+Default: \fBfalse\fP
+.IP \(bu 2
+Type: Boolean
+
+.RE
+.P
+When running \fBnpm outdated\fP and \fBnpm ls\fP, setting \fB\-\-all\fP will show all
+outdated or installed packages, rather than only those directly depended
+upon by the current project\.
 .SS json
 .RS 0
 .IP \(bu 2
@@ -142,6 +185,8 @@ Set it to false in order to use all\-ansi output\.
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm help explain
+.IP \(bu 2
 npm help config
 .IP \(bu 2
 npm help npmrc
diff --git a/deps/npm/man/man1/npm-org.1 b/deps/npm/man/man1/npm-org.1
index fca9dd3c5f4663..c0e0a34972f5ec 100644
--- a/deps/npm/man/man1/npm-org.1
+++ b/deps/npm/man/man1/npm-org.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ORG" "1" "November 2020" "" ""
+.TH "NPM\-ORG" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-org\fR \- Manage orgs
 .SS Synopsis
@@ -61,12 +61,14 @@ $ npm org ls my\-org @mx\-santos
 .RE
 .SS Description
 .P
-You can use the \fBnpm org\fP commands to manage and view users of an organization\.
-It supports adding and removing users, changing their roles, listing them, and
-finding specific ones and their roles\.
+You can use the \fBnpm org\fP commands to manage and view users of an
+organization\.  It supports adding and removing users, changing their roles,
+listing them, and finding specific ones and their roles\.
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm help using orgs
+.IP \(bu 2
 Documentation on npm Orgs \fIhttps://docs\.npmjs\.com/orgs/\fR
 
 .RE
diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1
index 8d6a78034e09c5..72f60b816786aa 100644
--- a/deps/npm/man/man1/npm-outdated.1
+++ b/deps/npm/man/man1/npm-outdated.1
@@ -1,4 +1,4 @@
-.TH "NPM\-OUTDATED" "1" "November 2020" "" ""
+.TH "NPM\-OUTDATED" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-outdated\fR \- Check for outdated packages
 .SS Synopsis
@@ -13,33 +13,42 @@ npm outdated [[<@scope>/]<pkg> \.\.\.]
 This command will check the registry to see if any (or, specific) installed
 packages are currently outdated\.
 .P
+By default, only the direct dependencies of the root project are shown\.
+Use \fB\-\-all\fP to find all outdated meta\-dependencies as well\.
+.P
 In the output:
 .RS 0
 .IP \(bu 2
 \fBwanted\fP is the maximum version of the package that satisfies the semver
-range specified in \fBpackage\.json\fP\|\. If there's no available semver range (i\.e\.
-you're running \fBnpm outdated \-\-global\fP, or the package isn't included in
-\fBpackage\.json\fP), then \fBwanted\fP shows the currently\-installed version\.
+range specified in \fBpackage\.json\fP\|\. If there's no available semver range
+(i\.e\.  you're running \fBnpm outdated \-\-global\fP, or the package isn't
+included in \fBpackage\.json\fP), then \fBwanted\fP shows the currently\-installed
+version\.
 .IP \(bu 2
 \fBlatest\fP is the version of the package tagged as latest in the registry\.
-Running \fBnpm publish\fP with no special configuration will publish the package
-with a dist\-tag of \fBlatest\fP\|\. This may or may not be the maximum version of
-the package, or the most\-recently published version of the package, depending
-on how the package's developer manages the latest dist\-tag \fInpm\-dist\-tag\fR\|\.
+Running \fBnpm publish\fP with no special configuration will publish the
+package with a dist\-tag of \fBlatest\fP\|\. This may or may not be the maximum
+version of the package, or the most\-recently published version of the
+package, depending on how the package's developer manages the latest
+npm help dist\-tag\.
 .IP \(bu 2
 \fBlocation\fP is where in the physical tree the package is located\.
 .IP \(bu 2
 \fBdepended by\fP shows which package depends on the displayed dependency
 .IP \(bu 2
-\fBpackage type\fP (when using \fB\-\-long\fP / \fB\-l\fP) tells you whether this package is
-a \fBdependency\fP or a dev/peer/optional dependency\. Packages not included in \fBpackage\.json\fP
-are always marked \fBdependencies\fP\|\.
+\fBpackage type\fP (when using \fB\-\-long\fP / \fB\-l\fP) tells you whether this
+package is a \fBdependency\fP or a dev/peer/optional dependency\. Packages not
+included in \fBpackage\.json\fP are always marked \fBdependencies\fP\|\.
 .IP \(bu 2
-\fBhomepage\fP (when using \fB\-\-long\fP / \fB\-l\fP) is the \fBhomepage\fP value contained in the package's packument
+\fBhomepage\fP (when using \fB\-\-long\fP / \fB\-l\fP) is the \fBhomepage\fP value contained
+in the package's packument
 .IP \(bu 2
-Red means there's a newer version matching your semver requirements, so you should update now\.
+Red means there's a newer version matching your semver requirements, so
+you should update now\.
 .IP \(bu 2
-Yellow indicates that there's a newer version above your semver requirements (usually new major, or new 0\.x minor) so proceed with caution\.
+Yellow indicates that there's a newer version \fIabove\fR your semver
+requirements (usually new major, or new 0\.x minor) so proceed with
+caution\.
 
 .RE
 .SS An example
@@ -72,22 +81,23 @@ With these \fBdependencies\fP:
 A few things to note:
 .RS 0
 .IP \(bu 2
-\fBglob\fP requires \fB^5\fP, which prevents npm from installing \fBglob@6\fP, which is
-outside the semver range\.
+\fBglob\fP requires \fB^5\fP, which prevents npm from installing \fBglob@6\fP, which
+is outside the semver range\.
 .IP \(bu 2
-Git dependencies will always be reinstalled, because of how they're specified\.
-The installed committish might satisfy the dependency specifier (if it's
-something immutable, like a commit SHA), or it might not, so \fBnpm outdated\fP and
-\fBnpm update\fP have to fetch Git repos to check\. This is why currently doing a
-reinstall of a Git dependency always forces a new clone and install\.
+Git dependencies will always be reinstalled, because of how they're
+specified\.  The installed committish might satisfy the dependency
+specifier (if it's something immutable, like a commit SHA), or it might
+not, so \fBnpm outdated\fP and \fBnpm update\fP have to fetch Git repos to check\.
+This is why currently doing a reinstall of a Git dependency always forces
+a new clone and install\.
 .IP \(bu 2
-\fBnpm@3\.5\.2\fP is marked as "wanted", but "latest" is \fBnpm@3\.5\.1\fP because npm
-uses dist\-tags to manage its \fBlatest\fP and \fBnext\fP release channels\. \fBnpm update\fP
-will install the \fInewest\fR version, but \fBnpm install npm\fP (with no semver range)
-will install whatever's tagged as \fBlatest\fP\|\.
+\fBnpm@3\.5\.2\fP is marked as "wanted", but "latest" is \fBnpm@3\.5\.1\fP because
+npm uses dist\-tags to manage its \fBlatest\fP and \fBnext\fP release channels\.
+\fBnpm update\fP will install the \fInewest\fR version, but \fBnpm install npm\fP
+(with no semver range) will install whatever's tagged as \fBlatest\fP\|\.
 .IP \(bu 2
-\fBonce\fP is just plain out of date\. Reinstalling \fBnode_modules\fP from scratch or
-running \fBnpm update\fP will bring it up to spec\.
+\fBonce\fP is just plain out of date\. Reinstalling \fBnode_modules\fP from
+scratch or running \fBnpm update\fP will bring it up to spec\.
 
 .RE
 .SS Configuration
diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1
index bc1e5d2e9b62a4..55b7580b94edf9 100644
--- a/deps/npm/man/man1/npm-owner.1
+++ b/deps/npm/man/man1/npm-owner.1
@@ -1,4 +1,4 @@
-.TH "NPM\-OWNER" "1" "November 2020" "" ""
+.TH "NPM\-OWNER" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-owner\fR \- Manage package owners
 .SS Synopsis
@@ -17,17 +17,14 @@ aliases: author
 Manage ownership of published packages\.
 .RS 0
 .IP \(bu 2
-ls:
-List all the users who have access to modify a package and push new versions\.
-Handy when you need to know who to bug for help\.
+ls: List all the users who have access to modify a package and push new
+versions\.  Handy when you need to know who to bug for help\.
 .IP \(bu 2
-add:
-Add a new user as a maintainer of a package\.  This user is enabled to modify
-metadata, publish new versions, and add other owners\.
+add: Add a new user as a maintainer of a package\.  This user is enabled
+to modify metadata, publish new versions, and add other owners\.
 .IP \(bu 2
-rm:
-Remove a user from the package owner list\.  This immediately revokes their
-privileges\.
+rm: Remove a user from the package owner list\.  This immediately revokes
+their privileges\.
 
 .RE
 .P
@@ -35,12 +32,14 @@ Note that there is only one level of access\.  Either you can modify a package,
 or you can't\.  Future versions may contain more fine\-grained access levels, but
 that is not implemented at this time\.
 .P
-If you have two\-factor authentication enabled with \fBauth\-and\-writes\fP then
-you'll need to include an otp on the command line when changing ownership
-with \fB\-\-otp\fP\|\.
+If you have two\-factor authentication enabled with \fBauth\-and\-writes\fP (see
+npm help \fBnpm\-profile\fP) then you'll need to include an otp
+on the command line when changing ownership with \fB\-\-otp\fP\|\.
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm help profile
+.IP \(bu 2
 npm help publish
 .IP \(bu 2
 npm help registry
diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1
index 1c048031cb997c..d6fbeef43eb678 100644
--- a/deps/npm/man/man1/npm-pack.1
+++ b/deps/npm/man/man1/npm-pack.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PACK" "1" "November 2020" "" ""
+.TH "NPM\-PACK" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-pack\fR \- Create a tarball from a package
 .SS Synopsis
@@ -11,10 +11,10 @@ npm pack [[<@scope>/]<pkg>\.\.\.] [\-\-dry\-run]
 .SS Description
 .P
 For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, name, or scoped name), this
-command will fetch it to the cache, and then copy the tarball to the
-current working directory as \fB<name>\-<version>\.tgz\fP, and then write
-the filenames out to stdout\.
+tarball url, git url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, copy the tarball to the current working
+directory as \fB<name>\-<version>\.tgz\fP, and then write the filenames out to
+stdout\.
 .P
 If the same package is specified multiple times, then the file will be
 overwritten the second time\.
@@ -22,10 +22,13 @@ overwritten the second time\.
 If no arguments are supplied, then npm packs the current package folder\.
 .P
 The \fB\-\-dry\-run\fP argument will do everything that pack usually does without
-actually packing anything\. Reports on what would have gone into the tarball\.
+actually packing anything\.  That is, it reports on what would have gone
+into the tarball, but nothing else\.
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm\-packlist package \fIhttp://npm\.im/npm\-packlist\fR
+.IP \(bu 2
 npm help cache
 .IP \(bu 2
 npm help publish
diff --git a/deps/npm/man/man1/npm-ping.1 b/deps/npm/man/man1/npm-ping.1
index 07a65248b3a008..95caf91ba5c414 100644
--- a/deps/npm/man/man1/npm-ping.1
+++ b/deps/npm/man/man1/npm-ping.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PING" "1" "November 2020" "" ""
+.TH "NPM\-PING" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-ping\fR \- Ping npm registry
 .SS Synopsis
@@ -29,6 +29,8 @@ Ping error: {*Detail about error}
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm help doctor
+.IP \(bu 2
 npm help config
 .IP \(bu 2
 npm help npmrc
diff --git a/deps/npm/man/man1/npm-prefix.1 b/deps/npm/man/man1/npm-prefix.1
index 75ea3b6a43b1c5..6d569b40f30640 100644
--- a/deps/npm/man/man1/npm-prefix.1
+++ b/deps/npm/man/man1/npm-prefix.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PREFIX" "1" "November 2020" "" ""
+.TH "NPM\-PREFIX" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-prefix\fR \- Display prefix
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-profile.1 b/deps/npm/man/man1/npm-profile.1
index e67ec8afd7e5f6..906ce6f9a08fe1 100644
--- a/deps/npm/man/man1/npm-profile.1
+++ b/deps/npm/man/man1/npm-profile.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PROFILE" "1" "November 2020" "" ""
+.TH "NPM\-PROFILE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-profile\fR \- Change settings on your registry profile
 .SS Synopsis
@@ -14,13 +14,13 @@ npm profile disable\-2fa
 .RE
 .SS Description
 .P
-Change your profile information on the registry\.  This not be available if
-you're using a non\-npmjs registry\.
+Change your profile information on the registry\.  Note that this command
+depends on the registry implementation, so third\-party registries may not
+support this interface\.
 .RS 0
 .IP \(bu 2
-\fBnpm profile get [<property>]\fP:
-Display all of the properties of your profile, or one or more specific
-properties\.  It looks like:
+\fBnpm profile get [<property>]\fP: Display all of the properties of your
+profile, or one or more specific properties\.  It looks like:
 
 .RE
 .P
@@ -51,31 +51,30 @@ properties\.  It looks like:
 .RE
 .RS 0
 .IP \(bu 2
-\fBnpm profile set <property> <value>\fP:
-Set the value of a profile property\. You can set the following properties this way:
-  email, fullname, homepage, freenode, twitter, github
+\fBnpm profile set <property> <value>\fP: Set the value of a profile
+property\. You can set the following properties this way: email, fullname,
+homepage, freenode, twitter, github
 .IP \(bu 2
-\fBnpm profile set password\fP:
-Change your password\.  This is interactive, you'll be prompted for your
-current password and a new password\.  You'll also be prompted for an OTP
-if you have two\-factor authentication enabled\.
+\fBnpm profile set password\fP: Change your password\.  This is interactive,
+you'll be prompted for your current password and a new password\.  You'll
+also be prompted for an OTP if you have two\-factor authentication
+enabled\.
 .IP \(bu 2
-\fBnpm profile enable\-2fa [auth\-and\-writes|auth\-only]\fP:
-Enables two\-factor authentication\. Defaults to \fBauth\-and\-writes\fP mode\. Modes are:
+\fBnpm profile enable\-2fa [auth\-and\-writes|auth\-only]\fP: Enables two\-factor
+authentication\. Defaults to \fBauth\-and\-writes\fP mode\. Modes are:
 .RS
 .IP \(bu 2
 \fBauth\-only\fP: Require an OTP when logging in or making changes to your
 account's authentication\.  The OTP will be required on both the website
 and the command line\.
 .IP \(bu 2
-\fBauth\-and\-writes\fP: Requires an OTP at all the times \fBauth\-only\fP does, and also requires one when
-publishing a module, setting the \fBlatest\fP dist\-tag, or changing access
-via \fBnpm access\fP and \fBnpm owner\fP\|\.
+\fBauth\-and\-writes\fP: Requires an OTP at all the times \fBauth\-only\fP does,
+and also requires one when publishing a module, setting the \fBlatest\fP
+dist\-tag, or changing access via \fBnpm access\fP and \fBnpm owner\fP\|\.
 
 .RE
 .IP \(bu 2
-\fBnpm profile disable\-2fa\fP:
-Disables two\-factor authentication\.
+\fBnpm profile disable\-2fa\fP: Disables two\-factor authentication\.
 
 .RE
 .SS Details
@@ -86,6 +85,10 @@ available on non npmjs\.com registries\.
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm help adduser
+.IP \(bu 2
+npm help logout
+.IP \(bu 2
 npm help config
 
 .RE
diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1
index c473c273379c54..0e56bdfa73d458 100644
--- a/deps/npm/man/man1/npm-prune.1
+++ b/deps/npm/man/man1/npm-prune.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PRUNE" "1" "November 2020" "" ""
+.TH "NPM\-PRUNE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-prune\fR \- Remove extraneous packages
 .SS Synopsis
@@ -10,29 +10,26 @@ npm prune [[<@scope>/]<pkg>\.\.\.] [\-\-production] [\-\-dry\-run] [\-\-json]
 .RE
 .SS Description
 .P
-This command removes "extraneous" packages\.  If a package name is
-provided, then only packages matching one of the supplied names are
-removed\.
+This command removes "extraneous" packages\.  If a package name is provided,
+then only packages matching one of the supplied names are removed\.
 .P
-Extraneous packages are packages that are not listed on the parent
-package's dependencies list\.
+Extraneous packages are those present in the \fBnode_modules\fP folder that are
+not listed as any package's dependency list\.
 .P
 If the \fB\-\-production\fP flag is specified or the \fBNODE_ENV\fP environment
 variable is set to \fBproduction\fP, this command will remove the packages
-specified in your \fBdevDependencies\fP\|\. Setting \fB\-\-no\-production\fP will
-negate \fBNODE_ENV\fP being set to \fBproduction\fP\|\.
+specified in your \fBdevDependencies\fP\|\. Setting \fB\-\-no\-production\fP will negate
+\fBNODE_ENV\fP being set to \fBproduction\fP\|\.
 .P
 If the \fB\-\-dry\-run\fP flag is used then no changes will actually be made\.
 .P
-If the \fB\-\-json\fP flag is used then the changes \fBnpm prune\fP made (or would
+If the \fB\-\-json\fP flag is used, then the changes \fBnpm prune\fP made (or would
 have made with \fB\-\-dry\-run\fP) are printed as a JSON object\.
 .P
-In normal operation with package\-locks enabled, extraneous modules are
-pruned automatically when modules are installed and you'll only need
-this command with the \fB\-\-production\fP flag\.
-.P
-If you've disabled package\-locks then extraneous modules will not be removed
-and it's up to you to run \fBnpm prune\fP from time\-to\-time to remove them\.
+In normal operation, extraneous modules are pruned automatically, so you'll
+only need this command with the \fB\-\-production\fP flag\.  However, in the real
+world, operation is not always "normal"\.  When crashes or mistakes happen,
+this command can help clean up any resulting garbage\.
 .SS See Also
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1
index f9e633183390d6..2ade35c42e411a 100644
--- a/deps/npm/man/man1/npm-publish.1
+++ b/deps/npm/man/man1/npm-publish.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PUBLISH" "1" "November 2020" "" ""
+.TH "NPM\-PUBLISH" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-publish\fR \- Publish a package
 .SS Synopsis
@@ -13,62 +13,95 @@ Sets tag 'latest' if no \-\-tag specified
 .RE
 .SS Description
 .P
-Publishes a package to the registry so that it can be installed by name\. All
-files in the package directory are included if no local \fB\|\.gitignore\fP or
-\fB\|\.npmignore\fP file exists\. If both files exist and a file is ignored by
-\fB\|\.gitignore\fP but not by \fB\|\.npmignore\fP then it will be included\.  See
-npm help \fBdevelopers\fP for full details on what's included in the published package, as well as details on how the package is built\.
+Publishes a package to the registry so that it can be installed by name\.
 .P
-By default npm will publish to the public registry\. This can be overridden by
-specifying a different default registry or using a npm help \fBscope\fP in the name (see npm help \fBpackage\.json\fP)\.
+By default npm will publish to the public registry\. This can be overridden
+by specifying a different default registry or using a
+npm help \fBscope\fP in the name (see
+npm help \fBpackage\.json\fP)\.
 .RS 0
 .IP \(bu 2
-\fB<folder>\fP:
-A folder containing a package\.json file
+\fB<folder>\fP: A folder containing a package\.json file
 .IP \(bu 2
-\fB<tarball>\fP:
-A url or file path to a gzipped tar archive containing a single folder
-with a package\.json file inside\.
+\fB<tarball>\fP: A url or file path to a gzipped tar archive containing a
+single folder with a package\.json file inside\.
 .IP \(bu 2
-\fB[\-\-tag <tag>]\fP
-Registers the published package with the given tag, such that
-\fBnpm install <name>@<tag>\fP will install this version\.  By default,
+\fB[\-\-tag <tag>]\fP: Registers the published package with the given tag, such
+that \fBnpm install <name>@<tag>\fP will install this version\.  By default,
 \fBnpm publish\fP updates and \fBnpm install\fP installs the \fBlatest\fP tag\. See
 \fBnpm\-dist\-tag\fP \fInpm\-dist\-tag\fR for details about tags\.
 .IP \(bu 2
-\fB[\-\-access <public|restricted>]\fP
-Tells the registry whether this package should be published as public or
-restricted\. Only applies to scoped packages, which default to \fBrestricted\fP\|\.
-If you don't have a paid account, you must publish with \fB\-\-access public\fP
-to publish scoped packages\.
+\fB[\-\-access <public|restricted>]\fP: Tells the registry whether this package
+should be published as public or restricted\. Only applies to scoped
+packages, which default to \fBrestricted\fP\|\.  If you don't have a paid
+account, you must publish with \fB\-\-access public\fP to publish scoped
+packages\.
 .IP \(bu 2
-\fB[\-\-otp <otpcode>]\fP
-If you have two\-factor authentication enabled in \fBauth\-and\-writes\fP mode
-then you can provide a code from your authenticator with this\. If you
-don't include this and you're running from a TTY then you'll be prompted\.
+\fB[\-\-otp <otpcode>]\fP: If you have two\-factor authentication enabled in
+\fBauth\-and\-writes\fP mode then you can provide a code from your
+authenticator with this\. If you don't include this and you're running
+from a TTY then you'll be prompted\.
 .IP \(bu 2
-\fB[\-\-dry\-run]\fP
-As of \fBnpm@6\fP, does everything publish would do except actually publishing
-to the registry\. Reports the details of what would have been published\.
+\fB[\-\-dry\-run]\fP: As of \fBnpm@6\fP, does everything publish would do except
+actually publishing to the registry\. Reports the details of what would
+have been published\.
 
 .RE
 .P
-Fails if the package name and version combination already exists in
-the specified registry\.
+The publish will fail if the package name and version combination already
+exists in the specified registry\.
 .P
-Once a package is published with a given name and version, that
-specific name and version combination can never be used again, even if
-it is removed with npm help \fBunpublish\fP\|\.
+Once a package is published with a given name and version, that specific
+name and version combination can never be used again, even if it is removed
+with npm help \fBunpublish\fP\|\.
 .P
 As of \fBnpm@5\fP, both a sha1sum and an integrity field with a sha512sum of the
 tarball will be submitted to the registry during publication\. Subsequent
 installs will use the strongest supported algorithm to verify downloads\.
 .P
-Similar to \fB\-\-dry\-run\fP see npm help \fBpack\fP, which figures out the files to be
-included and packs them into a tarball to be uploaded to the registry\.
+Similar to \fB\-\-dry\-run\fP see npm help \fBpack\fP, which figures
+out the files to be included and packs them into a tarball to be uploaded
+to the registry\.
+.SS Files included in package
+.P
+To see what will be included in your package, run \fBnpx npm\-packlist\fP\|\.  All
+files are included by default, with the following exceptions:
+.RS 0
+.IP \(bu 2
+Certain files that are relevant to package installation and distribution
+are always included\.  For example, \fBpackage\.json\fP, \fBREADME\.md\fP,
+\fBLICENSE\fP, and so on\.
+.IP \(bu 2
+If there is a "files" list in
+npm help \fBpackage\.json\fP, then only the files
+specified will be included\.  (If directories are specified, then they
+will be walked recursively and their contents included, subject to the
+same ignore rules\.)
+.IP \(bu 2
+If there is a \fB\|\.gitignore\fP or \fB\|\.npmignore\fP file, then ignored files in
+that and all child directories will be excluded from the package\.  If
+\fIboth\fR files exist, then the \fB\|\.gitignore\fP is ignored, and only the
+\fB\|\.npmignore\fP is used\.
+\fB\|\.npmignore\fP files follow the same pattern
+rules \fIhttps://git\-scm\.com/book/en/v2/Git\-Basics\-Recording\-Changes\-to\-the\-Repository#_ignoring\fR
+as \fB\|\.gitignore\fP files
+.IP \(bu 2
+If the file matches certain patterns, then it will \fInever\fR be included,
+unless explicitly added to the \fB"files"\fP list in \fBpackage\.json\fP, or
+un\-ignored with a \fB!\fP rule in a \fB\|\.npmignore\fP or \fB\|\.gitignore\fP file\.
+.IP \(bu 2
+Symbolic links are never included in npm packages\.
+
+.RE
+.P
+See npm help \fBdevelopers\fP for full details on what's
+included in the published package, as well as details on how the package is
+built\.
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm\-packlist package \fIhttp://npm\.im/npm\-packlist\fR
+.IP \(bu 2
 npm help registry
 .IP \(bu 2
 npm help scope
diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1
index 4807f81a96371d..d7fff484e3a546 100644
--- a/deps/npm/man/man1/npm-rebuild.1
+++ b/deps/npm/man/man1/npm-rebuild.1
@@ -1,23 +1,29 @@
-.TH "NPM\-REBUILD" "1" "November 2020" "" ""
+.TH "NPM\-REBUILD" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-rebuild\fR \- Rebuild a package
 .SS Synopsis
 .P
 .RS 2
 .nf
-npm rebuild [[<@scope>/<name>]\.\.\.]
+npm rebuild [[<@scope>/]<name>[@<version>] \.\.\.]
 
-alias: npm rb
+alias: rb
 .fi
 .RE
 .SS Description
 .P
-This command runs the \fBnpm build\fP command on the matched folders\.  This is useful when you install a new version of node, and must recompile all your C++ addons with the new binary\.
+This command runs the \fBnpm build\fP command on the matched folders\.  This is
+useful when you install a new version of node, and must recompile all your
+C++ addons with the new binary\.  It is also useful when installing with
+\fB\-\-ignore\-scripts\fP and \fB\-\-no\-bin\-links\fP, to explicitly choose which
+packages to build and/or link bins\.
+.P
+If one or more package names (and optionally version ranges) are provided,
+then only packages with a name and version matching one of the specifiers
+will be rebuilt\.
 .SS See Also
 .RS 0
 .IP \(bu 2
-npm help build
-.IP \(bu 2
 npm help install
 
 .RE
diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1
index 6beb1dab6017cd..fce87ad18e580d 100644
--- a/deps/npm/man/man1/npm-repo.1
+++ b/deps/npm/man/man1/npm-repo.1
@@ -1,4 +1,4 @@
-.TH "NPM\-REPO" "1" "November 2020" "" ""
+.TH "NPM\-REPO" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-repo\fR \- Open package repository page in the browser
 .SS Synopsis
@@ -11,9 +11,9 @@ npm repo [<pkgname> [<pkgname> \.\.\.]]
 .SS Description
 .P
 This command tries to guess at the likely location of a package's
-repository URL, and then tries to open it using the \fB\-\-browser\fP
-config param\. If no package name is provided, it will search for
-a \fBpackage\.json\fP in the current folder and use the \fBname\fP property\.
+repository URL, and then tries to open it using the \fB\-\-browser\fP config
+param\. If no package name is provided, it will search for a \fBpackage\.json\fP
+in the current folder and use the \fBrepository\fP property\.
 .SS Configuration
 .SS browser
 .RS 0
diff --git a/deps/npm/man/man1/npm-restart.1 b/deps/npm/man/man1/npm-restart.1
index 5e0dc83aa96932..60e00a33d51b29 100644
--- a/deps/npm/man/man1/npm-restart.1
+++ b/deps/npm/man/man1/npm-restart.1
@@ -1,4 +1,4 @@
-.TH "NPM\-RESTART" "1" "November 2020" "" ""
+.TH "NPM\-RESTART" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-restart\fR \- Restart a package
 .SS Synopsis
@@ -10,10 +10,23 @@ npm restart [\-\- <args>]
 .RE
 .SS Description
 .P
-This restarts a package\.
+This restarts a project\.  It is equivalent to running \fBnpm run\-script
+restart\fP\|\.
 .P
-This runs a package's "stop", "restart", and "start" scripts, and associated
-pre\- and post\- scripts, in the order given below:
+If the current project has a \fB"restart"\fP script specified in
+\fBpackage\.json\fP, then the following scripts will be run:
+.RS 0
+.IP 1. 3
+prerestart
+.IP 2. 3
+restart
+.IP 3. 3
+postrestart
+
+.RE
+.P
+If it does \fInot\fR have a \fB"restart"\fP script specified, but it does have
+\fBstop\fP and/or \fBstart\fP scripts, then the following scripts will be run:
 .RS 0
 .IP 1. 3
 prerestart
@@ -24,24 +37,15 @@ stop
 .IP 4. 3
 poststop
 .IP 5. 3
-restart
-.IP 6. 3
 prestart
-.IP 7. 3
+.IP 6. 3
 start
-.IP 8. 3
+.IP 7. 3
 poststart
-.IP 9. 3
+.IP 8. 3
 postrestart
 
 .RE
-.SS Note
-.P
-Note that the "restart" script is run \fBin addition to\fR the "stop"
-and "start" scripts, not instead of them\.
-.P
-This is the behavior as of \fBnpm\fP major version 2\.  A change in this
-behavior will be accompanied by an increase in major version number
 .SS See Also
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1
index 180ae54d8b40cc..e1ba4ef6caaf5c 100644
--- a/deps/npm/man/man1/npm-root.1
+++ b/deps/npm/man/man1/npm-root.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ROOT" "1" "November 2020" "" ""
+.TH "NPM\-ROOT" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-root\fR \- Display npm root
 .SS Synopsis
@@ -11,6 +11,17 @@ npm root [\-g]
 .SS Description
 .P
 Print the effective \fBnode_modules\fP folder to standard out\.
+.P
+Useful for using npm in shell scripts that do things with the
+\fBnode_modules\fP folder\.  For example:
+.P
+.RS 2
+.nf
+#!/bin/bash
+global_node_modules="$(npm root \-\-global)"
+echo "Global packages installed in: ${global_node_modules}"
+.fi
+.RE
 .SS See Also
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1
index df3a6424d0c3ec..2fb476eed78965 100644
--- a/deps/npm/man/man1/npm-run-script.1
+++ b/deps/npm/man/man1/npm-run-script.1
@@ -1,27 +1,29 @@
-.TH "NPM\-RUN\-SCRIPT" "1" "November 2020" "" ""
+.TH "NPM\-RUN\-SCRIPT" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-run-script\fR \- Run arbitrary package scripts
 .SS Synopsis
 .P
 .RS 2
 .nf
-npm run\-script <command> [\-\-silent] [\-\- <args>\.\.\.]
+npm run\-script <command> [\-\-if\-present] [\-\-silent] [\-\- <args>]
 
-alias: npm run
+aliases: run, rum, urn
 .fi
 .RE
 .SS Description
 .P
 This runs an arbitrary command from a package's \fB"scripts"\fP object\.  If no
-\fB"command"\fP is provided, it will list the available scripts\.  \fBrun[\-script]\fP is
-used by the test, start, restart, and stop commands, but can be called
-directly, as well\. When the scripts in the package are printed out, they're
-separated into lifecycle (test, start, restart) and directly\-run scripts\.
+\fB"command"\fP is provided, it will list the available scripts\.
 .P
-As of \fBnpm@2\.0\.0\fP \fIhttps://blog\.npmjs\.org/post/98131109725/npm\-2\-0\-0\fR, you can
-use custom arguments when executing scripts\. The special option \fB\-\-\fP is used by
-getopt \fIhttps://goo\.gl/KxMmtG\fR to delimit the end of the options\. npm will pass
-all the arguments after the \fB\-\-\fP directly to your script:
+\fBrun[\-script]\fP is used by the test, start, restart, and stop commands, but
+can be called directly, as well\. When the scripts in the package are
+printed out, they're separated into lifecycle (test, start, restart) and
+directly\-run scripts\.
+.P
+Any positional arguments are passed to the specified script\.  Use \fB\-\-\fP to
+pass \fB\-\fP\-prefixed flags and options which would otherwise be parsed by npm\.
+.P
+For example:
 .P
 .RS 2
 .nf
@@ -38,14 +40,14 @@ environment variables that will be available to the script at runtime\. If an
 built\-in\.
 .P
 In addition to the shell's pre\-existing \fBPATH\fP, \fBnpm run\fP adds
-\fBnode_modules/\.bin\fP to the \fBPATH\fP provided to scripts\. Any binaries provided by
-locally\-installed dependencies can be used without the \fBnode_modules/\.bin\fP
-prefix\. For example, if there is a \fBdevDependency\fP on \fBtap\fP in your package,
-you should write:
+\fBnode_modules/\.bin\fP to the \fBPATH\fP provided to scripts\. Any binaries
+provided by locally\-installed dependencies can be used without the
+\fBnode_modules/\.bin\fP prefix\. For example, if there is a \fBdevDependency\fP on
+\fBtap\fP in your package, you should write:
 .P
 .RS 2
 .nf
-"scripts": {"test": "tap test/\\*\.js"}
+"scripts": {"test": "tap test/*\.js"}
 .fi
 .RE
 .P
@@ -53,20 +55,17 @@ instead of
 .P
 .RS 2
 .nf
-"scripts": {"test": "node_modules/\.bin/tap test/\\*\.js"}
+"scripts": {"test": "node_modules/\.bin/tap test/*\.js"}
 .fi
 .RE
 .P
-to run your tests\.
-.P
 The actual shell your script is run within is platform dependent\. By default,
 on Unix\-like systems it is the \fB/bin/sh\fP command, on Windows it is the \fBcmd\.exe\fP\|\.
 The actual shell referred to by \fB/bin/sh\fP also depends on the system\.
-As of \fBnpm@5\.1\.0\fP \fIhttps://github\.com/npm/npm/releases/tag/v5\.1\.0\fR you can
-customize the shell with the \fBscript\-shell\fP configuration\.
+You can customize the shell with the \fBscript\-shell\fP configuration\.
 .P
-Scripts are run from the root of the module, regardless of what your current
-working directory is when you call \fBnpm run\fP\|\. If you want your script to
+Scripts are run from the root of the module, regardless of what the current
+working directory is when \fBnpm run\fP is called\. If you want your script to
 use different behavior based on what subdirectory you're in, you can use the
 \fBINIT_CWD\fP environment variable, which holds the full path you were in when
 you ran \fBnpm run\fP\|\.
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index 4b72f2e8557efc..d597664d37db75 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -1,4 +1,4 @@
-.TH "NPM\-SEARCH" "1" "November 2020" "" ""
+.TH "NPM\-SEARCH" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-search\fR \- Search for packages
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-set-script.1 b/deps/npm/man/man1/npm-set-script.1
new file mode 100644
index 00000000000000..97979b100a937a
--- /dev/null
+++ b/deps/npm/man/man1/npm-set-script.1
@@ -0,0 +1,43 @@
+.TH "NPM\-SET\-SCRIPT" "1" "December 2020" "" ""
+.SH "NAME"
+\fBnpm-set-script\fR \- Set tasks in the scripts section of package\.json
+.SS Synopsis
+.P
+An npm command that lets you create a task in the scripts section of the package\.json\.
+.P
+.RS 2
+.nf
+npm set\-script [<script>] [<command>]
+.fi
+.RE
+.P
+\fBExample:\fR
+.RS 0
+.IP \(bu 2
+\fBnpm set\-script start "http\-server \."\fP
+
+.RE
+.P
+.RS 2
+.nf
+{
+  "name": "my\-project",
+  "scripts": {
+    "start": "http\-server \.",
+    "test": "some existing value"
+  }
+}
+.fi
+.RE
+.SS See Also
+.RS 0
+.IP \(bu 2
+npm help run\-script
+.IP \(bu 2
+npm help install
+.IP \(bu 2
+npm help test
+.IP \(bu 2
+npm help start
+
+.RE
diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1
index aed1e8c5751709..71f8c4bd9188d4 100644
--- a/deps/npm/man/man1/npm-shrinkwrap.1
+++ b/deps/npm/man/man1/npm-shrinkwrap.1
@@ -1,4 +1,4 @@
-.TH "NPM\-SHRINKWRAP" "1" "November 2020" "" ""
+.TH "NPM\-SHRINKWRAP" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-shrinkwrap\fR \- Lock down dependency versions for publication
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1
index d47cc7505fcb0d..412283276b8c55 100644
--- a/deps/npm/man/man1/npm-star.1
+++ b/deps/npm/man/man1/npm-star.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STAR" "1" "November 2020" "" ""
+.TH "NPM\-STAR" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-star\fR \- Mark your favorite packages
 .SS Synopsis
@@ -6,7 +6,6 @@
 .RS 2
 .nf
 npm star [<pkg>\.\.\.]
-npm unstar [<pkg>\.\.\.]
 .fi
 .RE
 .SS Description
@@ -14,12 +13,25 @@ npm unstar [<pkg>\.\.\.]
 "Starring" a package means that you have some interest in it\.  It's
 a vaguely positive way to show that you care\.
 .P
+It's a boolean thing\. Starring repeatedly has no additional effect\.
+.SS More
+.P
+There's also these extra commands to help you manage your favorite packages:
+.SS Unstar
+.P
+You can also "unstar" a package using npm help \fBunstar\fP
+.P
 "Unstarring" is the same thing, but in reverse\.
+.SS Listing stars
 .P
-It's a boolean thing\.  Starring repeatedly has no additional effect\.
+You can see all your starred packages using npm help \fBstars\fP
 .SS See Also
 .RS 0
 .IP \(bu 2
+npm help unstar
+.IP \(bu 2
+npm help stars
+.IP \(bu 2
 npm help view
 .IP \(bu 2
 npm help whoami
diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1
index 39f539e52597a6..bb620239917412 100644
--- a/deps/npm/man/man1/npm-stars.1
+++ b/deps/npm/man/man1/npm-stars.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STARS" "1" "November 2020" "" ""
+.TH "NPM\-STARS" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-stars\fR \- View packages marked as favorites
 .SS Synopsis
@@ -20,6 +20,8 @@ you will most certainly enjoy this command\.
 .IP \(bu 2
 npm help star
 .IP \(bu 2
+npm help unstar
+.IP \(bu 2
 npm help view
 .IP \(bu 2
 npm help whoami
diff --git a/deps/npm/man/man1/npm-start.1 b/deps/npm/man/man1/npm-start.1
index 97cb2af187ca03..fecca5eb0841bf 100644
--- a/deps/npm/man/man1/npm-start.1
+++ b/deps/npm/man/man1/npm-start.1
@@ -1,4 +1,4 @@
-.TH "NPM\-START" "1" "November 2020" "" ""
+.TH "NPM\-START" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-start\fR \- Start a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-stop.1 b/deps/npm/man/man1/npm-stop.1
index 00b5ea1cdc3598..2653090795adc8 100644
--- a/deps/npm/man/man1/npm-stop.1
+++ b/deps/npm/man/man1/npm-stop.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STOP" "1" "November 2020" "" ""
+.TH "NPM\-STOP" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-stop\fR \- Stop a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-team.1 b/deps/npm/man/man1/npm-team.1
index 7ef02a93f7ae8e..0df7c41164899c 100644
--- a/deps/npm/man/man1/npm-team.1
+++ b/deps/npm/man/man1/npm-team.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TEAM" "1" "November 2020" "" ""
+.TH "NPM\-TEAM" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-team\fR \- Manage organization teams and team memberships
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-test.1 b/deps/npm/man/man1/npm-test.1
index 1affbbf3ce65b4..fa5bf03c36bf04 100644
--- a/deps/npm/man/man1/npm-test.1
+++ b/deps/npm/man/man1/npm-test.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TEST" "1" "November 2020" "" ""
+.TH "NPM\-TEST" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-test\fR \- Test a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-token.1 b/deps/npm/man/man1/npm-token.1
index 94466a50ff9d7a..b67902828222e3 100644
--- a/deps/npm/man/man1/npm-token.1
+++ b/deps/npm/man/man1/npm-token.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TOKEN" "1" "November 2020" "" ""
+.TH "NPM\-TOKEN" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-token\fR \- Manage your authentication tokens
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1
index 41682436f01e3f..d098c88415d57a 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UNINSTALL" "1" "November 2020" "" ""
+.TH "NPM\-UNINSTALL" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-uninstall\fR \- Remove a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1
index 556aea1f796490..0c7d946a4da332 100644
--- a/deps/npm/man/man1/npm-unpublish.1
+++ b/deps/npm/man/man1/npm-unpublish.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UNPUBLISH" "1" "November 2020" "" ""
+.TH "NPM\-UNPUBLISH" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-unpublish\fR \- Remove a package from the registry
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-unstar.1 b/deps/npm/man/man1/npm-unstar.1
new file mode 100644
index 00000000000000..d3115ff7ab57c9
--- /dev/null
+++ b/deps/npm/man/man1/npm-unstar.1
@@ -0,0 +1,37 @@
+.TH "NPM\-UNSTAR" "1" "December 2020" "" ""
+.SH "NAME"
+\fBnpm-unstar\fR \- Remove an item from your favorite packages
+.SS Synopsis
+.P
+.RS 2
+.nf
+npm unstar [<pkg>\.\.\.]
+.fi
+.RE
+.SS Description
+.P
+"Unstarring" a package is the opposite of npm help \fBstar\fP,
+it removes an item from your list of favorite packages\.
+.SS More
+.P
+There's also these extra commands to help you manage your favorite packages:
+.SS Star
+.P
+You can "star" a package using npm help \fBstar\fP
+.SS Listing stars
+.P
+You can see all your starred packages using npm help \fBstars\fP
+.SS See Also
+.RS 0
+.IP \(bu 2
+npm help star
+.IP \(bu 2
+npm help stars
+.IP \(bu 2
+npm help view
+.IP \(bu 2
+npm help whoami
+.IP \(bu 2
+npm help adduser
+
+.RE
diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1
index d8a8fd209477a8..2df28cd28e24eb 100644
--- a/deps/npm/man/man1/npm-update.1
+++ b/deps/npm/man/man1/npm-update.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UPDATE" "1" "November 2020" "" ""
+.TH "NPM\-UPDATE" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-update\fR \- Update a package
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1
index 59d21e8aa293fb..f6df51bfba9597 100644
--- a/deps/npm/man/man1/npm-version.1
+++ b/deps/npm/man/man1/npm-version.1
@@ -1,4 +1,4 @@
-.TH "NPM\-VERSION" "1" "November 2020" "" ""
+.TH "NPM\-VERSION" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-version\fR \- Bump a package version
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1
index 943bada0e6edf2..7334357ccfd685 100644
--- a/deps/npm/man/man1/npm-view.1
+++ b/deps/npm/man/man1/npm-view.1
@@ -1,4 +1,4 @@
-.TH "NPM\-VIEW" "1" "November 2020" "" ""
+.TH "NPM\-VIEW" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-view\fR \- View registry info
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1
index 49fe4b2dfb9307..73de7540360b63 100644
--- a/deps/npm/man/man1/npm-whoami.1
+++ b/deps/npm/man/man1/npm-whoami.1
@@ -1,4 +1,4 @@
-.TH "NPM\-WHOAMI" "1" "November 2020" "" ""
+.TH "NPM\-WHOAMI" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm-whoami\fR \- Display npm username
 .SS Synopsis
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 9197f45f0ad022..59655ec71e8bac 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "November 2020" "" ""
+.TH "NPM" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpm\fR \- javascript package manager
 .SS Synopsis
@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SS Version
 .P
-7\.0\.8
+7\.1\.2
 .SS Description
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man1/npx.1 b/deps/npm/man/man1/npx.1
index 88b597de523502..c11f9600e16da2 100644
--- a/deps/npm/man/man1/npx.1
+++ b/deps/npm/man/man1/npx.1
@@ -1,4 +1,4 @@
-.TH "NPX" "1" "November 2020" "" ""
+.TH "NPX" "1" "December 2020" "" ""
 .SH "NAME"
 \fBnpx\fR \- Run a command from a local or remote npm package
 .SS Synopsis
@@ -6,9 +6,9 @@
 .RS 2
 .nf
 npm exec \-\- <pkg>[@<version>] [args\.\.\.]
-npm exec \-p <pkg>[@<version>] \-\- <cmd> [args\.\.\.]
+npm exec \-\-package=<pkg>[@<version>] \-\- <cmd> [args\.\.\.]
 npm exec \-c '<cmd> [args\.\.\.]'
-npm exec \-p foo \-c '<cmd> [args\.\.\.]'
+npm exec \-\-package=foo \-c '<cmd> [args\.\.\.]'
 
 npx <pkg>[@<specifier>] [args\.\.\.]
 npx \-p <pkg>[@<specifier>] <cmd> [args\.\.\.]
@@ -17,7 +17,8 @@ npx \-p <pkg>[@<specifier>] \-c '<cmd> [args\.\.\.]'
 
 alias: npm x, npx
 
-\-p <pkg> \-\-package=<pkg> (may be specified multiple times)
+\-\-package=<pkg> (may be specified multiple times)
+\-p is a shorthand for \-\-package only when using npx executable
 \-c <cmd> \-\-call=<cmd> (may not be mixed with positional arguments)
 .fi
 .RE
@@ -27,9 +28,9 @@ This command allows you to run an arbitrary command from an npm package
 (either one installed locally, or fetched remotely), in a similar context
 as running it via \fBnpm run\fP\|\.
 .P
-Whatever packages are specified by the \fB\-\-package\fP or \fB\-p\fP option will be
+Whatever packages are specified by the \fB\-\-package\fP option will be
 provided in the \fBPATH\fP of the executed command, along with any locally
-installed package executables\.  The \fB\-\-package\fP or \fB\-p\fP option may be
+installed package executables\.  The \fB\-\-package\fP option may be
 specified multiple times, to execute the supplied command in an environment
 where all specified packages are available\.
 .P
@@ -45,14 +46,15 @@ only be considered a match if they have the exact same name and version as
 the local dependency\.
 .P
 If no \fB\-c\fP or \fB\-\-call\fP option is provided, then the positional arguments
-are used to generate the command string\.  If no \fB\-p\fP or \fB\-\-package\fP options
+are used to generate the command string\.  If no \fB\-\-package\fP options
 are provided, then npm will attempt to determine the executable name from
 the package specifier provided as the first positional argument according
 to the following heuristic:
 .RS 0
 .IP \(bu 2
 If the package has a single entry in its \fBbin\fP field in \fBpackage\.json\fP,
-then that command will be used\.
+or if all entries are aliases of the same command, then that command
+will be used\.
 .IP \(bu 2
 If the package has multiple \fBbin\fP entries, and one of them matches the
 unscoped portion of the \fBname\fP field, then that command will be used\.
diff --git a/deps/npm/man/man5/folders.5 b/deps/npm/man/man5/folders.5
index a41c3ea1d9f507..6d838019c6ce8f 100644
--- a/deps/npm/man/man5/folders.5
+++ b/deps/npm/man/man5/folders.5
@@ -1,4 +1,4 @@
-.TH "FOLDERS" "5" "November 2020" "" ""
+.TH "FOLDERS" "5" "December 2020" "" ""
 .SH "NAME"
 \fBfolders\fR \- Folder Structures Used by npm
 .SS Description
diff --git a/deps/npm/man/man5/install.5 b/deps/npm/man/man5/install.5
index 9b12559729816f..e827d11bdb9aea 100644
--- a/deps/npm/man/man5/install.5
+++ b/deps/npm/man/man5/install.5
@@ -1,4 +1,4 @@
-.TH "INSTALL" "5" "November 2020" "" ""
+.TH "INSTALL" "5" "December 2020" "" ""
 .SH "NAME"
 \fBinstall\fR \- Download and install node and npm
 .SS Description
diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5
index 46575b7ae96ef7..ea60e39a2494b9 100644
--- a/deps/npm/man/man5/npmrc.5
+++ b/deps/npm/man/man5/npmrc.5
@@ -1,4 +1,4 @@
-.TH "NPMRC" "5" "November 2020" "" ""
+.TH "NPMRC" "5" "December 2020" "" ""
 .SH "NAME"
 \fBnpmrc\fR \- The npm config files
 .SS Description
diff --git a/deps/npm/man/man5/package-json.5 b/deps/npm/man/man5/package-json.5
index 83f3babc75b0b3..5b8b5037634bd9 100644
--- a/deps/npm/man/man5/package-json.5
+++ b/deps/npm/man/man5/package-json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "November 2020" "" ""
+.TH "PACKAGE\.JSON" "5" "December 2020" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SS Description
diff --git a/deps/npm/man/man5/package-lock-json.5 b/deps/npm/man/man5/package-lock-json.5
index 2dabd65ecc4bc6..77d8ab1c3eefaf 100644
--- a/deps/npm/man/man5/package-lock-json.5
+++ b/deps/npm/man/man5/package-lock-json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\-LOCK\.JSON" "5" "November 2020" "" ""
+.TH "PACKAGE\-LOCK\.JSON" "5" "December 2020" "" ""
 .SH "NAME"
 \fBpackage-lock.json\fR \- A manifestation of the manifest
 .SS Description
diff --git a/deps/npm/man/man5/package-locks.5 b/deps/npm/man/man5/package-locks.5
index 8159e905907c00..0fc35cfb5a0298 100644
--- a/deps/npm/man/man5/package-locks.5
+++ b/deps/npm/man/man5/package-locks.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\-LOCKS" "5" "November 2020" "" ""
+.TH "PACKAGE\-LOCKS" "5" "December 2020" "" ""
 .SH "NAME"
 \fBpackage-locks\fR \- An explanation of npm lockfiles
 .SS Description
diff --git a/deps/npm/man/man5/shrinkwrap-json.5 b/deps/npm/man/man5/shrinkwrap-json.5
index 17e23a7dcdd88f..7457df20e4bf32 100644
--- a/deps/npm/man/man5/shrinkwrap-json.5
+++ b/deps/npm/man/man5/shrinkwrap-json.5
@@ -1,4 +1,4 @@
-.TH "SHRINKWRAP\.JSON" "5" "November 2020" "" ""
+.TH "SHRINKWRAP\.JSON" "5" "December 2020" "" ""
 .SH "NAME"
 \fBshrinkwrap.json\fR \- A publishable lockfile
 .SS Description
diff --git a/deps/npm/man/man7/config.7 b/deps/npm/man/man7/config.7
index 1d40942e9f9111..ebf2314e288d9e 100644
--- a/deps/npm/man/man7/config.7
+++ b/deps/npm/man/man7/config.7
@@ -1,4 +1,4 @@
-.TH "CONFIG" "7" "November 2020" "" ""
+.TH "CONFIG" "7" "December 2020" "" ""
 .SH "NAME"
 \fBconfig\fR \- More than you probably want to know about npm configuration
 .SS Description
@@ -577,7 +577,7 @@ Type: Boolean
 .RE
 .P
 When "true" displays the message at the end of each \fBnpm install\fP
-aknowledging the number of dependencies looking for funding\.
+acknowledging the number of dependencies looking for funding\.
 See npm help \fBfund\fP for details\.
 .SS fetch\-retries
 .RS 0
@@ -1473,7 +1473,7 @@ Type: Boolean
 .P
 If true, success/failure metrics will be reported to the registry stored in
 \fBmetrics\-registry\fP\|\.  These requests contain the number of successful and
-failing runs of the npm CLI and the time period overwhich those counts were
+failing runs of the npm CLI and the time period over which those counts were
 gathered\. No identifying information is included in these requests\.
 .SS shell
 .RS 0
diff --git a/deps/npm/man/man7/developers.7 b/deps/npm/man/man7/developers.7
index 9a34bf3edb0505..e24b78cff7ba9a 100644
--- a/deps/npm/man/man7/developers.7
+++ b/deps/npm/man/man7/developers.7
@@ -1,4 +1,4 @@
-.TH "DEVELOPERS" "7" "November 2020" "" ""
+.TH "DEVELOPERS" "7" "December 2020" "" ""
 .SH "NAME"
 \fBdevelopers\fR \- Developer Guide
 .SS Description
@@ -53,68 +53,63 @@ git+https://user@hostname/project/blah\.git#commit\-ish
 .RE
 .P
 The \fBcommit\-ish\fP can be any tag, sha, or branch which can be supplied as
-an argument to \fBgit checkout\fP\|\.  The default is \fBmaster\fP\|\.
+an argument to \fBgit checkout\fP\|\.  The default is whatever the repository uses
+as its default branch\.
 .SS The package\.json File
 .P
 You need to have a \fBpackage\.json\fP file in the root of your project to do
 much of anything with npm\.  That is basically the whole interface\.
 .P
-See npm help \fBpackage\.json\fP for details about what goes in that file\.  At the very
-least, you need:
+See npm help \fBpackage\.json\fP for details about what
+goes in that file\.  At the very least, you need:
 .RS 0
 .IP \(bu 2
-name:
-This should be a string that identifies your project\.  Please do not
-use the name to specify that it runs on node, or is in JavaScript\.
-You can use the "engines" field to explicitly state the versions of
-node (or whatever else) that your program requires, and it's pretty
-well assumed that it's JavaScript\.
+name: This should be a string that identifies your project\.  Please do
+not use the name to specify that it runs on node, or is in JavaScript\.
+You can use the "engines" field to explicitly state the versions of node
+(or whatever else) that your program requires, and it's pretty well
+assumed that it's JavaScript\.
 It does not necessarily need to match your github repository name\.
 So, \fBnode\-foo\fP and \fBbar\-js\fP are bad names\.  \fBfoo\fP or \fBbar\fP are better\.
 .IP \(bu 2
-version:
-A semver\-compatible version\.
+version: A semver\-compatible version\.
 .IP \(bu 2
-engines:
-Specify the versions of node (or whatever else) that your program
-runs on\.  The node API changes a lot, and there may be bugs or new
-functionality that you depend on\.  Be explicit\.
+engines: Specify the versions of node (or whatever else) that your
+program runs on\.  The node API changes a lot, and there may be bugs or
+new functionality that you depend on\.  Be explicit\.
 .IP \(bu 2
-author:
-Take some credit\.
+author: Take some credit\.
 .IP \(bu 2
-scripts:
-If you have a special compilation or installation script, then you
-should put it in the \fBscripts\fP object\.  You should definitely have at
-least a basic smoke\-test command as the "scripts\.test" field\.
-See npm help scripts\.
+scripts: If you have a special compilation or installation script, then
+you should put it in the \fBscripts\fP object\.  You should definitely have at
+least a basic smoke\-test command as the "scripts\.test" field\.  See
+npm help scripts\.
 .IP \(bu 2
-main:
-If you have a single module that serves as the entry point to your
-program (like what the "foo" package gives you at require("foo")),
-then you need to specify that in the "main" field\.
+main: If you have a single module that serves as the entry point to your
+program (like what the "foo" package gives you at require("foo")), then
+you need to specify that in the "main" field\.
 .IP \(bu 2
-directories:
-This is an object mapping names to folders\.  The best ones to include are
-"lib" and "doc", but if you use "man" to specify a folder full of man pages,
-they'll get installed just like these ones\.
+directories: This is an object mapping names to folders\.  The best ones
+to include are "lib" and "doc", but if you use "man" to specify a folder
+full of man pages, they'll get installed just like these ones\.
 
 .RE
 .P
 You can use \fBnpm init\fP in the root of your package in order to get you
-started with a pretty basic package\.json file\.  See
-npm help \fBinit\fP for more info\.
+started with a pretty basic package\.json file\.  See npm help \fBnpm
+init\fP for more info\.
 .SS Keeping files \fIout\fR of your package
 .P
-Use a \fB\|\.npmignore\fP file to keep stuff out of your package\.  If there's
-no \fB\|\.npmignore\fP file, but there \fIis\fR a \fB\|\.gitignore\fP file, then npm will
-ignore the stuff matched by the \fB\|\.gitignore\fP file\.  If you \fIwant\fR to
-include something that is excluded by your \fB\|\.gitignore\fP file, you can
-create an empty \fB\|\.npmignore\fP file to override it\. Like \fBgit\fP, \fBnpm\fP looks
-for \fB\|\.npmignore\fP and \fB\|\.gitignore\fP files in all subdirectories of your
-package, not only the root directory\.
+Use a \fB\|\.npmignore\fP file to keep stuff out of your package\.  If there's no
+\fB\|\.npmignore\fP file, but there \fIis\fR a \fB\|\.gitignore\fP file, then npm will ignore
+the stuff matched by the \fB\|\.gitignore\fP file\.  If you \fIwant\fR to include
+something that is excluded by your \fB\|\.gitignore\fP file, you can create an
+empty \fB\|\.npmignore\fP file to override it\. Like \fBgit\fP, \fBnpm\fP looks for
+\fB\|\.npmignore\fP and \fB\|\.gitignore\fP files in all subdirectories of your package,
+not only the root directory\.
 .P
-\fB\|\.npmignore\fP files follow the same pattern rules \fIhttps://git\-scm\.com/book/en/v2/Git\-Basics\-Recording\-Changes\-to\-the\-Repository#Ignoring\-Files\fR
+\fB\|\.npmignore\fP files follow the same pattern
+rules \fIhttps://git\-scm\.com/book/en/v2/Git\-Basics\-Recording\-Changes\-to\-the\-Repository#_ignoring\fR
 as \fB\|\.gitignore\fP files:
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man7/disputes.7 b/deps/npm/man/man7/disputes.7
index 6fccaabf4ab983..8e955059910560 100644
--- a/deps/npm/man/man7/disputes.7
+++ b/deps/npm/man/man7/disputes.7
@@ -1,4 +1,4 @@
-.TH "DISPUTES" "7" "November 2020" "" ""
+.TH "DISPUTES" "7" "December 2020" "" ""
 .SH "NAME"
 \fBdisputes\fR \- Handling Module Name Disputes
 .P
diff --git a/deps/npm/man/man7/orgs.7 b/deps/npm/man/man7/orgs.7
index 6d482bea3b7368..d496e4d4a9446e 100644
--- a/deps/npm/man/man7/orgs.7
+++ b/deps/npm/man/man7/orgs.7
@@ -1,4 +1,4 @@
-.TH "ORGS" "7" "November 2020" "" ""
+.TH "ORGS" "7" "December 2020" "" ""
 .SH "NAME"
 \fBorgs\fR \- Working with Teams & Orgs
 .SS Description
diff --git a/deps/npm/man/man7/registry.7 b/deps/npm/man/man7/registry.7
index 07e77118465e82..cf6b02faeb9643 100644
--- a/deps/npm/man/man7/registry.7
+++ b/deps/npm/man/man7/registry.7
@@ -1,4 +1,4 @@
-.TH "REGISTRY" "7" "November 2020" "" ""
+.TH "REGISTRY" "7" "December 2020" "" ""
 .SH "NAME"
 \fBregistry\fR \- The JavaScript Package Registry
 .SS Description
diff --git a/deps/npm/man/man7/removal.7 b/deps/npm/man/man7/removal.7
index 55e4d711dda495..24f08abfff760d 100644
--- a/deps/npm/man/man7/removal.7
+++ b/deps/npm/man/man7/removal.7
@@ -1,4 +1,4 @@
-.TH "REMOVAL" "7" "November 2020" "" ""
+.TH "REMOVAL" "7" "December 2020" "" ""
 .SH "NAME"
 \fBremoval\fR \- Cleaning the Slate
 .SS Synopsis
diff --git a/deps/npm/man/man7/scope.7 b/deps/npm/man/man7/scope.7
index 83c6cc2541a163..534b064c89b13d 100644
--- a/deps/npm/man/man7/scope.7
+++ b/deps/npm/man/man7/scope.7
@@ -1,4 +1,4 @@
-.TH "SCOPE" "7" "November 2020" "" ""
+.TH "SCOPE" "7" "December 2020" "" ""
 .SH "NAME"
 \fBscope\fR \- Scoped packages
 .SS Description
diff --git a/deps/npm/man/man7/scripts.7 b/deps/npm/man/man7/scripts.7
index 522e32cb80e158..d2ef4476abd00f 100644
--- a/deps/npm/man/man7/scripts.7
+++ b/deps/npm/man/man7/scripts.7
@@ -1,9 +1,9 @@
-.TH "SCRIPTS" "7" "November 2020" "" ""
+.TH "SCRIPTS" "7" "December 2020" "" ""
 .SH "NAME"
 \fBscripts\fR \- How npm handles the "scripts" field
 .SS Description
 .P
-The \fB"scripts"\fP property of of your \fBpackage\.json\fP file supports a number of built\-in scripts and their preset life cycle events as well as arbitrary scripts\. These all can be executed by running \fBnpm run\-script <stage>\fP or \fBnpm run <stage>\fP for short\. \fIPre\fR and \fIpost\fR commands with matching names will be run for those as well (e\.g\. \fBpremyscript\fP, \fBmyscript\fP, \fBpostmyscript\fP)\. Scripts from dependencies can be run with \fBnpm explore <pkg> \-\- npm run <stage>\fP\|\.
+The \fB"scripts"\fP property of your \fBpackage\.json\fP file supports a number of built\-in scripts and their preset life cycle events as well as arbitrary scripts\. These all can be executed by running \fBnpm run\-script <stage>\fP or \fBnpm run <stage>\fP for short\. \fIPre\fR and \fIpost\fR commands with matching names will be run for those as well (e\.g\. \fBpremyscript\fP, \fBmyscript\fP, \fBpostmyscript\fP)\. Scripts from dependencies can be run with \fBnpm explore <pkg> \-\- npm run <stage>\fP\|\.
 .SS Pre & Post Scripts
 .P
 To create "pre" or "post" scripts for any scripts defined in the \fB"scripts"\fP section of the \fBpackage\.json\fP, simply create another script \fIwith a matching name\fR and add "pre" or "post" to the beginning of them\.
@@ -177,10 +177,8 @@ default the \fBinstall\fP command to compile using node\-gyp\.
 .RE
 .SS User
 .P
-If npm was invoked with root privileges, then it will change the uid
-to the user account or uid specified by the \fBuser\fP config, which
-defaults to \fBnobody\fP\|\.  Set the \fBunsafe\-perm\fP flag to run scripts with
-root privileges\.
+When npm is run as root, scripts are always run with the effective uid
+and gid of the working directory owner\.
 .SS Environment
 .P
 Package scripts run in an environment where many pieces of information
diff --git a/deps/npm/man/man7/semver.7 b/deps/npm/man/man7/semver.7
index 8e9478e721bc58..0a08bf9abb3eed 100644
--- a/deps/npm/man/man7/semver.7
+++ b/deps/npm/man/man7/semver.7
@@ -1,4 +1,4 @@
-.TH "SEMVER" "7" "November 2020" "" ""
+.TH "SEMVER" "7" "December 2020" "" ""
 .SH "NAME"
 \fBsemver\fR \- The semantic versioner for npm
 .SH Install
diff --git a/deps/npm/man/man7/workspaces.7 b/deps/npm/man/man7/workspaces.7
index 8c982f1253eb03..ade7d238bd616a 100644
--- a/deps/npm/man/man7/workspaces.7
+++ b/deps/npm/man/man7/workspaces.7
@@ -1,4 +1,4 @@
-.TH "WORKSPACES" "7" "November 2020" "" ""
+.TH "WORKSPACES" "7" "December 2020" "" ""
 .SH "NAME"
 \fBworkspaces\fR \- Working with workspaces
 .SS Description
diff --git a/deps/npm/node_modules/@npmcli/arborist/CHANGELOG.md b/deps/npm/node_modules/@npmcli/arborist/CHANGELOG.md
new file mode 100644
index 00000000000000..3cd36d027b6318
--- /dev/null
+++ b/deps/npm/node_modules/@npmcli/arborist/CHANGELOG.md
@@ -0,0 +1,19 @@
+# CHANGELOG
+
+## 2.0
+
+* BREAKING CHANGE: root node is now included in inventory
+* All parent/target/fsParent/etc. references set in `root` setter, rather
+  than the hodgepodge of setters that existed before.
+* `treeCheck` function added, to enforce strict correctness guarantees when
+  `ARBORIST_DEBUG=1` in the environment (on by default in Arborist tests).
+
+## 1.0
+
+* Release for npm v7 beta
+* Fully functional
+
+## 0.0
+
+* Proof of concept
+* Before this, it was [`read-package-tree`](http://npm.im/read-package-tree)
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
index 54a6ff33751a1f..731b78518775ce 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
@@ -7,6 +7,10 @@ const semver = require('semver')
 const promiseCallLimit = require('promise-call-limit')
 const getPeerSet = require('../peer-set.js')
 const realpath = require('../../lib/realpath.js')
+const { resolve } = require('path')
+const { promisify } = require('util')
+const treeCheck = require('../tree-check.js')
+const readdir = promisify(require('readdir-scoped-modules'))
 
 const debug = require('../debug.js')
 const fromPath = require('../from-path.js')
@@ -182,8 +186,10 @@ module.exports = cls => class IdealTreeBuilder extends cls {
 
     process.emit('time', 'idealTree')
 
-    if (!options.add && !options.rm && this[_global])
-      return Promise.reject(new Error('global requires an add or rm option'))
+    if (!options.add && !options.rm && !options.update && this[_global]) {
+      const er = new Error('global requires add, rm, or update option')
+      return Promise.reject(er)
+    }
 
     // first get the virtual tree, if possible.  If there's a lockfile, then
     // that defines the ideal tree, unless the root package.json is not
@@ -209,7 +215,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
       this.finishTracker('idealTree')
     }
 
-    return this.idealTree
+    return treeCheck(this.idealTree)
   }
 
   [_checkEngineAndPlatform] () {
@@ -305,7 +311,6 @@ module.exports = cls => class IdealTreeBuilder extends cls {
       // cases we don't use a lockfile anyway.
       // Load on a new Arborist object, so the Nodes aren't the same,
       // or else it'll get super confusing when we change them!
-      // Only have to mapWorkspaces if we didn't get it from actual or virtual
       .then(async root => {
         if (!this[_updateAll] && !this[_global] && !root.meta.loadedFromDisk)
           await new this.constructor(this.options).loadActual({ root })
@@ -322,10 +327,10 @@ module.exports = cls => class IdealTreeBuilder extends cls {
   }
 
   [_globalRootNode] () {
-    const root = this[_rootNodeFromPackage]({})
+    const root = this[_rootNodeFromPackage]({ dependencies: {} })
     // this is a gross kludge to handle the fact that we don't save
     // metadata on the root node in global installs, because the "root"
-    // node is something like /usr/local/lib/node_modules.
+    // node is something like /usr/local/lib.
     const meta = new Shrinkwrap({ path: this.path })
     meta.reset()
     root.meta = meta
@@ -353,9 +358,19 @@ module.exports = cls => class IdealTreeBuilder extends cls {
     // If we have a list of package names to update, and we know it's
     // going to update them wherever they are, add any paths into those
     // named nodes to the buildIdealTree queue.
-    if (this[_updateNames].length)
+    if (!this[_global] && this[_updateNames].length)
       this[_queueNamedUpdates]()
 
+    // global updates only update the globalTop nodes, but we need to know
+    // that they're there, and not reinstall the world unnecessarily.
+    if (this[_global] && (this[_updateAll] || this[_updateNames].length)) {
+      const nm = resolve(this.path, 'node_modules')
+      for (const name of await readdir(nm)) {
+        if (this[_updateAll] || this[_updateNames].includes(name))
+          this.idealTree.package.dependencies[name] = '*'
+      }
+    }
+
     if (this.auditReport && this.auditReport.size > 0)
       this[_queueVulnDependents](options)
 
@@ -369,7 +384,8 @@ module.exports = cls => class IdealTreeBuilder extends cls {
       await this[_add](options)
 
     // triggers a refresh of all edgesOut
-    this.idealTree.package = this.idealTree.package
+    if (options.add && options.add.length || options.rm && options.rm.length)
+      this.idealTree.package = this.idealTree.package
     process.emit('timeEnd', 'idealTree:userRequests')
   }
 
@@ -563,7 +579,8 @@ module.exports = cls => class IdealTreeBuilder extends cls {
     const { meta, inventory } = this.idealTree
     const ancient = meta.ancientLockfile
     const old = meta.loadedFromDisk && !(meta.originalLockfileVersion >= 2)
-    if (inventory.size === 0 || !(ancient || old && this[_complete]))
+
+    if (inventory.size === 0 || !ancient && !(old && this[_complete]))
       return
 
     // if the lockfile is from node v5 or earlier, then we'll have to reload
@@ -583,27 +600,39 @@ This is a one-time fix-up, please be patient...
     this.addTracker('idealTree:inflate')
     const queue = []
     for (const node of inventory.values()) {
+      if (node.isRoot)
+        continue
+
       queue.push(async () => {
         this.log.silly('inflate', node.location)
-        const id = `${node.name}@${node.version}`
-        const sloc = node.location.substr('node_modules/'.length)
+        const { resolved, version, path, name, location, integrity } = node
+        // don't try to hit the registry for linked deps
+        const useResolved = !version ||
+          resolved && resolved.startsWith('file:')
+        const id = useResolved ? resolved : version
+        const spec = npa.resolve(name, id, path)
+        const sloc = location.substr('node_modules/'.length)
         const t = `idealTree:inflate:${sloc}`
         this.addTracker(t)
-        await pacote.manifest(id, {
+        await pacote.manifest(spec, {
           ...this.options,
-          resolved: node.resolved,
-          integrity: node.integrity,
+          resolved: resolved,
+          integrity: integrity,
           fullMetadata: false,
         }).then(mani => {
           node.package = { ...mani, _id: `${mani.name}@${mani.version}` }
         }).catch((er) => {
-          const warning = `Could not fetch metadata for ${id}`
+          const warning = `Could not fetch metadata for ${name}@${id}`
           this.log.warn(heading, warning, er)
         })
         this.finishTracker(t)
       })
     }
     await promiseCallLimit(queue)
+    // yes, yes, this isn't the "original" version, but now that it's been
+    // upgraded, we need to make sure we don't do the work to upgrade it
+    // again, since it's now as new as can be.
+    meta.originalLockfileVersion = 2
     this.finishTracker('idealTree:inflate')
     process.emit('timeEnd', 'idealTree:inflate')
   }
@@ -790,6 +819,11 @@ This is a one-time fix-up, please be patient...
     }
     await Promise.all(promises)
 
+    for (const { to } of node.edgesOut.values()) {
+      if (to && to.isLink)
+        this[_linkNodes].add(to)
+    }
+
     return this[_buildDepStep]()
   }
 
@@ -800,6 +834,7 @@ This is a one-time fix-up, please be patient...
     // is requesting this one, so that we can get all the peer deps in
     // a context where they're likely to be resolvable.
     const parent = parent_ || this[_virtualRoot](edge.from)
+    const realParent = edge.peer ? edge.from.resolveParent : edge.from
 
     const spec = npa.resolve(edge.name, edge.spec, edge.from.path)
     return this[_nodeFromSpec](edge.name, spec, parent, edge)
@@ -811,7 +846,7 @@ This is a one-time fix-up, please be patient...
         // a symbolic link to the earlier instance
         for (let p = edge.from.resolveParent; p; p = p.resolveParent) {
           if (p.matches(node) && !p.isRoot)
-            return new Link({ parent, target: p })
+            return new Link({ parent: realParent, target: p })
         }
         // keep track of the thing that caused this node to be included.
         const src = parent.sourceReference
@@ -1065,14 +1100,22 @@ This is a one-time fix-up, please be patient...
 
     let target
     let canPlace = null
+    let isSource = false
+    const source = this[_peerSetSource].get(dep)
     for (let check = start; check; check = check.resolveParent) {
+      // we always give the FIRST place we possibly *can* put this a little
+      // extra prioritization with peer dep overrides and deduping
+      if (check === source)
+        isSource = true
+
       // if the current location has a peerDep on it, then we can't place here
       // this is pretty rare to hit, since we always prefer deduping peers.
       const checkEdge = check.edgesOut.get(edge.name)
       if (!check.isTop && checkEdge && checkEdge.peer)
         continue
 
-      const cp = this[_canPlaceDep](dep, check, edge, peerEntryEdge, peerPath)
+      const cp = this[_canPlaceDep](dep, check, edge, peerEntryEdge, peerPath, isSource)
+      isSource = false
 
       // anything other than a conflict is fine to proceed with
       if (cp !== CONFLICT) {
@@ -1127,7 +1170,7 @@ This is a one-time fix-up, please be patient...
       integrity: dep.integrity,
       legacyPeerDeps: this.legacyPeerDeps,
       error: dep.errors[0],
-      ...(dep.target ? { target: dep.target } : {}),
+      ...(dep.target ? { target: dep.target, realpath: dep.target.path } : {}),
     })
     if (this[_loadFailures].has(dep))
       this[_loadFailures].add(newDep)
@@ -1144,7 +1187,7 @@ This is a one-time fix-up, please be patient...
       const oldDeps = []
       for (const [name, edge] of oldChild.edgesOut.entries()) {
         if (!newDep.edgesOut.has(name) && edge.to)
-          oldDeps.push(edge.to)
+          oldDeps.push(...gatherDepSet([edge.to], e => e.to !== edge.to))
       }
       newDep.replace(oldChild)
       this[_pruneForReplacement](newDep, oldDeps)
@@ -1202,6 +1245,8 @@ This is a one-time fix-up, please be patient...
           //             +-- c2 <-- pruning this would be bad
 
           const mask = node.parent !== target &&
+            node.parent &&
+            node.parent.parent &&
             node.parent.parent !== target &&
             node.parent.parent.resolve(newDep.name)
 
@@ -1245,14 +1290,17 @@ This is a one-time fix-up, please be patient...
     // deps that the new node doesn't depend on but the old one did.
     const invalidDeps = new Set([...node.edgesOut.values()]
       .filter(e => e.to && !e.valid).map(e => e.to))
-    for (const dep of oldDeps)
-      invalidDeps.add(dep)
+    for (const dep of oldDeps) {
+      const set = gatherDepSet([dep], e => e.to !== dep && e.valid)
+      for (const dep of set)
+        invalidDeps.add(dep)
+    }
 
     // ignore dependency edges from the node being replaced, but
     // otherwise filter the set down to just the set with no
     // dependencies from outside the set, except the node in question.
     const deps = gatherDepSet(invalidDeps, edge =>
-      edge.from !== node && edge.to !== node)
+      edge.from !== node && edge.to !== node && edge.valid)
 
     // now just delete whatever's left, because it's junk
     for (const dep of deps)
@@ -1279,7 +1327,7 @@ This is a one-time fix-up, please be patient...
   // checking, because either we're leaving it alone, or it won't work anyway.
   // When we check peers, we pass along the peerEntryEdge to track the
   // original edge that caused us to load the family of peer dependencies.
-  [_canPlaceDep] (dep, target, edge, peerEntryEdge = null, peerPath = []) {
+  [_canPlaceDep] (dep, target, edge, peerEntryEdge = null, peerPath = [], isSource = false) {
     /* istanbul ignore next */
     debug(() => {
       if (!dep)
@@ -1287,8 +1335,16 @@ This is a one-time fix-up, please be patient...
     })
     const entryEdge = peerEntryEdge || edge
     const source = this[_peerSetSource].get(dep)
-    const isSource = target === source
-    const { isRoot, isWorkspace } = source || {}
+    isSource = isSource || target === source
+    // if we're overriding the source, then we care if the *target* is
+    // ours, even if it wasn't actually the original source, since we
+    // are depending on something that has a dep that can't go in its own
+    // folder.  for example, a -> b, b -> PEER(a).  Even though a is the
+    // source, b has to be installed up a level, and if the root package
+    // depends on a, and it has a conflict, it's our problem.  So, the root
+    // (or whatever is bringing in a) becomes the "effective source" for
+    // the purposes of this calculation.
+    const { isRoot, isWorkspace } = isSource ? target : source || {}
     const isMine = isRoot || isWorkspace
 
     // Useful testing thingie right here.
@@ -1313,7 +1369,7 @@ This is a one-time fix-up, please be patient...
       const { version: newVer } = dep
       const tryReplace = curVer && newVer && semver.gte(newVer, curVer)
       if (tryReplace && dep.canReplace(current)) {
-        const res = this[_canPlacePeers](dep, target, edge, REPLACE, peerEntryEdge, peerPath)
+        const res = this[_canPlacePeers](dep, target, edge, REPLACE, peerEntryEdge, peerPath, isSource)
         /* istanbul ignore else - It's extremely rare that a replaceable
          * node would be a conflict, if the current one wasn't a conflict,
          * but it is theoretically possible if peer deps are pinned.  In
@@ -1333,7 +1389,7 @@ This is a one-time fix-up, please be patient...
       // a bit harder to be singletons.
       const preferDedupe = this[_preferDedupe] || edge.peer
       if (preferDedupe && !tryReplace && dep.canReplace(current)) {
-        const res = this[_canPlacePeers](dep, target, edge, REPLACE, peerEntryEdge, peerPath)
+        const res = this[_canPlacePeers](dep, target, edge, REPLACE, peerEntryEdge, peerPath, isSource)
         /* istanbul ignore else - It's extremely rare that a replaceable
          * node would be a conflict, if the current one wasn't a conflict,
          * but it is theoretically possible if peer deps are pinned.  In
@@ -1401,7 +1457,7 @@ This is a one-time fix-up, please be patient...
           }
         }
         if (canReplace) {
-          const ret = this[_canPlacePeers](dep, target, edge, REPLACE, peerEntryEdge, peerPath)
+          const ret = this[_canPlacePeers](dep, target, edge, REPLACE, peerEntryEdge, peerPath, isSource)
           /* istanbul ignore else - extremely rare that the peer set would
            * conflict if we can replace the node in question, but theoretically
            * possible, if peer deps are pinned aggressively. */
@@ -1462,14 +1518,14 @@ This is a one-time fix-up, please be patient...
     }
 
     // no objections!  ok to place here
-    return this[_canPlacePeers](dep, target, edge, OK, peerEntryEdge, peerPath)
+    return this[_canPlacePeers](dep, target, edge, OK, peerEntryEdge, peerPath, isSource)
   }
 
   // make sure the family of peer deps can live here alongside it.
   // this doesn't guarantee that THIS solution will be the one we take,
   // but it does establish that SOME solution exists at this level in
   // the tree.
-  [_canPlacePeers] (dep, target, edge, ret, peerEntryEdge, peerPath) {
+  [_canPlacePeers] (dep, target, edge, ret, peerEntryEdge, peerPath, isSource) {
     // do not go in cycles when we're resolving a peer group
     if (!dep.parent || peerEntryEdge && peerPath.includes(dep))
       return ret
@@ -1481,7 +1537,7 @@ This is a one-time fix-up, please be patient...
       if (!peerEdge.peer || !peerEdge.to)
         continue
       const peer = peerEdge.to
-      const canPlacePeer = this[_canPlaceDep](peer, target, peerEdge, entryEdge, peerPath)
+      const canPlacePeer = this[_canPlaceDep](peer, target, peerEdge, entryEdge, peerPath, isSource)
       if (canPlacePeer !== CONFLICT)
         continue
 
@@ -1506,42 +1562,26 @@ This is a one-time fix-up, please be patient...
   [_resolveLinks] () {
     for (const link of this[_linkNodes]) {
       this[_linkNodes].delete(link)
-      const realpath = link.realpath
-      const loc = relpath(this.path, realpath)
-      const fromInv = this.idealTree.inventory.get(loc)
-      if (fromInv && fromInv !== link.target)
-        link.target = fromInv
 
-      const external = /^\.\.(\/|$)/.test(loc)
+      // link we never ended up placing, skip it
+      if (link.root !== this.idealTree)
+        continue
+
+      const external = /^\.\.(\/|$)/.test(relpath(this.path, link.realpath))
 
-      if (external && !this[_follow]) {
-        // outside the root, somebody else's problem, ignore it
+      // outside the root, somebody else's problem, ignore it
+      if (external && !this[_follow])
         continue
-      }
 
-      if (!link.target.parent && !link.target.fsParent) {
-        // the fsParent MUST be some node in the tree, possibly the root.
-        // find it by walking up.  Note that this is where its deps may
-        // end up being installed, if possible.
-        const parts = loc.split('/')
-        for (let p = parts.length - 1; p > -1; p--) {
-          const path = parts.slice(0, p).join('/')
-          if (!path && external)
-            break
-          const node = !path ? this.idealTree
-            : this.idealTree.inventory.get(path)
-          if (node) {
-            link.target.fsParent = node
-            this.addTracker('idealTree', link.target.name, link.target.location)
-            this[_depsQueue].push(link.target)
-            p = -1
-          }
-        }
-      }
+      // didn't find a parent for it or it has not been seen yet
+      // so go ahead and process it.
+      const unseenLink = (link.target.parent || link.target.fsParent) &&
+        !this[_depsSeen].has(link.target)
 
-      // didn't find a parent for it, but we're filling in external
-      // link targets, so go ahead and process it.
-      if (this[_follow] && !link.target.parent && !link.target.fsParent) {
+      if (this[_follow] &&
+          !link.target.parent &&
+          !link.target.fsParent ||
+          unseenLink) {
         this.addTracker('idealTree', link.target.name, link.target.location)
         this[_depsQueue].push(link.target)
       }
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js
index 219b6378f13baa..abf39e5dc1757e 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js
@@ -1,12 +1,13 @@
 // mix-in implementing the loadActual method
 
-const {relative, dirname, resolve, join} = require('path')
+const {relative, dirname, resolve, join, normalize} = require('path')
 
 const rpj = require('read-package-json-fast')
 const {promisify} = require('util')
 const readdir = promisify(require('readdir-scoped-modules'))
 const walkUp = require('walk-up-path')
 const ancestorPath = require('common-ancestor-path')
+const treeCheck = require('../tree-check.js')
 
 const Shrinkwrap = require('../shrinkwrap.js')
 const calcDepFlags = require('../calc-dep-flags.js')
@@ -38,6 +39,7 @@ const _transplantFilter = Symbol('transplantFilter')
 
 const _filter = Symbol('filter')
 const _global = Symbol.for('global')
+const _changePath = Symbol.for('_changePath')
 
 module.exports = cls => class ActualLoader extends cls {
   constructor (options) {
@@ -85,7 +87,7 @@ module.exports = cls => class ActualLoader extends cls {
     return this.actualTree ? this.actualTree
       : this[_actualTreePromise] ? this[_actualTreePromise]
       : this[_actualTreePromise] = this[_loadActual](options)
-        .then(tree => this.actualTree = tree)
+        .then(tree => this.actualTree = treeCheck(tree))
   }
 
   async [_loadActual] (options) {
@@ -166,19 +168,15 @@ module.exports = cls => class ActualLoader extends cls {
   }
 
   [_transplant] (root) {
-    if (!root)
+    if (!root || root === this[_actualTree])
       return
-    // have to set the fsChildren first, because re-rooting a Link
-    // re-roots the target, but without updating its realpath, so
-    // we have to re-root the targets first so their location is
-    // updated appropriately.
-    for (const node of this[_actualTree].fsChildren)
-      node.fsParent = root
-
+    this[_actualTree][_changePath](root.path)
     for (const node of this[_actualTree].children.values()) {
-      if (this[_transplantFilter](node))
-        node.parent = root
+      if (!this[_transplantFilter](node))
+        node.parent = null
     }
+
+    root.replace(this[_actualTree])
     this[_actualTree] = root
   }
 
@@ -209,7 +207,7 @@ module.exports = cls => class ActualLoader extends cls {
       // soldier on if read-package-json raises an error
       .then(pkg => [pkg, null], error => [null, error])
       .then(([pkg, error]) => {
-        return this[path === real ? _newNode : _newLink]({
+        return this[normalize(path) === real ? _newNode : _newLink]({
           legacyPeerDeps: this.legacyPeerDeps,
           path,
           realpath: real,
@@ -322,7 +320,7 @@ module.exports = cls => class ActualLoader extends cls {
 
       const depPromises = []
       for (const [name, edge] of node.edgesOut.entries()) {
-        if (!edge.missing && !(edge.to && edge.to.dummy))
+        if (!edge.missing && !(edge.to && (edge.to.dummy || edge.to.parent !== node)))
           continue
 
         // start the walk from the dirname, because we would have found
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
index 14c96092753fc9..f03bd80c460dec 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
@@ -1,7 +1,6 @@
 // mixin providing the loadVirtual method
 
-const {dirname, resolve} = require('path')
-const walkUp = require('walk-up-path')
+const {resolve} = require('path')
 
 const nameFromFolder = require('@npmcli/name-from-folder')
 const consistentResolve = require('../consistent-resolve.js')
@@ -11,11 +10,12 @@ const Link = require('../link.js')
 const relpath = require('../relpath.js')
 const calcDepFlags = require('../calc-dep-flags.js')
 const rpj = require('read-package-json-fast')
+const treeCheck = require('../tree-check.js')
 
 const loadFromShrinkwrap = Symbol('loadFromShrinkwrap')
 const resolveNodes = Symbol('resolveNodes')
 const resolveLinks = Symbol('resolveLinks')
-const assignParentage = Symbol('assignParentage')
+const assignBundles = Symbol('assignBundles')
 const loadRoot = Symbol('loadRoot')
 const loadNode = Symbol('loadVirtualNode')
 const loadLink = Symbol('loadVirtualLink')
@@ -40,14 +40,16 @@ module.exports = cls => class VirtualLoader extends cls {
   // public method
   async loadVirtual (options = {}) {
     if (this.virtualTree)
-      return Promise.resolve(this.virtualTree)
+      return this.virtualTree
 
     // allow the user to set reify options on the ctor as well.
     // XXX: deprecate separate reify() options object.
     options = { ...this.options, ...options }
 
-    if (options.root && options.root.meta)
-      return this[loadFromShrinkwrap](options.root.meta, options.root)
+    if (options.root && options.root.meta) {
+      await this[loadFromShrinkwrap](options.root.meta, options.root)
+      return treeCheck(this.virtualTree)
+    }
 
     const s = await Shrinkwrap.load({ path: this.path })
     if (!s.loadedFromDisk && !options.root) {
@@ -61,7 +63,8 @@ module.exports = cls => class VirtualLoader extends cls {
       root = await this[loadRoot](s),
     } = options
 
-    return this[loadFromShrinkwrap](s, root)
+    await this[loadFromShrinkwrap](s, root)
+    return treeCheck(this.virtualTree)
   }
 
   async [loadRoot] (s) {
@@ -83,7 +86,7 @@ module.exports = cls => class VirtualLoader extends cls {
     this.virtualTree = root
     const {links, nodes} = this[resolveNodes](s, root)
     await this[resolveLinks](links, nodes)
-    this[assignParentage](nodes)
+    this[assignBundles](nodes)
     if (this[flagsSuspect])
       this[reCalcDepFlags]()
     return root
@@ -185,12 +188,6 @@ module.exports = cls => class VirtualLoader extends cls {
   // links is the set of metadata, and nodes is the map of non-Link nodes
   // Set the targets to nodes in the set, if we have them (we might not)
   async [resolveLinks] (links, nodes) {
-    // now we've loaded the root, and all real nodes
-    // link up the links
-    const {meta} = this.virtualTree
-    const {loadedFromDisk, originalLockfileVersion} = meta
-    const oldLockfile = loadedFromDisk && !(originalLockfileVersion >= 2)
-
     for (const [location, meta] of links.entries()) {
       const targetPath = resolve(this.path, meta.resolved)
       const targetLoc = relpath(this.path, targetPath)
@@ -198,11 +195,10 @@ module.exports = cls => class VirtualLoader extends cls {
       const link = this[loadLink](location, targetLoc, target, meta)
       nodes.set(location, link)
       nodes.set(targetLoc, link.target)
-      // legacy shrinkwraps do not store all the info we need for the target.
-      // if we're loading from disk, and have a link in place, we need to
-      // look in that actual folder (or at least try to) in order to get
-      // the dependencies of the link target and load it properly.
-      if (oldLockfile) {
+
+      // we always need to read the package.json for link targets
+      // outside node_modules because they can be changed by the local user
+      if (!link.target.parent) {
         const pj = link.realpath + '/package.json'
         const pkg = await rpj(pj).catch(() => null)
         if (pkg)
@@ -211,42 +207,33 @@ module.exports = cls => class VirtualLoader extends cls {
     }
   }
 
-  [assignParentage] (nodes) {
+  [assignBundles] (nodes) {
     for (const [location, node] of nodes) {
-      const { path, name } = node
-      for (const p of walkUp(dirname(path))) {
-        const ploc = relpath(this.path, p)
-        const parent = nodes.get(ploc)
-        if (!parent)
-          continue
-
-        const locTest = `${ploc}/node_modules/${name}`.replace(/^\//, '')
-        const ptype = location === locTest
-          ? 'parent'
-          : 'fsParent'
-        node[ptype] = parent
-        // read inBundle from package because 'package' here is
-        // actually a v2 lockfile metadata entry.
-        // If the *parent* is also bundled, though, then we assume
-        // that it's being pulled in just by virtue of that.
-        const {inBundle} = node.package
-        const ppkg = parent.package
-        const {inBundle: parentBundled} = ppkg
-        const hasEdge = parent.edgesOut.has(name)
-        if (ptype === 'parent' && inBundle && hasEdge && !parentBundled) {
-          if (!ppkg.bundleDependencies)
-            ppkg.bundleDependencies = [name]
-          else if (!ppkg.bundleDependencies.includes(name))
-            ppkg.bundleDependencies.push(name)
-        }
+      // Skip assignment of parentage for the root package
+      if (!location)
+        continue
+      const { name, parent, package: { inBundle }} = node
+      if (!parent)
+        continue
 
-        break
+      // read inBundle from package because 'package' here is
+      // actually a v2 lockfile metadata entry.
+      // If the *parent* is also bundled, though, then we assume
+      // that it's being pulled in just by virtue of that.
+      const { package: ppkg } = parent
+      const { inBundle: parentBundled } = ppkg
+      if (inBundle && !parentBundled) {
+        if (!ppkg.bundleDependencies)
+          ppkg.bundleDependencies = [name]
+        else if (!ppkg.bundleDependencies.includes(name))
+          ppkg.bundleDependencies.push(name)
       }
     }
   }
 
   [loadNode] (location, sw) {
-    const path = resolve(this.path, location)
+    const p = this.virtualTree ? this.virtualTree.realpath : this.path
+    const path = resolve(p, location)
     // shrinkwrap doesn't include package name unless necessary
     if (!sw.name)
       sw.name = nameFromFolder(path)
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
index 57ecf071fbaff6..1f979ba1402c3e 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
@@ -2,7 +2,7 @@
 
 const pacote = require('pacote')
 const rpj = require('read-package-json-fast')
-const { orderDeps, updateDepSpec } = require('../dep-spec.js')
+const { updateDepSpec } = require('../dep-spec.js')
 const AuditReport = require('../audit-report.js')
 const {subset} = require('semver')
 
@@ -10,18 +10,19 @@ const {dirname, resolve, relative} = require('path')
 const {depth: dfwalk} = require('treeverse')
 const fs = require('fs')
 const {promisify} = require('util')
-const rename = promisify(fs.rename)
 const symlink = promisify(fs.symlink)
-const writeFile = promisify(fs.writeFile)
 const mkdirp = require('mkdirp-infer-owner')
+const moveFile = require('@npmcli/move-file')
 const rimraf = promisify(require('rimraf'))
 const packageContents = require('@npmcli/installed-package-contents')
 
+const treeCheck = require('../tree-check.js')
 const relpath = require('../relpath.js')
 const Diff = require('../diff.js')
 const retirePath = require('../retire-path.js')
 const promiseAllRejectLate = require('promise-all-reject-late')
 const optionalSet = require('../optional-set.js')
+const updateRootPackageJson = require('../update-root-package-json.js')
 
 const _retiredPaths = Symbol('retiredPaths')
 const _retiredUnchanged = Symbol('retiredUnchanged')
@@ -60,6 +61,7 @@ const _rollbackRetireShallowNodes = Symbol.for('rollbackRetireShallowNodes')
 const _rollbackCreateSparseTree = Symbol.for('rollbackCreateSparseTree')
 const _rollbackMoveBackRetiredUnchanged = Symbol.for('rollbackMoveBackRetiredUnchanged')
 const _saveIdealTree = Symbol.for('saveIdealTree')
+const _saveLockFile = Symbol('saveLockFile')
 const _copyIdealToActual = Symbol('copyIdealToActual')
 const _addOmitsToTrashList = Symbol('addOmitsToTrashList')
 const _packageLockOnly = Symbol('packageLockOnly')
@@ -127,7 +129,7 @@ module.exports = cls => class Reifier extends cls {
 
     this.finishTracker('reify')
     process.emit('timeEnd', 'reify')
-    return this.actualTree
+    return treeCheck(this.actualTree)
   }
 
   async [_reifyPackages] () {
@@ -172,7 +174,7 @@ module.exports = cls => class Reifier extends cls {
       ignoreMissing: true,
       global: true,
       filter: (node, kid) => !node.isRoot ? true
-      : this[_explicitRequests].has(kid),
+      : (node.edgesOut.has(kid) || this[_explicitRequests].has(kid)),
     } : { ignoreMissing: true }
 
     if (!this[_global]) {
@@ -182,7 +184,9 @@ module.exports = cls => class Reifier extends cls {
 
     // the global install space tends to have a lot of stuff in it.  don't
     // load all of it, just what we care about.  we won't be saving a
-    // hidden lockfile in there anyway.
+    // hidden lockfile in there anyway.  Note that we have to load ideal
+    // BEFORE loading actual, so that the actualOpt can use the
+    // explicitRequests which is set during buildIdealTree
     return this.buildIdealTree(bitOpt)
       .then(() => this.loadActual(actualOpt))
       .then(() => process.emit('timeEnd', 'reify:loadTrees'))
@@ -251,7 +255,7 @@ module.exports = cls => class Reifier extends cls {
   }
 
   [_renamePath] (from, to, didMkdirp = false) {
-    return rename(from, to)
+    return moveFile(from, to)
       .catch(er => {
         // Occasionally an expected bin file might not exist in the package,
         // or a shim/symlink might have been moved aside.  If we've already
@@ -261,7 +265,7 @@ module.exports = cls => class Reifier extends cls {
           return didMkdirp ? null : mkdirp(dirname(to)).then(() =>
             this[_renamePath](from, to, true))
         } else if (er.code === 'EEXIST')
-          return rimraf(to).then(() => rename(from, to))
+          return rimraf(to).then(() => moveFile(from, to))
         else
           throw er
       })
@@ -427,7 +431,7 @@ module.exports = cls => class Reifier extends cls {
     const dir = dirname(node.path)
     const target = node.realpath
     const rel = relative(dir, target)
-    return symlink(rel, node.path, 'dir')
+    return symlink(rel, node.path, 'junction')
   }
 
   [_warnDeprecated] (node) {
@@ -436,23 +440,29 @@ module.exports = cls => class Reifier extends cls {
       this.log.warn('deprecated', `${_id}: ${deprecated}`)
   }
 
-  [_loadAncientPackageDetails] (node) {
+  async [_loadAncientPackageDetails] (node, forceReload = false) {
     // If we're loading from a v1 lockfile, load details from the package.json
     // that weren't recorded in the old format.
     const {meta} = this.idealTree
     const ancient = meta.ancientLockfile
     const old = meta.loadedFromDisk && !(meta.originalLockfileVersion >= 2)
+
     // already replaced with the manifest if it's truly ancient
-    if (old && !ancient) {
+    if (node.path && (forceReload || (old && !ancient))) {
       // XXX should have a shared location where package.json is read,
       // so we don't ever read the same pj more than necessary.
-      return rpj(node.path + '/package.json').then(pkg => {
+      let pkg
+      try {
+        pkg = await rpj(node.path + '/package.json')
+      } catch (err) {}
+
+      if (pkg) {
         node.package.bin = pkg.bin
         node.package.os = pkg.os
         node.package.cpu = pkg.cpu
         node.package.engines = pkg.engines
         meta.add(node)
-      })
+      }
     }
   }
 
@@ -798,7 +808,7 @@ module.exports = cls => class Reifier extends cls {
 
         if (req.registry) {
           const version = child.version
-          const prefixRange = this[_savePrefix] + version
+          const prefixRange = version ? this[_savePrefix] + version : '*'
           // if we installed a range, then we save the range specified
           // if it is not a subset of the ^x.y.z.  eg, installing a range
           // of `1.x <1.2.3` will not be saved as `^1.2.0`, because that
@@ -821,30 +831,37 @@ module.exports = cls => class Reifier extends cls {
     }
 
     // preserve indentation, if possible
-    const pj = resolve(this.idealTree.path, 'package.json')
     const {
       [Symbol.for('indent')]: indent,
-      [Symbol.for('newline')]: newline,
     } = this.idealTree.package
-    const pjData = orderDeps({
-      ...this.idealTree.package,
-      _id: undefined, // strip this off
-    })
     const format = indent === undefined ? '  ' : indent
-    const eol = newline === undefined ? '\n' : newline
-    const json = (JSON.stringify(pjData, null, format) + '\n')
-      .replace(/\n/g, eol)
 
     const saveOpt = {
       format: (this[_formatPackageLock] && format) ? format
       : this[_formatPackageLock],
     }
+
     return Promise.all([
-      this[_usePackageLock] && this.idealTree.meta.save(saveOpt),
-      writeFile(pj, json),
+      this[_saveLockFile](saveOpt),
+      updateRootPackageJson({ tree: this.idealTree }),
     ]).then(() => process.emit('timeEnd', 'reify:save'))
   }
 
+  async [_saveLockFile] (saveOpt) {
+    if (!this[_usePackageLock])
+      return
+
+    const { meta } = this.idealTree
+
+    // might have to update metadata for bins and stuff that gets lost
+    if (meta.loadedFromDisk && !(meta.originalLockfileVersion >= 2)) {
+      for (const node of this.idealTree.inventory.values())
+        await this[_loadAncientPackageDetails](node, true)
+    }
+
+    return meta.save(saveOpt)
+  }
+
   [_copyIdealToActual] () {
     // save the ideal's meta as a hidden lockfile after we actualize it
     this.idealTree.meta.filename =
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/audit-report.js b/deps/npm/node_modules/@npmcli/arborist/lib/audit-report.js
index 9407e0ee6f097c..15e17330addc0d 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/audit-report.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/audit-report.js
@@ -44,7 +44,7 @@ class AuditReport extends Map {
           optional: 0,
           peer: 0,
           peerOptional: 0,
-          total: this.tree.inventory.size,
+          total: this.tree.inventory.size - 1,
         },
       },
     }
@@ -281,7 +281,7 @@ class AuditReport extends Map {
 
   async [_getReport] () {
     // if we're not auditing, just return false
-    if (this.options.audit === false || this.tree.inventory.size === 0)
+    if (this.options.audit === false || this.tree.inventory.size === 1)
       return null
 
     process.emit('time', 'auditReport:getReport')
@@ -290,9 +290,10 @@ class AuditReport extends Map {
         // first try the super fast bulk advisory listing
         const body = prepareBulkData(this.tree, this[_omit])
 
-        // no sense asking if we don't have anything to audit
+        // no sense asking if we don't have anything to audit,
+        // we know it'll be empty
         if (!Object.keys(body).length)
-          return {}
+          return null
 
         const res = await fetch('/-/npm/v1/security/advisories/bulk', {
           ...this.options,
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/debug.js b/deps/npm/node_modules/@npmcli/arborist/lib/debug.js
index 9a8c0cf5f0ca8b..5acacee69e2232 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/debug.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/debug.js
@@ -10,9 +10,15 @@
 //     throw new Error('expensive check should have returned false')
 // })
 
-const debug = process.env.ARBORIST_DEBUG === '1' ||
+// run in debug mode if explicitly requested, running arborist tests,
+// or working in the arborist project directory.
+const debug = process.env.ARBORIST_DEBUG !== '0' && (
+  process.env.ARBORIST_DEBUG === '1' ||
   /\barborist\b/.test(process.env.NODE_DEBUG || '') ||
   process.env.npm_package_name === '@npmcli/arborist' &&
-  ['test', 'snap'].includes(process.env.npm_lifecycle_event)
+  ['test', 'snap'].includes(process.env.npm_lifecycle_event) ||
+  process.cwd() === require('path').resolve(__dirname, '..')
+)
 
 module.exports = debug ? fn => fn() : () => {}
+module.exports.log = (...msg) => module.exports(() => console.error(...msg))
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/dep-valid.js b/deps/npm/node_modules/@npmcli/arborist/lib/dep-valid.js
index 0e92ed4f058850..01e5e21e94ce5d 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/dep-valid.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/dep-valid.js
@@ -49,7 +49,7 @@ const depValid = (child, requested, requestor) => {
       // fallthrough
     case 'version':
       // if it's a version or a range other than '*', semver it
-      return semver.satisfies(child.package.version, requested.fetchSpec, true)
+      return semver.satisfies(child.version, requested.fetchSpec, true)
 
     case 'directory':
       // directory must be a link to the specified folder
@@ -112,7 +112,7 @@ const tarballValid = (child, requested, requestor) => {
     return false
 
   if (child.resolved)
-    return child.resolved === `file:${requested.fetchSpec}`
+    return child.resolved.replace(/\\/g, '/') === `file:${requested.fetchSpec.replace(/\\/g, '/')}`
 
   // if we have a legacy mutated package.json file.  we can't be 100%
   // sure that it resolved to the same file, but if it was the same
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/inventory.js b/deps/npm/node_modules/@npmcli/arborist/lib/inventory.js
index 696ad25e437f4b..cef0c4e2658998 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/inventory.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/inventory.js
@@ -4,7 +4,9 @@
 // keys is the set of fields to be able to query.
 const _primaryKey = Symbol('_primaryKey')
 const _index = Symbol('_index')
-const defaultKeys = ['name', 'license', 'funding']
+const defaultKeys = ['name', 'license', 'funding', 'realpath']
+const { hasOwnProperty } = Object.prototype
+const debug = require('./debug.js')
 class Inventory extends Map {
   constructor (opt = {}) {
     const { primary, keys } = opt
@@ -32,6 +34,18 @@ class Inventory extends Map {
   }
 
   add (node) {
+    const root = super.get('')
+    if (root && node.root !== root && node.root !== root.root) {
+      debug(() => {
+        throw Object.assign(new Error('adding external node to inventory'), {
+          root: root.path,
+          node: node.path,
+          nodeRoot: node.root.path,
+        })
+      })
+      return
+    }
+
     const current = super.get(node[this.primaryKey])
     if (current) {
       if (current === node)
@@ -40,7 +54,9 @@ class Inventory extends Map {
     }
     super.set(node[this.primaryKey], node)
     for (const [key, map] of this[_index].entries()) {
-      const val_ = node[key] || (node.package && node.package[key])
+      // if the node has the value, but it's false, then use that
+      const val_ = hasOwnProperty.call(node, key) ? node[key]
+        : node[key] || (node.package && node.package[key])
       const val = typeof val_ === 'string' ? val_
         : !val_ || typeof val_ !== 'object' ? val_
         : key === 'license' ? val_.type
@@ -58,7 +74,8 @@ class Inventory extends Map {
 
     super.delete(node[this.primaryKey])
     for (const [key, map] of this[_index].entries()) {
-      const val = node[key] || (node.package && node.package[key])
+      const val = node[key] !== undefined ? node[key]
+        : (node[key] || (node.package && node.package[key]))
       const set = map.get(val)
       if (set) {
         set.delete(node)
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/link.js b/deps/npm/node_modules/@npmcli/arborist/lib/link.js
index af4fac158ff0f4..2394c6e41173cf 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/link.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/link.js
@@ -1,11 +1,15 @@
+const debug = require('./debug.js')
 const relpath = require('./relpath.js')
 const Node = require('./node.js')
 const _loadDeps = Symbol.for('Arborist.Node._loadDeps')
-const _target = Symbol('_target')
+const _target = Symbol.for('_target')
 const {dirname} = require('path')
+// defined by Node class
+const _delistFromMeta = Symbol.for('_delistFromMeta')
+const _refreshLocation = Symbol.for('_refreshLocation')
 class Link extends Node {
   constructor (options) {
-    const { realpath, target } = options
+    const { root, realpath, target, parent, fsParent } = options
 
     if (!realpath && !(target && target.path))
       throw new TypeError('must provide realpath for Link node')
@@ -13,18 +17,23 @@ class Link extends Node {
     super({
       ...options,
       realpath: realpath || target.path,
+      root: root || (parent ? parent.root
+      : fsParent ? fsParent.root
+      : target ? target.root
+      : null),
     })
 
     this.target = target || new Node({
       ...options,
       path: realpath,
       parent: null,
+      fsParent: null,
       root: this.root,
-      linksIn: [this],
     })
+  }
 
-    if (this.root.meta)
-      this.root.meta.add(this)
+  get version () {
+    return this.target ? this.target.version : this.package.version || ''
   }
 
   get target () {
@@ -33,33 +42,70 @@ class Link extends Node {
 
   set target (target) {
     const current = this[_target]
-    if (current && current.linksIn)
-      current.linksIn.delete(this)
+    if (target === current)
+      return
+
+    if (current && current.then) {
+      debug(() => {
+        throw Object.assign(new Error('cannot set target while awaiting'), {
+          path: this.path,
+          realpath: this.realpath,
+        })
+      })
+    }
 
-    this[_target] = target
+    if (target && target.then) {
+      // can set to a promise during an async tree build operation
+      // wait until then to assign it.
+      this[_target] = target
+      target.then(node => {
+        this[_target] = null
+        this.target = node
+      })
+      return
+    }
 
     if (!target) {
-      this.package = {}
+      if (current && current.linksIn)
+        current.linksIn.delete(this)
+      if (this.path) {
+        this[_delistFromMeta]()
+        this[_target] = null
+        this.package = {}
+        this[_refreshLocation]()
+      } else
+        this[_target] = null
       return
     }
 
-    if (target.then) {
-      // can set to a promise during an async tree build operation
-      // wait until then to assign it.
-      target.then(node => this.target = node)
+    if (!this.path) {
+      // temp node pending assignment to a tree
+      // we know it's not in the inventory yet, because no path.
+      if (target.path)
+        this.realpath = target.path
+      else
+        target.path = target.realpath = this.realpath
+      target.root = this.root
+      this[_target] = target
+      target.linksIn.add(this)
+      this.package = target.package
       return
     }
 
+    // have to refresh metadata, because either realpath or package
+    // is very likely changing.
+    this[_delistFromMeta]()
     this.package = target.package
-
     this.realpath = target.path
-    if (target.root === target)
-      target.root = this.root
-    target.linksIn.add(this)
+    this[_refreshLocation]()
+
+    target.root = this.root
   }
 
   // a link always resolves to the relative path to its target
   get resolved () {
+    // the path/realpath guard is there for the benefit of setting
+    // these things in the "wrong" order
     return this.path && this.realpath
       ? `file:${relpath(dirname(this.path), this.realpath)}`
       : null
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/node.js b/deps/npm/node_modules/@npmcli/arborist/lib/node.js
index a783ce9c975722..6e243c049d2730 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/node.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/node.js
@@ -35,22 +35,25 @@ const {normalize} = require('read-package-json-fast')
 const {getPaths: getBinPaths} = require('bin-links')
 const npa = require('npm-package-arg')
 const debug = require('./debug.js')
+const gatherDepSet = require('./gather-dep-set.js')
+const treeCheck = require('./tree-check.js')
+const walkUp = require('walk-up-path')
 
 const {resolve, relative, dirname, basename} = require('path')
 const _package = Symbol('_package')
 const _parent = Symbol('_parent')
+const _target = Symbol.for('_target')
 const _fsParent = Symbol('_fsParent')
-const _reloadEdges = Symbol('_reloadEdges')
 const _loadDepType = Symbol('_loadDepType')
 const _loadWorkspaces = Symbol('_loadWorkspaces')
 const _reloadNamedEdges = Symbol('_reloadNamedEdges')
 // overridden by Link class
 const _loadDeps = Symbol.for('Arborist.Node._loadDeps')
 const _root = Symbol('_root')
-const _refreshLocation = Symbol('_refreshLocation')
-const _refreshTopMeta = Symbol('_refreshTopMeta')
-const _refreshPath = Symbol('_refreshPath')
-const _delistFromMeta = Symbol('_delistFromMeta')
+const _refreshLocation = Symbol.for('_refreshLocation')
+const _changePath = Symbol.for('_changePath')
+// used by Link class as well
+const _delistFromMeta = Symbol.for('_delistFromMeta')
 const _global = Symbol.for('global')
 const _workspaces = Symbol('_workspaces')
 const _explain = Symbol('_explain')
@@ -106,14 +109,16 @@ class Node {
 
     this.name = name ||
       nameFromFolder(path || pkg.name || realpath) ||
-      pkg.name
+      pkg.name ||
+      null
 
-    if (!this.name)
+    // should be equal if not a link
+    this.path = path ? resolve(path) : null
+
+    if (!this.name && (!this.path || this.path !== dirname(this.path)))
       throw new TypeError('could not detect node name from path or package')
 
-    // should be equal if not a link
-    this.path = path
-    this.realpath = !this.isLink ? this.path : realpath
+    this.realpath = !this.isLink ? this.path : resolve(realpath)
 
     this.resolved = resolved || null
     if (!this.resolved) {
@@ -142,6 +147,7 @@ class Node {
     this.children = new Map()
     this.fsChildren = new Set()
     this.inventory = new Inventory({})
+    this.tops = new Set()
     this.linksIn = new Set(linksIn || [])
 
     // these three are set by an Arborist taking a catalog
@@ -195,7 +201,8 @@ class Node {
     // Must be set prior to calling _loadDeps, because top-ness is relevant
 
     // will also assign root if present on the parent
-    this.parent = parent
+    this[_parent] = null
+    this.parent = parent || null
 
     this[_fsParent] = null
     this.fsParent = fsParent || null
@@ -206,9 +213,6 @@ class Node {
     if (!parent && !fsParent)
       this.root = root || null
 
-    if (this.isRoot)
-      this.location = ''
-
     // mostly a convenience for testing, but also a way to create
     // trees in a more declarative way than setting parent on each
     if (children) {
@@ -458,35 +462,244 @@ class Node {
   }
 
   set root (root) {
-    const nullRoot = root === null
-    if (nullRoot)
-      root = this
-    else {
-      // should only ever be 1 step
-      while (root.root !== root)
-        root = root.root
-    }
+    // setting to null means this is the new root
+    // should only ever be one step
+    while (root && root.root !== root)
+      root = root.root
 
-    if (root === this.root)
-      return
+    root = root || this
 
+    // delete from current root inventory
     this[_delistFromMeta]()
-    this[_root] = root
-    this[_refreshLocation]()
 
-    if (this.top.meta)
-      this[_refreshTopMeta]()
+    // can't set the root (yet) if there's no way to determine location
+    // this allows us to do new Node({...}) and then set the root later.
+    // just make the assignment so we don't lose it, and move on.
+    if (!this.path || !root.realpath || !root.path)
+      return this[_root] = root
 
-    if (this.target && !nullRoot)
-      this.target.root = root
+    // temporarily become a root node
+    this[_root] = this
 
-    this.fsChildren.forEach(c => c.root = root)
-    this.children.forEach(c => c.root = root)
-    /* istanbul ignore next - debug check */
-    debug(() => {
-      if (this !== root && this.inventory.size !== 0)
-        throw new Error('non-root has non-zero inventory')
-    })
+    // break all linksIn, we're going to re-set them if needed later
+    for (const link of this.linksIn) {
+      link[_target] = null
+      this.linksIn.delete(link)
+    }
+
+    // temporarily break this link as well, we'll re-set if possible later
+    const { target } = this
+    if (this.isLink) {
+      if (target) {
+        target.linksIn.delete(this)
+        if (target.root === this)
+          target[_delistFromMeta]()
+      }
+      this[_target] = null
+    }
+
+    // if this is part of a cascading root set, then don't do this bit
+    // but if the parent/fsParent is in a different set, we have to break
+    // that reference before proceeding
+    if (this.parent && this.parent.root !== root) {
+      this.parent.children.delete(this.name)
+      this[_parent] = null
+    }
+    if (this.fsParent && this.fsParent.root !== root) {
+      this.fsParent.fsChildren.delete(this)
+      this[_fsParent] = null
+    }
+
+    if (root === this)
+      this[_refreshLocation]()
+    else {
+      // setting to some different node.
+      const loc = relpath(root.realpath, this.path)
+      const current = root.inventory.get(loc)
+
+      // clobber whatever is there now
+      if (current)
+        current.root = null
+
+      this[_root] = root
+      // set this.location and add to inventory
+      this[_refreshLocation]()
+
+      // try to find our parent/fsParent in the new root inventory
+      for (const p of walkUp(dirname(this.path))) {
+        const ploc = relpath(root.realpath, p)
+        const parent = root.inventory.get(ploc)
+        if (parent) {
+          /* istanbul ignore next - impossible */
+          if (parent.isLink) {
+            debug(() => {
+              throw Object.assign(new Error('assigning parentage to link'), {
+                path: this.path,
+                parent: parent.path,
+                parentReal: parent.realpath,
+              })
+            })
+            continue
+          }
+          const childLoc = `${ploc}${ploc ? '/' : ''}node_modules/${this.name}`
+          const isParent = this.location === childLoc
+          if (isParent) {
+            const oldChild = parent.children.get(this.name)
+            if (oldChild && oldChild !== this)
+              oldChild.root = null
+            if (this.parent) {
+              this.parent.children.delete(this.name)
+              this.parent[_reloadNamedEdges](this.name)
+            }
+            parent.children.set(this.name, this)
+            this[_parent] = parent
+            // don't do it for links, because they don't have a target yet
+            // we'll hit them up a bit later on.
+            if (!this.isLink)
+              parent[_reloadNamedEdges](this.name)
+          } else {
+            /* istanbul ignore if - should be impossible, since we break
+             * all fsParent/child relationships when moving? */
+            if (this.fsParent)
+              this.fsParent.fsChildren.delete(this)
+            parent.fsChildren.add(this)
+            this[_fsParent] = parent
+          }
+          break
+        }
+      }
+
+      // if it doesn't have a parent, it's a top node
+      if (!this.parent)
+        root.tops.add(this)
+      else
+        root.tops.delete(this)
+
+      // assign parentage for any nodes that need to have this as a parent
+      // this can happen when we have a node at nm/a/nm/b added *before*
+      // the node at nm/a, which might have the root node as a fsParent.
+      // we can't rely on the public setter here, because it calls into
+      // this function to set up these references!
+      const nmloc = `${this.location}${this.location ? '/' : ''}node_modules/`
+      const isChild = n => n.location === nmloc + n.name
+      // check dirname so that /foo isn't treated as the fsparent of /foo-bar
+      const isFsChild = n => dirname(n.path).startsWith(this.path) &&
+        n !== this &&
+        !n.parent &&
+        (!n.fsParent || n.fsParent === this || dirname(this.path).startsWith(n.fsParent.path))
+      const isKid = n => isChild(n) || isFsChild(n)
+
+      // only walk top nodes, since anything else already has a parent.
+      for (const child of root.tops) {
+        if (!isKid(child))
+          continue
+
+        // set up the internal parentage links
+        if (this.isLink)
+          child.root = null
+        else {
+          // can't possibly have a parent, because it's in tops
+          if (child.fsParent)
+            child.fsParent.fsChildren.delete(child)
+          child[_fsParent] = null
+          if (isChild(child)) {
+            this.children.set(child.name, child)
+            child[_parent] = this
+            root.tops.delete(child)
+          } else {
+            this.fsChildren.add(child)
+            child[_fsParent] = this
+          }
+        }
+      }
+
+      // look for any nodes with the same realpath.  either they're links
+      // to that realpath, or a thing at that realpath if we're adding a link
+      // (if we're adding a regular node, we already deleted the old one)
+      for (const node of root.inventory.query('realpath', this.realpath)) {
+        if (node === this)
+          continue
+
+        /* istanbul ignore next - should be impossible */
+        debug(() => {
+          if (node.root !== root)
+            throw new Error('inventory contains node from other root')
+        })
+
+        if (this.isLink) {
+          const target = node.target || node
+          this[_target] = target
+          this[_package] = target.package
+          target.linksIn.add(this)
+          // reload edges here, because now we have a target
+          if (this.parent)
+            this.parent[_reloadNamedEdges](this.name)
+          break
+        } else {
+          /* istanbul ignore else - should be impossible */
+          if (node.isLink) {
+            node[_target] = this
+            node[_package] = this.package
+            this.linksIn.add(node)
+            if (node.parent)
+              node.parent[_reloadNamedEdges](node.name)
+          } else {
+            debug(() => {
+              throw Object.assign(new Error('duplicate node in root setter'), {
+                path: this.path,
+                realpath: this.realpath,
+                root: root.realpath,
+              })
+            })
+          }
+        }
+      }
+    }
+
+    // reload all edgesIn where the root doesn't match, so we don't have
+    // cross-tree dependency graphs
+    for (const edge of this.edgesIn) {
+      if (edge.from.root !== root)
+        edge.reload()
+    }
+    // reload all edgesOut where root doens't match, or is missing, since
+    // it might not be missing in the new tree
+    for (const edge of this.edgesOut.values()) {
+      if (!edge.to || edge.to.root !== root)
+        edge.reload()
+    }
+
+    // now make sure our family comes along for the ride!
+    const family = new Set([
+      ...this.fsChildren,
+      ...this.children.values(),
+      ...this.inventory.values(),
+    ].filter(n => n !== this))
+    for (const child of family) {
+      if (child.root !== root) {
+        child[_delistFromMeta]()
+        child[_parent] = null
+        this.children.delete(child.name)
+        child[_fsParent] = null
+        this.fsChildren.delete(child)
+        for (const l of child.linksIn) {
+          l[_target] = null
+          child.linksIn.delete(l)
+        }
+      }
+    }
+    for (const child of family) {
+      if (child.root !== root)
+        child.root = root
+    }
+
+    // if we had a target, and didn't find one in the new root, then bring
+    // it over as well.
+    if (this.isLink && target && !this.target)
+      target.root = root
+
+    // tree should always be valid upon root setter completion.
+    treeCheck(this)
   }
 
   get root () {
@@ -513,7 +726,7 @@ class Node {
     // Linked targets that are disconnected from the tree are tops,
     // but don't have a 'path' field, only a 'realpath', because we
     // don't know their canonical location. We don't need their devDeps.
-    if (this.isTop && this.path)
+    if (this.isTop && this.path && !this.sourceReference)
       this[_loadDepType](this.package.devDependencies, 'dev')
 
     const pd = this.package.peerDependencies
@@ -549,63 +762,78 @@ class Node {
   }
 
   set fsParent (fsParent) {
-    fsParent = fsParent || null
-
-    if (this[_fsParent] === fsParent)
-      return
-
-    const current = this[_fsParent]
-    if (current)
-      current.fsChildren.delete(this)
-
     if (!fsParent) {
-      this[_fsParent] = null
-      // reload ALL edges, since they're now all suspect and likely invalid
-      this[_reloadEdges](e => true)
+      if (this[_fsParent])
+        this.root = null
       return
     }
 
     debug(() => {
-      if (!this.fsParent && this.realpath.indexOf(fsParent.realpath) !== 0)
-        throw new Error('attempting to set fsParent improperly')
-
-      if (fsParent.isLink)
-        throw new Error('attempting to set fsParent to link node')
+      if (fsParent === this)
+        throw new Error('setting node to its own fsParent')
+
+      if (fsParent.realpath === this.realpath)
+        throw new Error('setting fsParent to same path')
+
+      // the initial set MUST be an actual walk-up from the realpath
+      // subsequent sets will re-root on the new fsParent's path.
+      if (!this[_fsParent] && this.realpath.indexOf(fsParent.realpath) !== 0) {
+        throw Object.assign(new Error('setting fsParent improperly'), {
+          path: this.path,
+          realpath: this.realpath,
+          fsParent: {
+            path: fsParent.path,
+            realpath: fsParent.realpath,
+          },
+        })
+      }
     })
 
-    // prune off the original location, so we don't leave edges lying around
-    if (current)
-      this.fsParent = null
+    if (fsParent.isLink)
+      fsParent = fsParent.target
 
-    const fspp = fsParent.realpath
-    const nmPath = resolve(fspp, 'node_modules', this.name)
-    // actually in the node_modules folder!  this can happen when a link
-    // points deep within a node_modules folder, so that the target node
-    // is loaded before its parent.
-    if (nmPath === this.path) {
-      this[_fsParent] = null
+    // setting a thing to its own fsParent is not normal, but no-op for safety
+    if (this === fsParent || fsParent.realpath === this.realpath)
+      return
+
+    // nothing to do
+    if (this[_fsParent] === fsParent)
+      return
+
+    const oldFsParent = this[_fsParent]
+    const newPath = !oldFsParent ? this.path
+      : resolve(fsParent.path, relative(oldFsParent.path, this.path))
+    const nmPath = resolve(fsParent.path, 'node_modules', this.name)
+
+    // this is actually the parent, set that instead
+    if (newPath === nmPath) {
       this.parent = fsParent
       return
     }
 
-    // ok!  have a pseudo-parent, meaning that we're contained in
-    // the parent node's fs tree, but NOT in its node_modules folder.
-    // Almost certainly due to being a linked workspace-style package.
-    this[_fsParent] = fsParent
-    fsParent.fsChildren.add(this)
-    // refresh the path BEFORE setting root, so meta gets updated properly
-    this[_refreshPath](fsParent, current && current.path)
-    this.root = fsParent.root
-    this[_reloadEdges](e => !e.to)
-  }
+    const pathChange = newPath !== this.path
 
-  // called when we find that we have an fsParent which could account
-  // for some missing edges which are actually fine and not missing at all.
-  [_reloadEdges] (filter) {
-    this[_explanation] = null
-    this.edgesOut.forEach(edge => filter(edge) && edge.reload())
-    this.fsChildren.forEach(c => c[_reloadEdges](filter))
-    this.children.forEach(c => c[_reloadEdges](filter))
+    // remove from old parent/fsParent
+    const oldParent = this.parent
+    const oldName = this.name
+    if (this.parent) {
+      this.parent.children.delete(this.name)
+      this[_parent] = null
+    }
+    if (this.fsParent) {
+      this.fsParent.fsChildren.delete(this)
+      this[_fsParent] = null
+    }
+
+    // update this.path/realpath for this and all children/fsChildren
+    if (pathChange)
+      this[_changePath](newPath)
+
+    if (oldParent)
+      oldParent[_reloadNamedEdges](oldName)
+
+    // clobbers anything at that path, resets all appropriate references
+    this.root = fsParent.root
   }
 
   // is it safe to replace one node with another?  check the edges to
@@ -621,8 +849,14 @@ class Node {
     if (node.name !== this.name)
       return false
 
+    // gather up all the deps of this node and that are only depended
+    // upon by deps of this node.  those ones don't count, since
+    // they'll be replaced if this node is replaced anyway.
+    const depSet = gatherDepSet([this], e => e.to !== this && e.valid)
+
     for (const edge of this.edgesIn) {
-      if (!edge.satisfiedBy(node))
+      // only care about edges that don't originate from this node
+      if (!depSet.has(edge.from) && !edge.satisfiedBy(node))
         return false
     }
 
@@ -640,7 +874,7 @@ class Node {
     const parsed = npa(requested)
     const { name = this.name, rawSpec: spec } = parsed
     return this.name === name && this.satisfies(new Edge({
-      from: new Node({ path: this.root.path }),
+      from: new Node({ path: this.root.realpath }),
       type: 'prod',
       name,
       spec,
@@ -685,29 +919,27 @@ class Node {
   // Useful when mutating an ideal tree, so we can avoid having to call
   // the parent/root setters more than necessary.
   replaceWith (node) {
-    node.path = this.path
-    node.name = this.name
-    if (!node.isLink)
-      node.realpath = this.path
-    node.root = this.isRoot ? node : this.root
-    // pretend to be in the tree, so top/etc refs are not changing for kids.
-    node.parent = null
-    node[_parent] = this[_parent]
+    node.replace(this)
+  }
+
+  replace (node) {
+    this[_delistFromMeta]()
+    this.path = node.path
+    this.name = node.name
+    if (!this.isLink)
+      this.realpath = this.path
+    this[_refreshLocation]()
 
-    // if we're replacing a non-link node with a link, then all the children
-    // and fsChildren just go along with it, because links don't have those.
-    if (!node.isLink) {
-      this.fsChildren.forEach(c => c.fsParent = node)
-      this.children.forEach(c => c.parent = node)
+    // keep children when a node replaces another
+    if (!this.isLink) {
+      for (const kid of node.children.values())
+        kid.parent = this
     }
 
-    // now remove the hidden reference, and call parent setter to finalize.
-    node[_parent] = null
-    node.parent = this.parent
-  }
+    if (!node.isRoot)
+      this.root = node.root
 
-  replace (node) {
-    node.replaceWith(this)
+    treeCheck(this)
   }
 
   get inShrinkwrap () {
@@ -729,173 +961,94 @@ class Node {
   // The only walk that starts from the parent rather than this node is
   // limited by edge name.
   set parent (parent) {
-    const oldParent = this[_parent]
-
-    // link nodes can't contain children directly.
-    // children go under the link target.
-    if (parent) {
-      if (parent.isLink)
-        parent = parent.target
-
-      if (oldParent === parent)
-        return
+    // when setting to null, just remove it from the tree entirely
+    if (!parent) {
+      // but only delete it if we actually had a parent in the first place
+      // otherwise it's just setting to null when it's already null
+      if (this[_parent])
+        this.root = null
+      return
     }
 
-    // ok now we know something is actually changing, and parent is not a link
+    if (parent.isLink)
+      parent = parent.target
 
-    // check to see if the location is going to change.
-    // we can skip some of the inventory/meta stuff if not.
-    const newPath = parent ? resolve(parent.path, 'node_modules', this.name)
-      : this.path
-    const pathChange = newPath !== this.path
-    const newTop = parent ? parent.top : this
-    const topChange = newTop !== this.top
-    const newRoot = parent ? parent.root : null
-    const rootChange = newRoot !== this.root
-
-    // if the path, top, or root are changing, then we need to delist
-    // from metadata and inventory where this module (and its children)
-    // are currently tracked.  Need to do this BEFORE updating the
-    // path and setting node.root.  We don't have to do this for node.target,
-    // because its path isn't changing, so everything we need will happen
-    // safely when we set this.root = parent.root.
-    if (this.path && (pathChange || topChange || rootChange)) {
-      this[_delistFromMeta]()
-      // delisting method doesn't walk children by default, since it would
-      // be excessive to do so when changing the root reference, as a
-      // root change walks children changing root as well.  But in this case,
-      // we are about to change the parent, and thus the top, so we have
-      // to delist from the metadata now to ensure we remove it from the
-      // proper top node metadata if it isn't the root.
-      this.fsChildren.forEach(c => c[_delistFromMeta]())
-      this.children.forEach(c => c[_delistFromMeta]())
-    }
-
-    // remove from former parent.
-    if (oldParent)
-      oldParent.children.delete(this.name)
+    // setting a thing to its own parent is not normal, but no-op for safety
+    if (this === parent)
+      return
 
-    // update internal link.  at this point, the node is actually in
-    // the new location in the tree, but the paths are not updated yet.
-    this[_parent] = parent
+    const oldParent = this[_parent]
+
+    // nothing to do
+    if (oldParent === parent)
+      return
 
-    // remove former child.  calls back into this setter to unlist
-    if (parent) {
-      const oldChild = parent.children.get(this.name)
-      if (oldChild)
-        oldChild.parent = null
+    // ok now we know something is actually changing, and parent is not a link
+    const newPath = resolve(parent.path, 'node_modules', this.name)
+    const pathChange = newPath !== this.path
 
-      parent.children.set(this.name, this)
+    // remove from old parent/fsParent
+    if (oldParent) {
+      oldParent.children.delete(this.name)
+      this[_parent] = null
+    }
+    if (this.fsParent) {
+      this.fsParent.fsChildren.delete(this)
+      this[_fsParent] = null
     }
 
-    // this is the point of no return.  this.location is no longer valid,
-    // and this.path is no longer going to reference this node in the
-    // inventory or shrinkwrap metadata.
-    if (parent)
-      this[_refreshPath](parent, oldParent && oldParent.path)
+    // update this.path/realpath for this and all children/fsChildren
+    if (pathChange)
+      this[_changePath](newPath)
 
-    // call the root setter.  this updates this.location, and sets the
-    // root on all children, and this.target if this is a link.
-    // if the root isn't changing, then this is a no-op.
-    // the root setter is a no-op if the root didn't change, so we have
-    // to manually call the method to update location and metadata
-    if (!rootChange)
-      this[_refreshLocation]()
-    else
-      this.root = newRoot
-
-    // if the new top is not the root, and it has meta, then we're updating
-    // nodes within a link target's folder.  update it now.
-    if (newTop !== newRoot && newTop.meta)
-      this[_refreshTopMeta]()
-
-    // refresh dep links
-    // note that this is _also_ done when a node is removed from the
-    // tree by setting parent=null, so deduplication is covered.
-    this.edgesIn.forEach(edge => edge.reload())
-    this.edgesOut.forEach(edge => edge.reload())
-
-    // in case any of the parent's other descendants were resolving to
-    // a different instance of this package, walk the tree from that point
-    // reloading edges by this name.  This only walks until it stops finding
-    // changes, so if there's a portion of the tree blocked by a different
-    // instance, or already updated by the previous in/out reloading, it won't
-    // needlessly re-resolve deps that won't need to be changed.
-    if (parent)
-      parent[_reloadNamedEdges](this.name, true)
-
-    // since loading a parent can add *or change* resolutions, we also
-    // walk the tree from this point reloading all edges.
-    this[_reloadEdges](e => true)
-
-    // have to refresh the location of children and fsChildren at this point,
-    // because their paths have likely changed, and root may have been set.
-    if (!rootChange) {
-      this.children.forEach(c => c[_refreshLocation]())
-      this.fsChildren.forEach(c => c[_refreshLocation]())
-    }
-  }
-
-  // called after changing the parent (and thus the top), and after changing
-  // the path, if the top is tracking metadata, so that we update the top's
-  // metadata with the new node.  Note that we DON'T walk fsChildren here,
-  // because they do not share our top node.
-  [_refreshTopMeta] () {
-    this.top.meta.add(this)
-    this.children.forEach(c => c[_refreshTopMeta]())
+    // clobbers anything at that path, resets all appropriate references
+    this.root = parent.root
   }
 
   // Call this before changing path or updating the _root reference.
-  // Removes the node from all the metadata trackers where it might live.
+  // Removes the node from its root the metadata and inventory.
   [_delistFromMeta] () {
-    const top = this.top
     const root = this.root
-
+    if (!root.realpath || !this.path)
+      return
     root.inventory.delete(this)
+    root.tops.delete(this)
     if (root.meta)
       root.meta.delete(this.path)
+    /* istanbul ignore next - should be impossible */
+    debug(() => {
+      if ([...root.inventory.values()].includes(this))
+        throw new Error('failed to delist')
+    })
+  }
 
-    // need to also remove from the top meta if that's set.  but, we only do
-    // that if the top is not the same as the root, or else we'll remove it
-    // twice unnecessarily.  If the top and this have different roots, then
-    // that means we're in the process of changing this.parent, which sets the
-    // internal _parent reference BEFORE setting the root node, because paths
-    // need to be set up before assigning root.  In that case, don't delist,
-    // or else we'll delete the metadata before we have a chance to apply it.
-    if (top.meta && top !== root && top.root === this.root)
-      top.meta.delete(this.path)
-  }
-
-  // recurse through the tree updating path when it changes.
-  // called by the parent and fsParent setters.
-  [_refreshPath] (parent, fromPath = null) {
-    const ppath = parent.path
-    const relPath = typeof fromPath === 'string'
-      ? relative(fromPath, this.path)
-      : null
-    const oldPath = this.path
-    const newPath = relPath !== null ? resolve(ppath, relPath)
-      : parent === this[_parent] ? resolve(ppath, 'node_modules', this.name)
-      // fsparent initial assignment, nothing to update here
-      : oldPath
-
-    // if no change, nothing to do!
-    if (newPath === oldPath)
-      return
-
+  // update this.path/realpath and the paths of all children/fsChildren
+  [_changePath] (newPath) {
+    // have to de-list before changing paths
     this[_delistFromMeta]()
+    const oldPath = this.path
     this.path = newPath
+    const namePattern = /(?:^|\/|\\)node_modules[\\/](@[^/\\]+[\\/][^\\/]+|[^\\/]+)$/
+    const nameChange = newPath.match(namePattern)
+    if (nameChange && this.name !== nameChange[1])
+      this.name = nameChange[1].replace(/\\/g, '/')
+
+    // if we move a link target, update link realpaths
     if (!this.isLink) {
-      this.realpath = this.path
-      if (this.linksIn.size) {
-        for (const link of this.linksIn)
-          link.realpath = newPath
+      this.realpath = newPath
+      for (const link of this.linksIn) {
+        link[_delistFromMeta]()
+        link.realpath = newPath
+        link[_refreshLocation]()
       }
     }
+    // if we move /x to /y, then a module at /x/a/b becomes /y/a/b
+    for (const child of this.fsChildren)
+      child[_changePath](resolve(newPath, relative(oldPath, child.path)))
+    for (const [name, child] of this.children.entries())
+      child[_changePath](resolve(newPath, 'node_modules', name))
 
     this[_refreshLocation]()
-    this.fsChildren.forEach(c => c[_refreshPath](this, oldPath))
-    this.children.forEach(c => c[_refreshPath](this, oldPath))
   }
 
   // Called whenever the root/parent is changed.
@@ -903,7 +1056,9 @@ class Node {
   // this.path BEFORE calling this method!
   [_refreshLocation] () {
     const root = this.root
-    this.location = relpath(root.realpath, this.path)
+    const loc = relpath(root.realpath, this.path)
+
+    this.location = loc
 
     root.inventory.add(this)
     if (root.meta)
@@ -922,44 +1077,38 @@ class Node {
       this.root.meta.addEdge(edge)
   }
 
-  [_reloadNamedEdges] (name, root) {
-    // either it's the node in question, or it's going to block it anyway
-    if (this.name === name && !this.isTop) {
-      // reload the edges in so that anything that SHOULD be blocked
-      // by this node actually will be.
-      this.edgesIn.forEach(e => e.reload())
-      return
-    }
-
+  [_reloadNamedEdges] (name, rootLoc = this.location) {
     const edge = this.edgesOut.get(name)
     // if we don't have an edge, do nothing, but keep descending
-    if (edge) {
-      const toBefore = edge.to
-      edge.reload()
-      const toAfter = edge.to
-      if (toBefore === toAfter && !root) {
-        // nothing changed, we're done here.  either it was already
-        // referring to this node (due to its edgesIn reloads), or
-        // it is blocked by another node in the tree.  So either its children
-        // have already been updated, or don't need to be.
-        //
-        // but: always descend past the _first_ node, because it's likely
-        // that this is being triggered by this node getting a new child,
-        // so the whole point is to update the rest of the family.
-        return
-      }
-    }
+    const rootLocResolved = edge && edge.to &&
+      edge.to.location === `${rootLoc}/node_modules/${edge.name}`
+    const sameResolved = edge && this.resolve(name) === edge.to
+    const recheck = rootLocResolved || !sameResolved
+    if (edge && recheck)
+      edge.reload(true)
     for (const c of this.children.values())
-      c[_reloadNamedEdges](name)
+      c[_reloadNamedEdges](name, rootLoc)
 
     for (const c of this.fsChildren)
-      c[_reloadNamedEdges](name)
+      c[_reloadNamedEdges](name, rootLoc)
   }
 
   get isLink () {
     return false
   }
 
+  get target () {
+    return null
+  }
+
+  set target (n) {
+    debug(() => {
+      throw Object.assign(new Error('cannot set target on non-Link Nodes'), {
+        path: this.path,
+      })
+    })
+  }
+
   get depth () {
     return this.isTop ? 0 : this.parent.depth + 1
   }
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/shrinkwrap.js b/deps/npm/node_modules/@npmcli/arborist/lib/shrinkwrap.js
index 74d14a8e735c19..a454320a318e68 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/shrinkwrap.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/shrinkwrap.js
@@ -758,11 +758,14 @@ class Shrinkwrap {
     if (this.tree) {
       if (this.yarnLock)
         this.yarnLock.fromTree(this.tree)
-      const root = Shrinkwrap.metaFromNode(this.tree, this.path)
+      const root = Shrinkwrap.metaFromNode(this.tree.target || this.tree, this.path)
       this.data.packages = {}
       if (Object.keys(root).length)
         this.data.packages[''] = root
-      for (const node of this.tree.inventory.values()) {
+      for (const node of this.tree.root.inventory.values()) {
+        // only way this.tree is not root is if the root is a link to it
+        if (node === this.tree || node.isRoot || node.location === '')
+          continue
         const loc = relpath(this.path, node.path)
         this.data.packages[loc] = Shrinkwrap.metaFromNode(node, this.path)
       }
@@ -877,8 +880,17 @@ class Shrinkwrap {
           // omit peer deps from legacy lockfile requires field, because
           // npm v6 doesn't handle peer deps, and this triggers some bad
           // behavior if the dep can't be found in the dependencies list.
-          if (!v.peer)
-            set[k] = v.spec
+          const { spec, peer } = v
+          if (peer)
+            return set
+          if (spec.startsWith('file:')) {
+            // turn absolute file: paths into relative paths from the node
+            // this especially shows up with workspace edges when the root
+            // node is also a workspace in the set.
+            const p = resolve(node.realpath, spec.substr('file:'.length))
+            set[k] = `file:${relpath(node.realpath, p)}`
+          } else
+            set[k] = spec
           return set
         }, {})
       } else
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/tree-check.js b/deps/npm/node_modules/@npmcli/arborist/lib/tree-check.js
new file mode 100644
index 00000000000000..00b43296fbdf52
--- /dev/null
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/tree-check.js
@@ -0,0 +1,104 @@
+const debug = require('./debug.js')
+
+const checkTree = (tree, checkUnreachable = true) => {
+  // this can only happen in tests where we have a "tree" object
+  // that isn't actually a tree.
+  if (!tree.root || !tree.root.inventory)
+    return tree
+
+  const { inventory } = tree.root
+  const seen = new Set()
+  const check = (node, via = tree, viaType = 'self') => {
+    if (!node || seen.has(node) || node.then)
+      return
+    if (node.isRoot && node !== tree.root) {
+      throw Object.assign(new Error('double root'), {
+        node: node.path,
+        realpath: node.realpath,
+        tree: tree.path,
+        root: tree.root.path,
+        via: via.path,
+        viaType,
+      })
+    }
+
+    if (node.root !== tree.root) {
+      throw Object.assign(new Error('node from other root in tree'), {
+        node: node.path,
+        realpath: node.realpath,
+        tree: tree.path,
+        root: tree.root.path,
+        via: via.path,
+        viaType,
+        otherRoot: node.root && node.root.path,
+      })
+    }
+
+    if (!node.isRoot && node.inventory.size !== 0) {
+      throw Object.assign(new Error('non-root has non-zero inventory'), {
+        node: node.path,
+        tree: tree.path,
+        root: tree.root.path,
+        via: via.path,
+        viaType,
+        inventory: [...node.inventory.values()].map(node =>
+          [node.path, node.location]),
+      })
+    }
+
+    if (!node.isRoot && !inventory.has(node) && !node.dummy) {
+      throw Object.assign(new Error('not in inventory'), {
+        node: node.path,
+        tree: tree.path,
+        root: tree.root.path,
+        via: via.path,
+        viaType,
+      })
+    }
+
+    const devEdges = [...node.edgesOut.values()].filter(e => e.dev)
+    if (!node.isTop && devEdges.length) {
+      throw Object.assign(new Error('dev edges on non-top node'), {
+        node: node.path,
+        tree: tree.path,
+        root: tree.root.path,
+        via: via.path,
+        viaType,
+        devEdges: devEdges.map(e => [e.type, e.name, e.spec, e.error]),
+      })
+    }
+
+    const { parent, fsParent, target } = node
+    seen.add(node)
+    check(parent, node, 'parent')
+    check(fsParent, node, 'fsParent')
+    check(target, node, 'target')
+    for (const kid of node.children.values())
+      check(kid, node, 'children')
+    for (const kid of node.fsChildren)
+      check(kid, node, 'fsChildren')
+    for (const link of node.linksIn)
+      check(link, node, 'linksIn')
+    for (const top of node.tops)
+      check(top, node, 'tops')
+  }
+  check(tree)
+  if (checkUnreachable) {
+    for (const node of inventory.values()) {
+      if (!seen.has(node) && node !== tree.root) {
+        throw Object.assign(new Error('unreachable in inventory'), {
+          node: node.path,
+          realpath: node.realpath,
+          location: node.location,
+          root: tree.root.path,
+          tree: tree.path,
+        })
+      }
+    }
+  }
+  return tree
+}
+
+// should only ever run this check in debug mode
+module.exports = tree => tree
+debug(() => module.exports = checkTree)
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/update-root-package-json.js b/deps/npm/node_modules/@npmcli/arborist/lib/update-root-package-json.js
new file mode 100644
index 00000000000000..f5d62f7a5a713a
--- /dev/null
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/update-root-package-json.js
@@ -0,0 +1,48 @@
+const fs = require('fs')
+const promisify = require('util').promisify
+const readFile = promisify(fs.readFile)
+const writeFile = promisify(fs.writeFile)
+const {resolve} = require('path')
+
+const parseJSON = require('json-parse-even-better-errors')
+
+const { orderDeps } = require('./dep-spec.js')
+
+const depTypes = new Set([
+  'dependencies',
+  'optionalDependencies',
+  'devDependencies',
+  'peerDependencies',
+])
+
+async function updateRootPackageJson ({ tree }) {
+  const filename = resolve(tree.path, 'package.json')
+  const originalContent = await readFile(filename, 'utf8')
+    .then(data => parseJSON(data))
+    .catch(() => null)
+
+  const depsData = orderDeps({
+    ...tree.package,
+  })
+
+  // if there's no package.json, just use internal pkg info as source of truth
+  const packageJsonContent = originalContent || depsData
+
+  // loop through all types of dependencies and update package json content
+  for (const type of depTypes)
+    packageJsonContent[type] = depsData[type]
+
+  // format content
+  const {
+    [Symbol.for('indent')]: indent,
+    [Symbol.for('newline')]: newline,
+  } = tree.package
+  const format = indent === undefined ? '  ' : indent
+  const eol = newline === undefined ? '\n' : newline
+  const content = (JSON.stringify(packageJsonContent, null, format) + '\n')
+    .replace(/\n/g, eol)
+
+  return writeFile(filename, content)
+}
+
+module.exports = updateRootPackageJson
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/yarn-lock.js b/deps/npm/node_modules/@npmcli/arborist/lib/yarn-lock.js
index 17dbc235cda566..14c7691f1bd42c 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/yarn-lock.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/yarn-lock.js
@@ -79,7 +79,7 @@ class YarnLock {
     const METADATA = /^ {2}[^\s]+ .+$/
     this.entries = new Map()
     this.current = null
-    const linere = /([^\n]*)\n/gm
+    const linere = /([^\r\n]*)\r?\n/gm
     let match
     let lineNum = 0
     if (!/\n$/.test(data))
diff --git a/deps/npm/node_modules/@npmcli/arborist/package.json b/deps/npm/node_modules/@npmcli/arborist/package.json
index fe72f409c4a457..2f3ccb6131982e 100644
--- a/deps/npm/node_modules/@npmcli/arborist/package.json
+++ b/deps/npm/node_modules/@npmcli/arborist/package.json
@@ -1,14 +1,15 @@
 {
   "name": "@npmcli/arborist",
-  "version": "1.0.8",
+  "version": "2.0.1",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@npmcli/installed-package-contents": "^1.0.5",
     "@npmcli/map-workspaces": "^1.0.1",
     "@npmcli/metavuln-calculator": "^1.0.0",
+    "@npmcli/move-file": "^1.0.1",
     "@npmcli/name-from-folder": "^1.0.1",
-    "@npmcli/node-gyp": "^1.0.0",
-    "@npmcli/run-script": "^1.7.2",
+    "@npmcli/node-gyp": "^1.0.1",
+    "@npmcli/run-script": "^1.8.1",
     "bin-links": "^2.2.1",
     "cacache": "^15.0.3",
     "common-ancestor-path": "^1.0.1",
@@ -16,19 +17,21 @@
     "json-stringify-nice": "^1.1.1",
     "mkdirp-infer-owner": "^2.0.0",
     "npm-install-checks": "^4.0.0",
-    "npm-package-arg": "^8.0.0",
+    "npm-package-arg": "^8.1.0",
     "npm-pick-manifest": "^6.1.0",
-    "pacote": "^11.1.10",
+    "pacote": "^11.1.13",
     "parse-conflict-json": "^1.1.1",
     "promise-all-reject-late": "^1.0.0",
     "promise-call-limit": "^1.0.1",
     "read-package-json-fast": "^1.2.1",
     "readdir-scoped-modules": "^1.1.0",
-    "semver": "^7.1.2",
+    "semver": "^7.3.4",
     "treeverse": "^1.0.4",
     "walk-up-path": "^1.0.0"
   },
   "devDependencies": {
+    "benchmark": "^2.1.4",
+    "chalk": "^4.1.0",
     "eslint": "^7.9.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
@@ -37,7 +40,7 @@
     "minify-registry-metadata": "^2.1.0",
     "mutate-fs": "^2.1.1",
     "require-inject": "^1.4.4",
-    "tap": "^14.10.7",
+    "tap": "^14.11.0",
     "tcompare": "^3.0.4"
   },
   "scripts": {
@@ -51,7 +54,9 @@
     "prepublishOnly": "git push origin --follow-tags",
     "eslint": "eslint",
     "lint": "npm run eslint -- \"lib/**/*.js\"",
-    "lintfix": "npm run lint -- --fix"
+    "lintfix": "npm run lint -- --fix",
+    "benchmark": "node scripts/benchmark.js",
+    "benchclean": "rm -rf scripts/benchmark/*/"
   },
   "repository": {
     "type": "git",
@@ -68,6 +73,7 @@
     "node-arg": [
       "--unhandled-rejections=strict"
     ],
+    "after": "test/fixtures/cleanup.js",
     "coverage-map": "map.js",
     "esm": false,
     "timeout": "120"
diff --git a/deps/npm/node_modules/@npmcli/config/lib/parse-field.js b/deps/npm/node_modules/@npmcli/config/lib/parse-field.js
index 216295a5f81d8c..95b8d9f272003a 100644
--- a/deps/npm/node_modules/@npmcli/config/lib/parse-field.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/parse-field.js
@@ -15,7 +15,7 @@ const parseField = (f, key, opts, listElement = false) => {
   const typeList = new Set([].concat(types[key]))
   const isPath = typeList.has(typeDefs.path.type)
   const isBool = typeList.has(typeDefs.Boolean.type)
-  const isString = typeList.has(typeDefs.String.type)
+  const isString = isPath || typeList.has(typeDefs.String.type)
   const isUmask = typeList.has(typeDefs.Umask.type)
   const isNumber = typeList.has(typeDefs.Number.type)
   const isList = !listElement && typeList.has(Array)
@@ -38,7 +38,7 @@ const parseField = (f, key, opts, listElement = false) => {
 
   // string types can be the string 'true', 'false', etc.
   // otherwise, parse these values out
-  if (!isString) {
+  if (!isString && !isPath && !isNumber) {
     switch (f) {
       case 'true': return true
       case 'false': return false
diff --git a/deps/npm/node_modules/@npmcli/config/lib/set-envs.js b/deps/npm/node_modules/@npmcli/config/lib/set-envs.js
index b1b1db35c5a861..089333796163ed 100644
--- a/deps/npm/node_modules/@npmcli/config/lib/set-envs.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/set-envs.js
@@ -59,6 +59,8 @@ const setEnvs = (config) => {
   else
     env.PREFIX = globalPrefix
 
+  env.INIT_CWD = env.INIT_CWD || process.cwd()
+
   // if the key is the default value,
   //   if the environ is NOT the default value,
   //     set the environ
@@ -94,7 +96,7 @@ const setEnvs = (config) => {
 
   if (require.main && require.main.filename)
     env.npm_execpath = require.main.filename
-  env.npm_node_execpath = config.execPath
+  env.NODE = env.npm_node_execpath = config.execPath
 }
 
 module.exports = setEnvs
diff --git a/deps/npm/node_modules/@npmcli/config/lib/type-defs.js b/deps/npm/node_modules/@npmcli/config/lib/type-defs.js
index 07703206c57439..049945a3e58123 100644
--- a/deps/npm/node_modules/@npmcli/config/lib/type-defs.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/type-defs.js
@@ -10,6 +10,13 @@ const validateSemver = (data, k, val) => {
   data[k] = valid
 }
 
+const noptValidatePath = nopt.typeDefs.path.validate
+const validatePath = (data, k, val) => {
+  if (typeof val !== 'string')
+    return false
+  return noptValidatePath(data, k, val)
+}
+
 // add descriptions so we can validate more usefully
 module.exports = {
   ...nopt.typeDefs,
@@ -29,6 +36,7 @@ module.exports = {
   },
   path: {
     ...nopt.typeDefs.path,
+    validate: validatePath,
     description: 'valid filesystem path',
   },
   Number: {
diff --git a/deps/npm/node_modules/@npmcli/config/package.json b/deps/npm/node_modules/@npmcli/config/package.json
index ef22e7bb0e7138..f8334ab51dbb58 100644
--- a/deps/npm/node_modules/@npmcli/config/package.json
+++ b/deps/npm/node_modules/@npmcli/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/config",
-  "version": "1.2.1",
+  "version": "1.2.6",
   "files": [
     "lib"
   ],
@@ -27,10 +27,11 @@
     "tap": "^14.10.8"
   },
   "dependencies": {
-    "walk-up-path": "^1.0.0",
     "ini": "^1.3.5",
+    "mkdirp-infer-owner": "^2.0.0",
     "nopt": "^5.0.0",
-    "mkdirp-infer-owner": "^2.0.0"
+    "semver": "^7.3.4",
+    "walk-up-path": "^1.0.0"
   },
   "engines": {
     "node": ">=10"
diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js b/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js
index 181be8493f3343..4c38b9401ddf06 100644
--- a/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js
+++ b/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js
@@ -3,6 +3,24 @@ const isWindows = require('./is-windows.js')
 const setPATH = require('./set-path.js')
 const {resolve} = require('path')
 const npm_config_node_gyp = require.resolve('node-gyp/bin/node-gyp.js')
+const { quoteForShell, ShellString, ShellStringText, ShellStringUnquoted } = require('puka')
+
+const escapeCmd = cmd => {
+  const result = []
+  const parsed = ShellString.sh([cmd])
+  for (const child of parsed.children) {
+    if (child instanceof ShellStringText) {
+      const children = child.contents.filter(segment => segment !== null).map(segment => quoteForShell(segment, false, isWindows && 'win32'))
+      result.push(...children)
+    } else if (child instanceof ShellStringUnquoted) {
+      result.push(child.value)
+    } else {
+      result.push(isWindows ? '&' : ';')
+    }
+  }
+
+  return result.join('')
+}
 
 const makeSpawnArgs = options => {
   const {
@@ -16,7 +34,7 @@ const makeSpawnArgs = options => {
   } = options
 
   const isCmd = /(?:^|\\)cmd(?:\.exe)?$/i.test(scriptShell)
-  const args = isCmd ? ['/d', '/s', '/c', `"${cmd}"`] : ['-c', cmd]
+  const args = isCmd ? ['/d', '/s', '/c', escapeCmd(cmd)] : ['-c', cmd]
 
   const spawnOpts = {
     env: setPATH(path, {
diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/run-script-pkg.js b/deps/npm/node_modules/@npmcli/run-script/lib/run-script-pkg.js
index 5980376f558f42..ccde173e014f6c 100644
--- a/deps/npm/node_modules/@npmcli/run-script/lib/run-script-pkg.js
+++ b/deps/npm/node_modules/@npmcli/run-script/lib/run-script-pkg.js
@@ -6,7 +6,8 @@ const signalManager = require('./signal-manager.js')
 const isServerPackage = require('./is-server-package.js')
 
 // you wouldn't like me when I'm angry...
-const bruce = (id, event, cmd) => `\n> ${id ? id + ' ' : ''}${event}\n> ${cmd}\n`
+const bruce = (id, event, cmd) =>
+  `\n> ${id ? id + ' ' : ''}${event}\n> ${cmd.trim().replace(/\n/g, '\n> ')}\n`
 
 const runScriptPkg = async options => {
   const {
@@ -20,6 +21,9 @@ const runScriptPkg = async options => {
     stdioString = false,
     // note: only used when stdio:inherit
     banner = true,
+    // how long to wait for a process.kill signal
+    // only exposed here so that we can make the test go a bit faster.
+    signalTimeout = 500,
   } = options
 
   const {scripts = {}, gypfile} = pkg
@@ -68,7 +72,17 @@ const runScriptPkg = async options => {
   if (p.stdin)
     p.stdin.end()
 
-  return p
+  return p.catch(er => {
+    const { signal } = er
+    if (stdio === 'inherit' && signal) {
+      process.kill(process.pid, signal)
+      // just in case we don't die, reject after 500ms
+      // this also keeps the node process open long enough to actually
+      // get the signal, rather than terminating gracefully.
+      return new Promise((res, rej) => setTimeout(() => rej(er), signalTimeout))
+    } else
+      throw er
+  })
 }
 
 module.exports = runScriptPkg
diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/run-script.js b/deps/npm/node_modules/@npmcli/run-script/lib/run-script.js
index 3be39b0ba8076f..af33d2113f9ef0 100644
--- a/deps/npm/node_modules/@npmcli/run-script/lib/run-script.js
+++ b/deps/npm/node_modules/@npmcli/run-script/lib/run-script.js
@@ -1,6 +1,7 @@
 const rpj = require('read-package-json-fast')
 const runScriptPkg = require('./run-script-pkg.js')
 const validateOptions = require('./validate-options.js')
+const isServerPackage = require('./is-server-package.js')
 
 const runScript = options => {
   validateOptions(options)
@@ -9,4 +10,4 @@ const runScript = options => {
     : rpj(path + '/package.json').then(pkg => runScriptPkg({...options, pkg}))
 }
 
-module.exports = runScript
+module.exports = Object.assign(runScript, { isServerPackage })
diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js
index dfa8001b7743dd..d7bd2c2886b355 100644
--- a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js
+++ b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js
@@ -1,6 +1,8 @@
 const {resolve, dirname} = require('path')
 const isWindows = require('./is-windows.js')
-const nodeGypPath = resolve(__dirname, 'node-gyp-bin')
+// the path here is relative, even though it does not need to be
+// in order to make the posix tests pass in windows
+const nodeGypPath = resolve(__dirname, '../lib/node-gyp-bin')
 
 // Windows typically calls its PATH environ 'Path', but this is not
 // guaranteed, nor is it guaranteed to be the only one.  Merge them
diff --git a/deps/npm/node_modules/@npmcli/run-script/package.json b/deps/npm/node_modules/@npmcli/run-script/package.json
index 5ec3bb5b66876e..7adb5c76d82cc1 100644
--- a/deps/npm/node_modules/@npmcli/run-script/package.json
+++ b/deps/npm/node_modules/@npmcli/run-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/run-script",
-  "version": "1.7.4",
+  "version": "1.8.1",
   "description": "Run a lifecycle script for a package (descendant of npm-lifecycle)",
   "author": "Isaac Z. Schlueter <i@izs.me> (https://izs.me)",
   "license": "ISC",
@@ -32,6 +32,7 @@
     "@npmcli/promise-spawn": "^1.3.0",
     "infer-owner": "^1.0.4",
     "node-gyp": "^7.1.0",
+    "puka": "^1.0.1",
     "read-package-json-fast": "^1.1.3"
   },
   "files": [
diff --git a/deps/npm/node_modules/aws4/aws4.js b/deps/npm/node_modules/aws4/aws4.js
index 8c772597da518e..b99b319f89f9a1 100644
--- a/deps/npm/node_modules/aws4/aws4.js
+++ b/deps/npm/node_modules/aws4/aws4.js
@@ -26,6 +26,20 @@ function encodeRfc3986Full(str) {
   return encodeRfc3986(encodeURIComponent(str))
 }
 
+// A bit of a combination of:
+// https://github.com/aws/aws-sdk-java-v2/blob/dc695de6ab49ad03934e1b02e7263abbd2354be0/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java#L59
+// https://github.com/aws/aws-sdk-js/blob/18cb7e5b463b46239f9fdd4a65e2ff8c81831e8f/lib/signers/v4.js#L191-L199
+// https://github.com/mhart/aws4fetch/blob/b3aed16b6f17384cf36ea33bcba3c1e9f3bdfefd/src/main.js#L25-L34
+var HEADERS_TO_IGNORE = {
+  'authorization': true,
+  'connection': true,
+  'x-amzn-trace-id': true,
+  'user-agent': true,
+  'expect': true,
+  'presigned-expires': true,
+  'range': true,
+}
+
 // request: { path | body, [host], [method], [headers], [service], [region] }
 // credentials: { accessKeyId, secretAccessKey, [sessionToken] }
 function RequestSigner(request, credentials) {
@@ -284,6 +298,7 @@ RequestSigner.prototype.canonicalHeaders = function() {
     return header.toString().trim().replace(/\s+/g, ' ')
   }
   return Object.keys(headers)
+    .filter(function(key) { return HEADERS_TO_IGNORE[key.toLowerCase()] == null })
     .sort(function(a, b) { return a.toLowerCase() < b.toLowerCase() ? -1 : 1 })
     .map(function(key) { return key.toLowerCase() + ':' + trimAll(headers[key]) })
     .join('\n')
@@ -292,6 +307,7 @@ RequestSigner.prototype.canonicalHeaders = function() {
 RequestSigner.prototype.signedHeaders = function() {
   return Object.keys(this.request.headers)
     .map(function(key) { return key.toLowerCase() })
+    .filter(function(key) { return HEADERS_TO_IGNORE[key] == null })
     .sort()
     .join(';')
 }
diff --git a/deps/npm/node_modules/aws4/package.json b/deps/npm/node_modules/aws4/package.json
index 4b795bfefdf747..424598d4a1486f 100644
--- a/deps/npm/node_modules/aws4/package.json
+++ b/deps/npm/node_modules/aws4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws4",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Signs and prepares requests using AWS Signature Version 4",
   "author": "Michael Hart <michael.hart.au@gmail.com> (https://github.com/mhart)",
   "license": "MIT",
diff --git a/deps/npm/node_modules/debug/node_modules/ms/index.js b/deps/npm/node_modules/debug/node_modules/ms/index.js
new file mode 100644
index 00000000000000..c4498bcc212589
--- /dev/null
+++ b/deps/npm/node_modules/debug/node_modules/ms/index.js
@@ -0,0 +1,162 @@
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var w = d * 7;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isFinite(val)) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'weeks':
+    case 'week':
+    case 'w':
+      return n * w;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtShort(ms) {
+  var msAbs = Math.abs(ms);
+  if (msAbs >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (msAbs >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (msAbs >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (msAbs >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtLong(ms) {
+  var msAbs = Math.abs(ms);
+  if (msAbs >= d) {
+    return plural(ms, msAbs, d, 'day');
+  }
+  if (msAbs >= h) {
+    return plural(ms, msAbs, h, 'hour');
+  }
+  if (msAbs >= m) {
+    return plural(ms, msAbs, m, 'minute');
+  }
+  if (msAbs >= s) {
+    return plural(ms, msAbs, s, 'second');
+  }
+  return ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, msAbs, n, name) {
+  var isPlural = msAbs >= n * 1.5;
+  return Math.round(ms / n) + ' ' + name + (isPlural ? 's' : '');
+}
diff --git a/deps/npm/node_modules/debug/node_modules/ms/license.md b/deps/npm/node_modules/debug/node_modules/ms/license.md
new file mode 100644
index 00000000000000..69b61253a38926
--- /dev/null
+++ b/deps/npm/node_modules/debug/node_modules/ms/license.md
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Zeit, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/debug/node_modules/ms/package.json b/deps/npm/node_modules/debug/node_modules/ms/package.json
new file mode 100644
index 00000000000000..eea666e1fb03d6
--- /dev/null
+++ b/deps/npm/node_modules/debug/node_modules/ms/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "ms",
+  "version": "2.1.2",
+  "description": "Tiny millisecond conversion utility",
+  "repository": "zeit/ms",
+  "main": "./index",
+  "files": [
+    "index.js"
+  ],
+  "scripts": {
+    "precommit": "lint-staged",
+    "lint": "eslint lib/* bin/*",
+    "test": "mocha tests.js"
+  },
+  "eslintConfig": {
+    "extends": "eslint:recommended",
+    "env": {
+      "node": true,
+      "es6": true
+    }
+  },
+  "lint-staged": {
+    "*.js": [
+      "npm run lint",
+      "prettier --single-quote --write",
+      "git add"
+    ]
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "eslint": "4.12.1",
+    "expect.js": "0.3.1",
+    "husky": "0.14.3",
+    "lint-staged": "5.0.0",
+    "mocha": "4.0.1"
+  }
+}
diff --git a/deps/npm/node_modules/debug/node_modules/ms/readme.md b/deps/npm/node_modules/debug/node_modules/ms/readme.md
new file mode 100644
index 00000000000000..9a1996b17e0de6
--- /dev/null
+++ b/deps/npm/node_modules/debug/node_modules/ms/readme.md
@@ -0,0 +1,60 @@
+# ms
+
+[![Build Status](https://travis-ci.org/zeit/ms.svg?branch=master)](https://travis-ci.org/zeit/ms)
+[![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/zeit)
+
+Use this package to easily convert various time formats to milliseconds.
+
+## Examples
+
+```js
+ms('2 days')  // 172800000
+ms('1d')      // 86400000
+ms('10h')     // 36000000
+ms('2.5 hrs') // 9000000
+ms('2h')      // 7200000
+ms('1m')      // 60000
+ms('5s')      // 5000
+ms('1y')      // 31557600000
+ms('100')     // 100
+ms('-3 days') // -259200000
+ms('-1h')     // -3600000
+ms('-200')    // -200
+```
+
+### Convert from Milliseconds
+
+```js
+ms(60000)             // "1m"
+ms(2 * 60000)         // "2m"
+ms(-3 * 60000)        // "-3m"
+ms(ms('10 hours'))    // "10h"
+```
+
+### Time Format Written-Out
+
+```js
+ms(60000, { long: true })             // "1 minute"
+ms(2 * 60000, { long: true })         // "2 minutes"
+ms(-3 * 60000, { long: true })        // "-3 minutes"
+ms(ms('10 hours'), { long: true })    // "10 hours"
+```
+
+## Features
+
+- Works both in [Node.js](https://nodejs.org) and in the browser
+- If a number is supplied to `ms`, a string with a unit is returned
+- If a string that contains the number is supplied, it returns it as a number (e.g.: it returns `100` for `'100'`)
+- If you pass a string with a number and a valid unit, the number of equivalent milliseconds is returned
+
+## Related Packages
+
+- [ms.macro](https://github.com/knpwrs/ms.macro) - Run `ms` as a macro at build-time.
+
+## Caught a Bug?
+
+1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device
+2. Link the package to the global module directory: `npm link`
+3. Within the module you want to test your local development instance of ms, just link it to the dependencies: `npm link ms`. Instead of the default one from npm, Node.js will now use your clone of ms!
+
+As always, you can run the tests using: `npm test`
diff --git a/deps/npm/node_modules/debug/package.json b/deps/npm/node_modules/debug/package.json
index c270ca0e51f0a3..da809d2b8d28b2 100644
--- a/deps/npm/node_modules/debug/package.json
+++ b/deps/npm/node_modules/debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "debug",
-  "version": "4.2.0",
+  "version": "4.3.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/visionmedia/debug.git"
diff --git a/deps/npm/node_modules/debug/src/browser.js b/deps/npm/node_modules/debug/src/browser.js
index ac3f7e1339b985..cd0fc35d1ee11e 100644
--- a/deps/npm/node_modules/debug/src/browser.js
+++ b/deps/npm/node_modules/debug/src/browser.js
@@ -9,6 +9,16 @@ exports.save = save;
 exports.load = load;
 exports.useColors = useColors;
 exports.storage = localstorage();
+exports.destroy = (() => {
+	let warned = false;
+
+	return () => {
+		if (!warned) {
+			warned = true;
+			console.warn('Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.');
+		}
+	};
+})();
 
 /**
  * Colors.
diff --git a/deps/npm/node_modules/debug/src/common.js b/deps/npm/node_modules/debug/src/common.js
index da7eada619f824..392a8e005a063a 100644
--- a/deps/npm/node_modules/debug/src/common.js
+++ b/deps/npm/node_modules/debug/src/common.js
@@ -12,16 +12,12 @@ function setup(env) {
 	createDebug.enable = enable;
 	createDebug.enabled = enabled;
 	createDebug.humanize = require('ms');
+	createDebug.destroy = destroy;
 
 	Object.keys(env).forEach(key => {
 		createDebug[key] = env[key];
 	});
 
-	/**
-	* Active `debug` instances.
-	*/
-	createDebug.instances = [];
-
 	/**
 	* The currently active debug mode names, and names to skip.
 	*/
@@ -63,6 +59,7 @@ function setup(env) {
 	*/
 	function createDebug(namespace) {
 		let prevTime;
+		let enableOverride = null;
 
 		function debug(...args) {
 			// Disabled?
@@ -92,7 +89,7 @@ function setup(env) {
 			args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format) => {
 				// If we encounter an escaped % then don't increase the array index
 				if (match === '%%') {
-					return match;
+					return '%';
 				}
 				index++;
 				const formatter = createDebug.formatters[format];
@@ -115,31 +112,28 @@ function setup(env) {
 		}
 
 		debug.namespace = namespace;
-		debug.enabled = createDebug.enabled(namespace);
 		debug.useColors = createDebug.useColors();
 		debug.color = createDebug.selectColor(namespace);
-		debug.destroy = destroy;
 		debug.extend = extend;
+		debug.destroy = createDebug.destroy; // XXX Temporary. Will be removed in the next major release.
+
+		Object.defineProperty(debug, 'enabled', {
+			enumerable: true,
+			configurable: false,
+			get: () => enableOverride === null ? createDebug.enabled(namespace) : enableOverride,
+			set: v => {
+				enableOverride = v;
+			}
+		});
 
 		// Env-specific initialization logic for debug instances
 		if (typeof createDebug.init === 'function') {
 			createDebug.init(debug);
 		}
 
-		createDebug.instances.push(debug);
-
 		return debug;
 	}
 
-	function destroy() {
-		const index = createDebug.instances.indexOf(this);
-		if (index !== -1) {
-			createDebug.instances.splice(index, 1);
-			return true;
-		}
-		return false;
-	}
-
 	function extend(namespace, delimiter) {
 		const newDebug = createDebug(this.namespace + (typeof delimiter === 'undefined' ? ':' : delimiter) + namespace);
 		newDebug.log = this.log;
@@ -177,11 +171,6 @@ function setup(env) {
 				createDebug.names.push(new RegExp('^' + namespaces + '$'));
 			}
 		}
-
-		for (i = 0; i < createDebug.instances.length; i++) {
-			const instance = createDebug.instances[i];
-			instance.enabled = createDebug.enabled(instance.namespace);
-		}
 	}
 
 	/**
@@ -256,6 +245,14 @@ function setup(env) {
 		return val;
 	}
 
+	/**
+	* XXX DO NOT USE. This is a temporary stub function.
+	* XXX It WILL be removed in the next major release.
+	*/
+	function destroy() {
+		console.warn('Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.');
+	}
+
 	createDebug.enable(createDebug.load());
 
 	return createDebug;
diff --git a/deps/npm/node_modules/debug/src/node.js b/deps/npm/node_modules/debug/src/node.js
index 5e1f1541a05593..79bc085cb0230c 100644
--- a/deps/npm/node_modules/debug/src/node.js
+++ b/deps/npm/node_modules/debug/src/node.js
@@ -15,6 +15,10 @@ exports.formatArgs = formatArgs;
 exports.save = save;
 exports.load = load;
 exports.useColors = useColors;
+exports.destroy = util.deprecate(
+	() => {},
+	'Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.'
+);
 
 /**
  * Colors.
@@ -244,7 +248,9 @@ const {formatters} = module.exports;
 formatters.o = function (v) {
 	this.inspectOpts.colors = this.useColors;
 	return util.inspect(v, this.inspectOpts)
-		.replace(/\s*\n\s*/g, ' ');
+		.split('\n')
+		.map(str => str.trim())
+		.join(' ');
 };
 
 /**
diff --git a/deps/npm/node_modules/function-bind/.editorconfig b/deps/npm/node_modules/function-bind/.editorconfig
new file mode 100644
index 00000000000000..ac29adef0361c6
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 120
+
+[CHANGELOG.md]
+indent_style = space
+indent_size = 2
+
+[*.json]
+max_line_length = off
+
+[Makefile]
+max_line_length = off
diff --git a/deps/npm/node_modules/function-bind/.jscs.json b/deps/npm/node_modules/function-bind/.jscs.json
new file mode 100644
index 00000000000000..8c4479480be70d
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/.jscs.json
@@ -0,0 +1,176 @@
+{
+	"es3": true,
+
+	"additionalRules": [],
+
+	"requireSemicolons": true,
+
+	"disallowMultipleSpaces": true,
+
+	"disallowIdentifierNames": [],
+
+	"requireCurlyBraces": {
+		"allExcept": [],
+		"keywords": ["if", "else", "for", "while", "do", "try", "catch"]
+	},
+
+	"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],
+
+	"disallowSpaceAfterKeywords": [],
+
+	"disallowSpaceBeforeComma": true,
+	"disallowSpaceAfterComma": false,
+	"disallowSpaceBeforeSemicolon": true,
+
+	"disallowNodeTypes": [
+		"DebuggerStatement",
+		"ForInStatement",
+		"LabeledStatement",
+		"SwitchCase",
+		"SwitchStatement",
+		"WithStatement"
+	],
+
+	"requireObjectKeysOnNewLine": { "allExcept": ["sameLine"] },
+
+	"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true },
+	"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
+	"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
+	"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
+	"disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true },
+
+	"requireSpaceBetweenArguments": true,
+
+	"disallowSpacesInsideParentheses": true,
+
+	"disallowSpacesInsideArrayBrackets": true,
+
+	"disallowQuotedKeysInObjects": { "allExcept": ["reserved"] },
+
+	"disallowSpaceAfterObjectKeys": true,
+
+	"requireCommaBeforeLineBreak": true,
+
+	"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+	"requireSpaceAfterPrefixUnaryOperators": [],
+
+	"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+	"requireSpaceBeforePostfixUnaryOperators": [],
+
+	"disallowSpaceBeforeBinaryOperators": [],
+	"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
+
+	"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
+	"disallowSpaceAfterBinaryOperators": [],
+
+	"disallowImplicitTypeConversion": ["binary", "string"],
+
+	"disallowKeywords": ["with", "eval"],
+
+	"requireKeywordsOnNewLine": [],
+	"disallowKeywordsOnNewLine": ["else"],
+
+	"requireLineFeedAtFileEnd": true,
+
+	"disallowTrailingWhitespace": true,
+
+	"disallowTrailingComma": true,
+
+	"excludeFiles": ["node_modules/**", "vendor/**"],
+
+	"disallowMultipleLineStrings": true,
+
+	"requireDotNotation": { "allExcept": ["keywords"] },
+
+	"requireParenthesesAroundIIFE": true,
+
+	"validateLineBreaks": "LF",
+
+	"validateQuoteMarks": {
+		"escape": true,
+		"mark": "'"
+	},
+
+	"disallowOperatorBeforeLineBreak": [],
+
+	"requireSpaceBeforeKeywords": [
+		"do",
+		"for",
+		"if",
+		"else",
+		"switch",
+		"case",
+		"try",
+		"catch",
+		"finally",
+		"while",
+		"with",
+		"return"
+	],
+
+	"validateAlignedFunctionParameters": {
+		"lineBreakAfterOpeningBraces": true,
+		"lineBreakBeforeClosingBraces": true
+	},
+
+	"requirePaddingNewLinesBeforeExport": true,
+
+	"validateNewlineAfterArrayElements": {
+		"maximum": 8
+	},
+
+	"requirePaddingNewLinesAfterUseStrict": true,
+
+	"disallowArrowFunctions": true,
+
+	"disallowMultiLineTernary": true,
+
+	"validateOrderInObjectKeys": "asc-insensitive",
+
+	"disallowIdenticalDestructuringNames": true,
+
+	"disallowNestedTernaries": { "maxLevel": 1 },
+
+	"requireSpaceAfterComma": { "allExcept": ["trailing"] },
+	"requireAlignedMultilineParams": false,
+
+	"requireSpacesInGenerator": {
+		"afterStar": true
+	},
+
+	"disallowSpacesInGenerator": {
+		"beforeStar": true
+	},
+
+	"disallowVar": false,
+
+	"requireArrayDestructuring": false,
+
+	"requireEnhancedObjectLiterals": false,
+
+	"requireObjectDestructuring": false,
+
+	"requireEarlyReturn": false,
+
+	"requireCapitalizedConstructorsNew": {
+		"allExcept": ["Function", "String", "Object", "Symbol", "Number", "Date", "RegExp", "Error", "Boolean", "Array"]
+	},
+
+	"requireImportAlphabetized": false,
+
+    "requireSpaceBeforeObjectValues": true,
+    "requireSpaceBeforeDestructuredValues": true,
+
+	"disallowSpacesInsideTemplateStringPlaceholders": true,
+
+    "disallowArrayDestructuringReturn": false,
+
+    "requireNewlineBeforeSingleStatementsInIf": false,
+
+	"disallowUnusedVariables": true,
+
+	"requireSpacesInsideImportedObjectBraces": true,
+
+	"requireUseStrict": true
+}
+
diff --git a/deps/npm/node_modules/function-bind/.npmignore b/deps/npm/node_modules/function-bind/.npmignore
new file mode 100644
index 00000000000000..dbb555fd1f9f59
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/.npmignore
@@ -0,0 +1,22 @@
+# gitignore
+.DS_Store
+.monitor
+.*.swp
+.nodemonignore
+releases
+*.log
+*.err
+fleet.json
+public/browserify
+bin/*.json
+.bin
+build
+compile
+.lock-wscript
+coverage
+node_modules
+
+# Only apps should have lockfiles
+npm-shrinkwrap.json
+package-lock.json
+yarn.lock
diff --git a/deps/npm/node_modules/function-bind/.travis.yml b/deps/npm/node_modules/function-bind/.travis.yml
new file mode 100644
index 00000000000000..85f70d2464f393
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/.travis.yml
@@ -0,0 +1,168 @@
+language: node_js
+os:
+ - linux
+node_js:
+  - "8.4"
+  - "7.10"
+  - "6.11"
+  - "5.12"
+  - "4.8"
+  - "iojs-v3.3"
+  - "iojs-v2.5"
+  - "iojs-v1.8"
+  - "0.12"
+  - "0.10"
+  - "0.8"
+before_install:
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then npm install -g npm@1.3 ; elif [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then case "$(npm --version)" in 1.*) npm install -g npm@1.4.28 ;; 2.*) npm install -g npm@2 ;; esac ; fi'
+  - 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then if [ "${TRAVIS_NODE_VERSION%${TRAVIS_NODE_VERSION#[0-9]}}" = "0" ] || [ "${TRAVIS_NODE_VERSION:0:4}" = "iojs" ]; then npm install -g npm@4.5 ; else npm install -g npm; fi; fi'
+install:
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then nvm install 0.8 && npm install -g npm@1.3 && npm install -g npm@1.4.28 && npm install -g npm@2 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
+script:
+  - 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
+  - 'if [ -n "${POSTTEST-}" ]; then npm run posttest ; fi'
+  - 'if [ -n "${COVERAGE-}" ]; then npm run coverage ; fi'
+  - 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi'
+sudo: false
+env:
+  - TEST=true
+matrix:
+  fast_finish: true
+  include:
+    - node_js: "node"
+      env: PRETEST=true
+    - node_js: "4"
+      env: COVERAGE=true
+    - node_js: "8.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.11"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v3.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v3.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v3.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.11"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.4"
+      env: TEST=true ALLOW_FAILURE=true
+  allow_failures:
+    - os: osx
+    - env: TEST=true ALLOW_FAILURE=true
diff --git a/deps/npm/node_modules/function-bind/LICENSE b/deps/npm/node_modules/function-bind/LICENSE
new file mode 100644
index 00000000000000..62d6d237ff179b
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2013 Raynos.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/deps/npm/node_modules/function-bind/README.md b/deps/npm/node_modules/function-bind/README.md
new file mode 100644
index 00000000000000..81862a02cb940c
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/README.md
@@ -0,0 +1,48 @@
+# function-bind
+
+<!--
+    [![build status][travis-svg]][travis-url]
+    [![NPM version][npm-badge-svg]][npm-url]
+    [![Coverage Status][5]][6]
+    [![gemnasium Dependency Status][7]][8]
+    [![Dependency status][deps-svg]][deps-url]
+    [![Dev Dependency status][dev-deps-svg]][dev-deps-url]
+-->
+
+<!-- [![browser support][11]][12] -->
+
+Implementation of function.prototype.bind
+
+## Example
+
+I mainly do this for unit tests I run on phantomjs.
+PhantomJS does not have Function.prototype.bind :(
+
+```js
+Function.prototype.bind = require("function-bind")
+```
+
+## Installation
+
+`npm install function-bind`
+
+## Contributors
+
+ - Raynos
+
+## MIT Licenced
+
+  [travis-svg]: https://travis-ci.org/Raynos/function-bind.svg
+  [travis-url]: https://travis-ci.org/Raynos/function-bind
+  [npm-badge-svg]: https://badge.fury.io/js/function-bind.svg
+  [npm-url]: https://npmjs.org/package/function-bind
+  [5]: https://coveralls.io/repos/Raynos/function-bind/badge.png
+  [6]: https://coveralls.io/r/Raynos/function-bind
+  [7]: https://gemnasium.com/Raynos/function-bind.png
+  [8]: https://gemnasium.com/Raynos/function-bind
+  [deps-svg]: https://david-dm.org/Raynos/function-bind.svg
+  [deps-url]: https://david-dm.org/Raynos/function-bind
+  [dev-deps-svg]: https://david-dm.org/Raynos/function-bind/dev-status.svg
+  [dev-deps-url]: https://david-dm.org/Raynos/function-bind#info=devDependencies
+  [11]: https://ci.testling.com/Raynos/function-bind.png
+  [12]: https://ci.testling.com/Raynos/function-bind
diff --git a/deps/npm/node_modules/function-bind/implementation.js b/deps/npm/node_modules/function-bind/implementation.js
new file mode 100644
index 00000000000000..cc4daec1b080a1
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/implementation.js
@@ -0,0 +1,52 @@
+'use strict';
+
+/* eslint no-invalid-this: 1 */
+
+var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
+var slice = Array.prototype.slice;
+var toStr = Object.prototype.toString;
+var funcType = '[object Function]';
+
+module.exports = function bind(that) {
+    var target = this;
+    if (typeof target !== 'function' || toStr.call(target) !== funcType) {
+        throw new TypeError(ERROR_MESSAGE + target);
+    }
+    var args = slice.call(arguments, 1);
+
+    var bound;
+    var binder = function () {
+        if (this instanceof bound) {
+            var result = target.apply(
+                this,
+                args.concat(slice.call(arguments))
+            );
+            if (Object(result) === result) {
+                return result;
+            }
+            return this;
+        } else {
+            return target.apply(
+                that,
+                args.concat(slice.call(arguments))
+            );
+        }
+    };
+
+    var boundLength = Math.max(0, target.length - args.length);
+    var boundArgs = [];
+    for (var i = 0; i < boundLength; i++) {
+        boundArgs.push('$' + i);
+    }
+
+    bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
+
+    if (target.prototype) {
+        var Empty = function Empty() {};
+        Empty.prototype = target.prototype;
+        bound.prototype = new Empty();
+        Empty.prototype = null;
+    }
+
+    return bound;
+};
diff --git a/deps/npm/node_modules/function-bind/index.js b/deps/npm/node_modules/function-bind/index.js
new file mode 100644
index 00000000000000..3bb6b9609889f8
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/index.js
@@ -0,0 +1,5 @@
+'use strict';
+
+var implementation = require('./implementation');
+
+module.exports = Function.prototype.bind || implementation;
diff --git a/deps/npm/node_modules/function-bind/package.json b/deps/npm/node_modules/function-bind/package.json
new file mode 100644
index 00000000000000..20a1727cbf8711
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "function-bind",
+  "version": "1.1.1",
+  "description": "Implementation of Function.prototype.bind",
+  "keywords": [
+    "function",
+    "bind",
+    "shim",
+    "es5"
+  ],
+  "author": "Raynos <raynos2@gmail.com>",
+  "repository": "git://github.com/Raynos/function-bind.git",
+  "main": "index",
+  "homepage": "https://github.com/Raynos/function-bind",
+  "contributors": [
+    {
+      "name": "Raynos"
+    },
+    {
+      "name": "Jordan Harband",
+      "url": "https://github.com/ljharb"
+    }
+  ],
+  "bugs": {
+    "url": "https://github.com/Raynos/function-bind/issues",
+    "email": "raynos2@gmail.com"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@ljharb/eslint-config": "^12.2.1",
+    "covert": "^1.1.0",
+    "eslint": "^4.5.0",
+    "jscs": "^3.0.7",
+    "tape": "^4.8.0"
+  },
+  "license": "MIT",
+  "scripts": {
+    "pretest": "npm run lint",
+    "test": "npm run tests-only",
+    "posttest": "npm run coverage -- --quiet",
+    "tests-only": "node test",
+    "coverage": "covert test/*.js",
+    "lint": "npm run jscs && npm run eslint",
+    "jscs": "jscs *.js */*.js",
+    "eslint": "eslint *.js */*.js"
+  },
+  "testling": {
+    "files": "test/index.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/16..latest",
+      "firefox/nightly",
+      "chrome/22..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  }
+}
diff --git a/deps/npm/node_modules/function-bind/test/index.js b/deps/npm/node_modules/function-bind/test/index.js
new file mode 100644
index 00000000000000..2edecce2f0fa5a
--- /dev/null
+++ b/deps/npm/node_modules/function-bind/test/index.js
@@ -0,0 +1,252 @@
+// jscs:disable requireUseStrict
+
+var test = require('tape');
+
+var functionBind = require('../implementation');
+var getCurrentContext = function () { return this; };
+
+test('functionBind is a function', function (t) {
+    t.equal(typeof functionBind, 'function');
+    t.end();
+});
+
+test('non-functions', function (t) {
+    var nonFunctions = [true, false, [], {}, 42, 'foo', NaN, /a/g];
+    t.plan(nonFunctions.length);
+    for (var i = 0; i < nonFunctions.length; ++i) {
+        try { functionBind.call(nonFunctions[i]); } catch (ex) {
+            t.ok(ex instanceof TypeError, 'throws when given ' + String(nonFunctions[i]));
+        }
+    }
+    t.end();
+});
+
+test('without a context', function (t) {
+    t.test('binds properly', function (st) {
+        var args, context;
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                context = this;
+            })
+        };
+        namespace.func(1, 2, 3);
+        st.deepEqual(args, [1, 2, 3]);
+        st.equal(context, getCurrentContext.call());
+        st.end();
+    });
+
+    t.test('binds properly, and still supplies bound arguments', function (st) {
+        var args, context;
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                context = this;
+            }, undefined, 1, 2, 3)
+        };
+        namespace.func(4, 5, 6);
+        st.deepEqual(args, [1, 2, 3, 4, 5, 6]);
+        st.equal(context, getCurrentContext.call());
+        st.end();
+    });
+
+    t.test('returns properly', function (st) {
+        var args;
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                return this;
+            }, null)
+        };
+        var context = namespace.func(1, 2, 3);
+        st.equal(context, getCurrentContext.call(), 'returned context is namespaced context');
+        st.deepEqual(args, [1, 2, 3], 'passed arguments are correct');
+        st.end();
+    });
+
+    t.test('returns properly with bound arguments', function (st) {
+        var args;
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                return this;
+            }, null, 1, 2, 3)
+        };
+        var context = namespace.func(4, 5, 6);
+        st.equal(context, getCurrentContext.call(), 'returned context is namespaced context');
+        st.deepEqual(args, [1, 2, 3, 4, 5, 6], 'passed arguments are correct');
+        st.end();
+    });
+
+    t.test('called as a constructor', function (st) {
+        var thunkify = function (value) {
+            return function () { return value; };
+        };
+        st.test('returns object value', function (sst) {
+            var expectedReturnValue = [1, 2, 3];
+            var Constructor = functionBind.call(thunkify(expectedReturnValue), null);
+            var result = new Constructor();
+            sst.equal(result, expectedReturnValue);
+            sst.end();
+        });
+
+        st.test('does not return primitive value', function (sst) {
+            var Constructor = functionBind.call(thunkify(42), null);
+            var result = new Constructor();
+            sst.notEqual(result, 42);
+            sst.end();
+        });
+
+        st.test('object from bound constructor is instance of original and bound constructor', function (sst) {
+            var A = function (x) {
+                this.name = x || 'A';
+            };
+            var B = functionBind.call(A, null, 'B');
+
+            var result = new B();
+            sst.ok(result instanceof B, 'result is instance of bound constructor');
+            sst.ok(result instanceof A, 'result is instance of original constructor');
+            sst.end();
+        });
+
+        st.end();
+    });
+
+    t.end();
+});
+
+test('with a context', function (t) {
+    t.test('with no bound arguments', function (st) {
+        var args, context;
+        var boundContext = {};
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                context = this;
+            }, boundContext)
+        };
+        namespace.func(1, 2, 3);
+        st.equal(context, boundContext, 'binds a context properly');
+        st.deepEqual(args, [1, 2, 3], 'supplies passed arguments');
+        st.end();
+    });
+
+    t.test('with bound arguments', function (st) {
+        var args, context;
+        var boundContext = {};
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                context = this;
+            }, boundContext, 1, 2, 3)
+        };
+        namespace.func(4, 5, 6);
+        st.equal(context, boundContext, 'binds a context properly');
+        st.deepEqual(args, [1, 2, 3, 4, 5, 6], 'supplies bound and passed arguments');
+        st.end();
+    });
+
+    t.test('returns properly', function (st) {
+        var boundContext = {};
+        var args;
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                return this;
+            }, boundContext)
+        };
+        var context = namespace.func(1, 2, 3);
+        st.equal(context, boundContext, 'returned context is bound context');
+        st.notEqual(context, getCurrentContext.call(), 'returned context is not lexical context');
+        st.deepEqual(args, [1, 2, 3], 'passed arguments are correct');
+        st.end();
+    });
+
+    t.test('returns properly with bound arguments', function (st) {
+        var boundContext = {};
+        var args;
+        var namespace = {
+            func: functionBind.call(function () {
+                args = Array.prototype.slice.call(arguments);
+                return this;
+            }, boundContext, 1, 2, 3)
+        };
+        var context = namespace.func(4, 5, 6);
+        st.equal(context, boundContext, 'returned context is bound context');
+        st.notEqual(context, getCurrentContext.call(), 'returned context is not lexical context');
+        st.deepEqual(args, [1, 2, 3, 4, 5, 6], 'passed arguments are correct');
+        st.end();
+    });
+
+    t.test('passes the correct arguments when called as a constructor', function (st) {
+        var expected = { name: 'Correct' };
+        var namespace = {
+            Func: functionBind.call(function (arg) {
+                return arg;
+            }, { name: 'Incorrect' })
+        };
+        var returned = new namespace.Func(expected);
+        st.equal(returned, expected, 'returns the right arg when called as a constructor');
+        st.end();
+    });
+
+    t.test('has the new instance\'s context when called as a constructor', function (st) {
+        var actualContext;
+        var expectedContext = { foo: 'bar' };
+        var namespace = {
+            Func: functionBind.call(function () {
+                actualContext = this;
+            }, expectedContext)
+        };
+        var result = new namespace.Func();
+        st.equal(result instanceof namespace.Func, true);
+        st.notEqual(actualContext, expectedContext);
+        st.end();
+    });
+
+    t.end();
+});
+
+test('bound function length', function (t) {
+    t.test('sets a correct length without thisArg', function (st) {
+        var subject = functionBind.call(function (a, b, c) { return a + b + c; });
+        st.equal(subject.length, 3);
+        st.equal(subject(1, 2, 3), 6);
+        st.end();
+    });
+
+    t.test('sets a correct length with thisArg', function (st) {
+        var subject = functionBind.call(function (a, b, c) { return a + b + c; }, {});
+        st.equal(subject.length, 3);
+        st.equal(subject(1, 2, 3), 6);
+        st.end();
+    });
+
+    t.test('sets a correct length without thisArg and first argument', function (st) {
+        var subject = functionBind.call(function (a, b, c) { return a + b + c; }, undefined, 1);
+        st.equal(subject.length, 2);
+        st.equal(subject(2, 3), 6);
+        st.end();
+    });
+
+    t.test('sets a correct length with thisArg and first argument', function (st) {
+        var subject = functionBind.call(function (a, b, c) { return a + b + c; }, {}, 1);
+        st.equal(subject.length, 2);
+        st.equal(subject(2, 3), 6);
+        st.end();
+    });
+
+    t.test('sets a correct length without thisArg and too many arguments', function (st) {
+        var subject = functionBind.call(function (a, b, c) { return a + b + c; }, undefined, 1, 2, 3, 4);
+        st.equal(subject.length, 0);
+        st.equal(subject(), 6);
+        st.end();
+    });
+
+    t.test('sets a correct length with thisArg and too many arguments', function (st) {
+        var subject = functionBind.call(function (a, b, c) { return a + b + c; }, {}, 1, 2, 3, 4);
+        st.equal(subject.length, 0);
+        st.equal(subject(), 6);
+        st.end();
+    });
+});
diff --git a/deps/npm/node_modules/has/LICENSE-MIT b/deps/npm/node_modules/has/LICENSE-MIT
new file mode 100644
index 00000000000000..ae7014d385df3d
--- /dev/null
+++ b/deps/npm/node_modules/has/LICENSE-MIT
@@ -0,0 +1,22 @@
+Copyright (c) 2013 Thiago de Arruda
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/has/README.md b/deps/npm/node_modules/has/README.md
new file mode 100644
index 00000000000000..635e3a4baab00b
--- /dev/null
+++ b/deps/npm/node_modules/has/README.md
@@ -0,0 +1,18 @@
+# has
+
+> Object.prototype.hasOwnProperty.call shortcut
+
+## Installation
+
+```sh
+npm install --save has
+```
+
+## Usage
+
+```js
+var has = require('has');
+
+has({}, 'hasOwnProperty'); // false
+has(Object.prototype, 'hasOwnProperty'); // true
+```
diff --git a/deps/npm/node_modules/has/package.json b/deps/npm/node_modules/has/package.json
new file mode 100644
index 00000000000000..7c4592f16de071
--- /dev/null
+++ b/deps/npm/node_modules/has/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "has",
+  "description": "Object.prototype.hasOwnProperty.call shortcut",
+  "version": "1.0.3",
+  "homepage": "https://github.com/tarruda/has",
+  "author": {
+    "name": "Thiago de Arruda",
+    "email": "tpadilha84@gmail.com"
+  },
+ "contributors": [
+    {
+      "name": "Jordan Harband",
+      "email": "ljharb@gmail.com",
+      "url": "http://ljharb.codes"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/tarruda/has.git"
+  },
+  "bugs": {
+    "url": "https://github.com/tarruda/has/issues"
+  },
+  "license": "MIT",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/tarruda/has/blob/master/LICENSE-MIT"
+    }
+  ],
+  "main": "./src",
+  "dependencies": {
+    "function-bind": "^1.1.1"
+  },
+  "devDependencies": {
+    "@ljharb/eslint-config": "^12.2.1",
+    "eslint": "^4.19.1",
+    "tape": "^4.9.0"
+  },
+  "engines": {
+    "node": ">= 0.4.0"
+  },
+  "scripts": {
+    "lint": "eslint .",
+    "pretest": "npm run lint",
+    "test": "tape test"
+  }
+}
diff --git a/deps/npm/node_modules/has/src/index.js b/deps/npm/node_modules/has/src/index.js
new file mode 100644
index 00000000000000..dd92dd9094edb0
--- /dev/null
+++ b/deps/npm/node_modules/has/src/index.js
@@ -0,0 +1,5 @@
+'use strict';
+
+var bind = require('function-bind');
+
+module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
diff --git a/deps/npm/node_modules/has/test/index.js b/deps/npm/node_modules/has/test/index.js
new file mode 100644
index 00000000000000..43d480b2c2e763
--- /dev/null
+++ b/deps/npm/node_modules/has/test/index.js
@@ -0,0 +1,10 @@
+'use strict';
+
+var test = require('tape');
+var has = require('../');
+
+test('has', function (t) {
+  t.equal(has({}, 'hasOwnProperty'), false, 'object literal does not have own property "hasOwnProperty"');
+  t.equal(has(Object.prototype, 'hasOwnProperty'), true, 'Object.prototype has own property "hasOwnProperty"');
+  t.end();
+});
diff --git a/deps/npm/node_modules/ini/ini.js b/deps/npm/node_modules/ini/ini.js
index 590195dd31478d..b576f08d7a6bbb 100644
--- a/deps/npm/node_modules/ini/ini.js
+++ b/deps/npm/node_modules/ini/ini.js
@@ -15,7 +15,7 @@ function encode (obj, opt) {
   if (typeof opt === 'string') {
     opt = {
       section: opt,
-      whitespace: false
+      whitespace: false,
     }
   } else {
     opt = opt || {}
@@ -30,27 +30,25 @@ function encode (obj, opt) {
       val.forEach(function (item) {
         out += safe(k + '[]') + separator + safe(item) + '\n'
       })
-    } else if (val && typeof val === 'object') {
+    } else if (val && typeof val === 'object')
       children.push(k)
-    } else {
+    else
       out += safe(k) + separator + safe(val) + eol
-    }
   })
 
-  if (opt.section && out.length) {
+  if (opt.section && out.length)
     out = '[' + safe(opt.section) + ']' + eol + out
-  }
 
   children.forEach(function (k, _, __) {
     var nk = dotSplit(k).join('\\.')
     var section = (opt.section ? opt.section + '.' : '') + nk
     var child = encode(obj[k], {
       section: section,
-      whitespace: opt.whitespace
+      whitespace: opt.whitespace,
     })
-    if (out.length && child.length) {
+    if (out.length && child.length)
       out += eol
-    }
+
     out += child
   })
 
@@ -62,7 +60,7 @@ function dotSplit (str) {
     .replace(/\\\./g, '\u0001')
     .split(/\./).map(function (part) {
       return part.replace(/\1/g, '\\.')
-      .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
+        .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
     })
 }
 
@@ -75,15 +73,25 @@ function decode (str) {
   var lines = str.split(/[\r\n]+/g)
 
   lines.forEach(function (line, _, __) {
-    if (!line || line.match(/^\s*[;#]/)) return
+    if (!line || line.match(/^\s*[;#]/))
+      return
     var match = line.match(re)
-    if (!match) return
+    if (!match)
+      return
     if (match[1] !== undefined) {
       section = unsafe(match[1])
+      if (section === '__proto__') {
+        // not allowed
+        // keep parsing the section, but don't attach it.
+        p = {}
+        return
+      }
       p = out[section] = out[section] || {}
       return
     }
     var key = unsafe(match[2])
+    if (key === '__proto__')
+      return
     var value = match[3] ? unsafe(match[4]) : true
     switch (value) {
       case 'true':
@@ -94,20 +102,20 @@ function decode (str) {
     // Convert keys with '[]' suffix to an array
     if (key.length > 2 && key.slice(-2) === '[]') {
       key = key.substring(0, key.length - 2)
-      if (!p[key]) {
+      if (key === '__proto__')
+        return
+      if (!p[key])
         p[key] = []
-      } else if (!Array.isArray(p[key])) {
+      else if (!Array.isArray(p[key]))
         p[key] = [p[key]]
-      }
     }
 
     // safeguard against resetting a previously defined
     // array by accidentally forgetting the brackets
-    if (Array.isArray(p[key])) {
+    if (Array.isArray(p[key]))
       p[key].push(value)
-    } else {
+    else
       p[key] = value
-    }
   })
 
   // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
@@ -115,9 +123,9 @@ function decode (str) {
   Object.keys(out).filter(function (k, _, __) {
     if (!out[k] ||
       typeof out[k] !== 'object' ||
-      Array.isArray(out[k])) {
+      Array.isArray(out[k]))
       return false
-    }
+
     // see if the parent section is also an object.
     // if so, add it to that, and mark this one for deletion
     var parts = dotSplit(k)
@@ -125,12 +133,15 @@ function decode (str) {
     var l = parts.pop()
     var nl = l.replace(/\\\./g, '.')
     parts.forEach(function (part, _, __) {
-      if (!p[part] || typeof p[part] !== 'object') p[part] = {}
+      if (part === '__proto__')
+        return
+      if (!p[part] || typeof p[part] !== 'object')
+        p[part] = {}
       p = p[part]
     })
-    if (p === out && nl === l) {
+    if (p === out && nl === l)
       return false
-    }
+
     p[nl] = out[k]
     return true
   }).forEach(function (del, _, __) {
@@ -152,18 +163,20 @@ function safe (val) {
     (val.length > 1 &&
      isQuoted(val)) ||
     val !== val.trim())
-      ? JSON.stringify(val)
-      : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
+    ? JSON.stringify(val)
+    : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
 }
 
 function unsafe (val, doUnesc) {
   val = (val || '').trim()
   if (isQuoted(val)) {
     // remove the single quotes before calling JSON.parse
-    if (val.charAt(0) === "'") {
+    if (val.charAt(0) === "'")
       val = val.substr(1, val.length - 2)
-    }
-    try { val = JSON.parse(val) } catch (_) {}
+
+    try {
+      val = JSON.parse(val)
+    } catch (_) {}
   } else {
     // walk the val to find the first not-escaped ; character
     var esc = false
@@ -171,23 +184,22 @@ function unsafe (val, doUnesc) {
     for (var i = 0, l = val.length; i < l; i++) {
       var c = val.charAt(i)
       if (esc) {
-        if ('\\;#'.indexOf(c) !== -1) {
+        if ('\\;#'.indexOf(c) !== -1)
           unesc += c
-        } else {
+        else
           unesc += '\\' + c
-        }
+
         esc = false
-      } else if (';#'.indexOf(c) !== -1) {
+      } else if (';#'.indexOf(c) !== -1)
         break
-      } else if (c === '\\') {
+      else if (c === '\\')
         esc = true
-      } else {
+      else
         unesc += c
-      }
     }
-    if (esc) {
+    if (esc)
       unesc += '\\'
-    }
+
     return unesc.trim()
   }
   return val
diff --git a/deps/npm/node_modules/ini/package.json b/deps/npm/node_modules/ini/package.json
index 269bc158dd3ab5..c830a3556ef824 100644
--- a/deps/npm/node_modules/ini/package.json
+++ b/deps/npm/node_modules/ini/package.json
@@ -2,26 +2,29 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
   "name": "ini",
   "description": "An ini encoder/decoder for node",
-  "version": "1.3.5",
+  "version": "1.3.8",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/ini.git"
   },
   "main": "ini.js",
   "scripts": {
-    "pretest": "standard ini.js",
-    "test": "tap test/*.js --100 -J",
+    "eslint": "eslint",
+    "lint": "npm run eslint -- ini.js test/*.js",
+    "lintfix": "npm run lint -- --fix",
+    "test": "tap",
+    "posttest": "npm run lint",
     "preversion": "npm test",
     "postversion": "npm publish",
-    "postpublish": "git push origin --all; git push origin --tags"
+    "prepublishOnly": "git push origin --follow-tags"
   },
-  "engines": {
-    "node": "*"
-  },
-  "dependencies": {},
   "devDependencies": {
-    "standard": "^10.0.3",
-    "tap": "^10.7.3 || 11"
+    "eslint": "^7.9.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "tap": "14"
   },
   "license": "ISC",
   "files": [
diff --git a/deps/npm/node_modules/is-core-module/.eslintignore b/deps/npm/node_modules/is-core-module/.eslintignore
new file mode 100644
index 00000000000000..404abb22121cdc
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.eslintignore
@@ -0,0 +1 @@
+coverage/
diff --git a/deps/npm/node_modules/is-core-module/.github/FUNDING.yml b/deps/npm/node_modules/is-core-module/.github/FUNDING.yml
new file mode 100644
index 00000000000000..422ce9b01a7f3b
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [ljharb]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: npm/is-core-module
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/deps/npm/node_modules/is-core-module/.github/workflows/node-4+.yml b/deps/npm/node_modules/is-core-module/.github/workflows/node-4+.yml
new file mode 100644
index 00000000000000..ba174e1d6c28cd
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/workflows/node-4+.yml
@@ -0,0 +1,54 @@
+name: 'Tests: node.js'
+
+on: [pull_request, push]
+
+jobs:
+  matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      latest: ${{ steps.set-matrix.outputs.requireds }}
+      minors: ${{ steps.set-matrix.outputs.optionals }}
+    steps:
+      - uses: ljharb/actions/node/matrix@main
+        id: set-matrix
+        with:
+          preset: '>=4'
+
+  latest:
+    needs: [matrix]
+    name: 'latest minors'
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix: ${{ fromJson(needs.matrix.outputs.latest) }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        name: 'npm install && npm run tests-only'
+        with:
+          node-version: ${{ matrix.node-version }}
+          command: 'tests-only'
+  minors:
+    needs: [matrix, latest]
+    name: 'non-latest minors'
+    continue-on-error: true
+    if: ${{ !github.head_ref || !startsWith(github.head_ref, 'renovate') }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix: ${{ fromJson(needs.matrix.outputs.minors) }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        with:
+          node-version: ${{ matrix.node-version }}
+          command: 'tests-only'
+
+  node:
+    name: 'node 4+'
+    needs: [latest, minors]
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo tests completed'
diff --git a/deps/npm/node_modules/is-core-module/.github/workflows/node-iojs.yml b/deps/npm/node_modules/is-core-module/.github/workflows/node-iojs.yml
new file mode 100644
index 00000000000000..f707c3cfc308ec
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/workflows/node-iojs.yml
@@ -0,0 +1,58 @@
+name: 'Tests: node.js (io.js)'
+
+on: [pull_request, push]
+
+jobs:
+  matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      latest: ${{ steps.set-matrix.outputs.requireds }}
+      minors: ${{ steps.set-matrix.outputs.optionals }}
+    steps:
+      - uses: ljharb/actions/node/matrix@main
+        id: set-matrix
+        with:
+          preset: 'iojs'
+
+  latest:
+    needs: [matrix]
+    name: 'latest minors'
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix: ${{ fromJson(needs.matrix.outputs.latest) }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        name: 'npm install && npm run tests-only'
+        with:
+          node-version: ${{ matrix.node-version }}
+          command: 'tests-only'
+          skip-ls-check: true
+
+  minors:
+    needs: [matrix, latest]
+    name: 'non-latest minors'
+    continue-on-error: true
+    if: ${{ !github.head_ref || !startsWith(github.head_ref, 'renovate') }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix: ${{ fromJson(needs.matrix.outputs.minors) }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        name: 'npm install && npm run tests-only'
+        with:
+          node-version: ${{ matrix.node-version }}
+          command: 'tests-only'
+          skip-ls-check: true
+
+  node:
+    name: 'io.js'
+    needs: [latest, minors]
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo tests completed'
diff --git a/deps/npm/node_modules/is-core-module/.github/workflows/node-pretest.yml b/deps/npm/node_modules/is-core-module/.github/workflows/node-pretest.yml
new file mode 100644
index 00000000000000..3921e0ae6cd6ba
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/workflows/node-pretest.yml
@@ -0,0 +1,26 @@
+name: 'Tests: pretest/posttest'
+
+on: [pull_request, push]
+
+jobs:
+  pretest:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        name: 'npm install && npm run pretest'
+        with:
+          node-version: 'lts/*'
+          command: 'pretest'
+
+  posttest:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        name: 'npm install && npm run posttest'
+        with:
+          node-version: 'lts/*'
+          command: 'posttest'
diff --git a/deps/npm/node_modules/is-core-module/.github/workflows/node-zero.yml b/deps/npm/node_modules/is-core-module/.github/workflows/node-zero.yml
new file mode 100644
index 00000000000000..d044c6031d5b3a
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/workflows/node-zero.yml
@@ -0,0 +1,58 @@
+name: 'Tests: node.js (0.x)'
+
+on: [pull_request, push]
+
+jobs:
+  matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      stable: ${{ steps.set-matrix.outputs.requireds }}
+      unstable: ${{ steps.set-matrix.outputs.optionals }}
+    steps:
+      - uses: ljharb/actions/node/matrix@main
+        id: set-matrix
+        with:
+          preset: '0.x'
+
+  stable:
+    needs: [matrix]
+    name: 'stable minors'
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix: ${{ fromJson(needs.matrix.outputs.stable) }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        with:
+          node-version: ${{ matrix.node-version }}
+          command: 'tests-only'
+          cache-node-modules-key: node_modules-${{ github.workflow }}-${{ github.action }}-${{ github.run_id }}
+          skip-ls-check: true
+
+  unstable:
+    needs: [matrix, stable]
+    name: 'unstable minors'
+    continue-on-error: true
+    if: ${{ !github.head_ref || !startsWith(github.head_ref, 'renovate') }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix: ${{ fromJson(needs.matrix.outputs.unstable) }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ljharb/actions/node/run@main
+        with:
+          node-version: ${{ matrix.node-version }}
+          command: 'tests-only'
+          cache-node-modules-key: node_modules-${{ github.workflow }}-${{ github.action }}-${{ github.run_id }}
+          skip-ls-check: true
+
+  node:
+    name: 'node 0.x'
+    needs: [stable, unstable]
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo tests completed'
diff --git a/deps/npm/node_modules/is-core-module/.github/workflows/rebase.yml b/deps/npm/node_modules/is-core-module/.github/workflows/rebase.yml
new file mode 100644
index 00000000000000..0c2ad39b5f7b82
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/workflows/rebase.yml
@@ -0,0 +1,15 @@
+name: Automatic Rebase
+
+on: [pull_request_target]
+
+jobs:
+  _:
+    name: "Automatic Rebase"
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - uses: ljharb/rebase@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/deps/npm/node_modules/is-core-module/.github/workflows/require-allow-edits.yml b/deps/npm/node_modules/is-core-module/.github/workflows/require-allow-edits.yml
new file mode 100644
index 00000000000000..aac42d3e29c7af
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.github/workflows/require-allow-edits.yml
@@ -0,0 +1,14 @@
+name: Require “Allow Edits”
+
+on: [pull_request_target]
+
+jobs:
+  _:
+    name: "Require “Allow Edits”"
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: ljharb/require-allow-edits@main
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/deps/npm/node_modules/is-core-module/.nycrc b/deps/npm/node_modules/is-core-module/.nycrc
new file mode 100644
index 00000000000000..1826526e091b89
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/.nycrc
@@ -0,0 +1,13 @@
+{
+	"all": true,
+	"check-coverage": false,
+	"reporter": ["text-summary", "text", "html", "json"],
+	"lines": 86,
+	"statements": 85.93,
+	"functions": 82.43,
+	"branches": 76.06,
+	"exclude": [
+		"coverage",
+		"test"
+	]
+}
diff --git a/deps/npm/node_modules/is-core-module/CHANGELOG.md b/deps/npm/node_modules/is-core-module/CHANGELOG.md
new file mode 100644
index 00000000000000..4cdb33d005960d
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/CHANGELOG.md
@@ -0,0 +1,58 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v2.2.0](https://github.com/inspect-js/is-core-module/compare/v2.1.0...v2.2.0) - 2020-11-26
+
+### Commits
+
+- [Tests] migrate tests to Github Actions [`c919f57`](https://github.com/inspect-js/is-core-module/commit/c919f573c0a92d10a0acad0b650b5aecb033d426)
+- [patch] `core.json`: %s/    /\t/g [`db3f685`](https://github.com/inspect-js/is-core-module/commit/db3f68581f53e73cc09cd675955eb1bdd6a5a39b)
+- [Tests] run `nyc` on all tests [`b2f925f`](https://github.com/inspect-js/is-core-module/commit/b2f925f8866f210ef441f39fcc8cc42692ab89b1)
+- [Dev Deps] update `eslint`, `@ljharb/eslint-config`, `aud`; add `safe-publish-latest` [`89f02a2`](https://github.com/inspect-js/is-core-module/commit/89f02a2b4162246dea303a6ee31bb9a550b05c72)
+- [New] add `path/posix`, `path/win32`, `util/types` [`77f94f1`](https://github.com/inspect-js/is-core-module/commit/77f94f1e90ffd7c0be2a3f1aa8574ebf7fd981b3)
+
+## [v2.1.0](https://github.com/inspect-js/is-core-module/compare/v2.0.0...v2.1.0) - 2020-11-04
+
+### Commits
+
+- [Dev Deps] update `eslint` [`5e0034e`](https://github.com/inspect-js/is-core-module/commit/5e0034eae57c09c8f1bd769f502486a00f56c6e4)
+- [New] Add `diagnostics_channel` [`c2d83d0`](https://github.com/inspect-js/is-core-module/commit/c2d83d0a0225a1a658945d9bab7036ea347d29ec)
+
+## [v2.0.0](https://github.com/inspect-js/is-core-module/compare/v1.0.2...v2.0.0) - 2020-09-29
+
+### Commits
+
+- v2 implementation [`865aeb5`](https://github.com/inspect-js/is-core-module/commit/865aeb5ca0e90248a3dfff5d7622e4751fdeb9cd)
+- Only apps should have lockfiles [`5a5e660`](https://github.com/inspect-js/is-core-module/commit/5a5e660d568e37eb44e17fb1ebb12a105205fc2b)
+- Initial commit for v2 [`5a51524`](https://github.com/inspect-js/is-core-module/commit/5a51524e06f92adece5fbb138c69b7b9748a2348)
+- Tests [`116eae4`](https://github.com/inspect-js/is-core-module/commit/116eae4fccd01bc72c1fd3cc4b7561c387afc496)
+- [meta] add `auto-changelog` [`c24388b`](https://github.com/inspect-js/is-core-module/commit/c24388bee828d223040519d1f5b226ca35beee63)
+- [actions] add "Automatic Rebase" and "require allow edits" actions [`34292db`](https://github.com/inspect-js/is-core-module/commit/34292dbcbadae0868aff03c22dbd8b7b8a11558a)
+- [Tests] add `npm run lint` [`4f9eeee`](https://github.com/inspect-js/is-core-module/commit/4f9eeee7ddff10698bbf528620f4dc8d4fa3e697)
+- [readme] fix travis badges, https all URLs [`e516a73`](https://github.com/inspect-js/is-core-module/commit/e516a73b0dccce20938c432b1ba512eae8eff9e9)
+- [meta] create FUNDING.yml [`1aabebc`](https://github.com/inspect-js/is-core-module/commit/1aabebca98d01f8a04e46bc2e2520fa93cf21ac6)
+- [Fix] `domain`: domain landed sometime &gt; v0.7.7 and &lt;= v0.7.12 [`2df7d37`](https://github.com/inspect-js/is-core-module/commit/2df7d37595d41b15eeada732b706b926c2771655)
+- [Fix] `sys`: worked in 0.6, not 0.7, and 0.8+ [`a75c134`](https://github.com/inspect-js/is-core-module/commit/a75c134229e1e9441801f6b73f6a52489346eb65)
+
+## [v1.0.2](https://github.com/inspect-js/is-core-module/compare/v1.0.1...v1.0.2) - 2014-09-28
+
+### Commits
+
+- simpler [`66fe90f`](https://github.com/inspect-js/is-core-module/commit/66fe90f9771581b9adc0c3900baa52c21b5baea2)
+
+## [v1.0.1](https://github.com/inspect-js/is-core-module/compare/v1.0.0...v1.0.1) - 2014-09-28
+
+### Commits
+
+- remove stupid [`f21f906`](https://github.com/inspect-js/is-core-module/commit/f21f906f882c2bd656a5fc5ed6fbe48ddaffb2ac)
+- update readme [`1eff0ec`](https://github.com/inspect-js/is-core-module/commit/1eff0ec69798d1ec65771552d1562911e90a8027)
+
+## v1.0.0 - 2014-09-28
+
+### Commits
+
+- init [`48e5e76`](https://github.com/inspect-js/is-core-module/commit/48e5e76cac378fddb8c1f7d4055b8dfc943d6b96)
diff --git a/deps/npm/node_modules/is-core-module/LICENSE b/deps/npm/node_modules/is-core-module/LICENSE
new file mode 100644
index 00000000000000..2e502872a74234
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Dave Justice
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/deps/npm/node_modules/is-core-module/README.md b/deps/npm/node_modules/is-core-module/README.md
new file mode 100644
index 00000000000000..479d6d24c0f041
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/README.md
@@ -0,0 +1,37 @@
+# is-core-module <sup>[![Version Badge][2]][1]</sup>
+
+[![Build Status][3]][4]
+[![dependency status][5]][6]
+[![dev dependency status][7]][8]
+[![License][license-image]][license-url]
+[![Downloads][downloads-image]][downloads-url]
+
+[![npm badge][11]][1]
+
+Is this specifier a node.js core module? Optionally provide a node version to check; defaults to the current node version.
+
+## Example
+
+```js
+var isCore = require('is-core-module');
+var assert = require('assert');
+assert(isCore('fs'));
+assert(!isCore('butts'));
+```
+
+## Tests
+Clone the repo, `npm install`, and run `npm test`
+
+[1]: https://npmjs.org/package/is-core-module
+[2]: https://versionbadg.es/inspect-js/is-core-module.svg
+[3]: https://travis-ci.com/inspect-js/is-core-module.svg
+[4]: https://travis-ci.com/inspect-js/is-core-module
+[5]: https://david-dm.org/inspect-js/is-core-module.svg
+[6]: https://david-dm.org/inspect-js/is-core-module
+[7]: https://david-dm.org/inspect-js/is-core-module/dev-status.svg
+[8]: https://david-dm.org/inspect-js/is-core-module#info=devDependencies
+[11]: https://nodei.co/npm/is-core-module.png?downloads=true&stars=true
+[license-image]: https://img.shields.io/npm/l/is-core-module.svg
+[license-url]: LICENSE
+[downloads-image]: https://img.shields.io/npm/dm/is-core-module.svg
+[downloads-url]: https://npm-stat.com/charts.html?package=is-core-module
diff --git a/deps/npm/node_modules/is-core-module/core.json b/deps/npm/node_modules/is-core-module/core.json
new file mode 100644
index 00000000000000..0238b61a4c71e4
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/core.json
@@ -0,0 +1,83 @@
+{
+	"assert": true,
+	"assert/strict": ">= 15",
+	"async_hooks": ">= 8",
+	"buffer_ieee754": "< 0.9.7",
+	"buffer": true,
+	"child_process": true,
+	"cluster": true,
+	"console": true,
+	"constants": true,
+	"crypto": true,
+	"_debug_agent": ">= 1 && < 8",
+	"_debugger": "< 8",
+	"dgram": true,
+	"diagnostics_channel": ">= 15.1",
+	"dns": true,
+	"dns/promises": ">= 15",
+	"domain": ">= 0.7.12",
+	"events": true,
+	"freelist": "< 6",
+	"fs": true,
+	"fs/promises": [">= 10 && < 10.1", ">= 14"],
+	"_http_agent": ">= 0.11.1",
+	"_http_client": ">= 0.11.1",
+	"_http_common": ">= 0.11.1",
+	"_http_incoming": ">= 0.11.1",
+	"_http_outgoing": ">= 0.11.1",
+	"_http_server": ">= 0.11.1",
+	"http": true,
+	"http2": ">= 8.8",
+	"https": true,
+	"inspector": ">= 8.0.0",
+	"_linklist": "< 8",
+	"module": true,
+	"net": true,
+	"node-inspect/lib/_inspect": ">= 7.6.0 && < 12",
+	"node-inspect/lib/internal/inspect_client": ">= 7.6.0 && < 12",
+	"node-inspect/lib/internal/inspect_repl": ">= 7.6.0 && < 12",
+	"os": true,
+	"path": true,
+	"path/posix": ">= 15.3",
+	"path/win32": ">= 15.3",
+	"perf_hooks": ">= 8.5",
+	"process": ">= 1",
+	"punycode": true,
+	"querystring": true,
+	"readline": true,
+	"repl": true,
+	"smalloc": ">= 0.11.5 && < 3",
+	"_stream_duplex": ">= 0.9.4",
+	"_stream_transform": ">= 0.9.4",
+	"_stream_wrap": ">= 1.4.1",
+	"_stream_passthrough": ">= 0.9.4",
+	"_stream_readable": ">= 0.9.4",
+	"_stream_writable": ">= 0.9.4",
+	"stream": true,
+	"stream/promises": ">= 15",
+	"string_decoder": true,
+	"sys": [">= 0.6 && < 0.7", ">= 0.8"],
+	"timers": true,
+	"timers/promises": ">= 15",
+	"_tls_common": ">= 0.11.13",
+	"_tls_legacy": ">= 0.11.3 && < 10",
+	"_tls_wrap": ">= 0.11.3",
+	"tls": true,
+	"trace_events": ">= 10",
+	"tty": true,
+	"url": true,
+	"util": true,
+	"util/types": ">= 15.3",
+	"v8/tools/arguments": ">= 10 && < 12",
+	"v8/tools/codemap": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
+	"v8/tools/consarray": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
+	"v8/tools/csvparser": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
+	"v8/tools/logreader": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
+	"v8/tools/profile_view": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
+	"v8/tools/splaytree": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
+	"v8": ">= 1",
+	"vm": true,
+	"wasi": ">= 13.4 && < 13.5",
+	"worker_threads": ">= 11.7",
+	"zlib": true
+}
diff --git a/deps/npm/node_modules/is-core-module/index.js b/deps/npm/node_modules/is-core-module/index.js
new file mode 100644
index 00000000000000..f5a69cf765f56b
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/index.js
@@ -0,0 +1,69 @@
+'use strict';
+
+var has = require('has');
+
+function specifierIncluded(current, specifier) {
+	var nodeParts = current.split('.');
+	var parts = specifier.split(' ');
+	var op = parts.length > 1 ? parts[0] : '=';
+	var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+
+	for (var i = 0; i < 3; ++i) {
+		var cur = parseInt(nodeParts[i] || 0, 10);
+		var ver = parseInt(versionParts[i] || 0, 10);
+		if (cur === ver) {
+			continue; // eslint-disable-line no-restricted-syntax, no-continue
+		}
+		if (op === '<') {
+			return cur < ver;
+		}
+		if (op === '>=') {
+			return cur >= ver;
+		}
+		return false;
+	}
+	return op === '>=';
+}
+
+function matchesRange(current, range) {
+	var specifiers = range.split(/ ?&& ?/);
+	if (specifiers.length === 0) {
+		return false;
+	}
+	for (var i = 0; i < specifiers.length; ++i) {
+		if (!specifierIncluded(current, specifiers[i])) {
+			return false;
+		}
+	}
+	return true;
+}
+
+function versionIncluded(nodeVersion, specifierValue) {
+	if (typeof specifierValue === 'boolean') {
+		return specifierValue;
+	}
+
+	var current = typeof nodeVersion === 'undefined'
+		? process.versions && process.versions.node && process.versions.node
+		: nodeVersion;
+
+	if (typeof current !== 'string') {
+		throw new TypeError(typeof nodeVersion === 'undefined' ? 'Unable to determine current node version' : 'If provided, a valid node version is required');
+	}
+
+	if (specifierValue && typeof specifierValue === 'object') {
+		for (var i = 0; i < specifierValue.length; ++i) {
+			if (matchesRange(current, specifierValue[i])) {
+				return true;
+			}
+		}
+		return false;
+	}
+	return matchesRange(current, specifierValue);
+}
+
+var data = require('./core.json');
+
+module.exports = function isCore(x, nodeVersion) {
+	return has(data, x) && versionIncluded(nodeVersion, data[x]);
+};
diff --git a/deps/npm/node_modules/is-core-module/package.json b/deps/npm/node_modules/is-core-module/package.json
new file mode 100644
index 00000000000000..21341cc431a505
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/package.json
@@ -0,0 +1,66 @@
+{
+	"name": "is-core-module",
+	"version": "2.2.0",
+	"description": "Is this specifier a node.js core module?",
+	"main": "index.js",
+	"exports": {
+		".": [
+			{
+				"default": "./index.js"
+			},
+			"./index.js"
+		],
+		"./package.json": "./package.json"
+	},
+	"scripts": {
+		"prepublish": "safe-publish-latest",
+		"lint": "eslint .",
+		"pretest": "npm run lint",
+		"tests-only": "tape 'test/**/*.js'",
+		"test": "nyc npm run tests-only",
+		"posttest": "aud --production",
+		"version": "auto-changelog && git add CHANGELOG.md",
+		"postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/inspect-js/is-core-module.git"
+	},
+	"keywords": [
+		"core",
+		"modules",
+		"module",
+		"npm",
+		"node",
+		"dependencies"
+	],
+	"author": "Jordan Harband <ljharb@gmail.com>",
+	"funding": {
+		"url": "https://github.com/sponsors/ljharb"
+	},
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/inspect-js/is-core-module/issues"
+	},
+	"homepage": "https://github.com/inspect-js/is-core-module",
+	"dependencies": {
+		"has": "^1.0.3"
+	},
+	"devDependencies": {
+		"@ljharb/eslint-config": "^17.3.0",
+		"aud": "^1.1.3",
+		"auto-changelog": "^2.2.1",
+		"eslint": "^7.14.0",
+		"nyc": "^10.3.2",
+		"safe-publish-latest": "^1.1.4",
+		"tape": "^5.0.1"
+	},
+	"auto-changelog": {
+		"output": "CHANGELOG.md",
+		"template": "keepachangelog",
+		"unreleased": false,
+		"commitLimit": false,
+		"backfillLimit": false,
+		"hideCredit": true
+	}
+}
diff --git a/deps/npm/node_modules/is-core-module/test/index.js b/deps/npm/node_modules/is-core-module/test/index.js
new file mode 100644
index 00000000000000..99659bcf113f78
--- /dev/null
+++ b/deps/npm/node_modules/is-core-module/test/index.js
@@ -0,0 +1,83 @@
+'use strict';
+
+var test = require('tape');
+var keys = require('object-keys');
+var isCore = require('../');
+var data = require('../core.json');
+
+test('core modules', function (t) {
+	t.test('isCore()', function (st) {
+		st.ok(isCore('fs'));
+		st.ok(isCore('net'));
+		st.ok(isCore('http'));
+
+		st.ok(!isCore('seq'));
+		st.ok(!isCore('../'));
+
+		st.ok(!isCore('toString'));
+
+		st.end();
+	});
+
+	t.test('core list', function (st) {
+		var cores = keys(data);
+		st.plan(cores.length);
+
+		for (var i = 0; i < cores.length; ++i) {
+			var mod = cores[i];
+			var requireFunc = function () { require(mod); }; // eslint-disable-line no-loop-func
+			if (isCore(mod)) {
+				st.doesNotThrow(requireFunc, mod + ' supported; requiring does not throw');
+			} else {
+				st['throws'](requireFunc, mod + ' not supported; requiring throws');
+			}
+		}
+
+		st.end();
+	});
+
+	t.test('core via repl module', { skip: !data.repl }, function (st) {
+		var libs = require('repl')._builtinLibs; // eslint-disable-line no-underscore-dangle
+		if (!libs) {
+			st.skip('module.builtinModules does not exist');
+		} else {
+			for (var i = 0; i < libs.length; ++i) {
+				var mod = libs[i];
+				st.ok(data[mod], mod + ' is a core module');
+				st.doesNotThrow(
+					function () { require(mod); }, // eslint-disable-line no-loop-func
+					'requiring ' + mod + ' does not throw'
+				);
+			}
+		}
+		st.end();
+	});
+
+	t.test('core via builtinModules list', { skip: !data.module }, function (st) {
+		var libs = require('module').builtinModules;
+		if (!libs) {
+			st.skip('module.builtinModules does not exist');
+		} else {
+			var excludeList = [
+				'_debug_agent',
+				'v8/tools/tickprocessor-driver',
+				'v8/tools/SourceMap',
+				'v8/tools/tickprocessor',
+				'v8/tools/profile'
+			];
+			for (var i = 0; i < libs.length; ++i) {
+				var mod = libs[i];
+				if (excludeList.indexOf(mod) === -1) {
+					st.ok(data[mod], mod + ' is a core module');
+					st.doesNotThrow(
+						function () { require(mod); }, // eslint-disable-line no-loop-func
+						'requiring ' + mod + ' does not throw'
+					);
+				}
+			}
+		}
+		st.end();
+	});
+
+	t.end();
+});
diff --git a/deps/npm/node_modules/libnpmfund/package.json b/deps/npm/node_modules/libnpmfund/package.json
index f337fffd15fd7c..b25d3aa6b520eb 100644
--- a/deps/npm/node_modules/libnpmfund/package.json
+++ b/deps/npm/node_modules/libnpmfund/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libnpmfund",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "files": [
     "index.js"
   ],
@@ -47,6 +47,6 @@
     "tap": "^14.10.7"
   },
   "dependencies": {
-    "@npmcli/arborist": "^0.0.33 || ^1.x"
+    "@npmcli/arborist": "^2.0.0"
   }
 }
diff --git a/deps/npm/node_modules/libnpmsearch/index.js b/deps/npm/node_modules/libnpmsearch/index.js
index 43889e5377e629..cb6b50783d35e8 100644
--- a/deps/npm/node_modules/libnpmsearch/index.js
+++ b/deps/npm/node_modules/libnpmsearch/index.js
@@ -15,6 +15,7 @@ function searchStream (query, opts = {}) {
     quality: 0.65,
     popularity: 0.98,
     maintenance: 0.5,
+    ...opts.opts, // this is to support the cli's --searchopts parameter
     ...opts
   }
 
diff --git a/deps/npm/node_modules/libnpmsearch/package.json b/deps/npm/node_modules/libnpmsearch/package.json
index 5b86d77d5cb2ba..a32a194ae6a102 100644
--- a/deps/npm/node_modules/libnpmsearch/package.json
+++ b/deps/npm/node_modules/libnpmsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libnpmsearch",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Programmatic API for searching in npm and compatible registries.",
   "author": "Kat Marchán <kzm@sykosomatic.org>",
   "files": [
@@ -15,10 +15,10 @@
   ],
   "license": "ISC",
   "scripts": {
-    "prerelease": "npm t",
-    "release": "standard-version -s",
-    "postrelease": "npm publish && git push --follow-tags",
-    "pretest": "standard",
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "prepublishOnly": "git push origin --follow-tags",
+    "posttest": "standard",
     "test": "tap"
   },
   "tap": {
@@ -27,8 +27,7 @@
   "devDependencies": {
     "nock": "^9.6.1",
     "standard": "^12.0.0",
-    "standard-version": "*",
-    "tap": "^14.10.6"
+    "tap": "^14.11.0"
   },
   "repository": {
     "type": "git",
diff --git a/deps/npm/node_modules/libnpmversion/lib/version.js b/deps/npm/node_modules/libnpmversion/lib/version.js
index ee02fb7ffb9d0a..309b9c2b9504f0 100644
--- a/deps/npm/node_modules/libnpmversion/lib/version.js
+++ b/deps/npm/node_modules/libnpmversion/lib/version.js
@@ -34,7 +34,7 @@ module.exports = async (newversion, opts) => {
   } = opts
 
   const { valid, clean, inc } = semver
-  const current = pkg.version
+  const current = pkg.version || '0.0.0'
   const currentClean = clean(current)
 
   const newV = valid(newversion, { loose: true }) ? clean(newversion, { loose: true })
diff --git a/deps/npm/node_modules/libnpmversion/package.json b/deps/npm/node_modules/libnpmversion/package.json
index 856e36da6d564d..d7e8d5fa586476 100644
--- a/deps/npm/node_modules/libnpmversion/package.json
+++ b/deps/npm/node_modules/libnpmversion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libnpmversion",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "lib/index.js",
   "files": [
     "lib/*.js"
diff --git a/deps/npm/node_modules/make-fetch-happen/agent.js b/deps/npm/node_modules/make-fetch-happen/agent.js
index 66ca886bea156b..e27eb4f3a801da 100644
--- a/deps/npm/node_modules/make-fetch-happen/agent.js
+++ b/deps/npm/node_modules/make-fetch-happen/agent.js
@@ -38,7 +38,7 @@ function getAgent (uri, opts) {
     `cert:${(isHttps && opts.cert) || '>no-cert<'}`,
     `key:${(isHttps && opts.key) || '>no-key<'}`,
     `timeout:${agentTimeout}`,
-    `maxSockets:${agentMaxSockets}`
+    `maxSockets:${agentMaxSockets}`,
   ].join(':')
 
   if (opts.agent != null) { // `agent: false` has special behavior!
@@ -48,20 +48,18 @@ function getAgent (uri, opts) {
   // keep alive in AWS lambda makes no sense
   const lambdaAgent = !isLambda ? null
     : isHttps ? require('https').globalAgent
-      : require('http').globalAgent
+    : require('http').globalAgent
 
-  if (isLambda && !pxuri) {
+  if (isLambda && !pxuri)
     return lambdaAgent
-  }
 
-  if (AGENT_CACHE.peek(key)) {
+  if (AGENT_CACHE.peek(key))
     return AGENT_CACHE.get(key)
-  }
 
   if (pxuri) {
     const pxopts = isLambda ? {
       ...opts,
-      agent: lambdaAgent
+      agent: lambdaAgent,
     } : opts
     const proxy = getProxy(pxuri, pxopts, isHttps)
     AGENT_CACHE.set(key, proxy)
@@ -80,11 +78,11 @@ function getAgent (uri, opts) {
     key: opts.key,
     localAddress: opts.localAddress,
     rejectUnauthorized: opts.strictSSL,
-    timeout: agentTimeout
+    timeout: agentTimeout,
   }) : new HttpAgent({
     maxSockets: agentMaxSockets,
     localAddress: opts.localAddress,
-    timeout: agentTimeout
+    timeout: agentTimeout,
   })
   AGENT_CACHE.set(key, agent)
   return agent
@@ -93,16 +91,16 @@ function getAgent (uri, opts) {
 function checkNoProxy (uri, opts) {
   const host = new url.URL(uri).hostname.split('.').reverse()
   let noproxy = (opts.noProxy || getProcessEnv('no_proxy'))
-  if (typeof noproxy === 'string') {
+  if (typeof noproxy === 'string')
     noproxy = noproxy.split(/\s*,\s*/g)
-  }
+
   return noproxy && noproxy.some(no => {
     const noParts = no.split('.').filter(x => x).reverse()
-    if (!noParts.length) { return false }
+    if (!noParts.length)
+      return false
     for (let i = 0; i < noParts.length; i++) {
-      if (host[i] !== noParts[i]) {
+      if (host[i] !== noParts[i])
         return false
-      }
     }
     return true
   })
@@ -111,9 +109,8 @@ function checkNoProxy (uri, opts) {
 module.exports.getProcessEnv = getProcessEnv
 
 function getProcessEnv (env) {
-  if (!env) {
+  if (!env)
     return
-  }
 
   let value
 
@@ -122,7 +119,8 @@ function getProcessEnv (env) {
       value = process.env[e] ||
         process.env[e.toUpperCase()] ||
         process.env[e.toLowerCase()]
-      if (typeof value !== 'undefined') { break }
+      if (typeof value !== 'undefined')
+        break
     }
   }
 
@@ -148,7 +146,8 @@ function getProxyUri (uri, opts) {
       protocol === 'http:' &&
       getProcessEnv(['https_proxy', 'http_proxy', 'proxy'])
     )
-  if (!proxy) { return null }
+  if (!proxy)
+    return null
 
   const parsedProxy = (typeof proxy === 'string') ? new url.URL(proxy) : proxy
 
@@ -157,8 +156,8 @@ function getProxyUri (uri, opts) {
 
 const getAuth = u =>
   u.username && u.password ? `${u.username}:${u.password}`
-    : u.username ? u.username
-      : null
+  : u.username ? u.username
+  : null
 
 const getPath = u => u.pathname + u.search + u.hash
 
@@ -179,34 +178,31 @@ function getProxy (proxyUrl, opts, isHttps) {
     timeout: getAgentTimeout(opts.timeout),
     localAddress: opts.localAddress,
     maxSockets: getMaxSockets(opts.maxSockets),
-    rejectUnauthorized: opts.strictSSL
+    rejectUnauthorized: opts.strictSSL,
   }
 
   if (proxyUrl.protocol === 'http:' || proxyUrl.protocol === 'https:') {
     if (!isHttps) {
-      if (!HttpProxyAgent) {
+      if (!HttpProxyAgent)
         HttpProxyAgent = require('http-proxy-agent')
-      }
 
       return new HttpProxyAgent(popts)
     } else {
-      if (!HttpsProxyAgent) {
+      if (!HttpsProxyAgent)
         HttpsProxyAgent = require('https-proxy-agent')
-      }
 
       return new HttpsProxyAgent(popts)
     }
   } else if (proxyUrl.protocol.startsWith('socks')) {
-    if (!SocksProxyAgent) {
+    if (!SocksProxyAgent)
       SocksProxyAgent = require('socks-proxy-agent')
-    }
 
     return new SocksProxyAgent(popts)
   } else {
     throw Object.assign(
       new Error(`unsupported proxy protocol: '${proxyUrl.protocol}'`),
       {
-        url: proxyUrl.href
+        url: proxyUrl.href,
       }
     )
   }
diff --git a/deps/npm/node_modules/make-fetch-happen/cache.js b/deps/npm/node_modules/make-fetch-happen/cache.js
index 1b7f0db1b688df..234e3a41d0519a 100644
--- a/deps/npm/node_modules/make-fetch-happen/cache.js
+++ b/deps/npm/node_modules/make-fetch-happen/cache.js
@@ -12,6 +12,20 @@ const MinipassPipeline = require('minipass-pipeline')
 
 const MAX_MEM_SIZE = 5 * 1024 * 1024 // 5MB
 
+// some headers should never be stored in the cache, either because
+// they're a security footgun to leave lying around, or because we
+// just don't need them taking up space.
+// set to undefined so they're omitted from the JSON.stringify
+const pruneHeaders = {
+  authorization: undefined,
+  'npm-session': undefined,
+  'set-cookie': undefined,
+  'cf-ray': undefined,
+  'cf-cache-status': undefined,
+  'cf-request-id': undefined,
+  'x-fetch-attempts': undefined,
+}
+
 function cacheKey (req) {
   const parsed = new url.URL(req.url)
   return `make-fetch-happen:request-cache:${
@@ -20,7 +34,8 @@ function cacheKey (req) {
       slashes: true,
       port: parsed.port,
       hostname: parsed.hostname,
-      pathname: parsed.pathname
+      pathname: parsed.pathname,
+      search: parsed.search,
     })
   }`
 }
@@ -35,6 +50,11 @@ module.exports = class Cache {
     this.Promise = (opts && opts.Promise) || Promise
   }
 
+  static get pruneHeaders () {
+    // exposed for testing, not modifiable
+    return { ...pruneHeaders }
+  }
+
   // Returns a Promise that resolves to the response associated with the first
   // matching request in the Cache object.
   match (req, opts) {
@@ -49,7 +69,7 @@ module.exports = class Cache {
         reqHeaders: new fetch.Headers(info.metadata.reqHeaders),
         resHeaders: new fetch.Headers(info.metadata.resHeaders),
         cacheIntegrity: info.integrity,
-        integrity: opts && opts.integrity
+        integrity: opts && opts.integrity,
       })) {
         const resHeaders = new fetch.Headers(info.metadata.resHeaders)
         addCacheHeaders(resHeaders, this._path, key, info.integrity, info.time)
@@ -57,7 +77,7 @@ module.exports = class Cache {
           return new fetch.Response(null, {
             url: req.url,
             headers: resHeaders,
-            status: 200
+            status: 200,
           })
         }
         const cachePath = this._path
@@ -70,7 +90,7 @@ module.exports = class Cache {
           opts.memoize !== false && fitInMemory
             ? () => {
               const c = cacache.get.stream.byDigest(cachePath, info.integrity, {
-                memoize: opts.memoize
+                memoize: opts.memoize,
               })
               c.on('error', /* istanbul ignore next */ err => {
                 body.emit('error', err)
@@ -80,7 +100,7 @@ module.exports = class Cache {
             : () => {
               removeOnResume()
               cacache.get.byDigest(cachePath, info.integrity, {
-                memoize: opts.memoize
+                memoize: opts.memoize,
               })
                 .then(data => body.end(data))
                 .catch(/* istanbul ignore next */ err => {
@@ -93,7 +113,7 @@ module.exports = class Cache {
           url: req.url,
           headers: resHeaders,
           status: 200,
-          size: info.size
+          size: info.size,
         }))
       }
     })
@@ -109,11 +129,17 @@ module.exports = class Cache {
       algorithms: opts.algorithms,
       metadata: {
         url: req.url,
-        reqHeaders: req.headers.raw(),
-        resHeaders: response.headers.raw()
+        reqHeaders: {
+          ...req.headers.raw(),
+          ...pruneHeaders,
+        },
+        resHeaders: {
+          ...response.headers.raw(),
+          ...pruneHeaders,
+        },
       },
       size,
-      memoize: fitInMemory && opts.memoize
+      memoize: fitInMemory && opts.memoize,
     }
     if (req.method === 'HEAD' || response.status === 304) {
       // Update metadata without writing
@@ -141,7 +167,7 @@ module.exports = class Cache {
     const newBody = new MinipassPipeline(new MinipassFlush({
       flush () {
         return cacheWritePromise
-      }
+      },
     }))
 
     let cacheWriteResolve, cacheWriteReject
@@ -184,11 +210,11 @@ module.exports = class Cache {
   'delete' (req, opts) {
     opts = opts || {}
     if (typeof opts.memoize === 'object') {
-      if (opts.memoize.reset) {
+      if (opts.memoize.reset)
         opts.memoize.reset()
-      } else if (opts.memoize.clear) {
+      else if (opts.memoize.clear)
         opts.memoize.clear()
-      } else {
+      else {
         Object.keys(opts.memoize).forEach(k => {
           opts.memoize[k] = null
         })
@@ -208,20 +234,19 @@ function matchDetails (req, cached) {
   const vary = cached.resHeaders.get('Vary')
   // https://tools.ietf.org/html/rfc7234#section-4.1
   if (vary) {
-    if (vary.match(/\*/)) {
+    if (vary.match(/\*/))
       return false
-    } else {
+    else {
       const fieldsMatch = vary.split(/\s*,\s*/).every(field => {
         return cached.reqHeaders.get(field) === req.headers.get(field)
       })
-      if (!fieldsMatch) {
+      if (!fieldsMatch)
         return false
-      }
     }
   }
-  if (cached.integrity) {
+  if (cached.integrity)
     return ssri.parse(cached.integrity).match(cached.cacheIntegrity)
-  }
+
   reqUrl.hash = null
   cacheUrl.hash = null
   return url.format(reqUrl) === url.format(cacheUrl)
diff --git a/deps/npm/node_modules/make-fetch-happen/index.js b/deps/npm/node_modules/make-fetch-happen/index.js
index 5a0b15d466287c..b8d7bd98da5965 100644
--- a/deps/npm/node_modules/make-fetch-happen/index.js
+++ b/deps/npm/node_modules/make-fetch-happen/index.js
@@ -22,13 +22,13 @@ const RETRY_ERRORS = [
   'ECONNRESET', // remote socket closed on us
   'ECONNREFUSED', // remote host refused to open connection
   'EADDRINUSE', // failed to bind to a local port (proxy?)
-  'ETIMEDOUT' // someone in the transaction is WAY TOO SLOW
+  'ETIMEDOUT', // someone in the transaction is WAY TOO SLOW
   // Known codes we do NOT retry on:
   // ENOTFOUND (getaddrinfo failure. Either bad hostname, or offline)
 ]
 
 const RETRY_TYPES = [
-  'request-timeout'
+  'request-timeout',
 ]
 
 // https://fetch.spec.whatwg.org/#http-network-or-cache-fetch
@@ -56,16 +56,15 @@ function cacheDelete (uri, opts) {
   if (opts.cacheManager) {
     const req = new fetch.Request(uri, {
       method: opts.method,
-      headers: opts.headers
+      headers: opts.headers,
     })
     return opts.cacheManager.delete(req, opts)
   }
 }
 
 function initializeSsri () {
-  if (!ssri) {
+  if (!ssri)
     ssri = require('ssri')
-  }
 }
 
 function cachingFetch (uri, _opts) {
@@ -90,7 +89,7 @@ function cachingFetch (uri, _opts) {
   if (isCachable) {
     const req = new fetch.Request(uri, {
       method: opts.method,
-      headers: opts.headers
+      headers: opts.headers,
     })
 
     return opts.cacheManager.match(req, opts).then(res => {
@@ -110,13 +109,11 @@ function cachingFetch (uri, _opts) {
           res.headers.delete('Warning')
         }
 
-        if (opts.cache === 'default' && !isStale(req, res)) {
+        if (opts.cache === 'default' && !isStale(req, res))
           return res
-        }
 
-        if (opts.cache === 'default' || opts.cache === 'no-cache') {
+        if (opts.cache === 'default' || opts.cache === 'no-cache')
           return conditionalFetch(req, res, opts)
-        }
 
         if (opts.cache === 'force-cache' || opts.cache === 'only-if-cached') {
           //   112 Disconnected operation
@@ -150,7 +147,7 @@ function isStale (req, res) {
   const _req = {
     url: req.url,
     method: req.method,
-    headers: iterableToObject(req.headers)
+    headers: iterableToObject(req.headers),
   }
 
   const policy = makePolicy(req, res)
@@ -182,7 +179,7 @@ function conditionalFetch (req, cachedRes, opts) {
   const _req = {
     url: req.url,
     method: req.method,
-    headers: Object.assign({}, opts.headers || {})
+    headers: Object.assign({}, opts.headers || {}),
   }
 
   const policy = makePolicy(req, cachedRes)
@@ -192,7 +189,7 @@ function conditionalFetch (req, cachedRes, opts) {
     .then(condRes => {
       const revalidatedPolicy = policy.revalidatedPolicy(_req, {
         status: condRes.status,
-        headers: iterableToObject(condRes.headers)
+        headers: iterableToObject(condRes.headers),
       })
 
       if (condRes.status >= 500 && !mustRevalidate(cachedRes)) {
@@ -216,12 +213,12 @@ function conditionalFetch (req, cachedRes, opts) {
             const newHeaders = revalidatedPolicy.policy.responseHeaders()
             const toDelete = [...newRes.headers.keys()]
               .filter(k => !newHeaders[k])
-            for (const key of toDelete) {
+            for (const key of toDelete)
               newRes.headers.delete(key)
-            }
-            for (const [key, val] of Object.entries(newHeaders)) {
+
+            for (const [key, val] of Object.entries(newHeaders))
               newRes.headers.set(key, val)
-            }
+
             return newRes
           })
       }
@@ -230,9 +227,9 @@ function conditionalFetch (req, cachedRes, opts) {
     })
     .then(res => res)
     .catch(err => {
-      if (mustRevalidate(cachedRes)) {
+      if (mustRevalidate(cachedRes))
         throw err
-      } else {
+      else {
         //   111 Revalidation failed
         // MUST be included if a cache returns a stale response because an
         // attempt to revalidate the response failed, due to an inability to
@@ -256,12 +253,12 @@ function conditionalFetch (req, cachedRes, opts) {
 }
 
 function remoteFetchHandleIntegrity (res, integrity) {
-  if (res.status !== 200) {
+  if (res.status !== 200)
     return res // Error responses aren't subject to integrity checks.
-  }
+
   const oldBod = res.body
   const newBod = ssri.integrityStream({
-    integrity
+    integrity,
   })
   return new fetch.Response(new MinipassPipeline(oldBod, newBod), res)
 }
@@ -271,12 +268,11 @@ function remoteFetch (uri, opts) {
   const headers = opts.headers instanceof fetch.Headers
     ? opts.headers
     : new fetch.Headers(opts.headers)
-  if (!headers.get('connection')) {
+  if (!headers.get('connection'))
     headers.set('connection', agent ? 'keep-alive' : 'close')
-  }
-  if (!headers.get('user-agent')) {
+
+  if (!headers.get('user-agent'))
     headers.set('user-agent', USER_AGENT)
-  }
 
   const reqOpts = {
     agent,
@@ -288,7 +284,7 @@ function remoteFetch (uri, opts) {
     redirect: 'manual',
     size: opts.size,
     counter: opts.counter,
-    timeout: opts.timeout
+    timeout: opts.timeout,
   }
 
   return retry(
@@ -296,9 +292,8 @@ function remoteFetch (uri, opts) {
       const req = new fetch.Request(uri, reqOpts)
       return fetch(req)
         .then((res) => {
-          if (opts.integrity) {
+          if (opts.integrity)
             res = remoteFetchHandleIntegrity(res, opts.integrity)
-          }
 
           res.headers.set('x-fetch-attempts', attemptNum)
 
@@ -317,16 +312,14 @@ function remoteFetch (uri, opts) {
               res.status === 200 // No other statuses should be stored!
             )
 
-            if (isCachable) {
+            if (isCachable)
               return opts.cacheManager.put(req, res, opts)
-            }
 
             if (!isMethodGetHead) {
               return opts.cacheManager.delete(req).then(() => {
                 if (res.status >= 500 && req.method !== 'POST' && !isStream) {
-                  if (typeof opts.onRetry === 'function') {
+                  if (typeof opts.onRetry === 'function')
                     opts.onRetry(res)
-                  }
 
                   return retryHandler(res)
                 }
@@ -348,19 +341,18 @@ function remoteFetch (uri, opts) {
           )
 
           if (isRetriable) {
-            if (typeof opts.onRetry === 'function') {
+            if (typeof opts.onRetry === 'function')
               opts.onRetry(res)
-            }
 
             return retryHandler(res)
           }
 
-          if (!fetch.isRedirect(res.status)) {
+          if (!fetch.isRedirect(res.status))
             return res
-          }
-          if (opts.redirect === 'manual') {
+
+          if (opts.redirect === 'manual')
             return res
-          }
+
           // if (!fetch.isRedirect(res.status) || opts.redirect === 'manual') {
           //   return res
           // }
@@ -402,9 +394,8 @@ function remoteFetch (uri, opts) {
           // Remove authorization if changing hostnames (but not if just
           // changing ports or protocols).  This matches the behavior of request:
           // https://github.com/request/request/blob/b12a6245/lib/redirect.js#L134-L138
-          if (new url.URL(req.url).hostname !== redirectURL.hostname) {
+          if (new url.URL(req.url).hostname !== redirectURL.hostname)
             req.headers.delete('authorization')
-          }
 
           // for POST request with 301/302 response, or any request with 303 response,
           // use GET when following redirect
@@ -441,13 +432,11 @@ function remoteFetch (uri, opts) {
             RETRY_TYPES.indexOf(err.type) === -1
           )
 
-          if (req.method === 'POST' || isRetryError) {
+          if (req.method === 'POST' || isRetryError)
             throw err
-          }
 
-          if (typeof opts.onRetry === 'function') {
+          if (typeof opts.onRetry === 'function')
             opts.onRetry(err)
-          }
 
           return retryHandler(err)
         })
diff --git a/deps/npm/node_modules/make-fetch-happen/package.json b/deps/npm/node_modules/make-fetch-happen/package.json
index 594483fb183253..4fc6163d5a0278 100644
--- a/deps/npm/node_modules/make-fetch-happen/package.json
+++ b/deps/npm/node_modules/make-fetch-happen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "make-fetch-happen",
-  "version": "8.0.10",
+  "version": "8.0.12",
   "description": "Opinionated, caching, retrying fetch client",
   "main": "index.js",
   "files": [
@@ -14,7 +14,9 @@
     "prepublishOnly": "git push --follow-tags",
     "test": "tap test/*.js",
     "posttest": "npm run lint",
-    "lint": "standard"
+    "eslint": "eslint",
+    "lint": "npm run eslint -- *.js utils test",
+    "lintfix": "npm run lint -- --fix"
   },
   "repository": "https://github.com/npm/make-fetch-happen",
   "keywords": [
@@ -33,33 +35,36 @@
   },
   "license": "ISC",
   "dependencies": {
-    "agentkeepalive": "^4.1.0",
-    "cacache": "^15.0.0",
-    "http-cache-semantics": "^4.0.4",
+    "agentkeepalive": "^4.1.3",
+    "cacache": "^15.0.5",
+    "http-cache-semantics": "^4.1.0",
     "http-proxy-agent": "^4.0.1",
     "https-proxy-agent": "^5.0.0",
     "is-lambda": "^1.0.1",
     "lru-cache": "^6.0.0",
     "minipass": "^3.1.3",
     "minipass-collect": "^1.0.2",
-    "minipass-fetch": "^1.3.0",
+    "minipass-fetch": "^1.3.2",
     "minipass-flush": "^1.0.5",
-    "minipass-pipeline": "^1.2.2",
+    "minipass-pipeline": "^1.2.4",
     "promise-retry": "^1.1.1",
     "socks-proxy-agent": "^5.0.0",
     "ssri": "^8.0.0"
   },
   "devDependencies": {
-    "mkdirp": "^1.0.3",
+    "eslint": "^7.14.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^5.0.0",
+    "mkdirp": "^1.0.4",
     "nock": "^11.9.1",
     "npmlog": "^4.1.2",
     "require-inject": "^1.4.2",
     "rimraf": "^2.7.1",
-    "safe-buffer": "^5.2.0",
-    "standard": "^14.3.1",
+    "safe-buffer": "^5.2.1",
     "standard-version": "^7.1.0",
-    "tacks": "^1.2.6",
-    "tap": "^14.10.6"
+    "tap": "^14.11.0"
   },
   "engines": {
     "node": ">= 10"
diff --git a/deps/npm/node_modules/make-fetch-happen/utils/configure-options.js b/deps/npm/node_modules/make-fetch-happen/utils/configure-options.js
index d55fec43978f85..75ea5d15ecda01 100644
--- a/deps/npm/node_modules/make-fetch-happen/utils/configure-options.js
+++ b/deps/npm/node_modules/make-fetch-happen/utils/configure-options.js
@@ -12,9 +12,9 @@ module.exports = function configureOptions (_opts) {
   } else {
     if (typeof opts.retry !== 'object') {
       // Shorthand
-      if (typeof opts.retry === 'number') {
+      if (typeof opts.retry === 'number')
         opts.retry = { retries: opts.retry }
-      }
+
       if (typeof opts.retry === 'string') {
         const value = parseInt(opts.retry, 10)
         opts.retry = (value) ? { retries: value } : { retries: 0 }
@@ -25,9 +25,8 @@ module.exports = function configureOptions (_opts) {
     }
   }
 
-  if (opts.cacheManager) {
+  if (opts.cacheManager)
     initializeCache(opts)
-  }
 
   return opts
 }
diff --git a/deps/npm/node_modules/make-fetch-happen/utils/is-header-conditional.js b/deps/npm/node_modules/make-fetch-happen/utils/is-header-conditional.js
index c2e70d5ea596c2..5081e0ce127e26 100644
--- a/deps/npm/node_modules/make-fetch-happen/utils/is-header-conditional.js
+++ b/deps/npm/node_modules/make-fetch-happen/utils/is-header-conditional.js
@@ -1,16 +1,15 @@
 'use strict'
 
 module.exports = function isHeaderConditional (headers) {
-  if (!headers || typeof headers !== 'object') {
+  if (!headers || typeof headers !== 'object')
     return false
-  }
 
   const modifiers = [
     'if-modified-since',
     'if-none-match',
     'if-unmodified-since',
     'if-match',
-    'if-range'
+    'if-range',
   ]
 
   return Object.keys(headers)
diff --git a/deps/npm/node_modules/make-fetch-happen/utils/iterable-to-object.js b/deps/npm/node_modules/make-fetch-happen/utils/iterable-to-object.js
index 6b844c4f237991..1fe5ba65448d60 100644
--- a/deps/npm/node_modules/make-fetch-happen/utils/iterable-to-object.js
+++ b/deps/npm/node_modules/make-fetch-happen/utils/iterable-to-object.js
@@ -2,8 +2,8 @@
 
 module.exports = function iterableToObject (iter) {
   const obj = {}
-  for (const k of iter.keys()) {
+  for (const k of iter.keys())
     obj[k] = iter.get(k)
-  }
+
   return obj
 }
diff --git a/deps/npm/node_modules/make-fetch-happen/utils/make-policy.js b/deps/npm/node_modules/make-fetch-happen/utils/make-policy.js
index b7dd3d29ab541a..5e884847dd8f45 100644
--- a/deps/npm/node_modules/make-fetch-happen/utils/make-policy.js
+++ b/deps/npm/node_modules/make-fetch-happen/utils/make-policy.js
@@ -8,11 +8,11 @@ module.exports = function makePolicy (req, res) {
   const _req = {
     url: req.url,
     method: req.method,
-    headers: iterableToObject(req.headers)
+    headers: iterableToObject(req.headers),
   }
   const _res = {
     status: res.status,
-    headers: iterableToObject(res.headers)
+    headers: iterableToObject(res.headers),
   }
 
   return new CachePolicy(_req, _res, { shared: false })
diff --git a/deps/npm/node_modules/ms/index.js b/deps/npm/node_modules/ms/index.js
index c4498bcc212589..ea734fb7382031 100644
--- a/deps/npm/node_modules/ms/index.js
+++ b/deps/npm/node_modules/ms/index.js
@@ -23,7 +23,7 @@ var y = d * 365.25;
  * @api public
  */
 
-module.exports = function(val, options) {
+module.exports = function (val, options) {
   options = options || {};
   var type = typeof val;
   if (type === 'string' && val.length > 0) {
diff --git a/deps/npm/node_modules/ms/license.md b/deps/npm/node_modules/ms/license.md
index 69b61253a38926..fa5d39b6213f8a 100644
--- a/deps/npm/node_modules/ms/license.md
+++ b/deps/npm/node_modules/ms/license.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Zeit, Inc.
+Copyright (c) 2020 Vercel, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/deps/npm/node_modules/ms/package.json b/deps/npm/node_modules/ms/package.json
index eea666e1fb03d6..49971890df8e2b 100644
--- a/deps/npm/node_modules/ms/package.json
+++ b/deps/npm/node_modules/ms/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ms",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Tiny millisecond conversion utility",
-  "repository": "zeit/ms",
+  "repository": "vercel/ms",
   "main": "./index",
   "files": [
     "index.js"
@@ -28,10 +28,11 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "eslint": "4.12.1",
+    "eslint": "4.18.2",
     "expect.js": "0.3.1",
     "husky": "0.14.3",
     "lint-staged": "5.0.0",
-    "mocha": "4.0.1"
+    "mocha": "4.0.1",
+    "prettier": "2.0.5"
   }
 }
diff --git a/deps/npm/node_modules/ms/readme.md b/deps/npm/node_modules/ms/readme.md
index 9a1996b17e0de6..0fc1abb3b8e30a 100644
--- a/deps/npm/node_modules/ms/readme.md
+++ b/deps/npm/node_modules/ms/readme.md
@@ -1,7 +1,6 @@
 # ms
 
-[![Build Status](https://travis-ci.org/zeit/ms.svg?branch=master)](https://travis-ci.org/zeit/ms)
-[![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/zeit)
+![CI](https://github.com/vercel/ms/workflows/CI/badge.svg)
 
 Use this package to easily convert various time formats to milliseconds.
 
diff --git a/deps/npm/node_modules/pacote/lib/fetcher.js b/deps/npm/node_modules/pacote/lib/fetcher.js
index 01058acb2bfef7..5142bb280a70c7 100644
--- a/deps/npm/node_modules/pacote/lib/fetcher.js
+++ b/deps/npm/node_modules/pacote/lib/fetcher.js
@@ -91,18 +91,11 @@ class FetcherBase {
 
     // command to run 'prepare' scripts on directories and git dirs
     // To use pacote with yarn, for example, set npmBin to 'yarn'
-    // and npmInstallCmd to ['add'], and npmCliConfig with yarn's equivalents.
+    // and npmCliConfig with yarn's equivalents.
     this.npmBin = opts.npmBin || 'npm'
 
     // command to install deps for preparing
-    this.npmInstallCmd = opts.npmInstallCmd || [
-      'install',
-      '--only=dev',
-      '--prod',
-      '--ignore-prepublish',
-      '--no-progress',
-      '--no-save',
-    ]
+    this.npmInstallCmd = opts.npmInstallCmd || [ 'install' ]
 
     // XXX fill more of this in based on what we know from this.opts
     // we explicitly DO NOT fill in --tag, though, since we are often
@@ -113,7 +106,10 @@ class FetcherBase {
       `--prefer-offline=${!!this.preferOffline}`,
       `--prefer-online=${!!this.preferOnline}`,
       `--offline=${!!this.offline}`,
-      `--before=${this.before ? this.before.toISOString() : ''}`,
+      ...(this.before ? [`--before=${this.before.toISOString()}`] : []),
+      '--no-progress',
+      '--no-save',
+      '--no-audit',
     ]
   }
 
diff --git a/deps/npm/node_modules/pacote/package.json b/deps/npm/node_modules/pacote/package.json
index 7f38a193f7cb94..bef19b66228a66 100644
--- a/deps/npm/node_modules/pacote/package.json
+++ b/deps/npm/node_modules/pacote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pacote",
-  "version": "11.1.12",
+  "version": "11.1.13",
   "description": "JavaScript package downloader",
   "author": "Isaac Z. Schlueter <i@izs.me> (https://izs.me)",
   "bin": {
@@ -47,7 +47,7 @@
     "minipass": "^3.1.3",
     "mkdirp": "^1.0.3",
     "npm-package-arg": "^8.0.1",
-    "npm-packlist": "^2.1.0",
+    "npm-packlist": "^2.1.4",
     "npm-pick-manifest": "^6.0.0",
     "npm-registry-fetch": "^9.0.0",
     "promise-retry": "^1.1.1",
diff --git a/deps/npm/node_modules/puka/CHANGELOG.md b/deps/npm/node_modules/puka/CHANGELOG.md
new file mode 100644
index 00000000000000..781b81295a4a7f
--- /dev/null
+++ b/deps/npm/node_modules/puka/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.1](https://gitlab.com/rhendric/puka/-/compare/v1.0.0...v1.0.1) - 2020-05-16
+
+### Fixed
+
+- Add more carets to win32 command arguments ([45965ca](https://gitlab.com/rhendric/puka/-/commit/45965ca60fcc518082e0b085d8e81f3f3279ffb4))
+
+    As previously documented and implemented, Puka assumed that all programs
+    are batch files for the purpose of multi-escaping commands that appear
+    in pipelines. However, regardless of whether a command is in a pipeline,
+    one extra layer of escaping is needed if the command invokes a batch
+    file, which Puka was not producing. This only applies to the arguments
+    to the command, not to the batch file path, nor to paths used in
+    redirects. (The property-based spawn test which was supposed to catch
+    such oversights missed this one because it was invoking the Node.js
+    executable directly, not, as recommended in the documentation, a batch
+    file.)
+
+    Going forward, the caveats described in the documentation continue to
+    apply: if you are running programs on Windows with Puka, make sure they
+    are batch files, or you may find arguments are being escaped with too
+    many carets. As the documentation says, if this causes problems for you,
+    please open an issue so we can work out the details of what a good
+    workaround looks like.
+
+## [1.0.0](https://gitlab.com/rhendric/puka/-/tags/v1.0.0) - 2017-09-29
diff --git a/deps/npm/node_modules/puka/LICENSE.txt b/deps/npm/node_modules/puka/LICENSE.txt
new file mode 100644
index 00000000000000..0141196a593376
--- /dev/null
+++ b/deps/npm/node_modules/puka/LICENSE.txt
@@ -0,0 +1,18 @@
+Copyright 2017 Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/puka/README.md b/deps/npm/node_modules/puka/README.md
new file mode 100644
index 00000000000000..2670f742b36773
--- /dev/null
+++ b/deps/npm/node_modules/puka/README.md
@@ -0,0 +1,411 @@
+# Puka
+
+[![GitLab CI pipeline status](https://gitlab.com/rhendric/puka/badges/master/pipeline.svg)](https://gitlab.com/rhendric/puka/commits/master) [![AppVeyor build status](https://img.shields.io/appveyor/ci/rhendric/puka.svg?label=windows%20tests)](https://ci.appveyor.com/project/rhendric/puka) [![Codecov status](https://img.shields.io/codecov/c/gl/rhendric/puka.svg)](https://codecov.io/gl/rhendric/puka)
+
+Puka is a cross-platform library for safely passing strings through shells.
+
+#### Contents
+
+-   [Introduction](#introduction)
+    -   [Why would I use Puka?](#why-would-i-use-puka)
+    -   [How do I use Puka?](#how-do-i-use-puka)
+    -   [What's the catch?](#whats-the-catch)
+-   [API Documentation](#api-documentation)
+    -   [Basic API](#basic-api)
+        -   [sh](#sh)
+        -   [unquoted](#unquoted)
+    -   [Advanced API](#advanced-api)
+        -   [quoteForShell](#quoteforshell)
+        -   [quoteForCmd](#quoteforcmd)
+        -   [quoteForSh](#quoteforsh)
+        -   [ShellString](#shellstring)
+    -   [Secret API](#secret-api)
+-   [The sh DSL](#the-sh-dsl)
+    -   [Syntax](#syntax)
+    -   [Semantics](#semantics)
+        -   [Types of placeholders](#types-of-placeholders)
+
+## Introduction
+
+### Why would I use Puka?
+
+When launching a child process from Node, you have a choice between launching
+directly from the operating system (as with [child_process.spawn](https://nodejs.org/api/child_process.html#child_process_child_process_spawn_command_args_options),
+if you don't use the `{ shell: true }` option), and running the command through
+a shell (as with [child_process.exec](https://nodejs.org/api/child_process.html#child_process_child_process_exec_command_options_callback)).
+Using a shell gives you more power, such as the ability to chain multiple
+commands together or use redirection, but you have to construct your command as
+a single string instead of using an array of arguments. And doing that can be
+buggy (if not dangerous) if you don't take care to quote any arguments
+correctly for the shell you're targeting, _and_ the quoting has to be done
+differently on Windows and non-Windows shells.
+
+Puka solves that problem by giving you a simple and platform-agnostic way to
+build shell commands with arguments that pass through your shell unaltered and
+with no unsafe side effects, **whether you are running on Windows or a
+Unix-based OS**.
+
+### How do I use Puka?
+
+Puka gives you an `sh` function intended for tagging
+[template literals](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals),
+which quotes (if necessary) any values interpolated into the template. A simple
+example:
+
+```javascript
+const { sh } = require('puka');
+const { execSync } = require('child_process');
+
+const arg = 'file with spaces.txt';
+execSync(sh`some-command ${arg}`);
+```
+
+But Puka supports more than this! See [the `sh` DSL documentation](#the-sh-dsl)
+for a detailed description of all the features currently supported.
+
+### What's the catch?
+
+Here are the ones I know about:
+
+Puka does _not_ ensure that the actual commands you're running are
+cross-platform. If you're running npm programs, you generally won't have a
+problem with that, but if you want to run ``sh`cat file` `` on Windows, you'll
+need to depend on something like
+[cash-cat](https://www.npmjs.com/package/cash-cat).
+
+I searched for days for a way to quote or escape line breaks in arguments to
+`cmd.exe`, but couldn't find one (regular `^`-prepending and quotation marks
+don't seem to cut it). If you know of a way that works, please [open an
+issue](https://gitlab.com/rhendric/puka/issues/new) to tell me about it! Until
+then, any line break characters (`\r` or `\n`) in values being interpolated by
+`sh` will cause an error to be thrown on Windows only.
+
+Also on Windows, you may notice quoting mistakes if you run commands that
+involve invoking a native executable (not a batch file ending in `.cmd` or
+`.bat`). Unfortunately, batch files require some extra escaping on Windows, and
+Puka assumes all programs are batch files because npm creates batch file shims
+for programs it installs (and, if you care about cross-platform, you'll be
+using npm programs in your commands). If this causes problems for you, please
+[open an issue](https://gitlab.com/rhendric/puka/issues/new); if your situation
+is specific enough, there may be workarounds or improvements to Puka to be
+found.
+
+## API Documentation
+
+### Basic API
+
+
+
+
+#### sh
+
+A string template tag for safely constructing cross-platform shell commands.
+
+An `sh` template is not actually treated as a literal string to be
+interpolated; instead, it is a tiny DSL designed to make working with shell
+strings safe, simple, and straightforward. To get started quickly, see the
+examples below. [More detailed documentation][1] is available
+further down.
+
+##### Examples
+
+```javascript
+const title = '"this" & "that"';
+sh`script --title=${title}`; // => "script '--title=\"this\" & \"that\"'"
+// Note: these examples show results for non-Windows platforms.
+// On Windows, the above would instead be
+// 'script ^^^"--title=\\^^^"this\\^^^" ^^^& \\^^^"that\\^^^"^^^"'.
+
+const names = ['file1', 'file 2'];
+sh`rimraf ${names}.txt`; // => "rimraf file1.txt 'file 2.txt'"
+
+const cmd1 = ['cat', 'file 1.txt', 'file 2.txt'];
+const cmd2 = ['use-input', '-abc'];
+sh`${cmd1}|${cmd2}`; // => "cat 'file 1.txt' 'file 2.txt'|use-input -abc"
+```
+
+Returns **[String][2]** a string formatted for the platform Node is currently
+running on.
+
+#### unquoted
+
+This function permits raw strings to be interpolated into a `sh` template.
+
+**IMPORTANT**: If you're using Puka due to security concerns, make sure you
+don't pass any untrusted content to `unquoted`. This may be obvious, but
+stray punctuation in an `unquoted` section can compromise the safety of the
+entire shell command.
+
+##### Parameters
+
+-   `value`  any value (it will be treated as a string)
+
+##### Examples
+
+```javascript
+const both = true;
+sh`foo ${unquoted(both ? '&&' : '||')} bar`; // => 'foo && bar'
+```
+
+### Advanced API
+
+If these functions make life easier for you, go ahead and use them; they
+are just as well supported as the above. But if you aren't certain you
+need them, you probably don't.
+
+
+#### quoteForShell
+
+Quotes a string for injecting into a shell command.
+
+This function is exposed for some hypothetical case when the `sh` DSL simply
+won't do; `sh` is expected to be the more convenient option almost always.
+Compare:
+
+```javascript
+console.log('cmd' + args.map(a => ' ' + quoteForShell(a)).join(''));
+console.log(sh`cmd ${args}`); // same as above
+
+console.log('cmd' + args.map(a => ' ' + quoteForShell(a, true)).join(''));
+console.log(sh`cmd "${args}"`); // same as above
+```
+
+Additionally, on Windows, `sh` checks the entire command string for pipes,
+which subtly change how arguments need to be quoted. If your commands may
+involve pipes, you are strongly encouraged to use `sh` and not try to roll
+your own with `quoteForShell`.
+
+##### Parameters
+
+-   `text` **[String][2]** to be quoted
+-   `forceQuote` **[Boolean][3]?** whether to always add quotes even if the string
+    is already safe. Defaults to `false`.
+-   `platform` **[String][2]?** a value that `process.platform` might take:
+    `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
+    When omitted, effectively the same as `process.platform`.
+
+Returns **[String][2]** a string that is safe for the current (or specified)
+platform.
+
+#### quoteForCmd
+
+A Windows-specific version of [quoteForShell][4].
+
+##### Parameters
+
+-   `text` **[String][2]** to be quoted
+-   `forceQuote` **[Boolean][3]?** whether to always add quotes even if the string
+    is already safe. Defaults to `false`.
+
+#### quoteForSh
+
+A Unix-specific version of [quoteForShell][4].
+
+##### Parameters
+
+-   `text` **[String][2]** to be quoted
+-   `forceQuote` **[Boolean][3]?** whether to always add quotes even if the string
+    is already safe. Defaults to `false`.
+
+#### ShellString
+
+A ShellString represents a shell command after it has been interpolated, but
+before it has been formatted for a particular platform. ShellStrings are
+useful if you want to prepare a command for a different platform than the
+current one, for instance.
+
+To create a ShellString, use `ShellString.sh` the same way you would use
+top-level `sh`.
+
+##### toString
+
+A method to format a ShellString into a regular String formatted for a
+particular platform.
+
+###### Parameters
+
+-   `platform` **[String][2]?** a value that `process.platform` might take:
+    `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
+    When omitted, effectively the same as `process.platform`.
+
+Returns **[String][2]** 
+
+##### sh
+
+`ShellString.sh` is a template tag just like `sh`; the only difference is
+that this function returns a ShellString which has not yet been formatted
+into a String.
+
+Returns **[ShellString][5]** 
+
+### Secret API
+
+Some internals of string formatting have been exposed for the ambitious and
+brave souls who want to try to extend Puka to handle more shells or custom
+interpolated values. This ‘secret’ API is partially documented in the code
+but not here, and the semantic versioning guarantees on this API are bumped
+down by one level: in other words, minor version releases of Puka can change
+the secret API in backward-incompatible ways, and patch releases can add or
+deprecate functionality.
+
+If it's not even documented in the code, use at your own risk—no semver
+guarantees apply.
+
+
+[1]: #the-sh-dsl
+
+[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
+
+[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
+
+[4]: #quoteforshell
+
+[5]: #shellstring
+
+## The sh DSL
+
+### Syntax
+
+An `sh` template comprises words, separated by whitespace. Words can contain:
+
+-   text, which is composed of any characters that are not whitespace, single or
+    double quotes, or any of the special characters
+    ``# $ & ( ) ; < > \ ` |``;
+-   quotations, which are matching single or double quotes surrounding any
+    characters other than the delimiting quote; and
+-   placeholders, using the standard JavaScript template syntax (`${}`).
+    (Placeholders may also appear inside quotations.)
+
+The special characters ``# $ & ( ) ; < > \ ` |``, if unquoted, form their own
+words.
+
+Redirect operators (`<`, `>`, `>>`, `2>`, etc.) receive their own special
+handling, as do semicolons. Other than these two exceptions, no attempt is made
+to understand any more sophisticated features of shell syntax.
+
+Standard JavaScript escape sequences, such as `\t`, are honored in the template
+literal, and are treated equivalently to the characters they represent. There
+is no further mechanism for escaping within the `sh` DSL itself; in particular,
+if you want to put quotes inside quotes, you have to use interpolation, like
+this:
+
+```javascript
+sh`echo "${'single = \', double = "'}"` // => "echo 'single = '\\'', double = \"'"
+```
+
+### Semantics
+
+Words that do not contain placeholders are emitted mostly verbatim to the
+output string. Quotations are formatted in the expected style for the target
+platform (single quotes for Unix, double quotes for Windows) regardless of the
+quotes used in the template literal—as with JavaScript, single and double quotes
+are interchangeable, except for the requirement to pair like with like. Unquoted
+semicolons are translated to ampersands on Windows; all other special characters
+(as enumerated above), when unquoted, are passed as-is to the output for the
+shell to interpret.
+
+Puka may still quote words not containing the above special characters, if they
+contain characters that need quoting on the target platform. For example, on
+Windows, the character `%` is used for variable interpolation in `cmd.exe`, and
+Puka quotes it on on that platform even if it appears unquoted in the template
+literal. Consequently, there is no need to be paranoid about quoting anything
+that doesn't look alphanumeric inside a `sh` template literal, for fear of being
+burned on a different operating system; anything that matches the definition of
+‘text’ above will never need manual quoting.
+
+#### Types of placeholders
+
+##### Strings
+
+If a word contains a string placeholder, then the value of the placeholder is
+interpolated into the word and the entire word, if necessary, is quoted. If
+the placeholder occurs within quotes, no further quoting is performed:
+
+```javascript
+sh`script --file="${'herp derp'}.txt"`; // => "script --file='herp derp.txt'"
+```
+
+This behavior can be exploited to force consistent quoting, if desired; but
+both of the examples below are safe on all platforms:
+
+```javascript
+const words = ['oneword', 'two words'];
+sh`minimal ${words[0]}`; // => "minimal oneword"
+sh`minimal ${words[1]}`; // => "minimal 'two words'"
+sh`consistent '${words[0]}'`; // => "consistent 'oneword'"
+sh`consistent '${words[1]}'`; // => "consistent 'two words'"
+```
+
+##### Arrays and iterables
+
+If a word contains a placeholder for an array (or other iterable object), then
+the entire word is repeated once for each value in the array, separated by
+spaces. If the array is empty, then the word is not emitted at all, and neither
+is any leading whitespace.
+
+```javascript
+const files = ['foo', 'bar'];
+sh`script ${files}`; // => "script foo bar"
+sh`script --file=${files}`; // => "script --file=foo --file=bar"
+sh`script --file=${[]}`; // => "script"
+```
+
+Note that, since special characters are their own words, the pipe operator here
+is not repeated:
+
+```javascript
+const cmd = ['script', 'foo', 'bar'];
+sh`${cmd}|another-script`; // => "script foo bar|another-script"
+```
+
+Multiple arrays in the same word generate a Cartesian product:
+
+```javascript
+const names = ['foo', 'bar'], exts = ['log', 'txt'];
+// Same word
+sh`... ${names}.${exts}`; // => "... foo.log foo.txt bar.log bar.txt"
+sh`... "${names} ${exts}"`; // => "... 'foo log' 'foo txt' 'bar log' 'bar txt'"
+
+// Not the same word (extra space just for emphasis):
+sh`... ${names}   ${exts}`; // => "... foo bar   log txt"
+sh`... ${names};${exts}`; // => "... foo bar;log txt"
+```
+
+Finally, if a placeholder appears in the object of a redirect operator, the
+entire redirect is repeated as necessary:
+
+```javascript
+sh`script > ${['foo', 'bar']}.txt`; // => "script > foo.txt > bar.txt"
+sh`script > ${[]}.txt`; // => "script"
+```
+
+##### unquoted
+
+The `unquoted` function returns a value that will skip being quoted when used
+in a placeholder, alone or in an array.
+
+```javascript
+const cmd = 'script < input.txt';
+const fields = ['foo', 'bar'];
+sh`${unquoted(cmd)} | json ${fields}`; // => "script < input.txt | json foo bar"
+```
+
+##### ShellString
+
+If `ShellString.sh` is used to construct an unformatted ShellString, that value
+can be used in a placeholder to insert the contents of the ShellString into the
+outer template literal. This is safer than using `unquoted` as in the previous
+example, but `unquoted` can be used when all you have is a string from another
+(trusted!) source.
+
+```javascript
+const url = 'http://example.com/data.json?x=1&y=2';
+const curl = ShellString.sh`curl -L ${url}`;
+const fields = ['foo', 'bar'];
+sh`${curl} | json ${fields}`; // => "curl -L 'http://example.com/data.json?x=1&y=2' | json foo bar"
+```
+
+##### Anything else
+
+... is treated like a string—namely, a value `x` is equivalent to `'' + x`, if
+not in one of the above categories.
diff --git a/deps/npm/node_modules/puka/index.js b/deps/npm/node_modules/puka/index.js
new file mode 100644
index 00000000000000..b69e47d7639db9
--- /dev/null
+++ b/deps/npm/node_modules/puka/index.js
@@ -0,0 +1,804 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Key a method on your object with this symbol and you can get special
+ * formatting for that value! See ShellStringText, ShellStringUnquoted, or
+ * shellStringSemicolon for examples.
+ * @ignore
+ */
+const formatSymbol = Symbol('format');
+/**
+ * This symbol is for implementing advanced behaviors like the need for extra
+ * carets in Windows shell strings that use pipes. If present, it's called in
+ * an earlier phase than formatSymbol, and is passed a mutable context that can
+ * be read during the format phase to influence formatting.
+ * @ignore
+ */
+const preformatSymbol = Symbol('preformat');
+
+// When minimum Node version becomes 6, replace calls to sticky with /.../y and
+// inline execFrom.
+let stickySupported = true;
+try {
+  new RegExp('', 'y');
+} catch (e) {
+  stickySupported = false;
+}
+const sticky = stickySupported ? source => new RegExp(source, 'y') : source => new RegExp(`^(?:${source})`);
+const execFrom = stickySupported ? (re, haystack, index) => (re.lastIndex = index, re.exec(haystack)) : (re, haystack, index) => re.exec(haystack.substr(index));
+
+function quoteForCmd(text, forceQuote) {
+  let caretDepth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  // See the below blog post for an explanation of this function and
+  // quoteForWin32:
+  // https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
+  if (!text.length) {
+    return '""';
+  }
+  if (/[\n\r]/.test(text)) {
+    throw new Error("Line breaks can't be quoted on Windows");
+  }
+  const caretEscape = /["%]/.test(text);
+  text = quoteForWin32(text, forceQuote || !caretEscape && /[&()<>^|]/.test(text));
+  if (caretEscape) {
+    // See Win32Context for explanation of what caretDepth is for.
+    do {
+      text = text.replace(/[\t "%&()<>^|]/g, '^$&');
+    } while (caretDepth--);
+  }
+  return text;
+}
+const quoteForWin32 = (text, forceQuote) => forceQuote || /[\t "]/.test(text) ? `"${text.replace(/\\+(?=$|")/g, '$&$&').replace(/"/g, '\\"')}"` : text;
+const cmdMetaChars = /[\t\n\r "%&()<>^|]/;
+class Win32Context {
+  constructor() {
+    this.currentScope = newScope(null);
+    this.scopesByObject = new Map();
+    this.argDetectState = 0;
+    this.argSet = new Set();
+  }
+  read(text) {
+    // When cmd.exe executes a batch file, or pipes to or from one, it spawns a
+    // second copy of itself to run the inner command. This necessitates
+    // doubling up on carets so that escaped characters survive both cmd.exe
+    // invocations. See:
+    // https://stackoverflow.com/questions/8192318/why-does-delayed-expansion-fail-when-inside-a-piped-block-of-code#8194279
+    // https://ss64.com/nt/syntax-redirection.html
+    //
+    // Parentheses can create an additional subshell, requiring additional
+    // escaping... it's a mess.
+    //
+    // So here's what we do about it: we read all unquoted text in a shell
+    // string and put it through this tiny parser that looks for pipes,
+    // sequence operators (&, &&, ||), redirects, and parentheses. This can't
+    // be part of the main Puka parsing, because it can be affected by
+    // `unquoted(...)` values provided at evaluation time.
+    //
+    // Then, after associating each thing that needs to be quoted with a scope
+    // (via `mark()`), and identifying whether or not it's an argument to a
+    // command, we can determine the depth of caret escaping required in each
+    // scope and pass it (via `Formatter::quote()`) to `quoteForCmd()`.
+    //
+    // See also `ShellStringText`, which holds the logic for the previous
+    // paragraph.
+    const length = text.length;
+    for (let pos = 0, match; pos < length;) {
+      while (match = execFrom(reUnimportant, text, pos)) {
+        if (match[2] == null) {
+          // (not whitespace)
+          if (match[1] != null) {
+            // (>&)
+            this.argDetectState = this.argDetectState === 0 ? ADS_FLAG_INITIAL_REDIRECT : 0;
+          } else if (this.argDetectState !== ADS_FLAG_ARGS) {
+            this.argDetectState |= ADS_FLAG_WORD;
+          }
+        } else {
+          // (whitespace)
+          if ((this.argDetectState & ADS_FLAG_WORD) !== 0) {
+            this.argDetectState = ADS_FLAG_ARGS & ~this.argDetectState >> 1;
+          }
+        }
+        pos += match[0].length;
+      }
+      if (pos >= length) break;
+      if (match = execFrom(reSeqOp, text, pos)) {
+        this.seq();
+        pos += match[0].length;
+      } else {
+        const char = text.charCodeAt(pos);
+        if (char === CARET) {
+          pos += 2;
+        } else if (char === QUOTE) {
+          // If you were foolish enough to leave a dangling quotation mark in
+          // an unquoted span... you're likely to have bigger problems than
+          // incorrect escaping. So we just do the simplest thing of looking for
+          // the end quote only in this piece of text.
+          pos += execFrom(reNotQuote, text, pos + 1)[0].length + 2;
+        } else {
+          if (char === OPEN_PAREN) {
+            this.enterScope();
+          } else if (char === CLOSE_PAREN) {
+            this.exitScope();
+          } else if (char === PIPE) {
+            this.pipe();
+          } else {
+            // (char === '<' or '>')
+            this.argDetectState = this.argDetectState === 0 ? ADS_FLAG_INITIAL_REDIRECT : 0;
+          }
+          pos++;
+        }
+      }
+    }
+  }
+  enterScope() {
+    this.currentScope = newScope(this.currentScope);
+    this.argDetectState = 0;
+  }
+  exitScope() {
+    this.currentScope = this.currentScope.parent || (this.currentScope.parent = newScope(null));
+    this.argDetectState = ADS_FLAG_ARGS;
+  }
+  seq() {
+    // | binds tighter than sequence operators, so the latter create new sibling
+    // scopes for future |s to mutate.
+    this.currentScope = newScope(this.currentScope.parent);
+    this.argDetectState = 0;
+  }
+  pipe() {
+    this.currentScope.depthDelta = 1;
+    this.argDetectState = 0;
+  }
+  mark(obj) {
+    this.scopesByObject.set(obj, this.currentScope);
+    if (this.argDetectState === ADS_FLAG_ARGS) {
+      this.argSet.add(obj);
+    } else {
+      this.argDetectState |= ADS_FLAG_WORD;
+    }
+  }
+  at(obj) {
+    const scope = this.scopesByObject.get(obj);
+    return {
+      depth: getDepth(scope),
+      isArgument: this.argSet.has(obj),
+      isNative: scope.isNative
+    };
+  }
+}
+// These flags span the Win32Context's argument detection state machine. WORD
+// is set when the context is inside a word that is not an argument (meaning it
+// is either the first word in the command, or it is the object of a redirect).
+// ARGS is set when the context has reached the arguments of a command.
+// INITIAL_REDIRECT tracks the edge case when a redirect occurs before the
+// first word of the command (if this flag is set, reaching the end of a word
+// should take the state machine back to 0 instead of setting ADS_FLAG_ARGS).
+const ADS_FLAG_WORD = 0x1;
+const ADS_FLAG_ARGS = 0x2;
+const ADS_FLAG_INITIAL_REDIRECT = 0x4;
+const getDepth = scope => scope === null ? 0 : scope.depth !== -1 ? scope.depth : scope.depth = getDepth(scope.parent) + scope.depthDelta;
+const newScope = parent => ({
+  parent,
+  depthDelta: 0,
+  depth: -1,
+  isNative: false
+});
+const CARET = '^'.charCodeAt();
+const QUOTE = '"'.charCodeAt();
+const OPEN_PAREN = '('.charCodeAt();
+const CLOSE_PAREN = ')'.charCodeAt();
+const PIPE = '|'.charCodeAt();
+const reNotQuote = sticky('[^"]*');
+const reSeqOp = sticky('&&?|\\|\\|');
+const reUnimportant = sticky('(\\d*>&)|[^\\s"$&()<>^|]+|(\\s+)');
+
+const quoteForSh = (text, forceQuote) => text.length ? forceQuote || shMetaChars.test(text) ? `'${text.replace(/'/g, "'\\''")}'`.replace(/^(?:'')+(?!$)/, '').replace(/\\'''/g, "\\'") : text : "''";
+const shMetaChars = /[\t\n\r "#$&'()*;<>?\\`|~]/;
+
+/**
+ * To get a Formatter, call `Formatter.for`.
+ *
+ * To create a new Formatter, pass an object to `Formatter.declare`.
+ *
+ * To set the global default Formatter, assign to `Formatter.default`.
+ *
+ * @class
+ * @property {Formatter} default - The Formatter to be used when no platform
+ * is provided—for example, when creating strings with `sh`.
+ * @ignore
+ */
+function Formatter() {}
+Object.assign(Formatter,
+/** @lends Formatter */
+{
+  /**
+   * Gets a Formatter that has been declared for the provided platform, or
+   * the base `'sh'` formatter if there is no Formatter specific to this
+   * platform, or the Formatter for the current platform if no specific platform
+   * is provided.
+   */
+  for(platform) {
+    return platform == null ? Formatter.default || (Formatter.default = Formatter.for(process.platform)) : Formatter._registry.get(platform) || Formatter._registry.get('sh');
+  },
+  /**
+   * Creates a new Formatter or mutates the properties on an existing
+   * Formatter. The `platform` key on the provided properties object determines
+   * when the Formatter is retrieved.
+   */
+  declare(props) {
+    const platform = props && props.platform || 'sh';
+    const existingFormatter = Formatter._registry.get(platform);
+    const formatter = Object.assign(existingFormatter || new Formatter(), props);
+    formatter.emptyString === void 0 && (formatter.emptyString = formatter.quote('', true));
+    existingFormatter || Formatter._registry.set(formatter.platform, formatter);
+  },
+  _registry: new Map(),
+  prototype: {
+    platform: 'sh',
+    quote: quoteForSh,
+    metaChars: shMetaChars,
+    hasExtraMetaChars: false,
+    statementSeparator: ';',
+    createContext() {
+      return defaultContext;
+    }
+  }
+});
+const defaultContext = {
+  at() {}
+};
+Formatter.declare();
+Formatter.declare({
+  platform: 'win32',
+  quote(text, forceQuote, opts) {
+    const caretDepth = opts ? (opts.depth || 0) + (opts.isArgument && !opts.isNative ? 1 : 0) : 0;
+    return quoteForCmd(text, forceQuote, caretDepth);
+  },
+  metaChars: cmdMetaChars,
+  hasExtraMetaChars: true,
+  statementSeparator: '&',
+  createContext(root) {
+    const context = new this.Context();
+    root[preformatSymbol](context);
+    return context;
+  },
+  Context: Win32Context
+});
+
+const isObject = any => any === Object(any);
+function memoize(f) {
+  const cache = new WeakMap();
+  return arg => {
+    let result = cache.get(arg);
+    if (result === void 0) {
+      result = f(arg);
+      cache.set(arg, result);
+    }
+    return result;
+  };
+}
+
+/**
+ * Represents a contiguous span of text that may or must be quoted. The contents
+ * may already contain quoted segments, which will always be quoted. If unquoted
+ * segments also require quoting, the entire span will be quoted together.
+ * @ignore
+ */
+class ShellStringText {
+  constructor(contents, untested) {
+    this.contents = contents;
+    this.untested = untested;
+  }
+  [formatSymbol](formatter, context) {
+    const unformattedContents = this.contents;
+    const length = unformattedContents.length;
+    const contents = new Array(length);
+    for (let i = 0; i < length; i++) {
+      const c = unformattedContents[i];
+      contents[i] = isObject(c) && formatSymbol in c ? c[formatSymbol](formatter) : c;
+    }
+    for (let unquoted = true, i = 0; i < length; i++) {
+      const content = contents[i];
+      if (content === null) {
+        unquoted = !unquoted;
+      } else {
+        if (unquoted && (formatter.hasExtraMetaChars || this.untested && this.untested.has(i)) && formatter.metaChars.test(content)) {
+          return formatter.quote(contents.join(''), false, context.at(this));
+        }
+      }
+    }
+    const parts = [];
+    for (let quoted = null, i = 0; i < length; i++) {
+      const content = contents[i];
+      if (content === null) {
+        quoted = quoted ? (parts.push(formatter.quote(quoted.join(''), true, context.at(this))), null) : [];
+      } else {
+        (quoted || parts).push(content);
+      }
+    }
+    const result = parts.join('');
+    return result.length ? result : formatter.emptyString;
+  }
+  [preformatSymbol](context) {
+    context.mark(this);
+  }
+}
+
+/**
+ * Represents a contiguous span of text that will not be quoted.
+ * @ignore
+ */
+class ShellStringUnquoted {
+  constructor(value) {
+    this.value = value;
+  }
+  [formatSymbol]() {
+    return this.value;
+  }
+  [preformatSymbol](context) {
+    context.read(this.value);
+  }
+}
+
+/**
+ * Represents a semicolon... or an ampersand, on Windows.
+ * @ignore
+ */
+const shellStringSemicolon = {
+  [formatSymbol](formatter) {
+    return formatter.statementSeparator;
+  },
+  [preformatSymbol](context) {
+    context.seq();
+  }
+};
+
+const PLACEHOLDER = {};
+const parse = memoize(templateSpans => {
+  // These are the token types our DSL can recognize. Their values won't escape
+  // this function.
+  const TOKEN_TEXT = 0;
+  const TOKEN_QUOTE = 1;
+  const TOKEN_SEMI = 2;
+  const TOKEN_UNQUOTED = 3;
+  const TOKEN_SPACE = 4;
+  const TOKEN_REDIRECT = 5;
+  const result = [];
+  let placeholderCount = 0;
+  let prefix = null;
+  let onlyPrefixOnce = false;
+  let contents = [];
+  let quote = 0;
+  const lastSpan = templateSpans.length - 1;
+  for (let spanIndex = 0; spanIndex <= lastSpan; spanIndex++) {
+    const templateSpan = templateSpans[spanIndex];
+    const posEnd = templateSpan.length;
+    let tokenStart = 0;
+    if (spanIndex) {
+      placeholderCount++;
+      contents.push(PLACEHOLDER);
+    }
+    // For each span, we first do a recognizing pass in which we use regular
+    // expressions to identify the positions of tokens in the text, and then
+    // a second pass that actually splits the text into the minimum number of
+    // substrings necessary.
+    const recognized = []; // [type1, index1, type2, index2...]
+    let firstWordBreak = -1;
+    let lastWordBreak = -1;
+    {
+      let pos = 0,
+          match;
+      while (pos < posEnd) {
+        if (quote) {
+          if (match = execFrom(quote === CHAR_SQUO ? reQuotation1 : reQuotation2, templateSpan, pos)) {
+            recognized.push(TOKEN_TEXT, pos);
+            pos += match[0].length;
+          }
+          if (pos < posEnd) {
+            recognized.push(TOKEN_QUOTE, pos++);
+            quote = 0;
+          }
+        } else {
+          if (match = execFrom(reRedirectOrSpace, templateSpan, pos)) {
+            firstWordBreak < 0 && (firstWordBreak = pos);
+            lastWordBreak = pos;
+            recognized.push(match[1] ? TOKEN_REDIRECT : TOKEN_SPACE, pos);
+            pos += match[0].length;
+          }
+          if (match = execFrom(reText, templateSpan, pos)) {
+            const setBreaks = match[1] != null;
+            setBreaks && firstWordBreak < 0 && (firstWordBreak = pos);
+            recognized.push(setBreaks ? TOKEN_UNQUOTED : TOKEN_TEXT, pos);
+            pos += match[0].length;
+            setBreaks && (lastWordBreak = pos);
+          }
+          const char = templateSpan.charCodeAt(pos);
+          if (char === CHAR_SEMI) {
+            firstWordBreak < 0 && (firstWordBreak = pos);
+            recognized.push(TOKEN_SEMI, pos++);
+            lastWordBreak = pos;
+          } else if (char === CHAR_SQUO || char === CHAR_DQUO) {
+            recognized.push(TOKEN_QUOTE, pos++);
+            quote = char;
+          }
+        }
+      }
+    }
+    // Word breaks are only important if they separate words with placeholders,
+    // so we can ignore the first/last break if this is the first/last span.
+    spanIndex === 0 && (firstWordBreak = -1);
+    spanIndex === lastSpan && (lastWordBreak = posEnd);
+    // Here begins the second pass mentioned above. This loop runs one more
+    // iteration than there are tokens in recognized, because it handles tokens
+    // on a one-iteration delay; hence the i <= iEnd instead of i < iEnd.
+    const iEnd = recognized.length;
+    for (let i = 0, type = -1; i <= iEnd; i += 2) {
+      let typeNext = -1,
+          pos;
+      if (i === iEnd) {
+        pos = posEnd;
+      } else {
+        typeNext = recognized[i];
+        pos = recognized[i + 1];
+        // If the next token is space or redirect, but there's another word
+        // break in this span, then we can handle that token the same way we
+        // would handle unquoted text because it isn't being attached to a
+        // placeholder.
+        typeNext >= TOKEN_SPACE && pos !== lastWordBreak && (typeNext = TOKEN_UNQUOTED);
+      }
+      const breakHere = pos === firstWordBreak || pos === lastWordBreak;
+      if (pos && (breakHere || typeNext !== type)) {
+        let value = type === TOKEN_QUOTE ? null : type === TOKEN_SEMI ? shellStringSemicolon : templateSpan.substring(tokenStart, pos);
+        if (type >= TOKEN_SEMI) {
+          // This branch handles semicolons, unquoted text, spaces, and
+          // redirects. shellStringSemicolon is already a formatSymbol object;
+          // the rest need to be wrapped.
+          type === TOKEN_SEMI || (value = new ShellStringUnquoted(value));
+          // We don't need to check placeholderCount here like we do below;
+          // that's only relevant during the first word break of the span, and
+          // because this iteration of the loop is processing the token that
+          // was checked for breaks in the previous iteration, it will have
+          // already been handled. For the same reason, prefix is guaranteed to
+          // be null.
+          if (contents.length) {
+            result.push(new ShellStringText(contents, null));
+            contents = [];
+          }
+          // Only spaces and redirects become prefixes, but not if they've been
+          // rewritten to unquoted above.
+          if (type >= TOKEN_SPACE) {
+            prefix = value;
+            onlyPrefixOnce = type === TOKEN_SPACE;
+          } else {
+            result.push(value);
+          }
+        } else {
+          contents.push(value);
+        }
+        tokenStart = pos;
+      }
+      if (breakHere) {
+        if (placeholderCount) {
+          result.push({
+            contents,
+            placeholderCount,
+            prefix,
+            onlyPrefixOnce
+          });
+        } else {
+          // There's no prefix to handle in this branch; a prefix prior to this
+          // span would mean placeholderCount > 0, and a prefix in this span
+          // can't be created because spaces and redirects get rewritten to
+          // unquoted before the last word break.
+          contents.length && result.push(new ShellStringText(contents, null));
+        }
+        placeholderCount = 0;
+        prefix = null;
+        onlyPrefixOnce = false;
+        contents = [];
+      }
+      type = typeNext;
+    }
+  }
+  if (quote) {
+    throw new SyntaxError(`String is missing a ${String.fromCharCode(quote)} character`);
+  }
+  return result;
+});
+const CHAR_SEMI = ';'.charCodeAt();
+const CHAR_SQUO = "'".charCodeAt();
+const CHAR_DQUO = '"'.charCodeAt();
+const reQuotation1 = sticky("[^']+");
+const reQuotation2 = sticky('[^"]+');
+const reText = sticky('[^\\s"#$&\'();<>\\\\`|]+|([#$&()\\\\`|]+)');
+const reRedirectOrSpace = sticky('(\\s*\\d*[<>]+\\s*)|\\s+');
+
+class BitSet {
+  constructor() {
+    this.vector = new Int32Array(1);
+  }
+  has(n) {
+    return (this.vector[n >>> 5] & 1 << n) !== 0;
+  }
+  add(n) {
+    const i = n >>> 5,
+          requiredLength = i + 1;
+    let vector = this.vector,
+        _vector = vector,
+        length = _vector.length;
+    if (requiredLength > length) {
+      while (requiredLength > (length *= 2));
+      const oldValues = vector;
+      vector = new Int32Array(length);
+      vector.set(oldValues);
+      this.vector = vector;
+    }
+    vector[i] |= 1 << n;
+  }
+}
+
+function evaluate(template, values) {
+  values = values.map(toStringishArray);
+  const children = [];
+  let valuesStart = 0;
+  for (let i = 0, iMax = template.length; i < iMax; i++) {
+    const word = template[i];
+    if (formatSymbol in word) {
+      children.push(word);
+      continue;
+    }
+    const contents = word.contents,
+          placeholderCount = word.placeholderCount,
+          prefix = word.prefix,
+          onlyPrefixOnce = word.onlyPrefixOnce;
+    const kMax = contents.length;
+    const valuesEnd = valuesStart + placeholderCount;
+    const tuples = cartesianProduct(values, valuesStart, valuesEnd);
+    valuesStart = valuesEnd;
+    for (let j = 0, jMax = tuples.length; j < jMax; j++) {
+      const needSpace = j > 0;
+      const tuple = tuples[j];
+      (needSpace || prefix) && children.push(needSpace && (onlyPrefixOnce || !prefix) ? unquotedSpace : prefix);
+      let interpolatedContents = [];
+      let untested = null;
+      let quoting = false;
+      let tupleIndex = 0;
+      for (let k = 0; k < kMax; k++) {
+        const content = contents[k];
+        if (content === PLACEHOLDER) {
+          const value = tuple[tupleIndex++];
+          if (quoting) {
+            interpolatedContents.push(value);
+          } else {
+            if (isObject(value) && formatSymbol in value) {
+              if (interpolatedContents.length) {
+                children.push(new ShellStringText(interpolatedContents, untested));
+                interpolatedContents = [];
+                untested = null;
+              }
+              children.push(value);
+            } else {
+              (untested || (untested = new BitSet())).add(interpolatedContents.length);
+              interpolatedContents.push(value);
+            }
+          }
+        } else {
+          interpolatedContents.push(content);
+          content === null && (quoting = !quoting);
+        }
+      }
+      if (interpolatedContents.length) {
+        children.push(new ShellStringText(interpolatedContents, untested));
+      }
+    }
+  }
+  return children;
+}
+const primToStringish = value => value == null ? '' + value : value;
+function toStringishArray(value) {
+  let array;
+  switch (true) {
+    default:
+      if (isObject(value)) {
+        if (Array.isArray(value)) {
+          array = value;
+          break;
+        }
+        if (Symbol.iterator in value) {
+          array = Array.from(value);
+          break;
+        }
+      }
+      array = [value];
+  }
+  return array.map(primToStringish);
+}
+function cartesianProduct(arrs, start, end) {
+  const size = end - start;
+  let resultLength = 1;
+  for (let i = start; i < end; i++) {
+    resultLength *= arrs[i].length;
+  }
+  if (resultLength > 1e6) {
+    throw new RangeError("Far too many elements to interpolate");
+  }
+  const result = new Array(resultLength);
+  const indices = new Array(size).fill(0);
+  for (let i = 0; i < resultLength; i++) {
+    const value = result[i] = new Array(size);
+    for (let j = 0; j < size; j++) {
+      value[j] = arrs[j + start][indices[j]];
+    }
+    for (let j = size - 1; j >= 0; j--) {
+      if (++indices[j] < arrs[j + start].length) break;
+      indices[j] = 0;
+    }
+  }
+  return result;
+}
+const unquotedSpace = new ShellStringUnquoted(' ');
+
+/**
+ * A ShellString represents a shell command after it has been interpolated, but
+ * before it has been formatted for a particular platform. ShellStrings are
+ * useful if you want to prepare a command for a different platform than the
+ * current one, for instance.
+ *
+ * To create a ShellString, use `ShellString.sh` the same way you would use
+ * top-level `sh`.
+ */
+class ShellString {
+  /** @hideconstructor */
+  constructor(children) {
+    this.children = children;
+  }
+  /**
+   * `ShellString.sh` is a template tag just like `sh`; the only difference is
+   * that this function returns a ShellString which has not yet been formatted
+   * into a String.
+   * @returns {ShellString}
+   * @function sh
+   * @static
+   * @memberof ShellString
+   */
+  static sh(templateSpans) {
+    for (var _len = arguments.length, values = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      values[_key - 1] = arguments[_key];
+    }
+    return new ShellString(evaluate(parse(templateSpans), values));
+  }
+  /**
+   * A method to format a ShellString into a regular String formatted for a
+   * particular platform.
+   *
+   * @param {String} [platform] a value that `process.platform` might take:
+   * `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
+   * When omitted, effectively the same as `process.platform`.
+   * @returns {String}
+   */
+  toString(platform) {
+    return this[formatSymbol](Formatter.for(platform));
+  }
+  [formatSymbol](formatter) {
+    let context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : formatter.createContext(this);
+    return this.children.map(child => child[formatSymbol](formatter, context)).join('');
+  }
+  [preformatSymbol](context) {
+    const children = this.children;
+    for (let i = 0, iMax = children.length; i < iMax; i++) {
+      const child = children[i];
+      if (preformatSymbol in child) {
+        child[preformatSymbol](context);
+      }
+    }
+  }
+}
+
+/**
+ * A Windows-specific version of {@link quoteForShell}.
+ * @param {String} text to be quoted
+ * @param {Boolean} [forceQuote] whether to always add quotes even if the string
+ * is already safe. Defaults to `false`.
+ */
+
+/**
+ * A Unix-specific version of {@link quoteForShell}.
+ * @param {String} text to be quoted
+ * @param {Boolean} [forceQuote] whether to always add quotes even if the string
+ * is already safe. Defaults to `false`.
+ */
+
+/**
+ * Quotes a string for injecting into a shell command.
+ *
+ * This function is exposed for some hypothetical case when the `sh` DSL simply
+ * won't do; `sh` is expected to be the more convenient option almost always.
+ * Compare:
+ *
+ * ```javascript
+ * console.log('cmd' + args.map(a => ' ' + quoteForShell(a)).join(''));
+ * console.log(sh`cmd ${args}`); // same as above
+ *
+ * console.log('cmd' + args.map(a => ' ' + quoteForShell(a, true)).join(''));
+ * console.log(sh`cmd "${args}"`); // same as above
+ * ```
+ *
+ * Additionally, on Windows, `sh` checks the entire command string for pipes,
+ * which subtly change how arguments need to be quoted. If your commands may
+ * involve pipes, you are strongly encouraged to use `sh` and not try to roll
+ * your own with `quoteForShell`.
+ *
+ * @param {String} text to be quoted
+ * @param {Boolean} [forceQuote] whether to always add quotes even if the string
+ * is already safe. Defaults to `false`.
+ * @param {String} [platform] a value that `process.platform` might take:
+ * `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
+ * When omitted, effectively the same as `process.platform`.
+ *
+ * @returns {String} a string that is safe for the current (or specified)
+ * platform.
+ */
+function quoteForShell(text, forceQuote, platform) {
+  return Formatter.for(platform).quote(text, forceQuote);
+}
+
+/**
+ * A string template tag for safely constructing cross-platform shell commands.
+ *
+ * An `sh` template is not actually treated as a literal string to be
+ * interpolated; instead, it is a tiny DSL designed to make working with shell
+ * strings safe, simple, and straightforward. To get started quickly, see the
+ * examples below. {@link #the-sh-dsl More detailed documentation} is available
+ * further down.
+ *
+ * @name sh
+ * @example
+ * const title = '"this" & "that"';
+ * sh`script --title=${title}`; // => "script '--title=\"this\" & \"that\"'"
+ * // Note: these examples show results for non-Windows platforms.
+ * // On Windows, the above would instead be
+ * // 'script ^^^"--title=\\^^^"this\\^^^" ^^^& \\^^^"that\\^^^"^^^"'.
+ *
+ * const names = ['file1', 'file 2'];
+ * sh`rimraf ${names}.txt`; // => "rimraf file1.txt 'file 2.txt'"
+ *
+ * const cmd1 = ['cat', 'file 1.txt', 'file 2.txt'];
+ * const cmd2 = ['use-input', '-abc'];
+ * sh`${cmd1}|${cmd2}`; // => "cat 'file 1.txt' 'file 2.txt'|use-input -abc"
+ *
+ * @returns {String} - a string formatted for the platform Node is currently
+ * running on.
+ */
+const sh = function () {
+  return ShellString.sh.apply(ShellString, arguments).toString();
+};
+
+/**
+ * This function permits raw strings to be interpolated into a `sh` template.
+ *
+ * **IMPORTANT**: If you're using Puka due to security concerns, make sure you
+ * don't pass any untrusted content to `unquoted`. This may be obvious, but
+ * stray punctuation in an `unquoted` section can compromise the safety of the
+ * entire shell command.
+ *
+ * @param value - any value (it will be treated as a string)
+ *
+ * @example
+ * const both = true;
+ * sh`foo ${unquoted(both ? '&&' : '||')} bar`; // => 'foo && bar'
+ */
+const unquoted = value => new ShellStringUnquoted(value);
+
+exports.Formatter = Formatter;
+exports.ShellString = ShellString;
+exports.ShellStringText = ShellStringText;
+exports.ShellStringUnquoted = ShellStringUnquoted;
+exports.quoteForCmd = quoteForCmd;
+exports.quoteForSh = quoteForSh;
+exports.quoteForShell = quoteForShell;
+exports.sh = sh;
+exports.shellStringSemicolon = shellStringSemicolon;
+exports.formatSymbol = formatSymbol;
+exports.preformatSymbol = preformatSymbol;
+exports.unquoted = unquoted;
diff --git a/deps/npm/node_modules/puka/package.json b/deps/npm/node_modules/puka/package.json
new file mode 100644
index 00000000000000..41798dc2493b85
--- /dev/null
+++ b/deps/npm/node_modules/puka/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "puka",
+  "version": "1.0.1",
+  "description": "A cross-platform library for safely passing strings through shells",
+  "keywords": [
+    "args",
+    "arguments",
+    "cmd",
+    "command",
+    "command-line",
+    "cross-platform",
+    "escape",
+    "escaping",
+    "exec",
+    "linux",
+    "mac",
+    "macos",
+    "osx",
+    "quote",
+    "quoting",
+    "sh",
+    "shell",
+    "spawn",
+    "unix",
+    "win",
+    "win32",
+    "windows"
+  ],
+  "homepage": "https://gitlab.com/rhendric/puka",
+  "bugs": "https://gitlab.com/rhendric/puka/issues",
+  "license": "MIT",
+  "author": "Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>",
+  "repository": "gitlab:rhendric/puka",
+  "dependencies": {},
+  "engines": {
+    "node": ">=4"
+  }
+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/tough-cookie/LICENSE b/deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/LICENSE
rename to deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE
diff --git a/deps/npm/node_modules/tough-cookie/README.md b/deps/npm/node_modules/request/node_modules/tough-cookie/README.md
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/README.md
rename to deps/npm/node_modules/request/node_modules/tough-cookie/README.md
diff --git a/deps/npm/node_modules/tough-cookie/lib/cookie.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/cookie.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/memstore.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/memstore.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/pathMatch.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/pathMatch.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/permuteDomain.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/permuteDomain.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/pubsuffix-psl.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix-psl.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/pubsuffix-psl.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix-psl.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/store.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/store.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/store.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/store.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/version.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/version.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/version.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/version.js
diff --git a/deps/npm/node_modules/tough-cookie/package.json b/deps/npm/node_modules/request/node_modules/tough-cookie/package.json
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/package.json
rename to deps/npm/node_modules/request/node_modules/tough-cookie/package.json
diff --git a/deps/npm/node_modules/resolve/.editorconfig b/deps/npm/node_modules/resolve/.editorconfig
index bc228f8269443b..b96fcfbf23d48f 100644
--- a/deps/npm/node_modules/resolve/.editorconfig
+++ b/deps/npm/node_modules/resolve/.editorconfig
@@ -1,20 +1,34 @@
 root = true
 
 [*]
-indent_style = tab
-indent_size = 4
+indent_style = space
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-max_line_length = 150
+max_line_length = 200
+
+[*.js]
+block_comment_start = /*
+block_comment = *
+block_comment_end = */
+
+[*.yml]
+indent_size = 1
+
+[package.json]
+indent_style = tab
 
 [CHANGELOG.md]
 indent_style = space
 indent_size = 2
 
-[*.json]
+[{*.json,Makefile}]
 max_line_length = off
 
-[Makefile]
+[test/{dotdot,resolver,module_dir,multirepo,node_path,pathfilter,precedence}/**/*]
+indent_style = off
+indent_size = off
 max_line_length = off
+insert_final_newline = off
diff --git a/deps/npm/node_modules/resolve/.travis.yml b/deps/npm/node_modules/resolve/.travis.yml
deleted file mode 100644
index 5ed0fa52f90b73..00000000000000
--- a/deps/npm/node_modules/resolve/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: ~> 1.0
-language: node_js
-os:
- - linux
-import:
- - ljharb/travis-ci:node/all.yml
- - ljharb/travis-ci:node/pretest.yml
- - ljharb/travis-ci:node/posttest.yml
diff --git a/deps/npm/node_modules/resolve/appveyor.yml b/deps/npm/node_modules/resolve/appveyor.yml
index 9458fb82b12447..747fbdbba5e515 100644
--- a/deps/npm/node_modules/resolve/appveyor.yml
+++ b/deps/npm/node_modules/resolve/appveyor.yml
@@ -4,6 +4,9 @@ build: off
 
 environment:
   matrix:
+    #- nodejs_version: "15"
+    - nodejs_version: "14"
+    - nodejs_version: "13"
     - nodejs_version: "12"
     - nodejs_version: "11"
     - nodejs_version: "10"
@@ -25,6 +28,7 @@ matrix:
   allow_failures:
     - nodejs_version: "5" # due to windows npm bug, registry-side
     - nodejs_version: "0.8"
+      # platform: x86 # x64 has started failing on the registry side, around early November 2020
     - nodejs_version: "0.6"
 
 platform:
@@ -33,17 +37,33 @@ platform:
 
 # Install scripts. (runs after repo cloning)
 install:
- # Fix symlinks in working copy (see https://github.com/appveyor/ci/issues/650#issuecomment-186592582) / https://github.com/charleskorn/batect/commit/d08986802ec43086902958c4ee7e57ff3e71dbef
- - git config core.symlinks true
- - git reset --hard
- # Get the latest stable version of Node.js or io.js
- - ps: Install-Product node $env:nodejs_version $env:platform
- - IF %nodejs_version% EQU 0.6 npm config set strict-ssl false && npm -g install npm@1.3
- - IF %nodejs_version% EQU 0.8 npm config set strict-ssl false && npm -g install npm@1.4.28 && npm install -g npm@4.5
- - set PATH=%APPDATA%\npm;%PATH%
- #- IF %nodejs_version% NEQ 0.6 AND %nodejs_version% NEQ 0.8 npm -g install npm
- # install modules
- - npm install
+  # Fix symlinks in working copy (see https://github.com/appveyor/ci/issues/650#issuecomment-186592582) / https://github.com/charleskorn/batect/commit/d08986802ec43086902958c4ee7e57ff3e71dbef
+  - git config core.symlinks true
+  - git reset --hard
+  # Get the latest stable version of Node.js or io.js
+  - ps: if ($env:nodejs_version -ne '0.6') { Install-Product node $env:nodejs_version $env:platform }
+  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
+  - IF %nodejs_version% EQU 0.6 npm config set strict-ssl false && npm -g install npm@1.3
+  - IF %nodejs_version% EQU 0.8 npm config set strict-ssl false && npm -g install npm@1.4.28 && npm install -g npm@4.5
+  - IF %nodejs_version% EQU 1 npm -g install npm@2.9
+  - IF %nodejs_version% EQU 2 npm -g install npm@4
+  - IF %nodejs_version% EQU 3 npm -g install npm@4
+  - IF %nodejs_version% EQU 4 npm -g install npm@5.3
+  - IF %nodejs_version% EQU 5 npm -g install npm@5.3
+  - IF %nodejs_version% EQU 6 npm -g install npm@6.9
+  - IF %nodejs_version% EQU 7 npm -g install npm@6
+  - IF %nodejs_version% EQU 8 npm -g install npm@6
+  - IF %nodejs_version% EQU 9 npm -g install npm@6.9
+  - IF %nodejs_version% EQU 10 npm -g install npm@7
+  - IF %nodejs_version% EQU 11 npm -g install npm@7
+  - IF %nodejs_version% EQU 12 npm -g install npm@7
+  - IF %nodejs_version% EQU 13 npm -g install npm@7
+  - IF %nodejs_version% EQU 14 npm -g install npm@7
+  - IF %nodejs_version% EQU 15 npm -g install npm@7
+  - set PATH=%APPDATA%\npm;%PATH%
+  #- IF %nodejs_version% NEQ 0.6 AND %nodejs_version% NEQ 0.8 npm -g install npm
+  # install modules
+  - npm install
 
 # Post-install test scripts.
 test_script:
diff --git a/deps/npm/node_modules/resolve/lib/async.js b/deps/npm/node_modules/resolve/lib/async.js
index 06aa4588335cb7..29285079451b15 100644
--- a/deps/npm/node_modules/resolve/lib/async.js
+++ b/deps/npm/node_modules/resolve/lib/async.js
@@ -1,9 +1,9 @@
 var fs = require('fs');
 var path = require('path');
-var caller = require('./caller.js');
-var nodeModulesPaths = require('./node-modules-paths.js');
-var normalizeOptions = require('./normalize-options.js');
-var isCore = require('./is-core');
+var caller = require('./caller');
+var nodeModulesPaths = require('./node-modules-paths');
+var normalizeOptions = require('./normalize-options');
+var isCore = require('is-core-module');
 
 var realpathFS = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
 
@@ -73,6 +73,7 @@ module.exports = function resolve(x, options, callback) {
     var packageIterator = opts.packageIterator;
 
     var extensions = opts.extensions || ['.js'];
+    var includeCoreModules = opts.includeCoreModules !== false;
     var basedir = opts.basedir || path.dirname(caller());
     var parent = opts.filename || basedir;
 
@@ -99,7 +100,7 @@ module.exports = function resolve(x, options, callback) {
             if ((/\/$/).test(x) && res === basedir) {
                 loadAsDirectory(res, opts.package, onfile);
             } else loadAsFile(res, opts.package, onfile);
-        } else if (isCore(x)) {
+        } else if (includeCoreModules && isCore(x)) {
             return cb(null, x);
         } else loadNodeModules(x, basedir, function (err, n, pkg) {
             if (err) cb(err);
diff --git a/deps/npm/node_modules/resolve/lib/core.js b/deps/npm/node_modules/resolve/lib/core.js
index 0877650ccad4e8..c417d23c5a8ff7 100644
--- a/deps/npm/node_modules/resolve/lib/core.js
+++ b/deps/npm/node_modules/resolve/lib/core.js
@@ -6,8 +6,8 @@ function specifierIncluded(specifier) {
     var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
 
     for (var i = 0; i < 3; ++i) {
-        var cur = Number(current[i] || 0);
-        var ver = Number(versionParts[i] || 0);
+        var cur = parseInt(current[i] || 0, 10);
+        var ver = parseInt(versionParts[i] || 0, 10);
         if (cur === ver) {
             continue; // eslint-disable-line no-restricted-syntax, no-continue
         }
diff --git a/deps/npm/node_modules/resolve/lib/core.json b/deps/npm/node_modules/resolve/lib/core.json
index d51b70b149acb2..226198f89b5ef0 100644
--- a/deps/npm/node_modules/resolve/lib/core.json
+++ b/deps/npm/node_modules/resolve/lib/core.json
@@ -1,5 +1,6 @@
 {
     "assert": true,
+    "assert/strict": ">= 15",
     "async_hooks": ">= 8",
     "buffer_ieee754": "< 0.9.7",
     "buffer": true,
@@ -11,8 +12,10 @@
     "_debug_agent": ">= 1 && < 8",
     "_debugger": "< 8",
     "dgram": true,
+    "diagnostics_channel": ">= 15.1",
     "dns": true,
-    "domain": true,
+    "dns/promises": ">= 15",
+    "domain": ">= 0.7.12",
     "events": true,
     "freelist": "< 6",
     "fs": true,
@@ -49,9 +52,11 @@
     "_stream_readable": ">= 0.9.4",
     "_stream_writable": ">= 0.9.4",
     "stream": true,
+    "stream/promises": ">= 15",
     "string_decoder": true,
-    "sys": true,
+    "sys": [">= 0.6 && < 0.7", ">= 0.8"],
     "timers": true,
+    "timers/promises": ">= 15",
     "_tls_common": ">= 0.11.13",
     "_tls_legacy": ">= 0.11.3 && < 10",
     "_tls_wrap": ">= 0.11.3",
diff --git a/deps/npm/node_modules/resolve/lib/is-core.js b/deps/npm/node_modules/resolve/lib/is-core.js
index 48bc96c47eadc5..537f5c782ffe55 100644
--- a/deps/npm/node_modules/resolve/lib/is-core.js
+++ b/deps/npm/node_modules/resolve/lib/is-core.js
@@ -1,5 +1,5 @@
-var core = require('./core');
+var isCoreModule = require('is-core-module');
 
 module.exports = function isCore(x) {
-    return Object.prototype.hasOwnProperty.call(core, x);
+    return isCoreModule(x);
 };
diff --git a/deps/npm/node_modules/resolve/lib/sync.js b/deps/npm/node_modules/resolve/lib/sync.js
index da74e19d0cb564..d5308c926e498b 100644
--- a/deps/npm/node_modules/resolve/lib/sync.js
+++ b/deps/npm/node_modules/resolve/lib/sync.js
@@ -1,9 +1,9 @@
-var isCore = require('./is-core');
+var isCore = require('is-core-module');
 var fs = require('fs');
 var path = require('path');
-var caller = require('./caller.js');
-var nodeModulesPaths = require('./node-modules-paths.js');
-var normalizeOptions = require('./normalize-options.js');
+var caller = require('./caller');
+var nodeModulesPaths = require('./node-modules-paths');
+var normalizeOptions = require('./normalize-options');
 
 var realpathFS = fs.realpathSync && typeof fs.realpathSync.native === 'function' ? fs.realpathSync.native : fs.realpathSync;
 
@@ -66,6 +66,7 @@ module.exports = function resolveSync(x, options) {
     var packageIterator = opts.packageIterator;
 
     var extensions = opts.extensions || ['.js'];
+    var includeCoreModules = opts.includeCoreModules !== false;
     var basedir = opts.basedir || path.dirname(caller());
     var parent = opts.filename || basedir;
 
@@ -79,7 +80,7 @@ module.exports = function resolveSync(x, options) {
         if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
         var m = loadAsFileSync(res) || loadAsDirectorySync(res);
         if (m) return maybeRealpathSync(realpathSync, m, opts);
-    } else if (isCore(x)) {
+    } else if (includeCoreModules && isCore(x)) {
         return x;
     } else {
         var n = loadNodeModulesSync(x, absoluteStart);
diff --git a/deps/npm/node_modules/resolve/package.json b/deps/npm/node_modules/resolve/package.json
index b6d3bec191d686..dfcfc497b34eaf 100644
--- a/deps/npm/node_modules/resolve/package.json
+++ b/deps/npm/node_modules/resolve/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "resolve",
 	"description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
-	"version": "1.17.0",
+	"version": "1.19.0",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/browserify/resolve.git"
@@ -14,23 +14,26 @@
 		"module"
 	],
 	"scripts": {
-		"prepublish": "safe-publish-latest",
-		"lint": "eslint .",
+		"prepublish": "safe-publish-latest && cp node_modules/is-core-module/core.json ./lib/",
+		"prelint": "eclint check '**/*'",
+		"lint": "eslint --ext=js,mjs .",
 		"pretests-only": "cd ./test/resolver/nested_symlinks && node mylib/sync && node mylib/async",
 		"tests-only": "tape test/*.js",
 		"pretest": "npm run lint",
 		"test": "npm run --silent tests-only",
-		"posttest": "npm run test:multirepo",
+		"posttest": "npm run test:multirepo && aud --production",
 		"test:multirepo": "cd ./test/resolver/multirepo && npm install && npm test"
 	},
 	"devDependencies": {
-		"@ljharb/eslint-config": "^16.0.0",
+		"@ljharb/eslint-config": "^17.2.0",
 		"array.prototype.map": "^1.0.2",
-		"eslint": "^6.8.0",
+		"aud": "^1.1.3",
+		"eclint": "^2.8.1",
+		"eslint": "^7.13.0",
 		"object-keys": "^1.1.1",
 		"safe-publish-latest": "^1.1.4",
 		"tap": "0.4.13",
-		"tape": "^5.0.0-next.5"
+		"tape": "^5.0.1"
 	},
 	"license": "MIT",
 	"author": {
@@ -42,6 +45,7 @@
 		"url": "https://github.com/sponsors/ljharb"
 	},
 	"dependencies": {
+		"is-core-module": "^2.1.0",
 		"path-parse": "^1.0.6"
 	}
 }
diff --git a/deps/npm/node_modules/resolve/readme.markdown b/deps/npm/node_modules/resolve/readme.markdown
index 5e1aea331767de..f742c38dd48df8 100644
--- a/deps/npm/node_modules/resolve/readme.markdown
+++ b/deps/npm/node_modules/resolve/readme.markdown
@@ -43,6 +43,12 @@ $ node example/sync.js
 var resolve = require('resolve');
 ```
 
+For both the synchronous and asynchronous methods, errors may have any of the following `err.code` values:
+
+- `MODULE_NOT_FOUND`: the given path string (`id`) could not be resolved to a module
+- `INVALID_BASEDIR`: the specified `opts.basedir` doesn't exist, or is not a directory
+- `INVALID_PACKAGE_MAIN`: a `package.json` was encountered with an invalid `main` property (eg. not a string)
+
 ## resolve(id, opts={}, cb)
 
 Asynchronously resolve the module path string `id` into `cb(err, res [, pkg])`, where `pkg` (if defined) is the data from `package.json`.
@@ -55,6 +61,8 @@ options are:
 
 * opts.extensions - array of file extensions to search in order
 
+* opts.includeCoreModules - set to `false` to exclude node core modules (e.g. `fs`) from the search
+
 * opts.readFile - how to read files asynchronously
 
 * opts.isFile - function to asynchronously test whether a file exists
@@ -102,6 +110,7 @@ default `opts` values:
     paths: [],
     basedir: __dirname,
     extensions: ['.js'],
+    includeCoreModules: true,
     readFile: fs.readFile,
     isFile: function isFile(file, cb) {
         fs.stat(file, function (err, stat) {
@@ -122,12 +131,12 @@ default `opts` values:
         });
     },
     realpath: function realpath(file, cb) {
-       var realpath = typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
-       realpath(file, function (realPathErr, realPath) {
-           if (realPathErr && realPathErr.code !== 'ENOENT') cb(realPathErr);
-           else cb(null, realPathErr ? file : realPath);
-       });
-   },
+        var realpath = typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
+        realpath(file, function (realPathErr, realPath) {
+            if (realPathErr && realPathErr.code !== 'ENOENT') cb(realPathErr);
+            else cb(null, realPathErr ? file : realPath);
+        });
+    },
     moduleDirectory: 'node_modules',
     preserveSymlinks: true
 }
@@ -144,6 +153,8 @@ options are:
 
 * opts.extensions - array of file extensions to search in order
 
+* opts.includeCoreModules - set to `false` to exclude node core modules (e.g. `fs`) from the search
+
 * opts.readFile - how to read files synchronously
 
 * opts.isFile - function to synchronously test whether a file exists
@@ -190,6 +201,7 @@ default `opts` values:
     paths: [],
     basedir: __dirname,
     extensions: ['.js'],
+    includeCoreModules: true,
     readFileSync: fs.readFileSync,
     isFile: function isFile(file) {
         try {
@@ -225,10 +237,6 @@ default `opts` values:
 }
 ```
 
-## resolve.isCore(pkg)
-
-Return whether a package is in core.
-
 # install
 
 With [npm](https://npmjs.org) do:
diff --git a/deps/npm/node_modules/resolve/test/core.js b/deps/npm/node_modules/resolve/test/core.js
index 4c111e1dde7797..7a3ccb16b435d6 100644
--- a/deps/npm/node_modules/resolve/test/core.js
+++ b/deps/npm/node_modules/resolve/test/core.js
@@ -22,16 +22,12 @@ test('core modules', function (t) {
 
         for (var i = 0; i < cores.length; ++i) {
             var mod = cores[i];
+            var requireFunc = function () { require(mod); }; // eslint-disable-line no-loop-func
+            console.log(mod, resolve.core, resolve.core[mod]);
             if (resolve.core[mod]) {
-                st.doesNotThrow(
-                    function () { require(mod); }, // eslint-disable-line no-loop-func
-                    mod + ' supported; requiring does not throw'
-                );
+                st.doesNotThrow(requireFunc, mod + ' supported; requiring does not throw');
             } else {
-                st.throws(
-                    function () { require(mod); }, // eslint-disable-line no-loop-func
-                    mod + ' not supported; requiring throws'
-                );
+                st.throws(requireFunc, mod + ' not supported; requiring throws');
             }
         }
 
diff --git a/deps/npm/node_modules/resolve/test/shadowed_core.js b/deps/npm/node_modules/resolve/test/shadowed_core.js
index 98c52a760b966a..3a5f4fcff728f3 100644
--- a/deps/npm/node_modules/resolve/test/shadowed_core.js
+++ b/deps/npm/node_modules/resolve/test/shadowed_core.js
@@ -36,3 +36,19 @@ test('shadowed core modules return shadow when appending `/` [sync]', function (
     t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
 });
 
+test('shadowed core modules return shadow with `includeCoreModules: false`', function (t) {
+    t.plan(2);
+
+    resolve('util', { basedir: path.join(__dirname, 'shadowed_core'), includeCoreModules: false }, function (err, res) {
+        t.ifError(err);
+        t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
+    });
+});
+
+test('shadowed core modules return shadow with `includeCoreModules: false` [sync]', function (t) {
+    t.plan(1);
+
+    var res = resolve.sync('util', { basedir: path.join(__dirname, 'shadowed_core'), includeCoreModules: false });
+
+    t.equal(res, path.join(__dirname, 'shadowed_core/node_modules/util/index.js'));
+});
diff --git a/deps/npm/node_modules/resolve/test/symlinks.js b/deps/npm/node_modules/resolve/test/symlinks.js
index 152d14ef2d1991..35f881afb8c7e0 100644
--- a/deps/npm/node_modules/resolve/test/symlinks.js
+++ b/deps/npm/node_modules/resolve/test/symlinks.js
@@ -68,7 +68,10 @@ test('sync symlink when preserveSymlinks = true', function (t) {
 test('sync symlink', function (t) {
     var start = new Date();
     t.doesNotThrow(function () {
-        t.equal(resolve.sync('foo', { basedir: symlinkDir, preserveSymlinks: false }), path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js'));
+        t.equal(
+            resolve.sync('foo', { basedir: symlinkDir, preserveSymlinks: false }),
+            path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js')
+        );
     });
     t.ok(new Date() - start < 50, 'resolve.sync timedout');
     t.end();
diff --git a/deps/npm/node_modules/semver/classes/comparator.js b/deps/npm/node_modules/semver/classes/comparator.js
index 3595792d0ed0cc..dbbef2d8fe20e6 100644
--- a/deps/npm/node_modules/semver/classes/comparator.js
+++ b/deps/npm/node_modules/semver/classes/comparator.js
@@ -5,12 +5,7 @@ class Comparator {
     return ANY
   }
   constructor (comp, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      }
-    }
+    options = parseOptions(options)
 
     if (comp instanceof Comparator) {
       if (comp.loose === !!options.loose) {
@@ -132,6 +127,7 @@ class Comparator {
 
 module.exports = Comparator
 
+const parseOptions = require('../internal/parse-options')
 const {re, t} = require('../internal/re')
 const cmp = require('../functions/cmp')
 const debug = require('../internal/debug')
diff --git a/deps/npm/node_modules/semver/classes/range.js b/deps/npm/node_modules/semver/classes/range.js
index 83f8967717ebbf..aa04f6bff94461 100644
--- a/deps/npm/node_modules/semver/classes/range.js
+++ b/deps/npm/node_modules/semver/classes/range.js
@@ -1,12 +1,7 @@
 // hoisted class for cyclic dependency
 class Range {
   constructor (range, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      }
-    }
+    options = parseOptions(options)
 
     if (range instanceof Range) {
       if (
@@ -46,6 +41,24 @@ class Range {
       throw new TypeError(`Invalid SemVer Range: ${range}`)
     }
 
+    // if we have any that are not the null set, throw out null sets.
+    if (this.set.length > 1) {
+      // keep the first one, in case they're all null sets
+      const first = this.set[0]
+      this.set = this.set.filter(c => !isNullSet(c[0]))
+      if (this.set.length === 0)
+        this.set = [first]
+      else if (this.set.length > 1) {
+        // if we have any that are *, then the range is just *
+        for (const c of this.set) {
+          if (c.length === 1 && isAny(c[0])) {
+            this.set = [c]
+            break
+          }
+        }
+      }
+    }
+
     this.format()
   }
 
@@ -64,8 +77,17 @@ class Range {
   }
 
   parseRange (range) {
-    const loose = this.options.loose
     range = range.trim()
+
+    // memoize range parsing for performance.
+    // this is a very hot path, and fully deterministic.
+    const memoOpts = Object.keys(this.options).join(',')
+    const memoKey = `parseRange:${memoOpts}:${range}`
+    const cached = cache.get(memoKey)
+    if (cached)
+      return cached
+
+    const loose = this.options.loose
     // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
     const hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE]
     range = range.replace(hr, hyphenReplace(this.options.includePrerelease))
@@ -87,15 +109,33 @@ class Range {
     // ready to be split into comparators.
 
     const compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
-    return range
+    const rangeList = range
       .split(' ')
       .map(comp => parseComparator(comp, this.options))
       .join(' ')
       .split(/\s+/)
+      // >=0.0.0 is equivalent to *
       .map(comp => replaceGTE0(comp, this.options))
       // in loose mode, throw out any that are not valid comparators
       .filter(this.options.loose ? comp => !!comp.match(compRe) : () => true)
       .map(comp => new Comparator(comp, this.options))
+
+    // if any comparators are the null set, then replace with JUST null set
+    // if more than one comparator, remove any * comparators
+    // also, don't include the same comparator more than once
+    const l = rangeList.length
+    const rangeMap = new Map()
+    for (const comp of rangeList) {
+      if (isNullSet(comp))
+        return [comp]
+      rangeMap.set(comp.value, comp)
+    }
+    if (rangeMap.size > 1 && rangeMap.has(''))
+      rangeMap.delete('')
+
+    const result = [...rangeMap.values()]
+    cache.set(memoKey, result)
+    return result
   }
 
   intersects (range, options) {
@@ -144,6 +184,10 @@ class Range {
 }
 module.exports = Range
 
+const LRU = require('lru-cache')
+const cache = new LRU({ max: 1000 })
+
+const parseOptions = require('../internal/parse-options')
 const Comparator = require('./comparator')
 const debug = require('../internal/debug')
 const SemVer = require('./semver')
@@ -155,6 +199,9 @@ const {
   caretTrimReplace
 } = require('../internal/re')
 
+const isNullSet = c => c.value === '<0.0.0-0'
+const isAny = c => c.value === ''
+
 // take a set of comparators and determine whether there
 // exists a version which can satisfy it
 const isSatisfiable = (comparators, options) => {
diff --git a/deps/npm/node_modules/semver/classes/semver.js b/deps/npm/node_modules/semver/classes/semver.js
index 73247ad2b7eabc..ed81a7ec6cbfe6 100644
--- a/deps/npm/node_modules/semver/classes/semver.js
+++ b/deps/npm/node_modules/semver/classes/semver.js
@@ -2,15 +2,12 @@ const debug = require('../internal/debug')
 const { MAX_LENGTH, MAX_SAFE_INTEGER } = require('../internal/constants')
 const { re, t } = require('../internal/re')
 
+const parseOptions = require('../internal/parse-options')
 const { compareIdentifiers } = require('../internal/identifiers')
 class SemVer {
   constructor (version, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      }
-    }
+    options = parseOptions(options)
+
     if (version instanceof SemVer) {
       if (version.loose === !!options.loose &&
           version.includePrerelease === !!options.includePrerelease) {
diff --git a/deps/npm/node_modules/semver/functions/parse.js b/deps/npm/node_modules/semver/functions/parse.js
index 457fee04a95c83..11f20f03745ab2 100644
--- a/deps/npm/node_modules/semver/functions/parse.js
+++ b/deps/npm/node_modules/semver/functions/parse.js
@@ -2,13 +2,9 @@ const {MAX_LENGTH} = require('../internal/constants')
 const { re, t } = require('../internal/re')
 const SemVer = require('../classes/semver')
 
+const parseOptions = require('../internal/parse-options')
 const parse = (version, options) => {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+  options = parseOptions(options)
 
   if (version instanceof SemVer) {
     return version
diff --git a/deps/npm/node_modules/semver/internal/parse-options.js b/deps/npm/node_modules/semver/internal/parse-options.js
new file mode 100644
index 00000000000000..42d2ebd6fa32f8
--- /dev/null
+++ b/deps/npm/node_modules/semver/internal/parse-options.js
@@ -0,0 +1,11 @@
+// parse out just the options we care about so we always get a consistent
+// obj with keys in a consistent order.
+const opts = ['includePrerelease', 'loose', 'rtl']
+const parseOptions = options =>
+  !options ? {}
+  : typeof options !== 'object' ? { loose: true }
+  : opts.filter(k => options[k]).reduce((options, k) => {
+    options[k] = true
+    return options
+  }, {})
+module.exports = parseOptions
diff --git a/deps/npm/node_modules/semver/package.json b/deps/npm/node_modules/semver/package.json
index 07867975d152ce..d4043d38a13529 100644
--- a/deps/npm/node_modules/semver/package.json
+++ b/deps/npm/node_modules/semver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "7.3.2",
+  "version": "7.3.4",
   "description": "The semantic version parser used by npm.",
   "main": "index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   "license": "ISC",
   "repository": "https://github.com/npm/node-semver",
   "bin": {
-    "semver": "./bin/semver.js"
+    "semver": "bin/semver.js"
   },
   "files": [
     "bin/**/*.js",
@@ -34,5 +34,8 @@
   },
   "engines": {
     "node": ">=10"
+  },
+  "dependencies": {
+    "lru-cache": "^6.0.0"
   }
 }
diff --git a/deps/npm/node_modules/semver/ranges/min-version.js b/deps/npm/node_modules/semver/ranges/min-version.js
index 7118d237bf5c41..2fac412914fe25 100644
--- a/deps/npm/node_modules/semver/ranges/min-version.js
+++ b/deps/npm/node_modules/semver/ranges/min-version.js
@@ -19,6 +19,7 @@ const minVersion = (range, loose) => {
   for (let i = 0; i < range.set.length; ++i) {
     const comparators = range.set[i]
 
+    let setMin = null
     comparators.forEach((comparator) => {
       // Clone to avoid manipulating the comparator's semver object.
       const compver = new SemVer(comparator.semver.version)
@@ -33,8 +34,8 @@ const minVersion = (range, loose) => {
           /* fallthrough */
         case '':
         case '>=':
-          if (!minver || gt(minver, compver)) {
-            minver = compver
+          if (!setMin || gt(compver, setMin)) {
+            setMin = compver
           }
           break
         case '<':
@@ -46,6 +47,8 @@ const minVersion = (range, loose) => {
           throw new Error(`Unexpected operation: ${comparator.operator}`)
       }
     })
+    if (setMin && (!minver || gt(minver, setMin)))
+      minver = setMin
   }
 
   if (minver && range.test(minver)) {
diff --git a/deps/npm/node_modules/semver/ranges/outside.js b/deps/npm/node_modules/semver/ranges/outside.js
index e35ed1176c84ed..2a4b0a13f9e298 100644
--- a/deps/npm/node_modules/semver/ranges/outside.js
+++ b/deps/npm/node_modules/semver/ranges/outside.js
@@ -32,7 +32,7 @@ const outside = (version, range, hilo, options) => {
       throw new TypeError('Must provide a hilo val of "<" or ">"')
   }
 
-  // If it satisifes the range it is not outside
+  // If it satisfies the range it is not outside
   if (satisfies(version, range, options)) {
     return false
   }
diff --git a/deps/npm/node_modules/semver/ranges/subset.js b/deps/npm/node_modules/semver/ranges/subset.js
index 6ae29a3c92b892..bb7d15fe2696bb 100644
--- a/deps/npm/node_modules/semver/ranges/subset.js
+++ b/deps/npm/node_modules/semver/ranges/subset.js
@@ -21,15 +21,18 @@ const compare = require('../functions/compare.js')
 //   - If EQ satisfies every C, return true
 //   - Else return false
 // - If GT
-//   - If GT is lower than any > or >= comp in C, return false
+//   - If GT.semver is lower than any > or >= comp in C, return false
 //   - If GT is >=, and GT.semver does not satisfy every C, return false
 // - If LT
-//   - If LT.semver is greater than that of any > comp in C, return false
+//   - If LT.semver is greater than any < or <= comp in C, return false
 //   - If LT is <=, and LT.semver does not satisfy every C, return false
 // - If any C is a = range, and GT or LT are set, return false
 // - Else return true
 
 const subset = (sub, dom, options) => {
+  if (sub === dom)
+    return true
+
   sub = new Range(sub, options)
   dom = new Range(dom, options)
   let sawNonNull = false
@@ -52,6 +55,9 @@ const subset = (sub, dom, options) => {
 }
 
 const simpleSubset = (sub, dom, options) => {
+  if (sub === dom)
+    return true
+
   if (sub.length === 1 && sub[0].semver === ANY)
     return dom.length === 1 && dom[0].semver === ANY
 
@@ -90,6 +96,7 @@ const simpleSubset = (sub, dom, options) => {
       if (!satisfies(eq, String(c), options))
         return false
     }
+
     return true
   }
 
@@ -101,7 +108,7 @@ const simpleSubset = (sub, dom, options) => {
     if (gt) {
       if (c.operator === '>' || c.operator === '>=') {
         higher = higherGT(gt, c, options)
-        if (higher === c)
+        if (higher === c && higher !== gt)
           return false
       } else if (gt.operator === '>=' && !satisfies(gt.semver, String(c), options))
         return false
@@ -109,7 +116,7 @@ const simpleSubset = (sub, dom, options) => {
     if (lt) {
       if (c.operator === '<' || c.operator === '<=') {
         lower = lowerLT(lt, c, options)
-        if (lower === c)
+        if (lower === c && lower !== lt)
           return false
       } else if (lt.operator === '<=' && !satisfies(lt.semver, String(c), options))
         return false
diff --git a/deps/npm/node_modules/socks/build/client/socksclient.js b/deps/npm/node_modules/socks/build/client/socksclient.js
index df3058a05aa3ce..14ac6714973548 100644
--- a/deps/npm/node_modules/socks/build/client/socksclient.js
+++ b/deps/npm/node_modules/socks/build/client/socksclient.js
@@ -37,9 +37,20 @@ class SocksClient extends events_1.EventEmitter {
      * @returns { Promise }
      */
     static createConnection(options, callback) {
-        // Validate SocksClientOptions
-        helpers_1.validateSocksClientOptions(options, ['connect']);
         return new Promise((resolve, reject) => {
+            // Validate SocksClientOptions
+            try {
+                helpers_1.validateSocksClientOptions(options, ['connect']);
+            }
+            catch (err) {
+                if (typeof callback === 'function') {
+                    callback(err);
+                    return resolve(); // Resolves pending promise (prevents memory leaks).
+                }
+                else {
+                    return reject(err);
+                }
+            }
             const client = new SocksClient(options);
             client.connect(options.existing_socket);
             client.once('established', (info) => {
@@ -75,14 +86,25 @@ class SocksClient extends events_1.EventEmitter {
      * @returns { Promise }
      */
     static createConnectionChain(options, callback) {
-        // Validate SocksClientChainOptions
-        helpers_1.validateSocksClientChainOptions(options);
-        // Shuffle proxies
-        if (options.randomizeChain) {
-            util_1.shuffleArray(options.proxies);
-        }
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            // Validate SocksClientChainOptions
+            try {
+                helpers_1.validateSocksClientChainOptions(options);
+            }
+            catch (err) {
+                if (typeof callback === 'function') {
+                    callback(err);
+                    return resolve(); // Resolves pending promise (prevents memory leaks).
+                }
+                else {
+                    return reject(err);
+                }
+            }
             let sock;
+            // Shuffle proxies
+            if (options.randomizeChain) {
+                util_1.shuffleArray(options.proxies);
+            }
             try {
                 // tslint:disable-next-line:no-increment-decrement
                 for (let i = 0; i < options.proxies.length; i++) {
diff --git a/deps/npm/node_modules/socks/build/client/socksclient.js.map b/deps/npm/node_modules/socks/build/client/socksclient.js.map
index 8fdc0ec620403b..2145dacf5f00eb 100644
--- a/deps/npm/node_modules/socks/build/client/socksclient.js.map
+++ b/deps/npm/node_modules/socks/build/client/socksclient.js.map
@@ -1 +1 @@
-{"version":3,"file":"socksclient.js","sourceRoot":"","sources":["../../src/client/socksclient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AACpC,2BAA2B;AAC3B,yBAAyB;AACzB,+CAAyC;AACzC,mDAiB6B;AAC7B,+CAG2B;AAC3B,2DAAsD;AACtD,yCAA8D;AAs2B5D,iGAt2BM,uBAAgB,OAs2BN;AA50BlB,MAAM,WAAY,SAAQ,qBAAY;IAepC,YAAY,OAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,qBACP,OAAO,CACX,CAAC;QAEF,8BAA8B;QAC9B,oCAA0B,CAAC,OAAO,CAAC,CAAC;QAEpC,gBAAgB;QAChB,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,gBAAgB,CACrB,OAA2B,EAC3B,QAAmB;QAEnB,8BAA8B;QAC9B,oCAA0B,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAEjD,OAAO,IAAI,OAAO,CAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClE,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,IAAiC,EAAE,EAAE;gBAC/D,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACrB,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;YAEH,kDAAkD;YAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBAClC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACd,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,qBAAqB,CAC1B,OAAgC,EAChC,QAAmB;QAEnB,mCAAmC;QACnC,yCAA+B,CAAC,OAAO,CAAC,CAAC;QAEzC,kBAAkB;QAClB,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,mBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,OAAO,IAAI,OAAO,CAA8B,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YACxE,IAAI,IAAgB,CAAC;YAErB,IAAI;gBACF,kDAAkD;gBAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAErC,0HAA0H;oBAC1H,MAAM,eAAe,GACnB,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;wBAC9B,CAAC,CAAC,OAAO,CAAC,WAAW;wBACrB,CAAC,CAAC;4BACE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;4BACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;yBAClC,CAAC;oBAER,4CAA4C;oBAC5C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC;wBAChD,OAAO,EAAE,SAAS;wBAClB,KAAK,EAAE,SAAS;wBAChB,WAAW,EAAE,eAAe;qBAE7B,CAAC,CAAC;oBAEH,wCAAwC;oBACxC,IAAI,CAAC,IAAI,EAAE;wBACT,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;qBACtB;iBACF;gBAED,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC/B,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,OAAO,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;iBACzB;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACd,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;aACF;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,OAA6B;QACjD,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;QAE1C,qBAAqB;QACrB,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;SACxD;aAAM,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC9C,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;SACxD;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAC3C;QAED,OAAO;QACP,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;QACP,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,IAAY;QAC/B,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QAEpB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAmB,IAAI,CAAC,SAAS,EAAE,CAAC;QAClD,IAAI,UAAU,CAAC;QAEf,IAAI,QAAQ,KAAK,0BAAc,CAAC,IAAI,EAAE;YACpC,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC/C;aAAM,IAAI,QAAQ,KAAK,0BAAc,CAAC,IAAI,EAAE;YAC3C,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/C;aAAM;YACL,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAChD;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEvC,OAAO;YACL,WAAW;YACX,UAAU,EAAE;gBACV,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,UAAU;aACjB;YACD,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE;SACxB,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,QAA0B;QACzC,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,KAAK,EAAE;YACzC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;SACvB;IACH,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,cAAuB;QACpC,IAAI,CAAC,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,CAAC,GAAU,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE/C,+CAA+C;QAC/C,MAAM,KAAK,GAAG,UAAU,CACtB,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,EACjC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,2BAAe,CACxC,CAAC;QAEF,8EAA8E;QAC9E,IAAI,KAAK,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE;YACpD,KAAK,CAAC,KAAK,EAAE,CAAC;SACf;QAED,yGAAyG;QACzG,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;SAC9B;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;SAChC;QAED,gCAAgC;QAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAE5C,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;QAEzC,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC7B;aAAM;YACJ,IAAI,CAAC,MAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAE7D,IACE,IAAI,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS;gBAC1C,IAAI,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,EACrC;gBACC,IAAI,CAAC,MAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;aACxE;SACF;QAED,6FAA6F;QAC7F,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/C,YAAY,CAAC,GAAG,EAAE;gBAChB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBAErE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;iBACtC;gBACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,+EAA+E;IACvE,gBAAgB;QACtB,uCACK,IAAI,CAAC,OAAO,CAAC,cAAc,KAC9B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAC7D,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAC7B;IACJ,CAAC;IAED;;;OAGG;IACK,oBAAoB;QAC1B,IACE,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,WAAW;YAC3C,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,yBAAyB,EACzD;YACA,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,uBAAuB,CAAC,CAAC;SAClD;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,SAAS,CAAC,CAAC;QAE1C,0BAA0B;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YACjC,IAAI,CAAC,0BAA0B,EAAE,CAAC;SACnC;aAAM;YACL,IAAI,CAAC,0BAA0B,EAAE,CAAC;SACnC;QAED,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACK,qBAAqB,CAAC,IAAY;QACxC;;;UAGE;QACF,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEhC,6BAA6B;QAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,WAAW;QACjB,mFAAmF;QACnF,OACE,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,WAAW;YAC3C,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,KAAK;YACrC,IAAI,CAAC,aAAa,CAAC,MAAM,IAAI,IAAI,CAAC,4BAA4B,EAC9D;YACA,gDAAgD;YAChD,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,oBAAoB,EAAE;gBACxD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;oBACjC,4CAA4C;oBAC5C,IAAI,CAAC,kCAAkC,EAAE,CAAC;iBAC3C;qBAAM;oBACL,wDAAwD;oBACxD,IAAI,CAAC,oCAAoC,EAAE,CAAC;iBAC7C;gBACD,wDAAwD;aACzD;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,kBAAkB,EAAE;gBAC7D,IAAI,CAAC,kDAAkD,EAAE,CAAC;gBAC1D,6DAA6D;aAC9D;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,kBAAkB,EAAE;gBAC7D,IAAI,CAAC,kCAAkC,EAAE,CAAC;gBAC1C,mEAAmE;aACpE;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,yBAAyB,EAAE;gBACpE,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;oBACjC,IAAI,CAAC,sCAAsC,EAAE,CAAC;iBAC/C;qBAAM;oBACL,IAAI,CAAC,sCAAsC,EAAE,CAAC;iBAC/C;aACF;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,aAAa,CAAC,CAAC;gBACvC,MAAM;aACP;SACF;IACH,CAAC;IAED;;;OAGG;IACK,cAAc;QACpB,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACK,cAAc,CAAC,GAAU;QAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACK,4BAA4B;QAClC,6FAA6F;QAC7F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,GAAW;QAC7B,2FAA2F;QAC3F,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,KAAK,EAAE;YACzC,+BAA+B;YAC/B,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,KAAK,CAAC,CAAC;YAEtC,iBAAiB;YACjB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAEtB,4BAA4B;YAC5B,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAEpC,sBAAsB;YACtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,uBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SAC7D;IACH,CAAC;IAED;;OAEG;IACK,0BAA0B;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;QAE/C,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAElD,iBAAiB;QACjB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC7C,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC3B,sBAAsB;SACvB;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACK,kCAAkC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YACtC,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,6BAA6B,OACrC,0BAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB,GAAG,CACJ,CAAC;SACH;aAAM;YACL,gBAAgB;YAChB,IAAI,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,IAAI,EAAE;gBAC5D,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBAEpB,MAAM,UAAU,GAAoB;oBAClC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;oBACzB,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;iBACvC,CAAC;gBAEF,yCAAyC;gBACzC,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;iBAChD;gBACD,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,yBAAyB,CAAC,CAAC;gBAC1D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;gBAEtD,mBAAmB;aACpB;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;aACjD;SACF;IACH,CAAC;IAED;;;OAGG;IACK,sCAAsC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YACtC,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,0CAA0C,OAClD,0BAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB,GAAG,CACJ,CAAC;SACH;aAAM;YACL,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;YAEpB,MAAM,UAAU,GAAoB;gBAClC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;gBACzB,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;aACvC,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;YAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;SAC7D;IACH,CAAC;IAED;;OAEG;IACK,0BAA0B;QAChC,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtB,6FAA6F;QAC7F,sHAAsH;QACtH,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC5D,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,sBAAU,CAAC,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,UAAU,CAAC,sBAAU,CAAC,QAAQ,CAAC,CAAC;SACtC;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,sBAAU,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,8BAA8B,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACK,oCAAoC;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,yCAAyC,CAAC,CAAC;SACpE;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,+CAA+C,CAAC,CAAC;SAC1E;aAAM;YACL,6EAA6E;YAC7E,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,sBAAU,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAChC,0EAA0E;aAC3E;iBAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,sBAAU,CAAC,QAAQ,EAAE;gBAC1C,IAAI,CAAC,gCAAgC,EAAE,CAAC;aACzC;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,4CAA4C,CAAC,CAAC;aACvE;SACF;IACH,CAAC;IAED;;;;OAIG;IACK,gCAAgC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QAEnD,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3B,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,oCAAoC,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACK,kDAAkD;QACxD,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,8BAA8B,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,0BAA0B,CAAC,CAAC;SACrD;aAAM;YACL,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;IACH,CAAC;IAED;;OAEG;IACK,wBAAwB;QAC9B,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAE/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtB,sBAAsB;QACtB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC7C,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YACpD,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACjD;QACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAElD,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,oBAAoB,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACK,kCAAkC;QACxC,+EAA+E;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YAC9D,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,mCAAmC,MAC3C,0BAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAC1B,EAAE,CACH,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAE9B,IAAI,UAA2B,CAAC;YAChC,IAAI,IAAiB,CAAC;YAEtB,OAAO;YACP,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBACvC,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBAEF,4DAA4D;gBAC5D,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;iBAChD;gBAED,WAAW;aACZ;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,QAAQ,EAAE;gBAClD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,UAAU,GAAG,uCAA2B,CAAC,sBAAsB,CACnE,UAAU,CACX,CAAC,CAAC,qCAAqC;gBAExC,8BAA8B;gBAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;oBACjC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBACF,OAAO;aACR;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBAC9C,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;aACH;YAED,6BAA6B;YAC7B,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,qBAAqB,CAAC,CAAC;YAEtD,gEAAgE;YAChE,IAAI,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,OAAO,EAAE;gBAC/D,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;aACjD;iBAAM,IAAI,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,IAAI,EAAE;gBACnE;mHACmG;gBACnG,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,yBAAyB,CAAC,CAAC;gBAC1D,IAAI,CAAC,4BAA4B;oBAC/B,uCAA2B,CAAC,oBAAoB,CAAC;gBACnD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;gBACtD;;;kBAGE;aACH;iBAAM,IACL,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,SAAS,EAC7D;gBACA,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,UAAU;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAED;;OAEG;IACK,sCAAsC;QAC5C,+EAA+E;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YAC9D,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,0CAA0C,MAClD,0BAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAC1B,EAAE,CACH,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAE9B,IAAI,UAA2B,CAAC;YAChC,IAAI,IAAiB,CAAC;YAEtB,OAAO;YACP,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBACvC,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBAEF,4DAA4D;gBAC5D,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;iBAChD;gBAED,WAAW;aACZ;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,QAAQ,EAAE;gBAClD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,UAAU,GAAG,uCAA2B,CAAC,sBAAsB,CACnE,UAAU,CACX,CAAC,CAAC,8BAA8B;gBAEjC,8BAA8B;gBAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;oBACjC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBACF,OAAO;aACR;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBAC9C,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;aACH;YAED,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;YAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,IAAI,kBAAkB;QACpB,yBACK,IAAI,CAAC,OAAO,EACf;IACJ,CAAC;CACF;AAGC,kCAAW"}
\ No newline at end of file
+{"version":3,"file":"socksclient.js","sourceRoot":"","sources":["../../src/client/socksclient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AACpC,2BAA2B;AAC3B,yBAAyB;AACzB,+CAAyC;AACzC,mDAiB6B;AAC7B,+CAG2B;AAC3B,2DAAsD;AACtD,yCAA8D;AAw3B5D,iGAx3BM,uBAAgB,OAw3BN;AA91BlB,MAAM,WAAY,SAAQ,qBAAY;IAepC,YAAY,OAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,qBACP,OAAO,CACX,CAAC;QAEF,8BAA8B;QAC9B,oCAA0B,CAAC,OAAO,CAAC,CAAC;QAEpC,gBAAgB;QAChB,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,gBAAgB,CACrB,OAA2B,EAC3B,QAAmB;QAEnB,OAAO,IAAI,OAAO,CAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClE,8BAA8B;YAC9B,IAAI;gBACF,oCAA0B,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aAClD;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACd,OAAO,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBACvE;qBAAM;oBACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;aACF;YAED,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,IAAiC,EAAE,EAAE;gBAC/D,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACrB,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;YAEH,kDAAkD;YAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBAClC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACd,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,qBAAqB,CAC1B,OAAgC,EAChC,QAAmB;QAEnB,OAAO,IAAI,OAAO,CAA8B,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YACxE,mCAAmC;YACnC,IAAI;gBACF,yCAA+B,CAAC,OAAO,CAAC,CAAC;aAC1C;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACd,OAAO,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBACvE;qBAAM;oBACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;aACF;YAED,IAAI,IAAgB,CAAC;YAErB,kBAAkB;YAClB,IAAI,OAAO,CAAC,cAAc,EAAE;gBAC1B,mBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAC/B;YAED,IAAI;gBACF,kDAAkD;gBAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAErC,0HAA0H;oBAC1H,MAAM,eAAe,GACnB,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;wBAC9B,CAAC,CAAC,OAAO,CAAC,WAAW;wBACrB,CAAC,CAAC;4BACE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;4BACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;yBAClC,CAAC;oBAER,4CAA4C;oBAC5C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC;wBAChD,OAAO,EAAE,SAAS;wBAClB,KAAK,EAAE,SAAS;wBAChB,WAAW,EAAE,eAAe;qBAE7B,CAAC,CAAC;oBAEH,wCAAwC;oBACxC,IAAI,CAAC,IAAI,EAAE;wBACT,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;qBACtB;iBACF;gBAED,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC/B,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,OAAO,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;iBACzB;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;oBAClC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACd,OAAO,EAAE,CAAC,CAAC,oDAAoD;iBAChE;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;aACF;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,OAA6B;QACjD,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;QAE1C,qBAAqB;QACrB,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;SACxD;aAAM,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC9C,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;SACxD;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAC3C;QAED,OAAO;QACP,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;QACP,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,IAAY;QAC/B,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QAEpB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAmB,IAAI,CAAC,SAAS,EAAE,CAAC;QAClD,IAAI,UAAU,CAAC;QAEf,IAAI,QAAQ,KAAK,0BAAc,CAAC,IAAI,EAAE;YACpC,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC/C;aAAM,IAAI,QAAQ,KAAK,0BAAc,CAAC,IAAI,EAAE;YAC3C,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/C;aAAM;YACL,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAChD;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEvC,OAAO;YACL,WAAW;YACX,UAAU,EAAE;gBACV,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,UAAU;aACjB;YACD,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE;SACxB,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,QAA0B;QACzC,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,KAAK,EAAE;YACzC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;SACvB;IACH,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,cAAuB;QACpC,IAAI,CAAC,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,CAAC,GAAU,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE/C,+CAA+C;QAC/C,MAAM,KAAK,GAAG,UAAU,CACtB,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,EACjC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,2BAAe,CACxC,CAAC;QAEF,8EAA8E;QAC9E,IAAI,KAAK,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE;YACpD,KAAK,CAAC,KAAK,EAAE,CAAC;SACf;QAED,yGAAyG;QACzG,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;SAC9B;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;SAChC;QAED,gCAAgC;QAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAE5C,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;QAEzC,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC7B;aAAM;YACJ,IAAI,CAAC,MAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAE7D,IACE,IAAI,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS;gBAC1C,IAAI,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,EACrC;gBACC,IAAI,CAAC,MAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;aACxE;SACF;QAED,6FAA6F;QAC7F,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/C,YAAY,CAAC,GAAG,EAAE;gBAChB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBAErE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;iBACtC;gBACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,+EAA+E;IACvE,gBAAgB;QACtB,uCACK,IAAI,CAAC,OAAO,CAAC,cAAc,KAC9B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAC7D,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAC7B;IACJ,CAAC;IAED;;;OAGG;IACK,oBAAoB;QAC1B,IACE,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,WAAW;YAC3C,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,yBAAyB,EACzD;YACA,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,uBAAuB,CAAC,CAAC;SAClD;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,SAAS,CAAC,CAAC;QAE1C,0BAA0B;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YACjC,IAAI,CAAC,0BAA0B,EAAE,CAAC;SACnC;aAAM;YACL,IAAI,CAAC,0BAA0B,EAAE,CAAC;SACnC;QAED,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACK,qBAAqB,CAAC,IAAY;QACxC;;;UAGE;QACF,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEhC,6BAA6B;QAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,WAAW;QACjB,mFAAmF;QACnF,OACE,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,WAAW;YAC3C,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,KAAK;YACrC,IAAI,CAAC,aAAa,CAAC,MAAM,IAAI,IAAI,CAAC,4BAA4B,EAC9D;YACA,gDAAgD;YAChD,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,oBAAoB,EAAE;gBACxD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;oBACjC,4CAA4C;oBAC5C,IAAI,CAAC,kCAAkC,EAAE,CAAC;iBAC3C;qBAAM;oBACL,wDAAwD;oBACxD,IAAI,CAAC,oCAAoC,EAAE,CAAC;iBAC7C;gBACD,wDAAwD;aACzD;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,kBAAkB,EAAE;gBAC7D,IAAI,CAAC,kDAAkD,EAAE,CAAC;gBAC1D,6DAA6D;aAC9D;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,kBAAkB,EAAE;gBAC7D,IAAI,CAAC,kCAAkC,EAAE,CAAC;gBAC1C,mEAAmE;aACpE;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,yBAAyB,EAAE;gBACpE,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;oBACjC,IAAI,CAAC,sCAAsC,EAAE,CAAC;iBAC/C;qBAAM;oBACL,IAAI,CAAC,sCAAsC,EAAE,CAAC;iBAC/C;aACF;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,aAAa,CAAC,CAAC;gBACvC,MAAM;aACP;SACF;IACH,CAAC;IAED;;;OAGG;IACK,cAAc;QACpB,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACK,cAAc,CAAC,GAAU;QAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACK,4BAA4B;QAClC,6FAA6F;QAC7F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,GAAW;QAC7B,2FAA2F;QAC3F,IAAI,IAAI,CAAC,KAAK,KAAK,4BAAgB,CAAC,KAAK,EAAE;YACzC,+BAA+B;YAC/B,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,KAAK,CAAC,CAAC;YAEtC,iBAAiB;YACjB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAEtB,4BAA4B;YAC5B,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAEpC,sBAAsB;YACtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,uBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SAC7D;IACH,CAAC;IAED;;OAEG;IACK,0BAA0B;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;QAE/C,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAElD,iBAAiB;QACjB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC7C,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC3B,sBAAsB;SACvB;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACK,kCAAkC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YACtC,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,6BAA6B,OACrC,0BAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB,GAAG,CACJ,CAAC;SACH;aAAM;YACL,gBAAgB;YAChB,IAAI,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,IAAI,EAAE;gBAC5D,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBAEpB,MAAM,UAAU,GAAoB;oBAClC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;oBACzB,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;iBACvC,CAAC;gBAEF,yCAAyC;gBACzC,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;iBAChD;gBACD,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,yBAAyB,CAAC,CAAC;gBAC1D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;gBAEtD,mBAAmB;aACpB;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;aACjD;SACF;IACH,CAAC;IAED;;;OAGG;IACK,sCAAsC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YACtC,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,0CAA0C,OAClD,0BAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CACxB,GAAG,CACJ,CAAC;SACH;aAAM;YACL,MAAM,IAAI,GAAG,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;YAEpB,MAAM,UAAU,GAAoB;gBAClC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;gBACzB,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;aACvC,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;YAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;SAC7D;IACH,CAAC;IAED;;OAEG;IACK,0BAA0B;QAChC,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtB,6FAA6F;QAC7F,sHAAsH;QACtH,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC5D,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,sBAAU,CAAC,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,UAAU,CAAC,sBAAU,CAAC,QAAQ,CAAC,CAAC;SACtC;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,sBAAU,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,8BAA8B,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACK,oCAAoC;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,yCAAyC,CAAC,CAAC;SACpE;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,+CAA+C,CAAC,CAAC;SAC1E;aAAM;YACL,6EAA6E;YAC7E,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,sBAAU,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAChC,0EAA0E;aAC3E;iBAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,sBAAU,CAAC,QAAQ,EAAE;gBAC1C,IAAI,CAAC,gCAAgC,EAAE,CAAC;aACzC;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,4CAA4C,CAAC,CAAC;aACvE;SACF;IACH,CAAC;IAED;;;;OAIG;IACK,gCAAgC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QAEnD,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3B,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,oCAAoC,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACK,kDAAkD;QACxD,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,8BAA8B,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,kBAAM,CAAC,0BAA0B,CAAC,CAAC;SACrD;aAAM;YACL,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;IACH,CAAC;IAED;;OAEG;IACK,wBAAwB;QAC9B,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;QAE/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtB,sBAAsB;QACtB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC7C,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YACpD,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACjD;QACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAElD,IAAI,CAAC,4BAA4B;YAC/B,uCAA2B,CAAC,oBAAoB,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACK,kCAAkC;QACxC,+EAA+E;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YAC9D,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,mCAAmC,MAC3C,0BAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAC1B,EAAE,CACH,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAE9B,IAAI,UAA2B,CAAC;YAChC,IAAI,IAAiB,CAAC;YAEtB,OAAO;YACP,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBACvC,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBAEF,4DAA4D;gBAC5D,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;iBAChD;gBAED,WAAW;aACZ;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,QAAQ,EAAE;gBAClD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,UAAU,GAAG,uCAA2B,CAAC,sBAAsB,CACnE,UAAU,CACX,CAAC,CAAC,qCAAqC;gBAExC,8BAA8B;gBAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;oBACjC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBACF,OAAO;aACR;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBAC9C,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;aACH;YAED,6BAA6B;YAC7B,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,qBAAqB,CAAC,CAAC;YAEtD,gEAAgE;YAChE,IAAI,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,OAAO,EAAE;gBAC/D,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;aACjD;iBAAM,IAAI,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,IAAI,EAAE;gBACnE;mHACmG;gBACnG,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,yBAAyB,CAAC,CAAC;gBAC1D,IAAI,CAAC,4BAA4B;oBAC/B,uCAA2B,CAAC,oBAAoB,CAAC;gBACnD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;gBACtD;;;kBAGE;aACH;iBAAM,IACL,wBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,wBAAY,CAAC,SAAS,EAC7D;gBACA,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,UAAU;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAED;;OAEG;IACK,sCAAsC;QAC5C,+EAA+E;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,0BAAc,CAAC,OAAO,EAAE;YAC9D,IAAI,CAAC,WAAW,CACd,GAAG,kBAAM,CAAC,0CAA0C,MAClD,0BAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAC1B,EAAE,CACH,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAE9B,IAAI,UAA2B,CAAC;YAChC,IAAI,IAAiB,CAAC;YAEtB,OAAO;YACP,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBACvC,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBAEF,4DAA4D;gBAC5D,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;iBAChD;gBAED,WAAW;aACZ;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,QAAQ,EAAE;gBAClD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,UAAU,GAAG,uCAA2B,CAAC,sBAAsB,CACnE,UAAU,CACX,CAAC,CAAC,8BAA8B;gBAEjC,8BAA8B;gBAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;oBACjC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;gBACF,OAAO;aACR;iBAAM,IAAI,WAAW,KAAK,0BAAc,CAAC,IAAI,EAAE;gBAC9C,8BAA8B;gBAC9B,MAAM,UAAU,GAAG,uCAA2B,CAAC,kBAAkB,CAAC;gBAClE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE;oBAC1C,IAAI,CAAC,4BAA4B,GAAG,UAAU,CAAC;oBAC/C,OAAO;iBACR;gBAED,IAAI,GAAG,0BAAW,CAAC,UAAU,CAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;gBAEF,UAAU,GAAG;oBACX,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBACtC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE;iBAC1B,CAAC;aACH;YAED,IAAI,CAAC,QAAQ,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;YAC5C,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,IAAI,kBAAkB;QACpB,yBACK,IAAI,CAAC,OAAO,EACf;IACJ,CAAC;CACF;AAGC,kCAAW"}
\ No newline at end of file
diff --git a/deps/npm/node_modules/socks/package.json b/deps/npm/node_modules/socks/package.json
index dc69653e21a761..8900ebbbb581b0 100644
--- a/deps/npm/node_modules/socks/package.json
+++ b/deps/npm/node_modules/socks/package.json
@@ -1,10 +1,10 @@
 {
   "name": "socks",
   "private": false,
-  "version": "2.4.4",
+  "version": "2.5.1",
   "description": "Fully featured SOCKS proxy client supporting SOCKSv4, SOCKSv4a, and SOCKSv5. Includes Bind and Associate functionality.",
   "main": "build/index.js",
-  "typings": "typings",
+  "typings": "typings/index.d.ts",
   "homepage": "https://github.com/JoshGlazebrook/socks/",
   "repository": {
     "type": "git",
@@ -33,20 +33,18 @@
   "license": "MIT",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "@types/chai": "^4.2.12",
     "@types/ip": "1.1.0",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.6.2",
-    "chai": "^4.1.2",
+    "@types/node": "^14.14.3",
     "coveralls": "3.1.0",
-    "mocha": "^8.1.3",
+    "mocha": "^8.2.0",
     "nyc": "15.1.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "socks5-server": "^0.1.1",
     "ts-node": "^9.0.0",
     "tslint": "^6.1.3",
     "tslint-config-airbnb": "^5.11.2",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.3"
   },
   "dependencies": {
     "ip": "^1.1.5",
@@ -59,7 +57,7 @@
     "coverage": "NODE_ENV=test nyc npm test",
     "coveralls": "NODE_ENV=test nyc npm test && nyc report --reporter=text-lcov | coveralls",
     "lint": "tslint --project tsconfig.json 'src/**/*.ts'",
-    "build": "tslint --project tsconfig.json && prettier --write ./src/**/*.ts --config .prettierrc.yaml && tsc -p ."
+    "build": "rm -rf build typings && tslint --project tsconfig.json && prettier --write ./src/**/*.ts --config .prettierrc.yaml && tsc -p ."
   },
   "nyc": {
     "extension": [
diff --git a/deps/npm/node_modules/spdx-license-ids/index.json b/deps/npm/node_modules/spdx-license-ids/index.json
index de204732913a72..864d2410c83a90 100644
--- a/deps/npm/node_modules/spdx-license-ids/index.json
+++ b/deps/npm/node_modules/spdx-license-ids/index.json
@@ -15,6 +15,7 @@
 	"AML",
 	"AMPAS",
 	"ANTLR-PD",
+	"ANTLR-PD-fallback",
 	"APAFML",
 	"APL-1.0",
 	"APSL-1.0",
@@ -50,6 +51,7 @@
 	"BSD-Protection",
 	"BSD-Source-Code",
 	"BSL-1.0",
+	"BUSL-1.1",
 	"Bahyph",
 	"Barr",
 	"Beerware",
@@ -65,6 +67,7 @@
 	"CC-BY-2.5",
 	"CC-BY-3.0",
 	"CC-BY-3.0-AT",
+	"CC-BY-3.0-US",
 	"CC-BY-4.0",
 	"CC-BY-NC-1.0",
 	"CC-BY-NC-2.0",
@@ -89,6 +92,7 @@
 	"CC-BY-ND-4.0",
 	"CC-BY-SA-1.0",
 	"CC-BY-SA-2.0",
+	"CC-BY-SA-2.0-UK",
 	"CC-BY-SA-2.5",
 	"CC-BY-SA-3.0",
 	"CC-BY-SA-3.0-AT",
@@ -179,6 +183,7 @@
 	"Glulxe",
 	"HPND",
 	"HPND-sell-variant",
+	"HTMLTIDY",
 	"HaskellReport",
 	"Hippocratic-2.1",
 	"IBM-pibs",
@@ -225,6 +230,7 @@
 	"MIT-advertising",
 	"MIT-enna",
 	"MIT-feh",
+	"MIT-open-group",
 	"MITNFA",
 	"MPL-1.0",
 	"MPL-1.1",
diff --git a/deps/npm/node_modules/spdx-license-ids/package.json b/deps/npm/node_modules/spdx-license-ids/package.json
index 5653f9d08fcb95..eea631250e53e7 100644
--- a/deps/npm/node_modules/spdx-license-ids/package.json
+++ b/deps/npm/node_modules/spdx-license-ids/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "spdx-license-ids",
-	"version": "3.0.6",
+	"version": "3.0.7",
 	"description": "A list of SPDX license identifiers",
 	"repository": "jslicense/spdx-license-ids",
 	"author": "Shinnosuke Watanabe (https://github.com/shinnn)",
@@ -8,6 +8,7 @@
 	"scripts": {
 		"build": "node build.js",
 		"pretest": "eslint .",
+		"latest": "node latest.js",
 		"test": "node test.js"
 	},
 	"files": [
diff --git a/deps/npm/node_modules/uuid/CHANGELOG.md b/deps/npm/node_modules/uuid/CHANGELOG.md
index bcefac2f20b941..7519d19d8d66d0 100644
--- a/deps/npm/node_modules/uuid/CHANGELOG.md
+++ b/deps/npm/node_modules/uuid/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [8.3.2](https://github.com/uuidjs/uuid/compare/v8.3.1...v8.3.2) (2020-12-08)
+
+### Bug Fixes
+
+- lazy load getRandomValues ([#537](https://github.com/uuidjs/uuid/issues/537)) ([16c8f6d](https://github.com/uuidjs/uuid/commit/16c8f6df2f6b09b4d6235602d6a591188320a82e)), closes [#536](https://github.com/uuidjs/uuid/issues/536)
+
 ### [8.3.1](https://github.com/uuidjs/uuid/compare/v8.3.0...v8.3.1) (2020-10-04)
 
 ### Bug Fixes
diff --git a/deps/npm/node_modules/uuid/README.md b/deps/npm/node_modules/uuid/README.md
index 6cea039335280e..ed27e576020fe7 100644
--- a/deps/npm/node_modules/uuid/README.md
+++ b/deps/npm/node_modules/uuid/README.md
@@ -12,7 +12,7 @@ For the creation of [RFC4122](http://www.ietf.org/rfc/rfc4122.txt) UUIDs
   - Node 8, 10, 12, 14
   - Chrome, Safari, Firefox, Edge, IE 11 browsers
   - Webpack and rollup.js module bundlers
-  - [React Native / Expo](#react-native-expo)
+  - [React Native / Expo](#react-native--expo)
 - **Secure** - Cryptographically-strong random values
 - **Small** - Zero-dependency, small footprint, plays nice with "tree shaking" packagers
 - **CLI** - Includes the [`uuid` command line](#command-line) utility
@@ -246,7 +246,7 @@ uuidv4(v4options); // ⇨ '109156be-c4fb-41ea-b1b4-efe1671c5836'
 
 ### uuid.v5(name, namespace[, buffer[, offset]])
 
-Createa an RFC version 5 (namespace w/ SHA-1) UUID
+Create an RFC version 5 (namespace w/ SHA-1) UUID
 
 |  |  |
 | --- | --- |
@@ -296,6 +296,23 @@ uuidValidate('not a UUID'); // ⇨ false
 uuidValidate('6ec0bd7f-11c0-43da-975e-2a8ad9ebae0b'); // ⇨ true
 ```
 
+Using `validate` and `version` together it is possible to do per-version validation, e.g. validate for only v4 UUIds.
+
+```javascript
+import { version as uuidVersion } from 'uuid';
+import { validate as uuidValidate } from 'uuid';
+
+function uuidValidateV4(uuid) {
+  return uuidValidate(uuid) && uuidVersion(uuid) === 4;
+}
+
+const v1Uuid = 'd9428888-122b-11e1-b85c-61cd3cbb3210';
+const v4Uuid = '109156be-c4fb-41ea-b1b4-efe1671c5836';
+
+uuidValidateV4(v4Uuid); // ⇨ true
+uuidValidateV4(v1Uuid); // ⇨ false
+```
+
 ### uuid.version(str)
 
 Detect RFC version of a UUID
diff --git a/deps/npm/node_modules/uuid/dist/esm-browser/rng.js b/deps/npm/node_modules/uuid/dist/esm-browser/rng.js
index a12aefaa7f466b..8abbf2ea5b3fc5 100644
--- a/deps/npm/node_modules/uuid/dist/esm-browser/rng.js
+++ b/deps/npm/node_modules/uuid/dist/esm-browser/rng.js
@@ -1,13 +1,18 @@
 // Unique ID creation requires a high quality random # generator. In the browser we therefore
 // require the crypto API and do not support built-in fallback to lower quality random number
 // generators (like Math.random()).
-// getRandomValues needs to be invoked in a context where "this" is a Crypto implementation. Also,
-// find the complete implementation of crypto (msCrypto) on IE11.
-var getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto) || typeof msCrypto !== 'undefined' && typeof msCrypto.getRandomValues === 'function' && msCrypto.getRandomValues.bind(msCrypto);
+var getRandomValues;
 var rnds8 = new Uint8Array(16);
 export default function rng() {
+  // lazy load so that environments that need to polyfill have a chance to do so
   if (!getRandomValues) {
-    throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation. Also,
+    // find the complete implementation of crypto (msCrypto) on IE11.
+    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto) || typeof msCrypto !== 'undefined' && typeof msCrypto.getRandomValues === 'function' && msCrypto.getRandomValues.bind(msCrypto);
+
+    if (!getRandomValues) {
+      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    }
   }
 
   return getRandomValues(rnds8);
diff --git a/deps/npm/node_modules/uuid/dist/rng-browser.js b/deps/npm/node_modules/uuid/dist/rng-browser.js
index d3cc3085c732bb..91faeae6d6acb2 100644
--- a/deps/npm/node_modules/uuid/dist/rng-browser.js
+++ b/deps/npm/node_modules/uuid/dist/rng-browser.js
@@ -7,14 +7,19 @@ exports.default = rng;
 // Unique ID creation requires a high quality random # generator. In the browser we therefore
 // require the crypto API and do not support built-in fallback to lower quality random number
 // generators (like Math.random()).
-// getRandomValues needs to be invoked in a context where "this" is a Crypto implementation. Also,
-// find the complete implementation of crypto (msCrypto) on IE11.
-const getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto) || typeof msCrypto !== 'undefined' && typeof msCrypto.getRandomValues === 'function' && msCrypto.getRandomValues.bind(msCrypto);
+let getRandomValues;
 const rnds8 = new Uint8Array(16);
 
 function rng() {
+  // lazy load so that environments that need to polyfill have a chance to do so
   if (!getRandomValues) {
-    throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation. Also,
+    // find the complete implementation of crypto (msCrypto) on IE11.
+    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto) || typeof msCrypto !== 'undefined' && typeof msCrypto.getRandomValues === 'function' && msCrypto.getRandomValues.bind(msCrypto);
+
+    if (!getRandomValues) {
+      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    }
   }
 
   return getRandomValues(rnds8);
diff --git a/deps/npm/node_modules/uuid/dist/umd/uuid.min.js b/deps/npm/node_modules/uuid/dist/umd/uuid.min.js
index 92745958e7de43..639ca2f2ddc41d 100644
--- a/deps/npm/node_modules/uuid/dist/umd/uuid.min.js
+++ b/deps/npm/node_modules/uuid/dist/umd/uuid.min.js
@@ -1 +1 @@
-!function(r,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((r="undefined"!=typeof globalThis?globalThis:r||self).uuid={})}(this,(function(r){"use strict";var e="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto),n=new Uint8Array(16);function t(){if(!e)throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return e(n)}var o=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;function a(r){return"string"==typeof r&&o.test(r)}for(var i,u,f=[],s=0;s<256;++s)f.push((s+256).toString(16).substr(1));function c(r){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=(f[r[e+0]]+f[r[e+1]]+f[r[e+2]]+f[r[e+3]]+"-"+f[r[e+4]]+f[r[e+5]]+"-"+f[r[e+6]]+f[r[e+7]]+"-"+f[r[e+8]]+f[r[e+9]]+"-"+f[r[e+10]]+f[r[e+11]]+f[r[e+12]]+f[r[e+13]]+f[r[e+14]]+f[r[e+15]]).toLowerCase();if(!a(n))throw TypeError("Stringified UUID is invalid");return n}var l=0,d=0;function v(r){if(!a(r))throw TypeError("Invalid UUID");var e,n=new Uint8Array(16);return n[0]=(e=parseInt(r.slice(0,8),16))>>>24,n[1]=e>>>16&255,n[2]=e>>>8&255,n[3]=255&e,n[4]=(e=parseInt(r.slice(9,13),16))>>>8,n[5]=255&e,n[6]=(e=parseInt(r.slice(14,18),16))>>>8,n[7]=255&e,n[8]=(e=parseInt(r.slice(19,23),16))>>>8,n[9]=255&e,n[10]=(e=parseInt(r.slice(24,36),16))/1099511627776&255,n[11]=e/4294967296&255,n[12]=e>>>24&255,n[13]=e>>>16&255,n[14]=e>>>8&255,n[15]=255&e,n}function p(r,e,n){function t(r,t,o,a){if("string"==typeof r&&(r=function(r){r=unescape(encodeURIComponent(r));for(var e=[],n=0;n<r.length;++n)e.push(r.charCodeAt(n));return e}(r)),"string"==typeof t&&(t=v(t)),16!==t.length)throw TypeError("Namespace must be array-like (16 iterable integer values, 0-255)");var i=new Uint8Array(16+r.length);if(i.set(t),i.set(r,t.length),(i=n(i))[6]=15&i[6]|e,i[8]=63&i[8]|128,o){a=a||0;for(var u=0;u<16;++u)o[a+u]=i[u];return o}return c(i)}try{t.name=r}catch(r){}return t.DNS="6ba7b810-9dad-11d1-80b4-00c04fd430c8",t.URL="6ba7b811-9dad-11d1-80b4-00c04fd430c8",t}function h(r){return 14+(r+64>>>9<<4)+1}function y(r,e){var n=(65535&r)+(65535&e);return(r>>16)+(e>>16)+(n>>16)<<16|65535&n}function g(r,e,n,t,o,a){return y((i=y(y(e,r),y(t,a)))<<(u=o)|i>>>32-u,n);var i,u}function m(r,e,n,t,o,a,i){return g(e&n|~e&t,r,e,o,a,i)}function w(r,e,n,t,o,a,i){return g(e&t|n&~t,r,e,o,a,i)}function b(r,e,n,t,o,a,i){return g(e^n^t,r,e,o,a,i)}function A(r,e,n,t,o,a,i){return g(n^(e|~t),r,e,o,a,i)}var U=p("v3",48,(function(r){if("string"==typeof r){var e=unescape(encodeURIComponent(r));r=new Uint8Array(e.length);for(var n=0;n<e.length;++n)r[n]=e.charCodeAt(n)}return function(r){for(var e=[],n=32*r.length,t="0123456789abcdef",o=0;o<n;o+=8){var a=r[o>>5]>>>o%32&255,i=parseInt(t.charAt(a>>>4&15)+t.charAt(15&a),16);e.push(i)}return e}(function(r,e){r[e>>5]|=128<<e%32,r[h(e)-1]=e;for(var n=1732584193,t=-271733879,o=-1732584194,a=271733878,i=0;i<r.length;i+=16){var u=n,f=t,s=o,c=a;n=m(n,t,o,a,r[i],7,-680876936),a=m(a,n,t,o,r[i+1],12,-389564586),o=m(o,a,n,t,r[i+2],17,606105819),t=m(t,o,a,n,r[i+3],22,-1044525330),n=m(n,t,o,a,r[i+4],7,-176418897),a=m(a,n,t,o,r[i+5],12,1200080426),o=m(o,a,n,t,r[i+6],17,-1473231341),t=m(t,o,a,n,r[i+7],22,-45705983),n=m(n,t,o,a,r[i+8],7,1770035416),a=m(a,n,t,o,r[i+9],12,-1958414417),o=m(o,a,n,t,r[i+10],17,-42063),t=m(t,o,a,n,r[i+11],22,-1990404162),n=m(n,t,o,a,r[i+12],7,1804603682),a=m(a,n,t,o,r[i+13],12,-40341101),o=m(o,a,n,t,r[i+14],17,-1502002290),n=w(n,t=m(t,o,a,n,r[i+15],22,1236535329),o,a,r[i+1],5,-165796510),a=w(a,n,t,o,r[i+6],9,-1069501632),o=w(o,a,n,t,r[i+11],14,643717713),t=w(t,o,a,n,r[i],20,-373897302),n=w(n,t,o,a,r[i+5],5,-701558691),a=w(a,n,t,o,r[i+10],9,38016083),o=w(o,a,n,t,r[i+15],14,-660478335),t=w(t,o,a,n,r[i+4],20,-405537848),n=w(n,t,o,a,r[i+9],5,568446438),a=w(a,n,t,o,r[i+14],9,-1019803690),o=w(o,a,n,t,r[i+3],14,-187363961),t=w(t,o,a,n,r[i+8],20,1163531501),n=w(n,t,o,a,r[i+13],5,-1444681467),a=w(a,n,t,o,r[i+2],9,-51403784),o=w(o,a,n,t,r[i+7],14,1735328473),n=b(n,t=w(t,o,a,n,r[i+12],20,-1926607734),o,a,r[i+5],4,-378558),a=b(a,n,t,o,r[i+8],11,-2022574463),o=b(o,a,n,t,r[i+11],16,1839030562),t=b(t,o,a,n,r[i+14],23,-35309556),n=b(n,t,o,a,r[i+1],4,-1530992060),a=b(a,n,t,o,r[i+4],11,1272893353),o=b(o,a,n,t,r[i+7],16,-155497632),t=b(t,o,a,n,r[i+10],23,-1094730640),n=b(n,t,o,a,r[i+13],4,681279174),a=b(a,n,t,o,r[i],11,-358537222),o=b(o,a,n,t,r[i+3],16,-722521979),t=b(t,o,a,n,r[i+6],23,76029189),n=b(n,t,o,a,r[i+9],4,-640364487),a=b(a,n,t,o,r[i+12],11,-421815835),o=b(o,a,n,t,r[i+15],16,530742520),n=A(n,t=b(t,o,a,n,r[i+2],23,-995338651),o,a,r[i],6,-198630844),a=A(a,n,t,o,r[i+7],10,1126891415),o=A(o,a,n,t,r[i+14],15,-1416354905),t=A(t,o,a,n,r[i+5],21,-57434055),n=A(n,t,o,a,r[i+12],6,1700485571),a=A(a,n,t,o,r[i+3],10,-1894986606),o=A(o,a,n,t,r[i+10],15,-1051523),t=A(t,o,a,n,r[i+1],21,-2054922799),n=A(n,t,o,a,r[i+8],6,1873313359),a=A(a,n,t,o,r[i+15],10,-30611744),o=A(o,a,n,t,r[i+6],15,-1560198380),t=A(t,o,a,n,r[i+13],21,1309151649),n=A(n,t,o,a,r[i+4],6,-145523070),a=A(a,n,t,o,r[i+11],10,-1120210379),o=A(o,a,n,t,r[i+2],15,718787259),t=A(t,o,a,n,r[i+9],21,-343485551),n=y(n,u),t=y(t,f),o=y(o,s),a=y(a,c)}return[n,t,o,a]}(function(r){if(0===r.length)return[];for(var e=8*r.length,n=new Uint32Array(h(e)),t=0;t<e;t+=8)n[t>>5]|=(255&r[t/8])<<t%32;return n}(r),8*r.length))}));function I(r,e,n,t){switch(r){case 0:return e&n^~e&t;case 1:return e^n^t;case 2:return e&n^e&t^n&t;case 3:return e^n^t}}function C(r,e){return r<<e|r>>>32-e}var R=p("v5",80,(function(r){var e=[1518500249,1859775393,2400959708,3395469782],n=[1732584193,4023233417,2562383102,271733878,3285377520];if("string"==typeof r){var t=unescape(encodeURIComponent(r));r=[];for(var o=0;o<t.length;++o)r.push(t.charCodeAt(o))}else Array.isArray(r)||(r=Array.prototype.slice.call(r));r.push(128);for(var a=r.length/4+2,i=Math.ceil(a/16),u=new Array(i),f=0;f<i;++f){for(var s=new Uint32Array(16),c=0;c<16;++c)s[c]=r[64*f+4*c]<<24|r[64*f+4*c+1]<<16|r[64*f+4*c+2]<<8|r[64*f+4*c+3];u[f]=s}u[i-1][14]=8*(r.length-1)/Math.pow(2,32),u[i-1][14]=Math.floor(u[i-1][14]),u[i-1][15]=8*(r.length-1)&4294967295;for(var l=0;l<i;++l){for(var d=new Uint32Array(80),v=0;v<16;++v)d[v]=u[l][v];for(var p=16;p<80;++p)d[p]=C(d[p-3]^d[p-8]^d[p-14]^d[p-16],1);for(var h=n[0],y=n[1],g=n[2],m=n[3],w=n[4],b=0;b<80;++b){var A=Math.floor(b/20),U=C(h,5)+I(A,y,g,m)+w+e[A]+d[b]>>>0;w=m,m=g,g=C(y,30)>>>0,y=h,h=U}n[0]=n[0]+h>>>0,n[1]=n[1]+y>>>0,n[2]=n[2]+g>>>0,n[3]=n[3]+m>>>0,n[4]=n[4]+w>>>0}return[n[0]>>24&255,n[0]>>16&255,n[0]>>8&255,255&n[0],n[1]>>24&255,n[1]>>16&255,n[1]>>8&255,255&n[1],n[2]>>24&255,n[2]>>16&255,n[2]>>8&255,255&n[2],n[3]>>24&255,n[3]>>16&255,n[3]>>8&255,255&n[3],n[4]>>24&255,n[4]>>16&255,n[4]>>8&255,255&n[4]]}));r.NIL="00000000-0000-0000-0000-000000000000",r.parse=v,r.stringify=c,r.v1=function(r,e,n){var o=e&&n||0,a=e||new Array(16),f=(r=r||{}).node||i,s=void 0!==r.clockseq?r.clockseq:u;if(null==f||null==s){var v=r.random||(r.rng||t)();null==f&&(f=i=[1|v[0],v[1],v[2],v[3],v[4],v[5]]),null==s&&(s=u=16383&(v[6]<<8|v[7]))}var p=void 0!==r.msecs?r.msecs:Date.now(),h=void 0!==r.nsecs?r.nsecs:d+1,y=p-l+(h-d)/1e4;if(y<0&&void 0===r.clockseq&&(s=s+1&16383),(y<0||p>l)&&void 0===r.nsecs&&(h=0),h>=1e4)throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");l=p,d=h,u=s;var g=(1e4*(268435455&(p+=122192928e5))+h)%4294967296;a[o++]=g>>>24&255,a[o++]=g>>>16&255,a[o++]=g>>>8&255,a[o++]=255&g;var m=p/4294967296*1e4&268435455;a[o++]=m>>>8&255,a[o++]=255&m,a[o++]=m>>>24&15|16,a[o++]=m>>>16&255,a[o++]=s>>>8|128,a[o++]=255&s;for(var w=0;w<6;++w)a[o+w]=f[w];return e||c(a)},r.v3=U,r.v4=function(r,e,n){var o=(r=r||{}).random||(r.rng||t)();if(o[6]=15&o[6]|64,o[8]=63&o[8]|128,e){n=n||0;for(var a=0;a<16;++a)e[n+a]=o[a];return e}return c(o)},r.v5=R,r.validate=a,r.version=function(r){if(!a(r))throw TypeError("Invalid UUID");return parseInt(r.substr(14,1),16)},Object.defineProperty(r,"__esModule",{value:!0})}));
\ No newline at end of file
+!function(r,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((r="undefined"!=typeof globalThis?globalThis:r||self).uuid={})}(this,(function(r){"use strict";var e,n=new Uint8Array(16);function t(){if(!e&&!(e="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto)))throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return e(n)}var o=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;function a(r){return"string"==typeof r&&o.test(r)}for(var i,u,f=[],s=0;s<256;++s)f.push((s+256).toString(16).substr(1));function c(r){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=(f[r[e+0]]+f[r[e+1]]+f[r[e+2]]+f[r[e+3]]+"-"+f[r[e+4]]+f[r[e+5]]+"-"+f[r[e+6]]+f[r[e+7]]+"-"+f[r[e+8]]+f[r[e+9]]+"-"+f[r[e+10]]+f[r[e+11]]+f[r[e+12]]+f[r[e+13]]+f[r[e+14]]+f[r[e+15]]).toLowerCase();if(!a(n))throw TypeError("Stringified UUID is invalid");return n}var l=0,d=0;function v(r){if(!a(r))throw TypeError("Invalid UUID");var e,n=new Uint8Array(16);return n[0]=(e=parseInt(r.slice(0,8),16))>>>24,n[1]=e>>>16&255,n[2]=e>>>8&255,n[3]=255&e,n[4]=(e=parseInt(r.slice(9,13),16))>>>8,n[5]=255&e,n[6]=(e=parseInt(r.slice(14,18),16))>>>8,n[7]=255&e,n[8]=(e=parseInt(r.slice(19,23),16))>>>8,n[9]=255&e,n[10]=(e=parseInt(r.slice(24,36),16))/1099511627776&255,n[11]=e/4294967296&255,n[12]=e>>>24&255,n[13]=e>>>16&255,n[14]=e>>>8&255,n[15]=255&e,n}function p(r,e,n){function t(r,t,o,a){if("string"==typeof r&&(r=function(r){r=unescape(encodeURIComponent(r));for(var e=[],n=0;n<r.length;++n)e.push(r.charCodeAt(n));return e}(r)),"string"==typeof t&&(t=v(t)),16!==t.length)throw TypeError("Namespace must be array-like (16 iterable integer values, 0-255)");var i=new Uint8Array(16+r.length);if(i.set(t),i.set(r,t.length),(i=n(i))[6]=15&i[6]|e,i[8]=63&i[8]|128,o){a=a||0;for(var u=0;u<16;++u)o[a+u]=i[u];return o}return c(i)}try{t.name=r}catch(r){}return t.DNS="6ba7b810-9dad-11d1-80b4-00c04fd430c8",t.URL="6ba7b811-9dad-11d1-80b4-00c04fd430c8",t}function h(r){return 14+(r+64>>>9<<4)+1}function y(r,e){var n=(65535&r)+(65535&e);return(r>>16)+(e>>16)+(n>>16)<<16|65535&n}function g(r,e,n,t,o,a){return y((i=y(y(e,r),y(t,a)))<<(u=o)|i>>>32-u,n);var i,u}function m(r,e,n,t,o,a,i){return g(e&n|~e&t,r,e,o,a,i)}function w(r,e,n,t,o,a,i){return g(e&t|n&~t,r,e,o,a,i)}function b(r,e,n,t,o,a,i){return g(e^n^t,r,e,o,a,i)}function A(r,e,n,t,o,a,i){return g(n^(e|~t),r,e,o,a,i)}var U=p("v3",48,(function(r){if("string"==typeof r){var e=unescape(encodeURIComponent(r));r=new Uint8Array(e.length);for(var n=0;n<e.length;++n)r[n]=e.charCodeAt(n)}return function(r){for(var e=[],n=32*r.length,t="0123456789abcdef",o=0;o<n;o+=8){var a=r[o>>5]>>>o%32&255,i=parseInt(t.charAt(a>>>4&15)+t.charAt(15&a),16);e.push(i)}return e}(function(r,e){r[e>>5]|=128<<e%32,r[h(e)-1]=e;for(var n=1732584193,t=-271733879,o=-1732584194,a=271733878,i=0;i<r.length;i+=16){var u=n,f=t,s=o,c=a;n=m(n,t,o,a,r[i],7,-680876936),a=m(a,n,t,o,r[i+1],12,-389564586),o=m(o,a,n,t,r[i+2],17,606105819),t=m(t,o,a,n,r[i+3],22,-1044525330),n=m(n,t,o,a,r[i+4],7,-176418897),a=m(a,n,t,o,r[i+5],12,1200080426),o=m(o,a,n,t,r[i+6],17,-1473231341),t=m(t,o,a,n,r[i+7],22,-45705983),n=m(n,t,o,a,r[i+8],7,1770035416),a=m(a,n,t,o,r[i+9],12,-1958414417),o=m(o,a,n,t,r[i+10],17,-42063),t=m(t,o,a,n,r[i+11],22,-1990404162),n=m(n,t,o,a,r[i+12],7,1804603682),a=m(a,n,t,o,r[i+13],12,-40341101),o=m(o,a,n,t,r[i+14],17,-1502002290),n=w(n,t=m(t,o,a,n,r[i+15],22,1236535329),o,a,r[i+1],5,-165796510),a=w(a,n,t,o,r[i+6],9,-1069501632),o=w(o,a,n,t,r[i+11],14,643717713),t=w(t,o,a,n,r[i],20,-373897302),n=w(n,t,o,a,r[i+5],5,-701558691),a=w(a,n,t,o,r[i+10],9,38016083),o=w(o,a,n,t,r[i+15],14,-660478335),t=w(t,o,a,n,r[i+4],20,-405537848),n=w(n,t,o,a,r[i+9],5,568446438),a=w(a,n,t,o,r[i+14],9,-1019803690),o=w(o,a,n,t,r[i+3],14,-187363961),t=w(t,o,a,n,r[i+8],20,1163531501),n=w(n,t,o,a,r[i+13],5,-1444681467),a=w(a,n,t,o,r[i+2],9,-51403784),o=w(o,a,n,t,r[i+7],14,1735328473),n=b(n,t=w(t,o,a,n,r[i+12],20,-1926607734),o,a,r[i+5],4,-378558),a=b(a,n,t,o,r[i+8],11,-2022574463),o=b(o,a,n,t,r[i+11],16,1839030562),t=b(t,o,a,n,r[i+14],23,-35309556),n=b(n,t,o,a,r[i+1],4,-1530992060),a=b(a,n,t,o,r[i+4],11,1272893353),o=b(o,a,n,t,r[i+7],16,-155497632),t=b(t,o,a,n,r[i+10],23,-1094730640),n=b(n,t,o,a,r[i+13],4,681279174),a=b(a,n,t,o,r[i],11,-358537222),o=b(o,a,n,t,r[i+3],16,-722521979),t=b(t,o,a,n,r[i+6],23,76029189),n=b(n,t,o,a,r[i+9],4,-640364487),a=b(a,n,t,o,r[i+12],11,-421815835),o=b(o,a,n,t,r[i+15],16,530742520),n=A(n,t=b(t,o,a,n,r[i+2],23,-995338651),o,a,r[i],6,-198630844),a=A(a,n,t,o,r[i+7],10,1126891415),o=A(o,a,n,t,r[i+14],15,-1416354905),t=A(t,o,a,n,r[i+5],21,-57434055),n=A(n,t,o,a,r[i+12],6,1700485571),a=A(a,n,t,o,r[i+3],10,-1894986606),o=A(o,a,n,t,r[i+10],15,-1051523),t=A(t,o,a,n,r[i+1],21,-2054922799),n=A(n,t,o,a,r[i+8],6,1873313359),a=A(a,n,t,o,r[i+15],10,-30611744),o=A(o,a,n,t,r[i+6],15,-1560198380),t=A(t,o,a,n,r[i+13],21,1309151649),n=A(n,t,o,a,r[i+4],6,-145523070),a=A(a,n,t,o,r[i+11],10,-1120210379),o=A(o,a,n,t,r[i+2],15,718787259),t=A(t,o,a,n,r[i+9],21,-343485551),n=y(n,u),t=y(t,f),o=y(o,s),a=y(a,c)}return[n,t,o,a]}(function(r){if(0===r.length)return[];for(var e=8*r.length,n=new Uint32Array(h(e)),t=0;t<e;t+=8)n[t>>5]|=(255&r[t/8])<<t%32;return n}(r),8*r.length))}));function I(r,e,n,t){switch(r){case 0:return e&n^~e&t;case 1:return e^n^t;case 2:return e&n^e&t^n&t;case 3:return e^n^t}}function C(r,e){return r<<e|r>>>32-e}var R=p("v5",80,(function(r){var e=[1518500249,1859775393,2400959708,3395469782],n=[1732584193,4023233417,2562383102,271733878,3285377520];if("string"==typeof r){var t=unescape(encodeURIComponent(r));r=[];for(var o=0;o<t.length;++o)r.push(t.charCodeAt(o))}else Array.isArray(r)||(r=Array.prototype.slice.call(r));r.push(128);for(var a=r.length/4+2,i=Math.ceil(a/16),u=new Array(i),f=0;f<i;++f){for(var s=new Uint32Array(16),c=0;c<16;++c)s[c]=r[64*f+4*c]<<24|r[64*f+4*c+1]<<16|r[64*f+4*c+2]<<8|r[64*f+4*c+3];u[f]=s}u[i-1][14]=8*(r.length-1)/Math.pow(2,32),u[i-1][14]=Math.floor(u[i-1][14]),u[i-1][15]=8*(r.length-1)&4294967295;for(var l=0;l<i;++l){for(var d=new Uint32Array(80),v=0;v<16;++v)d[v]=u[l][v];for(var p=16;p<80;++p)d[p]=C(d[p-3]^d[p-8]^d[p-14]^d[p-16],1);for(var h=n[0],y=n[1],g=n[2],m=n[3],w=n[4],b=0;b<80;++b){var A=Math.floor(b/20),U=C(h,5)+I(A,y,g,m)+w+e[A]+d[b]>>>0;w=m,m=g,g=C(y,30)>>>0,y=h,h=U}n[0]=n[0]+h>>>0,n[1]=n[1]+y>>>0,n[2]=n[2]+g>>>0,n[3]=n[3]+m>>>0,n[4]=n[4]+w>>>0}return[n[0]>>24&255,n[0]>>16&255,n[0]>>8&255,255&n[0],n[1]>>24&255,n[1]>>16&255,n[1]>>8&255,255&n[1],n[2]>>24&255,n[2]>>16&255,n[2]>>8&255,255&n[2],n[3]>>24&255,n[3]>>16&255,n[3]>>8&255,255&n[3],n[4]>>24&255,n[4]>>16&255,n[4]>>8&255,255&n[4]]}));r.NIL="00000000-0000-0000-0000-000000000000",r.parse=v,r.stringify=c,r.v1=function(r,e,n){var o=e&&n||0,a=e||new Array(16),f=(r=r||{}).node||i,s=void 0!==r.clockseq?r.clockseq:u;if(null==f||null==s){var v=r.random||(r.rng||t)();null==f&&(f=i=[1|v[0],v[1],v[2],v[3],v[4],v[5]]),null==s&&(s=u=16383&(v[6]<<8|v[7]))}var p=void 0!==r.msecs?r.msecs:Date.now(),h=void 0!==r.nsecs?r.nsecs:d+1,y=p-l+(h-d)/1e4;if(y<0&&void 0===r.clockseq&&(s=s+1&16383),(y<0||p>l)&&void 0===r.nsecs&&(h=0),h>=1e4)throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");l=p,d=h,u=s;var g=(1e4*(268435455&(p+=122192928e5))+h)%4294967296;a[o++]=g>>>24&255,a[o++]=g>>>16&255,a[o++]=g>>>8&255,a[o++]=255&g;var m=p/4294967296*1e4&268435455;a[o++]=m>>>8&255,a[o++]=255&m,a[o++]=m>>>24&15|16,a[o++]=m>>>16&255,a[o++]=s>>>8|128,a[o++]=255&s;for(var w=0;w<6;++w)a[o+w]=f[w];return e||c(a)},r.v3=U,r.v4=function(r,e,n){var o=(r=r||{}).random||(r.rng||t)();if(o[6]=15&o[6]|64,o[8]=63&o[8]|128,e){n=n||0;for(var a=0;a<16;++a)e[n+a]=o[a];return e}return c(o)},r.v5=R,r.validate=a,r.version=function(r){if(!a(r))throw TypeError("Invalid UUID");return parseInt(r.substr(14,1),16)},Object.defineProperty(r,"__esModule",{value:!0})}));
\ No newline at end of file
diff --git a/deps/npm/node_modules/uuid/dist/umd/uuidv1.min.js b/deps/npm/node_modules/uuid/dist/umd/uuidv1.min.js
index b185d7ccb8d408..2622889a25e52b 100644
--- a/deps/npm/node_modules/uuid/dist/umd/uuidv1.min.js
+++ b/deps/npm/node_modules/uuid/dist/umd/uuidv1.min.js
@@ -1 +1 @@
-!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self).uuidv1=o()}(this,(function(){"use strict";var e="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto),o=new Uint8Array(16);function t(){if(!e)throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return e(o)}var n=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;function r(e){return"string"==typeof e&&n.test(e)}for(var i,u,s=[],a=0;a<256;++a)s.push((a+256).toString(16).substr(1));var d=0,f=0;return function(e,o,n){var a=o&&n||0,c=o||new Array(16),l=(e=e||{}).node||i,p=void 0!==e.clockseq?e.clockseq:u;if(null==l||null==p){var v=e.random||(e.rng||t)();null==l&&(l=i=[1|v[0],v[1],v[2],v[3],v[4],v[5]]),null==p&&(p=u=16383&(v[6]<<8|v[7]))}var y=void 0!==e.msecs?e.msecs:Date.now(),m=void 0!==e.nsecs?e.nsecs:f+1,g=y-d+(m-f)/1e4;if(g<0&&void 0===e.clockseq&&(p=p+1&16383),(g<0||y>d)&&void 0===e.nsecs&&(m=0),m>=1e4)throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");d=y,f=m,u=p;var h=(1e4*(268435455&(y+=122192928e5))+m)%4294967296;c[a++]=h>>>24&255,c[a++]=h>>>16&255,c[a++]=h>>>8&255,c[a++]=255&h;var w=y/4294967296*1e4&268435455;c[a++]=w>>>8&255,c[a++]=255&w,c[a++]=w>>>24&15|16,c[a++]=w>>>16&255,c[a++]=p>>>8|128,c[a++]=255&p;for(var b=0;b<6;++b)c[a+b]=l[b];return o||function(e){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,t=(s[e[o+0]]+s[e[o+1]]+s[e[o+2]]+s[e[o+3]]+"-"+s[e[o+4]]+s[e[o+5]]+"-"+s[e[o+6]]+s[e[o+7]]+"-"+s[e[o+8]]+s[e[o+9]]+"-"+s[e[o+10]]+s[e[o+11]]+s[e[o+12]]+s[e[o+13]]+s[e[o+14]]+s[e[o+15]]).toLowerCase();if(!r(t))throw TypeError("Stringified UUID is invalid");return t}(c)}}));
\ No newline at end of file
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self).uuidv1=o()}(this,(function(){"use strict";var e,o=new Uint8Array(16);function t(){if(!e&&!(e="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto)))throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return e(o)}var n=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;function r(e){return"string"==typeof e&&n.test(e)}for(var i,u,s=[],a=0;a<256;++a)s.push((a+256).toString(16).substr(1));var d=0,f=0;return function(e,o,n){var a=o&&n||0,c=o||new Array(16),l=(e=e||{}).node||i,p=void 0!==e.clockseq?e.clockseq:u;if(null==l||null==p){var v=e.random||(e.rng||t)();null==l&&(l=i=[1|v[0],v[1],v[2],v[3],v[4],v[5]]),null==p&&(p=u=16383&(v[6]<<8|v[7]))}var y=void 0!==e.msecs?e.msecs:Date.now(),m=void 0!==e.nsecs?e.nsecs:f+1,g=y-d+(m-f)/1e4;if(g<0&&void 0===e.clockseq&&(p=p+1&16383),(g<0||y>d)&&void 0===e.nsecs&&(m=0),m>=1e4)throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");d=y,f=m,u=p;var h=(1e4*(268435455&(y+=122192928e5))+m)%4294967296;c[a++]=h>>>24&255,c[a++]=h>>>16&255,c[a++]=h>>>8&255,c[a++]=255&h;var w=y/4294967296*1e4&268435455;c[a++]=w>>>8&255,c[a++]=255&w,c[a++]=w>>>24&15|16,c[a++]=w>>>16&255,c[a++]=p>>>8|128,c[a++]=255&p;for(var b=0;b<6;++b)c[a+b]=l[b];return o||function(e){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,t=(s[e[o+0]]+s[e[o+1]]+s[e[o+2]]+s[e[o+3]]+"-"+s[e[o+4]]+s[e[o+5]]+"-"+s[e[o+6]]+s[e[o+7]]+"-"+s[e[o+8]]+s[e[o+9]]+"-"+s[e[o+10]]+s[e[o+11]]+s[e[o+12]]+s[e[o+13]]+s[e[o+14]]+s[e[o+15]]).toLowerCase();if(!r(t))throw TypeError("Stringified UUID is invalid");return t}(c)}}));
\ No newline at end of file
diff --git a/deps/npm/node_modules/uuid/dist/umd/uuidv4.min.js b/deps/npm/node_modules/uuid/dist/umd/uuidv4.min.js
index 9a38c982f2159d..e9df84b830b628 100644
--- a/deps/npm/node_modules/uuid/dist/umd/uuidv4.min.js
+++ b/deps/npm/node_modules/uuid/dist/umd/uuidv4.min.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).uuidv4=e()}(this,(function(){"use strict";var t="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto),e=new Uint8Array(16);function o(){if(!t)throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return t(e)}var n=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;function r(t){return"string"==typeof t&&n.test(t)}for(var i=[],u=0;u<256;++u)i.push((u+256).toString(16).substr(1));return function(t,e,n){var u=(t=t||{}).random||(t.rng||o)();if(u[6]=15&u[6]|64,u[8]=63&u[8]|128,e){n=n||0;for(var f=0;f<16;++f)e[n+f]=u[f];return e}return function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,o=(i[t[e+0]]+i[t[e+1]]+i[t[e+2]]+i[t[e+3]]+"-"+i[t[e+4]]+i[t[e+5]]+"-"+i[t[e+6]]+i[t[e+7]]+"-"+i[t[e+8]]+i[t[e+9]]+"-"+i[t[e+10]]+i[t[e+11]]+i[t[e+12]]+i[t[e+13]]+i[t[e+14]]+i[t[e+15]]).toLowerCase();if(!r(o))throw TypeError("Stringified UUID is invalid");return o}(u)}}));
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).uuidv4=e()}(this,(function(){"use strict";var t,e=new Uint8Array(16);function o(){if(!t&&!(t="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto)))throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return t(e)}var n=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;function r(t){return"string"==typeof t&&n.test(t)}for(var i=[],u=0;u<256;++u)i.push((u+256).toString(16).substr(1));return function(t,e,n){var u=(t=t||{}).random||(t.rng||o)();if(u[6]=15&u[6]|64,u[8]=63&u[8]|128,e){n=n||0;for(var f=0;f<16;++f)e[n+f]=u[f];return e}return function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,o=(i[t[e+0]]+i[t[e+1]]+i[t[e+2]]+i[t[e+3]]+"-"+i[t[e+4]]+i[t[e+5]]+"-"+i[t[e+6]]+i[t[e+7]]+"-"+i[t[e+8]]+i[t[e+9]]+"-"+i[t[e+10]]+i[t[e+11]]+i[t[e+12]]+i[t[e+13]]+i[t[e+14]]+i[t[e+15]]).toLowerCase();if(!r(o))throw TypeError("Stringified UUID is invalid");return o}(u)}}));
\ No newline at end of file
diff --git a/deps/npm/node_modules/uuid/package.json b/deps/npm/node_modules/uuid/package.json
index 5c5ab2a496f1c0..f0ab3711ee4f49 100644
--- a/deps/npm/node_modules/uuid/package.json
+++ b/deps/npm/node_modules/uuid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uuid",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "description": "RFC4122 (v1, v4, and v5) UUIDs",
   "commitlint": {
     "extends": [
diff --git a/deps/npm/package.json b/deps/npm/package.json
index d0ca0bf91a7dd5..89cb0e6aad7f00 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "7.0.8",
+  "version": "7.1.2",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -42,16 +42,15 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@npmcli/arborist": "^1.0.8",
+    "@npmcli/arborist": "^2.0.1",
     "@npmcli/ci-detect": "^1.2.0",
-    "@npmcli/config": "^1.2.1",
-    "@npmcli/run-script": "^1.7.4",
+    "@npmcli/config": "^1.2.6",
+    "@npmcli/run-script": "^1.8.1",
     "abbrev": "~1.1.1",
     "ansicolors": "~0.3.2",
     "ansistyles": "~0.1.3",
     "aproba": "^2.0.0",
     "archy": "~1.0.0",
-    "bin-links": "^2.2.1",
     "byte-size": "^7.0.0",
     "cacache": "^15.0.5",
     "chalk": "^4.1.0",
@@ -63,27 +62,27 @@
     "glob": "^7.1.4",
     "graceful-fs": "^4.2.3",
     "hosted-git-info": "^3.0.6",
-    "inherits": "^2.0.4",
-    "ini": "^1.3.5",
+    "ini": "^1.3.8",
     "init-package-json": "^2.0.1",
     "is-cidr": "^4.0.2",
     "leven": "^3.1.0",
     "libnpmaccess": "^4.0.1",
-    "libnpmfund": "^1.0.1",
+    "libnpmfund": "^1.0.2",
     "libnpmhook": "^6.0.1",
     "libnpmorg": "^2.0.1",
     "libnpmpack": "^2.0.0",
     "libnpmpublish": "^4.0.0",
-    "libnpmsearch": "^3.0.1",
+    "libnpmsearch": "^3.1.0",
     "libnpmteam": "^2.0.2",
-    "libnpmversion": "^1.0.6",
-    "make-fetch-happen": "^8.0.9",
+    "libnpmversion": "^1.0.7",
+    "make-fetch-happen": "^8.0.12",
+    "minipass": "^3.1.3",
+    "minipass-pipeline": "^1.2.4",
     "mkdirp": "^1.0.4",
     "mkdirp-infer-owner": "^2.0.0",
     "ms": "^2.1.2",
     "node-gyp": "^7.1.2",
     "nopt": "^5.0.0",
-    "normalize-package-data": "^3.0.0",
     "npm-audit-report": "^2.1.4",
     "npm-package-arg": "^8.1.0",
     "npm-pick-manifest": "^6.1.0",
@@ -92,19 +91,20 @@
     "npm-user-validate": "^1.0.1",
     "npmlog": "~4.1.2",
     "opener": "^1.5.2",
-    "pacote": "^11.1.12",
+    "pacote": "^11.1.13",
     "parse-conflict-json": "^1.1.1",
     "qrcode-terminal": "^0.12.0",
     "read": "~1.0.7",
     "read-package-json": "^3.0.0",
     "read-package-json-fast": "^1.2.1",
     "rimraf": "^3.0.2",
-    "semver": "^7.3.2",
+    "semver": "^7.3.4",
     "sorted-object": "~2.0.1",
     "ssri": "^8.0.0",
     "tar": "^6.0.5",
     "text-table": "~0.2.0",
     "tiny-relative-date": "^1.3.0",
+    "treeverse": "^1.0.4",
     "uuid": "^8.3.1",
     "validate-npm-package-name": "~3.0.0",
     "which": "^2.0.2",
@@ -120,7 +120,6 @@
     "ansistyles",
     "aproba",
     "archy",
-    "bin-links",
     "byte-size",
     "cacache",
     "chalk",
@@ -132,10 +131,10 @@
     "glob",
     "graceful-fs",
     "hosted-git-info",
-    "inherits",
     "ini",
     "init-package-json",
     "is-cidr",
+    "json-parse-even-better-errors",
     "leven",
     "libnpmaccess",
     "libnpmfund",
@@ -147,12 +146,13 @@
     "libnpmteam",
     "libnpmversion",
     "make-fetch-happen",
+    "minipass",
+    "minipass-pipeline",
     "mkdirp",
     "mkdirp-infer-owner",
     "ms",
     "node-gyp",
     "nopt",
-    "normalize-package-data",
     "npm-audit-report",
     "npm-package-arg",
     "npm-pick-manifest",
@@ -174,22 +174,24 @@
     "tar",
     "text-table",
     "tiny-relative-date",
+    "treeverse",
     "uuid",
     "validate-npm-package-name",
     "which",
     "write-file-atomic"
   ],
   "devDependencies": {
-    "cmark-gfm": "^0.8.3",
-    "eslint": "^7.12.1",
+    "cmark-gfm": "^0.8.5",
+    "eslint": "^7.14.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.2",
+    "eslint-plugin-standard": "^5.0.0",
     "jsdom": "^16.4.0",
+    "json-parse-even-better-errors": "^2.3.1",
     "marked-man": "^0.7.0",
     "require-inject": "^1.4.4",
-    "tap": "^14.10.8",
+    "tap": "^14.11.0",
     "yaml": "^1.10.0"
   },
   "scripts": {
@@ -204,7 +206,7 @@
     "sudotest:nocleanup": "sudo NO_TEST_CLEANUP=1 npm run test --",
     "posttest": "npm run lint",
     "eslint": "eslint",
-    "lint": "npm run eslint -- \"lib/**/*.js\"",
+    "lint": "npm run eslint -- test/lib test/bin \"lib/**/*.js\"",
     "lintfix": "npm run lint -- --fix",
     "prelint": "rimraf test/npm_cache*",
     "resetdeps": "bash scripts/resetdeps.sh"
@@ -214,6 +216,7 @@
     "Remove the 'files' below once we're done porting old tests over"
   ],
   "tap": {
+    "color": 1,
     "files": "test/{lib,bin}",
     "coverage-map": "test/coverage-map.js",
     "check-coverage": true,
diff --git a/deps/npm/scripts/install.sh b/deps/npm/scripts/install.sh
index 7f66151daea033..4458de87faefbe 100755
--- a/deps/npm/scripts/install.sh
+++ b/deps/npm/scripts/install.sh
@@ -8,7 +8,7 @@
 # shell living at /bin/sh.
 #
 # See this helpful document on writing portable shell scripts:
-# https://www.gnu.org/s/hello/manual/autoconf/Portable-Shell.html
+# http://www.gnu.org/s/hello/manual/autoconf/Portable-Shell.html
 #
 # The only shell it won't ever work on is cmd.exe.
 
@@ -23,32 +23,27 @@ if [ "x$0" = "xsh" ]; then
   if [ $ret -eq 0 ]; then
     (exit 0)
   else
-    echo "Uninstalling npm-install-$$.sh" >&2
     rm npm-install-$$.sh
-    echo "Failed to download script" >&2
+    echo "failed to download script" >&2
     exit $ret
   fi
   sh npm-install-$$.sh
   ret=$?
-  echo "Uninstalling npm-install-$$.sh" >&2
   rm npm-install-$$.sh
   exit $ret
 fi
 
-# See what "npm_config_*" things there are in the env,
-# and make them permanent.
-# If this fails, it's not such a big deal.
-configures="`env | grep 'npm_config_' | sed -e 's|^npm_config_||g'`"
-
+debug=0
 npm_config_loglevel="error"
 if [ "x$npm_debug" = "x" ]; then
   (exit 0)
 else
-  echo "Running in debug mode."
-  echo "Note that this requires bash or zsh."
+  echo "running in debug mode."
+  echo "note that this requires bash or zsh."
   set -o xtrace
   set -o pipefail
   npm_config_loglevel="verbose"
+  debug=1
 fi
 export npm_config_loglevel
 
@@ -61,33 +56,20 @@ if [ $ret -ne 0 ]; then
   ret=$?
 fi
 if [ $ret -eq 0 ] && [ -x "$node" ]; then
+  if [ $debug -eq 1 ]; then
+    echo "found 'node' at: $node"
+    echo -n "version: "
+    $node --version
+    echo ""
+  fi
   (exit 0)
 else
   echo "npm cannot be installed without node.js." >&2
-  echo "Install node first, and then try again." >&2
+  echo "install node first, and then try again." >&2
   echo "" >&2
-  echo "Maybe node is installed, but not in the PATH?" >&2
-  echo "Note that running as sudo can change envs." >&2
-  echo ""
-  echo "PATH=$PATH" >&2
   exit $ret
 fi
 
-# set the temp dir
-TMP="${TMPDIR}"
-if [ "x$TMP" = "x" ]; then
-  TMP="/tmp"
-fi
-TMP="${TMP}/npm.$$"
-rm -rf "$TMP" || true
-mkdir "$TMP"
-if [ $? -ne 0 ]; then
-  echo "failed to mkdir $TMP" >&2
-  exit 1
-fi
-
-BACK="$PWD"
-
 ret=0
 tar="${TAR}"
 if [ -z "$tar" ]; then
@@ -99,10 +81,11 @@ if [ -z "$tar" ]; then
 fi
 
 if [ $ret -eq 0 ] && [ -x "$tar" ]; then
-  echo "tar=$tar"
-  if [ $tar --version > /dev/null 2>&1 ]; then
-    echo "version:"
+  if [ $debug -eq 1 ]; then
+    echo "found 'tar' at: $tar"
+    echo -n "version: "
     $tar --version
+    echo ""
   fi
   ret=$?
 fi
@@ -110,76 +93,43 @@ fi
 if [ $ret -eq 0 ]; then
   (exit 0)
 else
-  echo "No suitable tar program found."
+  echo "this script requires 'tar', please install it and try again."
   exit 1
 fi
 
-
-
-# Try to find a suitable make
-# If the MAKE environment var is set, use that.
-# otherwise, try to find gmake, and then make.
-# If no make is found, then just execute the necessary commands.
-
-# XXX For some reason, make is building all the docs every time.  This
-# is an annoying source of bugs. Figure out why this happens.
-MAKE=NOMAKE
-
-if [ "x$MAKE" = "x" ]; then
-  make=`which gmake 2>&1`
-  if [ $? -eq 0 ] && [ -x "$make" ]; then
-    (exit 0)
-  else
-    make=`which make 2>&1`
-    if [ $? -eq 0 ] && [ -x "$make" ]; then
-      (exit 0)
-    else
-      make=NOMAKE
-    fi
+curl=`which curl 2>&1`
+ret=$?
+if [ $ret -eq 0 ]; then
+  if [ $debug -eq 1 ]; then
+    echo "found 'curl' at: $curl"
+    echo -n "version: "
+    $curl --version | head -n 1
+    echo ""
   fi
-else
-  make="$MAKE"
-fi
-
-if [ -x "$make" ]; then
   (exit 0)
 else
-  # echo "Installing without make. This may fail." >&2
-  make=NOMAKE
+  echo "this script requires 'curl', please install it and try again."
+  exit 1
 fi
 
-# If there's no bash, then don't even try to clean
-if [ -x "/bin/bash" ]; then
-  (exit 0)
-else
-  clean="no"
+# set the temp dir
+TMP="${TMPDIR}"
+if [ "x$TMP" = "x" ]; then
+  TMP="/tmp"
 fi
-
-node_version=`"$node" --version 2>&1`
-ret=$?
-if [ $ret -ne 0 ]; then
-  echo "You need node to run this program." >&2
-  echo "node --version reports: $node_version" >&2
-  echo "with exit code = $ret" >&2
-  echo "Please install node before continuing." >&2
-  exit $ret
+TMP="${TMP}/npm.$$"
+rm -rf "$TMP" || true
+mkdir "$TMP"
+if [ $? -ne 0 ]; then
+  echo "failed to mkdir $TMP" >&2
+  exit 1
 fi
 
+BACK="$PWD"
+
 t="${npm_install}"
 if [ -z "$t" ]; then
-  # switch based on node version.
-  # note that we can only use strict sh-compatible patterns here.
-  case $node_version in
-    0.[01234567].* | v0.[01234567].*)
-      echo "You are using an outdated and unsupported version of" >&2
-      echo "node ($node_version).  Please update node and try again." >&2
-      exit 99
-      ;;
-    *)
-      echo "install npm@latest"
-      t="latest"
-      ;;
-  esac
+  t="latest"
 fi
 
 # need to echo "" after, because Posix sed doesn't treat EOF
@@ -201,7 +151,7 @@ if [ "x$url" = "x" ]; then
   fi
 fi
 if [ $ret -ne 0 ]; then
-  echo "Failed to get tarball url for npm/$t" >&2
+  echo "failed to get tarball url for npm/$t" >&2
   exit $ret
 fi
 
@@ -209,37 +159,19 @@ fi
 echo "fetching: $url" >&2
 
 cd "$TMP" \
-  && curl -SsL "$url" \
-     | $tar -xzf - \
-  && cd "$TMP"/* \
-  && (ret=0
-      if [ $ret -ne 0 ]; then
-        echo "Aborted 0.x cleanup.  Exiting." >&2
-        exit $ret
-      fi) \
-  && (if [ "x$configures" = "x" ]; then
-        (exit 0)
-      else
-        echo "./configure $configures"
-        echo "$configures" > npmrc
-      fi) \
-  && (if [ "$make" = "NOMAKE" ]; then
-        (exit 0)
-      elif "$make" uninstall install; then
-        (exit 0)
-      else
-        make="NOMAKE"
-      fi
-      if [ "$make" = "NOMAKE" ]; then
-        "$node" bin/npm-cli.js rm npm -gf
-        "$node" bin/npm-cli.js install -gf $("$node" bin/npm-cli.js pack | tail -1)
-      fi) \
+  && curl -SsL -o npm.tgz "$url" \
+  && $tar -xzf npm.tgz \
+  && cd "$TMP"/package \
+  && echo "removing existing npm" \
+  && "$node" bin/npm-cli.js rm npm -gf --loglevel=silent \
+  && echo "installing npm@$t" \
+  && "$node" bin/npm-cli.js install -gf ../npm.tgz \
   && cd "$BACK" \
   && rm -rf "$TMP" \
-  && echo "It worked"
+  && echo "successfully installed npm@$t"
 
 ret=$?
 if [ $ret -ne 0 ]; then
-  echo "It failed" >&2
+  echo "failed!" >&2
 fi
 exit $ret
diff --git a/deps/npm/tap-snapshots/test-lib-init.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-init.js-TAP.test.js
new file mode 100644
index 00000000000000..25015aab65cb68
--- /dev/null
+++ b/deps/npm/tap-snapshots/test-lib-init.js-TAP.test.js
@@ -0,0 +1,19 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/lib/init.js TAP classic npm init no args > should print helper info 1`] = `
+This utility will walk you through creating a package.json file.
+It only covers the most common items, and tries to guess sensible defaults.
+
+See \`npm help init\` for definitive documentation on these fields
+and exactly what they do.
+
+Use \`npm install <pkg>\` afterwards to install a package and
+save it as a dependency in the package.json file.
+
+Press ^C at any time to quit.
+`
diff --git a/deps/npm/tap-snapshots/test-lib-search.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-search.js-TAP.test.js
new file mode 100644
index 00000000000000..4b4dc75ea3e896
--- /dev/null
+++ b/deps/npm/tap-snapshots/test-lib-search.js-TAP.test.js
@@ -0,0 +1,20 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/lib/search.js TAP empty search results > should have expected search results 1`] = `
+No matches found for "foo"
+`
+
+exports[`test/lib/search.js TAP search <name> --searchexclude --searchopts > should have filtered expected search results 1`] = `
+NAME                      | AUTHOR          | DATE        | VERSION  | KEYWORDS
+foo                       | =foo            | prehistoric | 1.0.0    |         
+`
+
+exports[`test/lib/search.js TAP search <name> > should have expected search results 1`] = `
+NAME                      | AUTHOR          | DATE       | VERSION  | KEYWORDS                   
+libnpm                    | =nlf…           | 2019-07-16 | 3.0.1    | npm api package manager liblibnpmaccess              | =nlf…           | 2020-11-03 | 4.0.1    | @evocateur/libnpmaccess   | =evocateur      | 2019-07-16 | 3.1.2    | @evocateur/libnpmpublish  | =evocateur      | 2019-07-16 | 1.2.2    | libnpmorg                 | =nlf…           | 2020-11-03 | 2.0.1    | libnpm npm package manager api orgs teamslibnpmsearch              | =nlf…           | 2020-12-08 | 3.1.0    | npm search api libnpmlibnpmteam                | =nlf…           | 2020-11-03 | 2.0.2    | libnpmhook                | =nlf…           | 2020-11-03 | 6.0.1    | npm hooks registry npm apilibnpmpublish             | =nlf…           | 2020-11-03 | 4.0.0    | libnpmfund                | =nlf…           | 2020-12-08 | 1.0.2    | npm npmcli libnpm cli git fund gitfund@npmcli/map-workspaces    | =nlf…           | 2020-09-30 | 1.0.1    | npm npmcli libnpm cli workspaces map-workspaceslibnpmversion             | =nlf…           | 2020-11-04 | 1.0.7    | @types/libnpmsearch       | =types          | 2019-09-26 | 2.0.1    | 
+`
diff --git a/deps/npm/tap-snapshots/test-lib-stars.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-stars.js-TAP.test.js
new file mode 100644
index 00000000000000..ac628148fd7061
--- /dev/null
+++ b/deps/npm/tap-snapshots/test-lib-stars.js-TAP.test.js
@@ -0,0 +1,15 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/lib/stars.js TAP no args > should output a list of starred packages 1`] = `
+
+@npmcli/arborist
+@npmcli/map-workspaces
+libnpmfund
+libnpmpublish
+ipt
+`
diff --git a/deps/npm/tap-snapshots/test-lib-team.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-team.js-TAP.test.js
new file mode 100644
index 00000000000000..73123ee1af7f69
--- /dev/null
+++ b/deps/npm/tap-snapshots/test-lib-team.js-TAP.test.js
@@ -0,0 +1,85 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/lib/team.js TAP team add <scope:team> <user> --parseable > should output success result for parseable add user 1`] = `
+foo	npmcli:developers	added
+`
+
+exports[`test/lib/team.js TAP team add <scope:team> <user> default output > should output success result for add user 1`] = `
+foo added to @npmcli:developers
+`
+
+exports[`test/lib/team.js TAP team create <scope:team> --parseable > should output parseable success result for create team 1`] = `
+npmcli:newteam	created
+`
+
+exports[`test/lib/team.js TAP team create <scope:team> default output > should output success result for create team 1`] = `
++@npmcli:newteam
+`
+
+exports[`test/lib/team.js TAP team destroy <scope:team> --parseable > should output parseable result for destroy team 1`] = `
+npmcli:newteam	deleted
+`
+
+exports[`test/lib/team.js TAP team destroy <scope:team> default output > should output success result for destroy team 1`] = `
+-@npmcli:newteam
+`
+
+exports[`test/lib/team.js TAP team ls <scope:team> --parseable > should list users for a parseable scope:team 1`] = `
+darcyclarke
+isaacs
+nlf
+ruyadorno
+`
+
+exports[`test/lib/team.js TAP team ls <scope:team> default output > should list users for a given scope:team 1`] = `
+
+@npmcli:developers has 4 users:
+darcyclarke isaacs nlf ruyadorno
+`
+
+exports[`test/lib/team.js TAP team ls <scope:team> no users > should list no users for a given scope 1`] = `
+
+@npmcli:developers has 0 users
+`
+
+exports[`test/lib/team.js TAP team ls <scope:team> single user > should list single user for a given scope 1`] = `
+
+@npmcli:developers has 1 user:
+foo
+`
+
+exports[`test/lib/team.js TAP team ls <scope> --parseable > should list teams for a parseable scope 1`] = `
+npmcli:designers
+npmcli:developers
+npmcli:product
+`
+
+exports[`test/lib/team.js TAP team ls <scope> default output > should list teams for a given scope 1`] = `
+
+@npmcli has 3 teams:
+@npmcli:designers @npmcli:developers @npmcli:product
+`
+
+exports[`test/lib/team.js TAP team ls <scope> no teams > should list no teams for a given scope 1`] = `
+
+@npmcli has 0 teams
+`
+
+exports[`test/lib/team.js TAP team ls <scope> single team > should list single team for a given scope 1`] = `
+
+@npmcli has 1 team:
+@npmcli:developers
+`
+
+exports[`test/lib/team.js TAP team rm <scope:team> <user> --parseable > should output parseable result for remove user 1`] = `
+foo	npmcli:newteam	removed
+`
+
+exports[`test/lib/team.js TAP team rm <scope:team> <user> default output > should output success result for remove user 1`] = `
+foo removed from @npmcli:newteam
+`
diff --git a/deps/npm/tap-snapshots/test-lib-utils-cmd-list.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-utils-cmd-list.js-TAP.test.js
index c77da6b18317dc..68f0d8328a7852 100644
--- a/deps/npm/tap-snapshots/test-lib-utils-cmd-list.js-TAP.test.js
+++ b/deps/npm/tap-snapshots/test-lib-utils-cmd-list.js-TAP.test.js
@@ -94,7 +94,6 @@ Object {
     "udpate": "update",
     "un": "uninstall",
     "unlink": "uninstall",
-    "unstar": "star",
     "up": "update",
     "upgrade": "update",
     "urn": "run-script",
@@ -125,6 +124,7 @@ Object {
     "publish",
     "star",
     "stars",
+    "unstar",
     "adduser",
     "login",
     "logout",
@@ -162,6 +162,7 @@ Object {
     "start",
     "restart",
     "run-script",
+    "set-script",
     "completion",
     "doctor",
     "exec",
@@ -189,7 +190,6 @@ Object {
     "t": "test",
     "tst": "test",
     "un": "uninstall",
-    "unstar": "star",
     "up": "update",
     "v": "view",
     "why": "explain",
diff --git a/deps/npm/tap-snapshots/test-lib-utils-config.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-utils-config.js-TAP.test.js
index 5190a5604a2407..3bdf905d869e6a 100644
--- a/deps/npm/tap-snapshots/test-lib-utils-config.js-TAP.test.js
+++ b/deps/npm/tap-snapshots/test-lib-utils-config.js-TAP.test.js
@@ -8,6 +8,7 @@
 exports[`test/lib/utils/config.js TAP no process.umask() method > must match snapshot 1`] = `
 Object {
   "defaults": Object {
+    "_auth": null,
     "access": null,
     "all": false,
     "allow-same-version": false,
@@ -267,6 +268,10 @@ Object {
     ],
   },
   "types": Object {
+    "_auth": Array [
+      null,
+      "{String TYPE}",
+    ],
     "access": Array [
       null,
       "restricted",
@@ -537,6 +542,7 @@ Object {
 exports[`test/lib/utils/config.js TAP no working network interfaces, on windows > must match snapshot 1`] = `
 Object {
   "defaults": Object {
+    "_auth": null,
     "access": null,
     "all": false,
     "allow-same-version": false,
@@ -796,6 +802,10 @@ Object {
     ],
   },
   "types": Object {
+    "_auth": Array [
+      null,
+      "{String TYPE}",
+    ],
     "access": Array [
       null,
       "restricted",
@@ -1066,6 +1076,7 @@ Object {
 exports[`test/lib/utils/config.js TAP working network interfaces, not windows > must match snapshot 1`] = `
 Object {
   "defaults": Object {
+    "_auth": null,
     "access": null,
     "all": false,
     "allow-same-version": false,
@@ -1325,6 +1336,10 @@ Object {
     ],
   },
   "types": Object {
+    "_auth": Array [
+      null,
+      "{String TYPE}",
+    ],
     "access": Array [
       null,
       "restricted",
diff --git a/deps/npm/tap-snapshots/test-lib-utils-explain-dep.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-utils-explain-dep.js-TAP.test.js
index 48f84e5111821f..54a77bc122b4db 100644
--- a/deps/npm/tap-snapshots/test-lib-utils-explain-dep.js-TAP.test.js
+++ b/deps/npm/tap-snapshots/test-lib-utils-explain-dep.js-TAP.test.js
@@ -10,7 +10,7 @@ manydep@1.0.0
   manydep@"1.0.0" from prod-dep@1.2.3
   node_modules/prod-dep
     prod-dep@"1.x" from the root project
-  6 more (optdep, extra-neos, deep-dev, peer, ...)
+  7 more (optdep, extra-neos, deep-dev, peer, the root project, ...)
 `
 
 exports[`test/lib/utils/explain-dep.js TAP > ellipses test two 1`] = `
@@ -18,7 +18,7 @@ manydep@1.0.0
   manydep@"1.0.0" from prod-dep@1.2.3
   node_modules/prod-dep
     prod-dep@"1.x" from the root project
-  5 more (optdep, extra-neos, deep-dev, peer, a package with a pretty long name)
+  6 more (optdep, extra-neos, deep-dev, peer, the root project, a package with a pretty long name)
 `
 
 exports[`test/lib/utils/explain-dep.js TAP deepDev > explain color deep 1`] = `
@@ -90,6 +90,7 @@ exports[`test/lib/utils/explain-dep.js TAP manyDeps > explain color deep 1`] = `
   peer manydep@">1.0.0-beta <1.0.1" from peer@1.0.0 peer
   node_modules/peer
     peer peer@"1.0.0" from the root project
+  manydep@">1.0.0-beta <1.0.1" from the root project
   manydep@"1" from a package with a pretty long name@1.2.3
   manydep@"1" from another package with a pretty long name@1.2.3
   manydep@"1" from yet another a package with a pretty long name@1.2.3
@@ -100,7 +101,7 @@ manydep@1.0.0
   manydep@"1.0.0" from prod-dep@1.2.3
   node_modules/prod-dep
     prod-dep@"1.x" from the root project
-  7 more (optdep, extra-neos, deep-dev, peer, ...)
+  8 more (optdep, extra-neos, deep-dev, peer, the root project, ...)
 `
 
 exports[`test/lib/utils/explain-dep.js TAP manyDeps > print color 1`] = `
diff --git a/deps/npm/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js
index 0e6c053b2f452e..ae85195d7b78d1 100644
--- a/deps/npm/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js
+++ b/deps/npm/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js
@@ -7,6 +7,7 @@
 'use strict'
 exports[`test/lib/utils/flat-options.js TAP basic > flat options 1`] = `
 Object {
+  "_auth": undefined,
   "@scope:registry": "@scope:registry",
   "//nerf.dart:_authToken": "//nerf.dart:_authToken",
   "access": "access",
@@ -94,7 +95,9 @@ Object {
     "description": "description",
     "exclude": "searchexclude",
     "limit": "searchlimit",
-    "opts": "searchopts",
+    "opts": Null Object {
+      "from": "1",
+    },
     "staleness": "searchstaleness",
   },
   "sendMetrics": "send-metrics",
diff --git a/deps/npm/tap-snapshots/test-lib-utils-reify-finish.js-TAP.test.js b/deps/npm/tap-snapshots/test-lib-utils-reify-finish.js-TAP.test.js
new file mode 100644
index 00000000000000..a82905a399679a
--- /dev/null
+++ b/deps/npm/tap-snapshots/test-lib-utils-reify-finish.js-TAP.test.js
@@ -0,0 +1,15 @@
+/* IMPORTANT
+ * This snapshot file is auto-generated, but designed for humans.
+ * It should be checked into source control and tracked carefully.
+ * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
+ * Make sure to inspect the output below.  Do not ignore changes!
+ */
+'use strict'
+exports[`test/lib/utils/reify-finish.js TAP should write if everything above passes > written config 1`] = `
+hasBuiltinConfig=true
+x=y
+
+[nested]
+foo=bar
+
+`
diff --git a/deps/npm/test/bin/npm-cli.js b/deps/npm/test/bin/npm-cli.js
index b68d29185873ae..bcca99c8c8fe1f 100644
--- a/deps/npm/test/bin/npm-cli.js
+++ b/deps/npm/test/bin/npm-cli.js
@@ -5,6 +5,6 @@ t.test('loading the bin calls the implementation', t => {
     '../../lib/cli.js': proc => {
       t.equal(proc, process, 'called implementation with process object')
       t.end()
-    }
+    },
   })
 })
diff --git a/deps/npm/test/bin/npx-cli.js b/deps/npm/test/bin/npx-cli.js
index fc85f636683822..2b7b488297cab2 100644
--- a/deps/npm/test/bin/npx-cli.js
+++ b/deps/npm/test/bin/npx-cli.js
@@ -64,7 +64,7 @@ t.test('use a bunch of deprecated switches and options', t => {
     '--shell-auto-fallback',
     '--ignore-existing',
     '-q',
-    'foobar'
+    'foobar',
   ]
 
   const expect = [
@@ -78,18 +78,18 @@ t.test('use a bunch of deprecated switches and options', t => {
     '--loglevel',
     'warn',
     '--',
-    'foobar'
+    'foobar',
   ]
   requireInject(npx, { [cli]: () => {} })
   t.strictSame(process.argv, expect)
   t.strictSame(logs, [
-    [ 'npx: the --npm argument has been removed.' ],
-    [ 'npx: the --node-arg argument has been removed.' ],
-    [ 'npx: the --n argument has been removed.' ],
-    [ 'npx: the --always-spawn argument has been removed.' ],
-    [ 'npx: the --shell-auto-fallback argument has been removed.' ],
-    [ 'npx: the --ignore-existing argument has been removed.' ],
-    [ 'See `npm help exec` for more information' ]
+    ['npx: the --npm argument has been removed.'],
+    ['npx: the --node-arg argument has been removed.'],
+    ['npx: the --n argument has been removed.'],
+    ['npx: the --always-spawn argument has been removed.'],
+    ['npx: the --shell-auto-fallback argument has been removed.'],
+    ['npx: the --ignore-existing argument has been removed.'],
+    ['See `npm help exec` for more information'],
   ])
   t.end()
 })
diff --git a/deps/npm/test/coverage-map.js b/deps/npm/test/coverage-map.js
index cb2670129e9c09..f247c051f0a2d2 100644
--- a/deps/npm/test/coverage-map.js
+++ b/deps/npm/test/coverage-map.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const full = process.env.npm_lifecycle_event === 'check-coverage'
 const coverageMap = (filename) => {
   if (full && /load-all.js$/.test(filename)) {
@@ -9,9 +7,8 @@ const coverageMap = (filename) => {
     return glob.sync(`${dir}/**/*.js`)
       .map(f => relative(process.cwd(), f))
   }
-  if (/^test\/(lib|bin)\//.test(filename)) {
+  if (/^test\/(lib|bin)\//.test(filename))
     return filename.replace(/^test\//, '')
-  }
   return []
 }
 
diff --git a/deps/npm/test/fixtures/libnpmsearch-stream-result.js b/deps/npm/test/fixtures/libnpmsearch-stream-result.js
new file mode 100644
index 00000000000000..4d3aca396fbca4
--- /dev/null
+++ b/deps/npm/test/fixtures/libnpmsearch-stream-result.js
@@ -0,0 +1,277 @@
+module.exports = [
+  {
+    name: 'libnpm',
+    scope: 'unscoped',
+    version: '3.0.1',
+    description: 'Collection of programmatic APIs for the npm CLI',
+    keywords: ['npm', 'api', 'package manager', 'lib'],
+    date: new Date('2019-07-16T17:50:00.572Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpm',
+      homepage: 'https://github.com/npm/libnpm#readme',
+      repository: 'https://github.com/npm/libnpm',
+      bugs: 'https://github.com/npm/libnpm/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@zkat.tech' },
+    publisher: { username: 'isaacs', email: 'i@izs.me' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmaccess',
+    scope: 'unscoped',
+    version: '4.0.1',
+    description: 'programmatic library for `npm access` commands',
+    date: new Date('2020-11-03T19:19:00.526Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmaccess',
+      homepage: 'https://npmjs.com/package/libnpmaccess',
+      repository: 'https://github.com/npm/libnpmaccess',
+      bugs: 'https://github.com/npm/libnpmaccess/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@sykosomatic.org' },
+    publisher: { username: 'nlf', email: 'quitlahok@gmail.com' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: '@evocateur/libnpmaccess',
+    scope: 'evocateur',
+    version: '3.1.2',
+    description: 'programmatic library for `npm access` commands',
+    date: new Date('2019-07-16T19:43:33.959Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/%40evocateur%2Flibnpmaccess',
+      homepage: 'https://npmjs.com/package/@evocateur/libnpmaccess',
+      repository: 'https://github.com/evocateur/libnpmaccess',
+      bugs: 'https://github.com/evocateur/libnpmaccess/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@zkat.tech' },
+    publisher: { username: 'evocateur', email: 'daniel.stockman@gmail.com' },
+    maintainers: [{ username: 'evocateur', email: 'daniel.stockman@gmail.com' }],
+  },
+  {
+    name: '@evocateur/libnpmpublish',
+    scope: 'evocateur',
+    version: '1.2.2',
+    description: 'Programmatic API for the bits behind npm publish and unpublish',
+    date: new Date('2019-07-16T19:40:40.850Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/%40evocateur%2Flibnpmpublish',
+      homepage: 'https://npmjs.com/package/@evocateur/libnpmpublish',
+      repository: 'https://github.com/evocateur/libnpmpublish',
+      bugs: 'https://github.com/evocateur/libnpmpublish/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@zkat.tech' },
+    publisher: { username: 'evocateur', email: 'daniel.stockman@gmail.com' },
+    maintainers: [{ username: 'evocateur', email: 'daniel.stockman@gmail.com' }],
+  },
+  {
+    name: 'libnpmorg',
+    scope: 'unscoped',
+    version: '2.0.1',
+    description: 'Programmatic api for `npm org` commands',
+    keywords: ['libnpm', 'npm', 'package manager', 'api', 'orgs', 'teams'],
+    date: new Date('2020-11-03T19:21:57.757Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmorg',
+      homepage: 'https://npmjs.com/package/libnpmorg',
+      repository: 'https://github.com/npm/libnpmorg',
+      bugs: 'https://github.com/npm/libnpmorg/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@sykosomatic.org' },
+    publisher: { username: 'nlf', email: 'quitlahok@gmail.com' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmsearch',
+    scope: 'unscoped',
+    version: '3.1.0',
+    description: 'Programmatic API for searching in npm and compatible registries.',
+    keywords: ['npm', 'search', 'api', 'libnpm'],
+    date: new Date('2020-12-08T23:54:18.374Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmsearch',
+      homepage: 'https://npmjs.com/package/libnpmsearch',
+      repository: 'https://github.com/npm/libnpmsearch',
+      bugs: 'https://github.com/npm/libnpmsearch/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@sykosomatic.org' },
+    publisher: { username: 'isaacs', email: 'i@izs.me' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmteam',
+    scope: 'unscoped',
+    version: '2.0.2',
+    description: 'npm Team management APIs',
+    date: new Date('2020-11-03T19:24:42.380Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmteam',
+      homepage: 'https://npmjs.com/package/libnpmteam',
+      repository: 'https://github.com/npm/libnpmteam',
+      bugs: 'https://github.com/npm/libnpmteam/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@zkat.tech' },
+    publisher: { username: 'nlf', email: 'quitlahok@gmail.com' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmhook',
+    scope: 'unscoped',
+    version: '6.0.1',
+    description: 'programmatic API for managing npm registry hooks',
+    keywords: ['npm', 'hooks', 'registry', 'npm api'],
+    date: new Date('2020-11-03T19:20:45.818Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmhook',
+      homepage: 'https://github.com/npm/libnpmhook#readme',
+      repository: 'https://github.com/npm/libnpmhook',
+      bugs: 'https://github.com/npm/libnpmhook/issues',
+    },
+    author: { name: 'Kat Marchán', email: 'kzm@sykosomatic.org' },
+    publisher: { username: 'nlf', email: 'quitlahok@gmail.com' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmpublish',
+    scope: 'unscoped',
+    version: '4.0.0',
+    description: 'Programmatic API for the bits behind npm publish and unpublish',
+    date: new Date('2020-11-03T19:13:43.780Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmpublish',
+      homepage: 'https://npmjs.com/package/libnpmpublish',
+      repository: 'https://github.com/npm/libnpmpublish',
+      bugs: 'https://github.com/npm/libnpmpublish/issues',
+    },
+    author: { name: 'npm Inc.', email: 'support@npmjs.com' },
+    publisher: { username: 'nlf', email: 'quitlahok@gmail.com' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmfund',
+    scope: 'unscoped',
+    version: '1.0.2',
+    description: 'Programmatic API for npm fund',
+    keywords: [
+      'npm', 'npmcli',
+      'libnpm', 'cli',
+      'git', 'fund',
+      'gitfund',
+    ],
+    date: new Date('2020-12-08T23:22:00.213Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmfund',
+      homepage: 'https://github.com/npm/libnpmfund#readme',
+      repository: 'https://github.com/npm/libnpmfund',
+      bugs: 'https://github.com/npm/libnpmfund/issues',
+    },
+    author: { name: 'npm Inc.', email: 'support@npmjs.com' },
+    publisher: { username: 'isaacs', email: 'i@izs.me' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: '@npmcli/map-workspaces',
+    scope: 'npmcli',
+    version: '1.0.1',
+    description: 'Retrieves a name:pathname Map for a given workspaces config',
+    keywords: [
+      'npm',
+      'npmcli',
+      'libnpm',
+      'cli',
+      'workspaces',
+      'map-workspaces',
+    ],
+    date: new Date('2020-09-30T15:16:29.017Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/%40npmcli%2Fmap-workspaces',
+      homepage: 'https://github.com/npm/map-workspaces#readme',
+      repository: 'https://github.com/npm/map-workspaces',
+      bugs: 'https://github.com/npm/map-workspaces/issues',
+    },
+    author: { name: 'npm Inc.', email: 'support@npmjs.com' },
+    publisher: { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: 'libnpmversion',
+    scope: 'unscoped',
+    version: '1.0.7',
+    description: "library to do the things that 'npm version' does",
+    date: new Date('2020-11-04T00:21:41.069Z'),
+    links: {
+      npm: 'https://www.npmjs.com/package/libnpmversion',
+      homepage: 'https://github.com/npm/libnpmversion#readme',
+      repository: 'https://github.com/npm/libnpmversion',
+      bugs: 'https://github.com/npm/libnpmversion/issues',
+    },
+    author: {
+      name: 'Isaac Z. Schlueter',
+      email: 'i@izs.me',
+      url: 'https://izs.me',
+      username: 'isaacs',
+    },
+    publisher: { username: 'isaacs', email: 'i@izs.me' },
+    maintainers: [
+      { username: 'nlf', email: 'quitlahok@gmail.com' },
+      { username: 'ruyadorno', email: 'ruyadorno@hotmail.com' },
+      { username: 'darcyclarke', email: 'darcy@darcyclarke.me' },
+      { username: 'isaacs', email: 'i@izs.me' },
+    ],
+  },
+  {
+    name: '@types/libnpmsearch',
+    scope: 'types',
+    version: '2.0.1',
+    description: 'TypeScript definitions for libnpmsearch',
+    date: new Date('2019-09-26T22:24:28.713Z'),
+    links: { npm: 'https://www.npmjs.com/package/%40types%2Flibnpmsearch' },
+    publisher: { username: 'types', email: 'ts-npm-types@microsoft.com' },
+    maintainers: [{ username: 'types', email: 'ts-npm-types@microsoft.com' }],
+  },
+]
diff --git a/deps/npm/test/lib/access.js b/deps/npm/test/lib/access.js
index 5d5a910f94e2fc..3063b6c53263f2 100644
--- a/deps/npm/test/lib/access.js
+++ b/deps/npm/test/lib/access.js
@@ -3,8 +3,8 @@ const requireInject = require('require-inject')
 
 const emptyMock = requireInject('../../lib/access.js', {
   '../../lib/npm.js': {
-    flatOptions: {}
-  }
+    flatOptions: {},
+  },
 })
 
 test('completion', t => {
@@ -27,7 +27,7 @@ test('completion', t => {
     'ls-collaborators',
     'edit',
     '2fa-required',
-    '2fa-not-required'
+    '2fa-not-required',
   ])
 
   testComp(['npm', 'access', 'grant'], ['read-only', 'read-write'])
@@ -75,7 +75,7 @@ test('edit', (t) => {
 
   access([
     'edit',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.match(
       err,
@@ -89,14 +89,14 @@ test('edit', (t) => {
 test('access public on unscoped package', (t) => {
   const prefix = t.testdir({
     'package.json': JSON.stringify({
-      name: 'npm-access-public-pkg'
-    })
+      name: 'npm-access-public-pkg',
+    }),
   })
   const access = requireInject('../../lib/access.js', {
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'public'
+    'public',
   ], (err) => {
     t.match(
       err,
@@ -111,10 +111,10 @@ test('access public on scoped package', (t) => {
   t.plan(4)
   const name = '@scoped/npm-access-public-pkg'
   const prefix = t.testdir({
-    'package.json': JSON.stringify({ name })
+    'package.json': JSON.stringify({ name }),
   })
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       public: (pkg, { registry }) => {
         t.equal(pkg, name, 'should use pkg name ref')
         t.equal(
@@ -123,17 +123,17 @@ test('access public on scoped package', (t) => {
           'should forward correct options'
         )
         return true
-      }
+      },
     },
     '../../lib/npm.js': {
       flatOptions: {
-        registry: 'https://registry.npmjs.org'
+        registry: 'https://registry.npmjs.org',
       },
-      prefix
-    }
+      prefix,
+    },
   })
   access([
-    'public'
+    'public',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access public on scoped package')
@@ -142,13 +142,13 @@ test('access public on scoped package', (t) => {
 
 test('access public on missing package.json', (t) => {
   const prefix = t.testdir({
-    'node_modules': {}
+    node_modules: {},
   })
   const access = requireInject('../../lib/access.js', {
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'public'
+    'public',
   ], (err) => {
     t.match(
       err,
@@ -162,13 +162,13 @@ test('access public on missing package.json', (t) => {
 test('access public on invalid package.json', (t) => {
   const prefix = t.testdir({
     'package.json': '{\n',
-    'node_modules': {}
+    node_modules: {},
   })
   const access = requireInject('../../lib/access.js', {
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'public'
+    'public',
   ], (err) => {
     t.match(
       err,
@@ -182,14 +182,14 @@ test('access public on invalid package.json', (t) => {
 test('access restricted on unscoped package', (t) => {
   const prefix = t.testdir({
     'package.json': JSON.stringify({
-      name: 'npm-access-restricted-pkg'
-    })
+      name: 'npm-access-restricted-pkg',
+    }),
   })
   const access = requireInject('../../lib/access.js', {
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'restricted'
+    'restricted',
   ], (err) => {
     t.match(
       err,
@@ -204,10 +204,10 @@ test('access restricted on scoped package', (t) => {
   t.plan(4)
   const name = '@scoped/npm-access-restricted-pkg'
   const prefix = t.testdir({
-    'package.json': JSON.stringify({ name })
+    'package.json': JSON.stringify({ name }),
   })
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       restricted: (pkg, { registry }) => {
         t.equal(pkg, name, 'should use pkg name ref')
         t.equal(
@@ -216,17 +216,17 @@ test('access restricted on scoped package', (t) => {
           'should forward correct options'
         )
         return true
-      }
+      },
     },
     '../../lib/npm.js': {
       flatOptions: {
-        registry: 'https://registry.npmjs.org'
+        registry: 'https://registry.npmjs.org',
       },
-      prefix
-    }
+      prefix,
+    },
   })
   access([
-    'restricted'
+    'restricted',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access restricted on scoped package')
@@ -235,13 +235,13 @@ test('access restricted on scoped package', (t) => {
 
 test('access restricted on missing package.json', (t) => {
   const prefix = t.testdir({
-    'node_modules': {}
+    node_modules: {},
   })
   const access = requireInject('../../lib/access.js', {
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'restricted'
+    'restricted',
   ], (err) => {
     t.match(
       err,
@@ -255,13 +255,13 @@ test('access restricted on missing package.json', (t) => {
 test('access restricted on invalid package.json', (t) => {
   const prefix = t.testdir({
     'package.json': '{\n',
-    'node_modules': {}
+    node_modules: {},
   })
   const access = requireInject('../../lib/access.js', {
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'restricted'
+    'restricted',
   ], (err) => {
     t.match(
       err,
@@ -275,21 +275,21 @@ test('access restricted on invalid package.json', (t) => {
 test('access grant read-only', (t) => {
   t.plan(5)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       grant: (spec, team, permissions) => {
         t.equal(spec, '@scoped/another', 'should use expected spec')
         t.equal(team, 'myorg:myteam', 'should use expected team')
         t.equal(permissions, 'read-only', 'should forward permissions')
         return true
-      }
+      },
     },
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
   access([
     'grant',
     'read-only',
     'myorg:myteam',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access grant read-only')
@@ -299,21 +299,21 @@ test('access grant read-only', (t) => {
 test('access grant read-write', (t) => {
   t.plan(5)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       grant: (spec, team, permissions) => {
         t.equal(spec, '@scoped/another', 'should use expected spec')
         t.equal(team, 'myorg:myteam', 'should use expected team')
         t.equal(permissions, 'read-write', 'should forward permissions')
         return true
-      }
+      },
     },
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
   access([
     'grant',
     'read-write',
     'myorg:myteam',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access grant read-write')
@@ -324,24 +324,24 @@ test('access grant current cwd', (t) => {
   t.plan(5)
   const prefix = t.testdir({
     'package.json': JSON.stringify({
-      name: 'yargs'
-    })
+      name: 'yargs',
+    }),
   })
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       grant: (spec, team, permissions) => {
         t.equal(spec, 'yargs', 'should use expected spec')
         t.equal(team, 'myorg:myteam', 'should use expected team')
         t.equal(permissions, 'read-write', 'should forward permissions')
         return true
-      }
+      },
     },
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
     'grant',
     'read-write',
-    'myorg:myteam'
+    'myorg:myteam',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access grant current cwd')
@@ -355,7 +355,7 @@ test('access grant others', (t) => {
     'grant',
     'rerere',
     'myorg:myteam',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.match(
       err,
@@ -373,7 +373,7 @@ test('access grant missing team args', (t) => {
     'grant',
     'read-only',
     undefined,
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.match(
       err,
@@ -391,7 +391,7 @@ test('access grant malformed team arg', (t) => {
     'grant',
     'read-only',
     'foo',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.match(
       err,
@@ -403,11 +403,9 @@ test('access grant malformed team arg', (t) => {
 })
 
 test('access 2fa-required/2fa-not-required', t => {
-  let pkg
-
   t.plan(2)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       tfaRequired: (spec) => {
         t.equal(spec, '@scope/pkg', 'should use expected spec')
         return true
@@ -415,9 +413,9 @@ test('access 2fa-required/2fa-not-required', t => {
       tfaNotRequired: (spec) => {
         t.equal(spec, 'unscoped-pkg', 'should use expected spec')
         return true
-      }
+      },
     },
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
 
   access(['2fa-required', '@scope/pkg'], er => {
@@ -434,19 +432,19 @@ test('access 2fa-required/2fa-not-required', t => {
 test('access revoke', (t) => {
   t.plan(4)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       revoke: (spec, team) => {
         t.equal(spec, '@scoped/another', 'should use expected spec')
         t.equal(team, 'myorg:myteam', 'should use expected team')
         return true
-      }
+      },
     },
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
   access([
     'revoke',
     'myorg:myteam',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access revoke')
@@ -459,7 +457,7 @@ test('access revoke missing team args', (t) => {
   access([
     'revoke',
     undefined,
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.match(
       err,
@@ -476,7 +474,7 @@ test('access revoke malformed team arg', (t) => {
   access([
     'revoke',
     'foo',
-    '@scoped/another'
+    '@scoped/another',
   ], (err) => {
     t.match(
       err,
@@ -490,18 +488,18 @@ test('access revoke malformed team arg', (t) => {
 test('npm access ls-packages with no team', (t) => {
   t.plan(3)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       lsPackages: (entity) => {
         t.equal(entity, 'foo', 'should use expected entity')
         return {}
-      }
+      },
     },
     '../../lib/utils/get-identity.js': () => Promise.resolve('foo'),
     '../../lib/utils/output.js': () => null,
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
   access([
-    'ls-packages'
+    'ls-packages',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access ls-packages with no team')
@@ -511,18 +509,18 @@ test('npm access ls-packages with no team', (t) => {
 test('access ls-packages on team', (t) => {
   t.plan(3)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       lsPackages: (entity) => {
         t.equal(entity, 'myorg:myteam', 'should use expected entity')
         return {}
-      }
+      },
     },
     '../../lib/utils/output.js': () => null,
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
   access([
     'ls-packages',
-    'myorg:myteam'
+    'myorg:myteam',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access ls-packages on team')
@@ -533,21 +531,21 @@ test('access ls-collaborators on current', (t) => {
   t.plan(3)
   const prefix = t.testdir({
     'package.json': JSON.stringify({
-      name: 'yargs'
-    })
+      name: 'yargs',
+    }),
   })
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       lsCollaborators: (spec) => {
         t.equal(spec, 'yargs', 'should use expected spec')
         return {}
-      }
+      },
     },
     '../../lib/utils/output.js': () => null,
-    '../../lib/npm.js': { prefix }
+    '../../lib/npm.js': { prefix },
   })
   access([
-    'ls-collaborators'
+    'ls-collaborators',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access ls-collaborators on current')
@@ -557,18 +555,18 @@ test('access ls-collaborators on current', (t) => {
 test('access ls-collaborators on spec', (t) => {
   t.plan(3)
   const access = requireInject('../../lib/access.js', {
-    'libnpmaccess': {
+    libnpmaccess: {
       lsCollaborators: (spec) => {
         t.equal(spec, 'yargs', 'should use expected spec')
         return {}
-      }
+      },
     },
     '../../lib/utils/output.js': () => null,
-    '../../lib/npm.js': {}
+    '../../lib/npm.js': {},
   })
   access([
     'ls-collaborators',
-    'yargs'
+    'yargs',
   ], (err) => {
     t.ifError(err, 'npm access')
     t.ok('should successfully access ls-packages with no team')
diff --git a/deps/npm/test/lib/adduser.js b/deps/npm/test/lib/adduser.js
index 4d2233b18ce6c0..4e6a56fc199d60 100644
--- a/deps/npm/test/lib/adduser.js
+++ b/deps/npm/test/lib/adduser.js
@@ -8,11 +8,12 @@ let result = ''
 const _flatOptions = {
   authType: 'legacy',
   registry: 'https://registry.npmjs.org/',
-  scope: ''
+  scope: '',
 }
 
 let failSave = false
 let deletedConfig = {}
+let registryOutput = ''
 let setConfig = {}
 const authDummy = () => Promise.resolve({
   message: 'success',
@@ -20,55 +21,64 @@ const authDummy = () => Promise.resolve({
     username: 'u',
     password: 'p',
     email: 'u@npmjs.org',
-    alwaysAuth: false
-  }
+    alwaysAuth: false,
+  },
 })
 
 const deleteMock = (key, where) => {
   deletedConfig = {
     ...deletedConfig,
-    [key]: where
+    [key]: where,
   }
 }
 const adduser = requireInject('../../lib/adduser.js', {
   npmlog: {
-    disableProgress: () => null
+    disableProgress: () => null,
+    notice: (_, msg) => {
+      registryOutput = msg
+    },
   },
   '../../lib/npm.js': {
     flatOptions: _flatOptions,
     config: {
       delete: deleteMock,
       get (key, where) {
-        if (!where || where === 'user') {
+        if (!where || where === 'user')
           return _flatOptions[key]
-        }
       },
       getCredentialsByURI,
       async save () {
-        if (failSave) {
+        if (failSave)
           throw new Error('error saving user config')
-        }
       },
       set (key, value, where) {
         setConfig = {
           ...setConfig,
           [key]: {
             value,
-            where
-          }
+            where,
+          },
         }
       },
-      setCredentialsByURI
-    }
+      setCredentialsByURI,
+    },
   },
-  '../../lib/utils/output.js': msg => { result = msg },
-  '../../lib/auth/legacy.js': authDummy
+  '../../lib/utils/output.js': msg => {
+    result = msg
+  },
+  '../../lib/auth/legacy.js': authDummy,
 })
 
 test('simple login', (t) => {
   adduser([], (err) => {
     t.ifError(err, 'npm adduser')
 
+    t.equal(
+      registryOutput,
+      'Log in on https://registry.npmjs.org/',
+      'should have correct message result'
+    )
+
     t.deepEqual(
       deletedConfig,
       {
@@ -80,7 +90,7 @@ test('simple login', (t) => {
         _authtoken: 'user',
         _authToken: 'user',
         '//registry.npmjs.org/:-authtoken': undefined,
-        '//registry.npmjs.org/:_authToken': 'user'
+        '//registry.npmjs.org/:_authToken': 'user',
       },
       'should delete token in user config'
     )
@@ -91,7 +101,7 @@ test('simple login', (t) => {
         '//registry.npmjs.org/:_password': { value: 'cA==', where: 'user' },
         '//registry.npmjs.org/:username': { value: 'u', where: 'user' },
         '//registry.npmjs.org/:email': { value: 'u@npmjs.org', where: 'user' },
-        '//registry.npmjs.org/:always-auth': { value: false, where: 'user' }
+        '//registry.npmjs.org/:always-auth': { value: false, where: 'user' },
       },
       'should set expected user configs'
     )
@@ -102,6 +112,7 @@ test('simple login', (t) => {
       'should output auth success msg'
     )
 
+    registryOutput = ''
     deletedConfig = {}
     setConfig = {}
     result = ''
diff --git a/deps/npm/test/lib/audit.js b/deps/npm/test/lib/audit.js
index 4918cb2fc27110..cc7379394b2adb 100644
--- a/deps/npm/test/lib/audit.js
+++ b/deps/npm/test/lib/audit.js
@@ -5,7 +5,7 @@ const audit = require('../../lib/audit.js')
 t.test('should audit using Arborist', t => {
   let ARB_ARGS = null
   let AUDIT_CALLED = false
-  let REIFY_OUTPUT_CALLED = false
+  let REIFY_FINISH_CALLED = false
   let AUDIT_REPORT_CALLED = false
   let OUTPUT_CALLED = false
   let ARB_OBJ = null
@@ -14,14 +14,14 @@ t.test('should audit using Arborist', t => {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        json: false
+        json: false,
       },
     },
     'npm-audit-report': () => {
       AUDIT_REPORT_CALLED = true
       return {
         report: 'there are vulnerabilities',
-        exitCode: 0
+        exitCode: 0,
       }
     },
     '@npmcli/arborist': function (args) {
@@ -32,15 +32,15 @@ t.test('should audit using Arborist', t => {
         this.auditReport = {}
       }
     },
-    '../../lib/utils/reify-output.js': arb => {
-      if (arb !== ARB_OBJ) {
+    '../../lib/utils/reify-finish.js': arb => {
+      if (arb !== ARB_OBJ)
         throw new Error('got wrong object passed to reify-output')
-      }
-      REIFY_OUTPUT_CALLED = true
+
+      REIFY_FINISH_CALLED = true
     },
     '../../lib/utils/output.js': () => {
       OUTPUT_CALLED = true
-    }
+    },
   })
 
   t.test('audit', t => {
@@ -55,7 +55,7 @@ t.test('should audit using Arborist', t => {
 
   t.test('audit fix', t => {
     audit(['fix'], () => {
-      t.equal(REIFY_OUTPUT_CALLED, true, 'called reify output')
+      t.equal(REIFY_FINISH_CALLED, true, 'called reify output')
       t.end()
     })
   })
@@ -68,12 +68,12 @@ t.test('should audit - json', t => {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        json: true
+        json: true,
       },
     },
     'npm-audit-report': () => ({
       report: 'there are vulnerabilities',
-      exitCode: 0
+      exitCode: 0,
     }),
     '@npmcli/arborist': function () {
       this.audit = () => {
@@ -81,7 +81,7 @@ t.test('should audit - json', t => {
       }
     },
     '../../lib/utils/reify-output.js': () => {},
-    '../../lib/utils/output.js': () => {}
+    '../../lib/utils/output.js': () => {},
   })
 
   audit([], (err) => {
@@ -100,11 +100,11 @@ t.test('report endpoint error', t => {
           prefix: 'foo',
           command: 'audit',
           flatOptions: {
-            json
+            json,
           },
           log: {
-            warn: (...warning) => LOGS.push(warning)
-          }
+            warn: (...warning) => LOGS.push(warning),
+          },
         },
         'npm-audit-report': () => {
           throw new Error('should not call audit report when there are errors')
@@ -117,25 +117,25 @@ t.test('report endpoint error', t => {
                 method: 'POST',
                 uri: 'https://example.com/',
                 headers: {
-                  head: ['ers']
+                  head: ['ers'],
                 },
                 statusCode: 420,
                 body: json ? { nope: 'lol' }
-                  : Buffer.from('i had a vuln but i eated it lol')
-              }
+                : Buffer.from('i had a vuln but i eated it lol'),
+              },
             }
           }
         },
         '../../lib/utils/reify-output.js': () => {},
         '../../lib/utils/output.js': (...msg) => {
           OUTPUT.push(msg)
-        }
+        },
       }
       // have to pass mocks to both to get the npm and output set right
       const auditError = requireInject('../../lib/utils/audit-error.js', mocks)
       const audit = requireInject('../../lib/audit.js', {
         ...mocks,
-        '../../lib/utils/audit-error.js': auditError
+        '../../lib/utils/audit-error.js': auditError,
       })
 
       audit([], (err) => {
@@ -156,8 +156,8 @@ t.test('report endpoint error', t => {
               '    "nope": "lol"\n' +
               '  }\n' +
               '}'
-              : 'i had a vuln but i eated it lol'
-          ]
+            : 'i had a vuln but i eated it lol',
+          ],
         ])
         t.strictSame(LOGS, [['audit', 'hello, this didnt work']])
         t.end()
@@ -170,8 +170,10 @@ t.test('report endpoint error', t => {
 t.test('completion', t => {
   t.test('fix', t => {
     audit.completion({
-      conf: { argv: { remain: ['npm', 'audit'] } }
+      conf: { argv: { remain: ['npm', 'audit'] } },
     }, (err, res) => {
+      if (err)
+        throw err
       const subcmd = res.pop()
       t.equals('fix', subcmd, 'completes to fix')
       t.end()
@@ -180,16 +182,17 @@ t.test('completion', t => {
 
   t.test('subcommand fix', t => {
     audit.completion({
-      conf: { argv: { remain: ['npm', 'audit', 'fix'] } }
+      conf: { argv: { remain: ['npm', 'audit', 'fix'] } },
     }, (err) => {
-      t.notOk(err, 'no errors')
+      if (err)
+        throw err
       t.end()
     })
   })
 
   t.test('subcommand not recognized', t => {
     audit.completion({
-      conf: { argv: { remain: ['npm', 'audit', 'repare'] } }
+      conf: { argv: { remain: ['npm', 'audit', 'repare'] } },
     }, (err) => {
       t.ok(err, 'not recognized')
       t.end()
diff --git a/deps/npm/test/lib/auth/legacy.js b/deps/npm/test/lib/auth/legacy.js
index 1607641d8390eb..f926ae13063eae 100644
--- a/deps/npm/test/lib/auth/legacy.js
+++ b/deps/npm/test/lib/auth/legacy.js
@@ -10,20 +10,20 @@ const legacy = requireInject('../../../lib/auth/legacy.js', {
   npmlog: {
     info: (...msgs) => {
       log += msgs.join(' ')
-    }
+    },
   },
   'npm-profile': profile,
   '../../../lib/utils/open-url.js': (url, msg, cb) => {
-    if (url) {
+    if (url)
       cb()
-    } else {
+    else {
       cb(Object.assign(
         new Error('failed open url'),
         { code: 'ERROR' }
       ))
     }
   },
-  '../../../lib/utils/read-user-info.js': read
+  '../../../lib/utils/read-user-info.js': read,
 })
 
 test('login using username/password with token result', async (t) => {
@@ -33,16 +33,16 @@ test('login using username/password with token result', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await legacy({
     creds: {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -74,16 +74,16 @@ test('login using username/password with user info result', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await legacy({
     creds: {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -98,7 +98,7 @@ test('login using username/password with user info result', async (t) => {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     'should return used credentials'
   )
@@ -125,16 +125,16 @@ test('login otp requested', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await legacy({
     creds: {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -165,10 +165,10 @@ test('login missing basic credential info', async (t) => {
     legacy({
       creds: {
         username: 'u',
-        password: 'p'
+        password: 'p',
       },
       registry: 'https://registry.npmjs.org/',
-      scope: ''
+      scope: '',
     }),
     { code: 'ERROR' },
     'should throw server response error'
@@ -195,16 +195,16 @@ test('create new user when user not found', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await legacy({
     creds: {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -245,13 +245,13 @@ test('prompts for user info if required', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await legacy({
     creds: {
-      alwaysAuth: true
+      alwaysAuth: true,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -272,7 +272,7 @@ test('prompts for user info if required', async (t) => {
       username: 'foo',
       password: 'pass',
       email: 'foo@npmjs.org',
-      alwaysAuth: true
+      alwaysAuth: true,
     },
     'should return result from profile.login containing prompt info'
   )
@@ -309,10 +309,10 @@ test('request otp when creating new user', async (t) => {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   log = ''
@@ -338,10 +338,10 @@ test('unknown error during user creation', async (t) => {
         username: 'u',
         password: 'p',
         email: 'u@npmjs.org',
-        alwaysAuth: false
+        alwaysAuth: false,
       },
       registry: 'https://registry.npmjs.org/',
-      scope: ''
+      scope: '',
     }),
     { code: 'ERROR' },
     'should throw unknown error'
@@ -353,16 +353,18 @@ test('unknown error during user creation', async (t) => {
 })
 
 test('open url error', async (t) => {
-  profile.login = async (opener, prompt, opts) => { await opener() }
+  profile.login = async (opener, prompt, opts) => {
+    await opener()
+  }
 
   await t.rejects(
     legacy({
       creds: {
         username: 'u',
-        password: 'p'
+        password: 'p',
       },
       registry: 'https://registry.npmjs.org/',
-      scope: ''
+      scope: '',
     }),
     { message: 'failed open url', code: 'ERROR' },
     'should throw unknown error'
@@ -380,10 +382,10 @@ test('login no credentials provided', async (t) => {
       username: undefined,
       password: undefined,
       email: undefined,
-      alwaysAuth: undefined
+      alwaysAuth: undefined,
     },
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -404,10 +406,10 @@ test('scoped login', async (t) => {
       username: 'u',
       password: 'p',
       email: 'u@npmjs.org',
-      alwaysAuth: false
+      alwaysAuth: false,
     },
     registry: 'https://diff-registry.npmjs.org/',
-    scope: 'myscope'
+    scope: 'myscope',
   })
 
   t.equal(
diff --git a/deps/npm/test/lib/auth/oauth.js b/deps/npm/test/lib/auth/oauth.js
index a8461d235e5e59..82d478b52c7cc9 100644
--- a/deps/npm/test/lib/auth/oauth.js
+++ b/deps/npm/test/lib/auth/oauth.js
@@ -6,7 +6,7 @@ test('oauth login', (t) => {
   const oauthOpts = {
     creds: {},
     registry: 'https://diff-registry.npmjs.org/',
-    scope: 'myscope'
+    scope: 'myscope',
   }
 
   const oauth = requireInject('../../../lib/auth/oauth.js', {
@@ -18,9 +18,9 @@ test('oauth login', (t) => {
         set: (key, value) => {
           t.equal(key, 'sso-type', 'should define sso-type')
           t.equal(value, 'oauth', 'should set sso-type to oauth')
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   oauth(oauthOpts)
diff --git a/deps/npm/test/lib/auth/saml.js b/deps/npm/test/lib/auth/saml.js
index 3e0015bf39be38..87fa6688b57ea7 100644
--- a/deps/npm/test/lib/auth/saml.js
+++ b/deps/npm/test/lib/auth/saml.js
@@ -6,7 +6,7 @@ test('saml login', (t) => {
   const samlOpts = {
     creds: {},
     registry: 'https://diff-registry.npmjs.org/',
-    scope: 'myscope'
+    scope: 'myscope',
   }
 
   const saml = requireInject('../../../lib/auth/saml.js', {
@@ -18,9 +18,9 @@ test('saml login', (t) => {
         set: (key, value) => {
           t.equal(key, 'sso-type', 'should define sso-type')
           t.equal(value, 'saml', 'should set sso-type to saml')
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   saml(samlOpts)
diff --git a/deps/npm/test/lib/auth/sso.js b/deps/npm/test/lib/auth/sso.js
index 0e04309c82bf79..1fc04c64cd3cca 100644
--- a/deps/npm/test/lib/auth/sso.js
+++ b/deps/npm/test/lib/auth/sso.js
@@ -5,7 +5,7 @@ let log = ''
 let warn = ''
 
 const _flatOptions = {
-  ssoType: 'oauth'
+  ssoType: 'oauth',
 }
 const token = '24528a24f240'
 const SSO_URL = 'https://registry.npmjs.org/{SSO_URL}'
@@ -18,17 +18,17 @@ const sso = requireInject('../../../lib/auth/sso.js', {
     },
     warn: (...msgs) => {
       warn += msgs.join(' ')
-    }
+    },
   },
   'npm-profile': profile,
   'npm-registry-fetch': npmFetch,
   '../../../lib/npm.js': {
-    flatOptions: _flatOptions
+    flatOptions: _flatOptions,
   },
   '../../../lib/utils/open-url.js': (url, msg, cb) => {
-    if (url) {
+    if (url)
       cb()
-    } else {
+    else {
       cb(Object.assign(
         new Error('failed open url'),
         { code: 'ERROR' }
@@ -36,15 +36,15 @@ const sso = requireInject('../../../lib/auth/sso.js', {
     }
   },
   '../../../lib/utils/otplease.js': (opts, fn) => {
-    if (opts) {
+    if (opts)
       return fn({ ...opts, otp: '1234' })
-    } else {
+    else {
       throw Object.assign(
         new Error('failed retrieving otp'),
         { code: 'ERROR' }
       )
     }
-  }
+  },
 })
 
 test('empty login', async (t) => {
@@ -80,7 +80,7 @@ test('simple login', async (t) => {
         otp: '1234',
         registry: 'https://registry.npmjs.org/',
         scope: '',
-        ssoType: 'oauth'
+        ssoType: 'oauth',
       },
       'should use dummy password'
     )
@@ -91,11 +91,11 @@ test('simple login', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await sso({
     creds: {},
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   t.equal(
@@ -160,7 +160,7 @@ test('polling retry', async (t) => {
   await sso({
     creds: {},
     registry: 'https://registry.npmjs.org/',
-    scope: ''
+    scope: '',
   })
 
   log = ''
@@ -180,7 +180,7 @@ test('polling error', async (t) => {
     sso({
       creds: {},
       registry: 'https://registry.npmjs.org/',
-      scope: ''
+      scope: '',
     }),
     { message: 'unknown error', code: 'ERROR' },
     'should throw unknown error'
@@ -199,7 +199,7 @@ test('no token retrieved from loginCouch', async (t) => {
     sso({
       creds: {},
       registry: 'https://registry.npmjs.org/',
-      scope: ''
+      scope: '',
     }),
     { message: 'no SSO token returned' },
     'should throw no SSO token returned error'
@@ -217,7 +217,7 @@ test('no sso url retrieved from loginCouch', async (t) => {
     sso({
       creds: {},
       registry: 'https://registry.npmjs.org/',
-      scope: ''
+      scope: '',
     }),
     { message: 'no SSO URL returned by services' },
     'should throw no SSO url returned error'
@@ -234,11 +234,11 @@ test('scoped login', async (t) => {
 
   const {
     message,
-    newCreds
+    newCreds,
   } = await sso({
     creds: {},
     registry: 'https://diff-registry.npmjs.org/',
-    scope: 'myscope'
+    scope: 'myscope',
   })
 
   t.equal(
diff --git a/deps/npm/test/lib/bin.js b/deps/npm/test/lib/bin.js
index 05fc1e21e05d4c..c5ed2a91b98310 100644
--- a/deps/npm/test/lib/bin.js
+++ b/deps/npm/test/lib/bin.js
@@ -9,7 +9,7 @@ test('bin', (t) => {
     '../../lib/npm.js': { bin: dir, flatOptions: { global: false } },
     '../../lib/utils/output.js': (output) => {
       t.equal(output, dir, 'prints the correct directory')
-    }
+    },
   })
 
   bin([], (err) => {
@@ -35,7 +35,7 @@ test('bin -g', (t) => {
     '../../lib/utils/path.js': [dir],
     '../../lib/utils/output.js': (output) => {
       t.equal(output, dir, 'prints the correct directory')
-    }
+    },
   })
 
   bin([], (err) => {
@@ -61,7 +61,7 @@ test('bin -g (not in path)', (t) => {
     '../../lib/utils/path.js': ['/not/my/dir'],
     '../../lib/utils/output.js': (output) => {
       t.equal(output, dir, 'prints the correct directory')
-    }
+    },
   })
 
   bin([], (err) => {
diff --git a/deps/npm/test/lib/birthday.js b/deps/npm/test/lib/birthday.js
index 35255f97aa34bb..21b60b4c79620f 100644
--- a/deps/npm/test/lib/birthday.js
+++ b/deps/npm/test/lib/birthday.js
@@ -38,6 +38,7 @@ test('birthday (nope again)', (t) => {
       const d = new D()
       return d[B[f]('Z2V0RnVsbFllYXI=', _6)[l]()]() + 1
     }
+
     [B[f]('Z2V0VVRDTW9udGg=', _6)[l]()] () {
       return 9
     }
@@ -66,6 +67,7 @@ test('birthday (yup)', (t) => {
     [B[f]('Z2V0VVRDTW9udGg=', _6)[l]()] () {
       return 8
     }
+
     [B[f]('Z2V0VVRDRGF0ZQ==', _6)[l]()] () {
       return 29
     }
diff --git a/deps/npm/test/lib/bugs.js b/deps/npm/test/lib/bugs.js
index 79d5089724a50b..df64349878e619 100644
--- a/deps/npm/test/lib/bugs.js
+++ b/deps/npm/test/lib/bugs.js
@@ -5,40 +5,40 @@ const pacote = {
   manifest: async (spec, options) => {
     return spec === 'nobugs' ? {
       name: 'nobugs',
-      version: '1.2.3'
-    }
-    : spec === 'bugsurl' ? {
-      name: 'bugsurl',
-      version: '1.2.3',
-      bugs: 'https://bugzilla.localhost/bugsurl'
-    }
-    : spec === 'bugsobj' ? {
-      name: 'bugsobj',
-      version: '1.2.3',
-      bugs: { url: 'https://bugzilla.localhost/bugsobj' }
-    }
-    : spec === 'bugsobj-nourl' ? {
-      name: 'bugsobj-nourl',
-      version: '1.2.3',
-      bugs: { no: 'url here' }
-    }
-    : spec === 'repourl' ? {
-      name: 'repourl',
-      version: '1.2.3',
-      repository: 'https://github.com/foo/repourl'
-    }
-    : spec === 'repoobj' ? {
-      name: 'repoobj',
       version: '1.2.3',
-      repository: { url: 'https://github.com/foo/repoobj' }
     }
-    : spec === '.' ? {
-      name: 'thispkg',
-      version: '1.2.3',
-      bugs: 'https://example.com'
-    }
-    : null
-  }
+      : spec === 'bugsurl' ? {
+        name: 'bugsurl',
+        version: '1.2.3',
+        bugs: 'https://bugzilla.localhost/bugsurl',
+      }
+      : spec === 'bugsobj' ? {
+        name: 'bugsobj',
+        version: '1.2.3',
+        bugs: { url: 'https://bugzilla.localhost/bugsobj' },
+      }
+      : spec === 'bugsobj-nourl' ? {
+        name: 'bugsobj-nourl',
+        version: '1.2.3',
+        bugs: { no: 'url here' },
+      }
+      : spec === 'repourl' ? {
+        name: 'repourl',
+        version: '1.2.3',
+        repository: 'https://github.com/foo/repourl',
+      }
+      : spec === 'repoobj' ? {
+        name: 'repoobj',
+        version: '1.2.3',
+        repository: { url: 'https://github.com/foo/repoobj' },
+      }
+      : spec === '.' ? {
+        name: 'thispkg',
+        version: '1.2.3',
+        bugs: 'https://example.com',
+      }
+      : null
+  },
 }
 
 // keep a tally of which urls got opened
@@ -51,7 +51,7 @@ const openUrl = (url, errMsg, cb) => {
 
 const bugs = requireInject('../../lib/bugs.js', {
   pacote,
-  '../../lib/utils/open-url.js': openUrl
+  '../../lib/utils/open-url.js': openUrl,
 })
 
 t.test('completion', t => {
@@ -70,7 +70,7 @@ t.test('open bugs urls', t => {
     bugsobj: 'https://bugzilla.localhost/bugsobj',
     repourl: 'https://github.com/foo/repourl/issues',
     repoobj: 'https://github.com/foo/repoobj/issues',
-    '.': 'https://example.com'
+    '.': 'https://example.com',
   }
   const keys = Object.keys(expect)
   t.plan(keys.length)
diff --git a/deps/npm/test/lib/cache.js b/deps/npm/test/lib/cache.js
new file mode 100644
index 00000000000000..2e9ad346bb59bc
--- /dev/null
+++ b/deps/npm/test/lib/cache.js
@@ -0,0 +1,228 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+const path = require('path')
+
+const usageUtil = () => 'usage instructions'
+
+const flatOptions = {
+  force: false,
+}
+
+const npm = {
+  flatOptions,
+  cache: '/fake/path',
+}
+
+let rimrafPath = ''
+const rimraf = (path, cb) => {
+  rimrafPath = path
+  return cb()
+}
+
+let logOutput = []
+const npmlog = {
+  silly: (...args) => {
+    logOutput.push(['silly', ...args])
+  },
+}
+
+let tarballStreamSpec = ''
+let tarballStreamOpts = {}
+const pacote = {
+  tarball: {
+    stream: (spec, handler, opts) => {
+      tarballStreamSpec = spec
+      tarballStreamOpts = opts
+      return handler({
+        resume: () => {},
+        promise: () => Promise.resolve(),
+      })
+    },
+  },
+}
+
+let outputOutput = []
+const output = (msg) => {
+  outputOutput.push(msg)
+}
+
+const cacacheVerifyStats = {
+  keptSize: 100,
+  verifiedContent: 1,
+  totalEntries: 1,
+  runTime: { total: 2000 },
+}
+const cacache = {
+  verify: (path) => {
+    return cacacheVerifyStats
+  },
+}
+
+const mocks = {
+  cacache,
+  npmlog,
+  pacote,
+  rimraf,
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': output,
+  '../../lib/utils/usage.js': usageUtil,
+}
+
+const cache = requireInject('../../lib/cache.js', mocks)
+
+t.test('cache no args', t => {
+  cache([], err => {
+    t.equal(err.message, 'usage instructions', 'should throw usage instructions')
+    t.end()
+  })
+})
+
+t.test('cache clean', t => {
+  cache(['clean'], err => {
+    t.match(err.message, 'the npm cache self-heals', 'should throw warning')
+    t.end()
+  })
+})
+
+t.test('cache clean (force)', t => {
+  flatOptions.force = true
+  t.teardown(() => {
+    rimrafPath = ''
+    flatOptions.force = false
+  })
+
+  cache(['clear'], err => {
+    t.ifError(err)
+    t.equal(rimrafPath, path.join(npm.cache, '_cacache'))
+    t.end()
+  })
+})
+
+t.test('cache clean with arg', t => {
+  cache(['rm', 'pkg'], err => {
+    t.match(err.message, 'does not accept arguments', 'should throw error')
+    t.end()
+  })
+})
+
+t.test('cache add no arg', t => {
+  t.teardown(() => {
+    logOutput = []
+  })
+
+  cache(['add'], err => {
+    t.strictSame(logOutput, [
+      ['silly', 'cache add', 'args', []],
+    ], 'logs correctly')
+    t.equal(err.code, 'EUSAGE', 'throws usage error')
+    t.end()
+  })
+})
+
+t.test('cache add pkg only', t => {
+  t.teardown(() => {
+    logOutput = []
+    tarballStreamSpec = ''
+    tarballStreamOpts = {}
+  })
+
+  cache(['add', 'mypkg'], err => {
+    t.ifError(err)
+    t.strictSame(logOutput, [
+      ['silly', 'cache add', 'args', ['mypkg']],
+      ['silly', 'cache add', 'spec', 'mypkg'],
+    ], 'logs correctly')
+    t.equal(tarballStreamSpec, 'mypkg', 'passes the correct spec to pacote')
+    t.same(tarballStreamOpts, flatOptions, 'passes the correct options to pacote')
+    t.end()
+  })
+})
+
+t.test('cache add pkg w/ spec modifier', t => {
+  t.teardown(() => {
+    logOutput = []
+    tarballStreamSpec = ''
+    tarballStreamOpts = {}
+  })
+
+  cache(['add', 'mypkg', 'latest'], err => {
+    t.ifError(err)
+    t.strictSame(logOutput, [
+      ['silly', 'cache add', 'args', ['mypkg', 'latest']],
+      ['silly', 'cache add', 'spec', 'mypkg@latest'],
+    ], 'logs correctly')
+    t.equal(tarballStreamSpec, 'mypkg@latest', 'passes the correct spec to pacote')
+    t.same(tarballStreamOpts, flatOptions, 'passes the correct options to pacote')
+    t.end()
+  })
+})
+
+t.test('cache verify', t => {
+  t.teardown(() => {
+    outputOutput = []
+  })
+
+  cache(['verify'], err => {
+    t.ifError(err)
+    t.match(outputOutput, [
+      `Cache verified and compressed (${path.join(npm.cache, '_cacache')})`,
+      'Content verified: 1 (100 bytes)',
+      'Index entries: 1',
+      'Finished in 2s',
+    ], 'prints correct output')
+    t.end()
+  })
+})
+
+t.test('cache verify w/ extra output', t => {
+  npm.cache = `${process.env.HOME}/fake/path`
+  cacacheVerifyStats.badContentCount = 1
+  cacacheVerifyStats.reclaimedCount = 2
+  cacacheVerifyStats.reclaimedSize = 200
+  cacacheVerifyStats.missingContent = 3
+  t.teardown(() => {
+    npm.cache = '/fake/path'
+    outputOutput = []
+    delete cacacheVerifyStats.badContentCount
+    delete cacacheVerifyStats.reclaimedCount
+    delete cacacheVerifyStats.reclaimedSize
+    delete cacacheVerifyStats.missingContent
+  })
+
+  cache(['check'], err => {
+    t.ifError(err)
+    t.match(outputOutput, [
+      `Cache verified and compressed (~${path.join('/fake/path', '_cacache')})`,
+      'Content verified: 1 (100 bytes)',
+      'Corrupted content removed: 1',
+      'Content garbage-collected: 2 (200 bytes)',
+      'Missing content: 3',
+      'Index entries: 1',
+      'Finished in 2s',
+    ], 'prints correct output')
+    t.end()
+  })
+})
+
+t.test('cache completion', t => {
+  const { completion } = cache
+
+  const testComp = (argv, expect) => {
+    completion({ conf: { argv: { remain: argv } } }, (err, res) => {
+      t.ifError(err)
+      t.strictSame(res, expect, argv.join(' '))
+    })
+  }
+
+  testComp(['npm', 'cache'], [
+    'add',
+    'clean',
+    'verify',
+  ])
+
+  testComp(['npm', 'cache', 'add'], [])
+  testComp(['npm', 'cache', 'clean'], [])
+  testComp(['npm', 'cache', 'verify'], [])
+
+  t.end()
+})
diff --git a/deps/npm/test/lib/ci.js b/deps/npm/test/lib/ci.js
index 645fc6aed97e4f..c32fb83279a413 100644
--- a/deps/npm/test/lib/ci.js
+++ b/deps/npm/test/lib/ci.js
@@ -3,17 +3,29 @@ const util = require('util')
 const readdir = util.promisify(fs.readdir)
 
 const { test } = require('tap')
-const { resolve } = require('path')
 
 const requireInject = require('require-inject')
 
-test('should use Arborist', (t) => {
+test('should use Arborist and run-script', (t) => {
+  const scripts = [
+    'preinstall',
+    'install',
+    'postinstall',
+    'prepublish', // XXX should we remove this finally??
+    'preprepare',
+    'prepare',
+    'postprepare',
+  ]
   const ci = requireInject('../../lib/ci.js', {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        global: false
-      }
+        global: false,
+      },
+    },
+    '../../lib/utils/reify-finish.js': async () => {},
+    '@npmcli/run-script': opts => {
+      t.match(opts, { event: scripts.shift() })
     },
     '@npmcli/arborist': function (args) {
       t.ok(args, 'gets options object')
@@ -25,40 +37,69 @@ test('should use Arborist', (t) => {
         t.ok(true, 'reify is called')
       }
     },
-    'util': {
-      'inherits': () => {},
-      'promisify': (fn) => fn
+    util: {
+      inherits: () => {},
+      promisify: (fn) => fn,
     },
-    'rimraf': (path) => {
+    rimraf: (path) => {
       t.ok(path, 'rimraf called with path')
       return Promise.resolve(true)
     },
     '../../lib/utils/reify-output.js': function (arb) {
       t.ok(arb, 'gets arborist tree')
-    }
+    },
   })
-  ci(null, () => {
+  ci(null, er => {
+    if (er)
+      throw er
+    t.strictSame(scripts, [], 'called all scripts')
     t.end()
   })
 })
 
+test('should pass flatOptions to Arborist.reify', (t) => {
+  const ci = requireInject('../../lib/ci.js', {
+    '../../lib/npm.js': {
+      prefix: 'foo',
+      flatOptions: {
+        production: true,
+      },
+    },
+    '../../lib/utils/reify-finish.js': async () => {},
+    '@npmcli/run-script': opts => {},
+    '@npmcli/arborist': function () {
+      this.loadVirtual = () => Promise.resolve(true)
+      this.reify = async (options) => {
+        t.equal(options.production, true, 'should pass flatOptions to Arborist.reify')
+        t.end()
+      }
+    },
+  })
+  ci(null, er => {
+    if (er)
+      throw er
+  })
+})
+
 test('should throw if package-lock.json or npm-shrinkwrap missing', (t) => {
   const testDir = t.testdir({
     'index.js': 'some contents',
-    'package.json': 'some info'
+    'package.json': 'some info',
   })
 
   const ci = requireInject('../../lib/ci.js', {
     '../../lib/npm.js': {
       prefix: testDir,
       flatOptions: {
-        global: false
-      }
+        global: false,
+      },
     },
-    'npmlog': {
+    '@npmcli/run-script': opts => {},
+    '../../lib/utils/reify-finish.js': async () => {},
+    npmlog: {
       verbose: () => {
         t.ok(true, 'log fn called')
-      }
+      },
     },
   })
   ci(null, (err, res) => {
@@ -73,9 +114,11 @@ test('should throw ECIGLOBAL', (t) => {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        global: true
-      }
-    }
+        global: true,
+      },
+    },
+    '@npmcli/run-script': opts => {},
+    '../../lib/utils/reify-finish.js': async () => {},
   })
   ci(null, (err, res) => {
     t.equals(err.code, 'ECIGLOBAL', 'throws error with global packages')
@@ -86,18 +129,20 @@ test('should throw ECIGLOBAL', (t) => {
 
 test('should remove existing node_modules before installing', (t) => {
   const testDir = t.testdir({
-    'node_modules': {
-      'some-file': 'some contents'
-    }
+    node_modules: {
+      'some-file': 'some contents',
+    },
   })
 
   const ci = requireInject('../../lib/ci.js', {
     '../../lib/npm.js': {
       prefix: testDir,
       flatOptions: {
-        global: false
-      }
+        global: false,
+      },
     },
+    '@npmcli/run-script': opts => {},
+    '../../lib/utils/reify-finish.js': async () => {},
     '@npmcli/arborist': function () {
       this.loadVirtual = () => Promise.resolve(true)
       this.reify = async (options) => {
@@ -108,8 +153,11 @@ test('should remove existing node_modules before installing', (t) => {
         t.same(nodeModules, ['node_modules'], 'should only have the node_modules directory')
         t.end()
       }
-    }
+    },
   })
 
-  ci(null, () => {})
+  ci(null, er => {
+    if (er)
+      throw er
+  })
 })
diff --git a/deps/npm/test/lib/cli.js b/deps/npm/test/lib/cli.js
index 0d9b6ad6a5a8a6..b5441be1e44d87 100644
--- a/deps/npm/test/lib/cli.js
+++ b/deps/npm/test/lib/cli.js
@@ -8,14 +8,16 @@ const npmock = {
   config: {
     settings: {},
     get: (k) => npmock.config.settings[k],
-    set: (k, v) => { npmock.config.settings[k] = v },
+    set: (k, v) => {
+      npmock.config.settings[k] = v
+    },
   },
-  commands: {}
+  commands: {},
 }
 
 const unsupportedMock = {
   checkForBrokenNode: () => {},
-  checkForUnsupportedNode: () => {}
+  checkForUnsupportedNode: () => {},
 }
 
 let errorHandlerCalled = null
@@ -31,7 +33,7 @@ const logs = []
 const npmlogMock = {
   pause: () => logs.push('pause'),
   verbose: (...msg) => logs.push(['verbose', ...msg]),
-  info: (...msg) => logs.push(['info', ...msg])
+  info: (...msg) => logs.push(['info', ...msg]),
 }
 
 const requireInject = require('require-inject')
@@ -39,7 +41,7 @@ const cli = requireInject.installGlobally('../../lib/cli.js', {
   '../../lib/npm.js': npmock,
   '../../lib/utils/unsupported.js': unsupportedMock,
   '../../lib/utils/error-handler.js': errorHandlerMock,
-  npmlog: npmlogMock
+  npmlog: npmlogMock,
 })
 
 t.test('print the version, and treat npm_g to npm -g', t => {
@@ -50,7 +52,7 @@ t.test('print the version, and treat npm_g to npm -g', t => {
   const proc = {
     argv: ['node', 'npm_g', '-v'],
     version: '420.69.lol',
-    on: () => {}
+    on: () => {},
   }
   process.argv = proc.argv
   npmock.config.settings.version = true
@@ -58,14 +60,14 @@ t.test('print the version, and treat npm_g to npm -g', t => {
   cli(proc)
 
   t.strictSame(npmock.argv, [])
-  t.strictSame(proc.argv, [ 'node', 'npm', '-g', '-v' ])
+  t.strictSame(proc.argv, ['node', 'npm', '-g', '-v'])
   t.strictSame(logs, [
     'pause',
-    [ 'verbose', 'cli', [ 'node', 'npm', '-g', '-v' ] ],
-    [ 'info', 'using', 'npm@%s', '99.99.99' ],
-    [ 'info', 'using', 'node@%s', '420.69.lol' ]
+    ['verbose', 'cli', ['node', 'npm', '-g', '-v']],
+    ['info', 'using', 'npm@%s', '99.99.99'],
+    ['info', 'using', 'node@%s', '420.69.lol'],
   ])
-  t.strictSame(consoleLogs, [ [ '99.99.99' ] ])
+  t.strictSame(consoleLogs, [['99.99.99']])
   t.strictSame(errorHandlerExitCalled, 0)
 
   delete npmock.config.settings.version
@@ -87,7 +89,7 @@ t.test('calling with --versions calls npm version with no args', t => {
   const processArgv = process.argv
   const proc = {
     argv: ['node', 'npm', 'install', 'or', 'whatever', '--versions'],
-    on: () => {}
+    on: () => {},
   }
   process.argv = proc.argv
   npmock.config.set('versions', true)
@@ -107,12 +109,12 @@ t.test('calling with --versions calls npm version with no args', t => {
   npmock.commands.version = (args, cb) => {
     t.equal(proc.title, 'npm')
     t.strictSame(npmock.argv, [])
-    t.strictSame(proc.argv, [ 'node', 'npm', 'install', 'or', 'whatever', '--versions' ])
+    t.strictSame(proc.argv, ['node', 'npm', 'install', 'or', 'whatever', '--versions'])
     t.strictSame(logs, [
       'pause',
-      [ 'verbose', 'cli', [ 'node', 'npm', 'install', 'or', 'whatever', '--versions' ] ],
-      [ 'info', 'using', 'npm@%s', '99.99.99' ],
-      [ 'info', 'using', 'node@%s', undefined ]
+      ['verbose', 'cli', ['node', 'npm', 'install', 'or', 'whatever', '--versions']],
+      ['info', 'using', 'npm@%s', '99.99.99'],
+      ['info', 'using', 'node@%s', undefined],
     ])
 
     t.strictSame(consoleLogs, [])
@@ -131,7 +133,7 @@ t.test('print usage if -h provided', t => {
   console.log = (...msg) => consoleLogs.push(msg)
   const proc = {
     argv: ['node', 'npm', 'asdf'],
-    on: () => {}
+    on: () => {},
   }
   npmock.argv = ['asdf']
 
@@ -150,12 +152,12 @@ t.test('print usage if -h provided', t => {
     t.equal(proc.title, 'npm')
     t.strictSame(args, ['asdf'])
     t.strictSame(npmock.argv, ['asdf'])
-    t.strictSame(proc.argv, [ 'node', 'npm', 'asdf' ])
+    t.strictSame(proc.argv, ['node', 'npm', 'asdf'])
     t.strictSame(logs, [
       'pause',
-      [ 'verbose', 'cli', [ 'node', 'npm', 'asdf' ] ],
-      [ 'info', 'using', 'npm@%s', '99.99.99' ],
-      [ 'info', 'using', 'node@%s', undefined ]
+      ['verbose', 'cli', ['node', 'npm', 'asdf']],
+      ['info', 'using', 'npm@%s', '99.99.99'],
+      ['info', 'using', 'node@%s', undefined],
     ])
     t.strictSame(consoleLogs, [])
     t.strictSame(errorHandlerExitCalled, null)
@@ -170,11 +172,10 @@ t.test('load error calls error handler', t => {
   LOAD_ERROR = er
   const proc = {
     argv: ['node', 'npm', 'asdf'],
-    on: () => {}
+    on: () => {},
   }
   cli(proc)
   t.strictSame(errorHandlerCalled, [er])
   LOAD_ERROR = null
   t.end()
 })
-
diff --git a/deps/npm/test/lib/completion.js b/deps/npm/test/lib/completion.js
new file mode 100644
index 00000000000000..367a1c03ab68e6
--- /dev/null
+++ b/deps/npm/test/lib/completion.js
@@ -0,0 +1,587 @@
+const { test } = require('tap')
+const requireInject = require('require-inject')
+const fs = require('fs')
+const path = require('path')
+
+const completionScript = fs.readFileSync(path.resolve(__dirname, '../../lib/utils/completion.sh'), { encoding: 'utf8' }).replace(/^#!.*?\n/, '')
+
+const output = []
+const npmConfig = {}
+let accessCompletionError = false
+
+const npm = {
+  config: {
+    set: (key, value) => {
+      npmConfig[key] = value
+    },
+    clear: () => {
+      for (const key in npmConfig)
+        delete npmConfig[key]
+    },
+  },
+  commands: {
+    completion: {
+      completion: (opts, cb) => {
+        return cb(null, [['>>', '~/.bashrc']])
+      },
+    },
+    adduser: {},
+    access: {
+      completion: (opts, cb) => {
+        if (accessCompletionError)
+          return cb(new Error('access completion failed'))
+
+        return cb(null, ['public', 'restricted'])
+      },
+    },
+    donothing: {
+      completion: (opts, cb) => {
+        return cb(null, null)
+      },
+    },
+    driveaboat: {
+      completion: (opts, cb) => {
+        // the leading space here is to exercise the escape method
+        return cb(null, ' fast')
+      },
+    },
+  },
+}
+
+const cmdList = {
+  aliases: {
+    login: 'adduser',
+  },
+  cmdList: [
+    'access',
+    'adduser',
+    'completion',
+  ],
+  plumbing: [],
+}
+
+const config = {
+  types: {
+    global: Boolean,
+    browser: [null, Boolean, String],
+    registry: [null, String],
+  },
+  shorthands: {
+    reg: ['--registry'],
+  },
+}
+
+const deref = (cmd) => {
+  return cmd
+}
+
+const completion = requireInject('../../lib/completion.js', {
+  '../../lib/npm.js': npm,
+  '../../lib/utils/cmd-list.js': cmdList,
+  '../../lib/utils/config.js': config,
+  '../../lib/utils/deref-command.js': deref,
+  '../../lib/utils/is-windows-shell.js': false,
+  '../../lib/utils/output.js': (line) => {
+    output.push(line)
+  },
+})
+
+test('completion completion', t => {
+  const home = process.env.HOME
+  t.teardown(() => {
+    process.env.HOME = home
+  })
+
+  process.env.HOME = t.testdir({
+    '.bashrc': '',
+    '.zshrc': '',
+  })
+
+  completion.completion({ w: 2 }, (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(res, [
+      ['>>', '~/.zshrc'],
+      ['>>', '~/.bashrc'],
+    ], 'identifies both shells')
+    t.end()
+  })
+})
+
+test('completion completion no known shells', t => {
+  const home = process.env.HOME
+  t.teardown(() => {
+    process.env.HOME = home
+  })
+
+  process.env.HOME = t.testdir()
+
+  completion.completion({ w: 2 }, (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(res, [], 'no responses')
+    t.end()
+  })
+})
+
+test('completion completion wrong word count', t => {
+  completion.completion({ w: 3 }, (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(res, undefined, 'no responses')
+    t.end()
+  })
+})
+
+test('completion errors in windows without bash', t => {
+  const compl = requireInject('../../lib/completion.js', {
+    '../../lib/utils/is-windows-shell.js': true,
+  })
+
+  compl({}, (err) => {
+    t.match(err, {
+      code: 'ENOTSUP',
+      message: /completion supported only in MINGW/,
+    }, 'returns the correct error')
+    t.end()
+  })
+})
+
+test('dump script when completion is not being attempted', t => {
+  const _write = process.stdout.write
+  const _on = process.stdout.on
+  t.teardown(() => {
+    process.stdout.write = _write
+    process.stdout.on = _on
+  })
+
+  let errorHandler
+  process.stdout.on = (event, handler) => {
+    errorHandler = handler
+    process.stdout.on = _on
+  }
+
+  let data
+  process.stdout.write = (chunk, callback) => {
+    data = chunk
+    process.stdout.write = _write
+    process.nextTick(() => {
+      callback()
+      errorHandler({ errno: 'EPIPE' })
+    })
+  }
+
+  completion({}, (err) => {
+    if (err)
+      throw err
+
+    t.equal(data, completionScript, 'wrote the completion script')
+    t.end()
+  })
+})
+
+test('dump script exits correctly when EPIPE is emitted on stdout', t => {
+  const _write = process.stdout.write
+  const _on = process.stdout.on
+  t.teardown(() => {
+    process.stdout.write = _write
+    process.stdout.on = _on
+  })
+
+  let errorHandler
+  process.stdout.on = (event, handler) => {
+    errorHandler = handler
+    process.stdout.on = _on
+  }
+
+  let data
+  process.stdout.write = (chunk, callback) => {
+    data = chunk
+    process.stdout.write = _write
+    process.nextTick(() => {
+      errorHandler({ errno: 'EPIPE' })
+      callback()
+    })
+  }
+
+  completion({}, (err) => {
+    if (err)
+      throw err
+
+    t.equal(data, completionScript, 'wrote the completion script')
+    t.end()
+  })
+})
+
+test('non EPIPE errors cause failures', t => {
+  const _write = process.stdout.write
+  const _on = process.stdout.on
+  t.teardown(() => {
+    process.stdout.write = _write
+    process.stdout.on = _on
+  })
+
+  let errorHandler
+  process.stdout.on = (event, handler) => {
+    errorHandler = handler
+    process.stdout.on = _on
+  }
+
+  let data
+  process.stdout.write = (chunk, callback) => {
+    data = chunk
+    process.stdout.write = _write
+    process.nextTick(() => {
+      errorHandler({ errno: 'ESOMETHINGELSE' })
+      callback()
+    })
+  }
+
+  completion({}, (err) => {
+    t.equal(err.errno, 'ESOMETHINGELSE', 'propagated error')
+    t.equal(data, completionScript, 'wrote the completion script')
+    t.end()
+  })
+})
+
+test('completion completes single command name', t => {
+  process.env.COMP_CWORD = 1
+  process.env.COMP_LINE = 'npm c'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'c'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(output, ['completion'], 'correctly completed a command name')
+    t.end()
+  })
+})
+
+test('completion completes command names', t => {
+  process.env.COMP_CWORD = 1
+  process.env.COMP_LINE = 'npm a'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'a'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(output, [['access', 'adduser'].join('\n')], 'correctly completed a command name')
+    t.end()
+  })
+})
+
+test('completion of invalid command name does nothing', t => {
+  process.env.COMP_CWORD = 1
+  process.env.COMP_LINE = 'npm compute'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'compute'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(output, [], 'returns no results')
+    t.end()
+  })
+})
+
+test('completion triggers command completions', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm access '
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'access', ''], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'access'],
+        cooked: ['npm', 'access'],
+        original: ['npm', 'access'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, [['public', 'restricted'].join('\n')], 'correctly completed a subcommand name')
+    t.end()
+  })
+})
+
+test('completion triggers filtered command completions', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm access p'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'access', 'p'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'access'],
+        cooked: ['npm', 'access'],
+        original: ['npm', 'access'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, ['public'], 'correctly completed a subcommand name')
+    t.end()
+  })
+})
+
+test('completions for commands that return nested arrays are joined', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm completion '
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'completion', ''], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'completion'],
+        cooked: ['npm', 'completion'],
+        original: ['npm', 'completion'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, ['>> ~/.bashrc'], 'joins nested arrays')
+    t.end()
+  })
+})
+
+test('completions for commands that return nothing work correctly', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm donothing '
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'donothing', ''], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'donothing'],
+        cooked: ['npm', 'donothing'],
+        original: ['npm', 'donothing'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, [], 'returns nothing')
+    t.end()
+  })
+})
+
+test('completions for commands that return a single item work correctly', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm driveaboat '
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'driveaboat', ''], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'driveaboat'],
+        cooked: ['npm', 'driveaboat'],
+        original: ['npm', 'driveaboat'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, ['\' fast\''], 'returns the correctly escaped string')
+    t.end()
+  })
+})
+
+test('command completion for commands with no completion return no results', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm adduser '
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  // quotes around adduser are to ensure coverage when unescaping commands
+  completion(['npm', '\'adduser\'', ''], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'adduser'],
+        cooked: ['npm', 'adduser'],
+        original: ['npm', 'adduser'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, [], 'correctly completed a subcommand name')
+    t.end()
+  })
+})
+
+test('command completion errors propagate', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm access '
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+  accessCompletionError = true
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+    accessCompletionError = false
+  })
+
+  completion(['npm', 'access', ''], (err, res) => {
+    t.match(err, /access completion failed/, 'catches the appropriate error')
+    t.strictSame(npmConfig, {
+      argv: {
+        remain: ['npm', 'access'],
+        cooked: ['npm', 'access'],
+        original: ['npm', 'access'],
+      },
+    }, 'applies command config appropriately')
+    t.strictSame(output, [], 'returns no results')
+    t.end()
+  })
+})
+
+test('completion can complete flags', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm install --'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', 'install', '--'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {}, 'does not apply command config')
+    t.strictSame(output, [['--global', '--browser', '--registry', '--reg', '--no-global', '--no-browser'].join('\n')], 'correctly completes flag names')
+    t.end()
+  })
+})
+
+test('double dashes escape from flag completion', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm -- install --'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', '--', 'install', '--'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {}, 'does not apply command config')
+    t.strictSame(output, [['access', 'adduser', 'completion', 'login'].join('\n')], 'correctly completes flag names')
+    t.end()
+  })
+})
+
+test('completion cannot complete options that take a value in mid-command', t => {
+  process.env.COMP_CWORD = 2
+  process.env.COMP_LINE = 'npm --registry install'
+  process.env.COMP_POINT = process.env.COMP_LINE.length
+
+  t.teardown(() => {
+    delete process.env.COMP_CWORD
+    delete process.env.COMP_LINE
+    delete process.env.COMP_POINT
+    npm.config.clear()
+    output.length = 0
+  })
+
+  completion(['npm', '--registry', 'install'], (err, res) => {
+    if (err)
+      throw err
+
+    t.strictSame(npmConfig, {}, 'does not apply command config')
+    t.strictSame(output, [], 'does not try to complete option arguments in the middle of a command')
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/config.js b/deps/npm/test/lib/config.js
index 890d65731a88c7..8a11a40c813370 100644
--- a/deps/npm/test/lib/config.js
+++ b/deps/npm/test/lib/config.js
@@ -25,20 +25,20 @@ const types = {
   'init-author-name': String,
   'init-version': String,
   'init.author.name': String,
-  'init.version': String
+  'init.version': String,
 }
 const defaults = {
   'init-author-name': '',
   'init-version': '1.0.0',
   'init.author.name': '',
-  'init.version': '1.0.0'
+  'init.version': '1.0.0',
 }
 
 const flatOptions = {
   editor: 'vi',
   json: false,
   long: false,
-  global: false
+  global: false,
 }
 
 const npm = {
@@ -46,17 +46,21 @@ const npm = {
   log: {
     info: () => null,
     enableProgress: () => null,
-    disableProgress: () => null
+    disableProgress: () => null,
   },
   config: {
     data: new Map(Object.entries({
       default: { data: defaults, source: 'default values' },
       global: { data: {}, source: '/etc/npmrc' },
-      cli: { data: flatOptions, source: 'command line options' }
+      cli: { data: flatOptions, source: 'command line options' },
     })),
-    get (key) { return flatOptions[key] },
-    validate () { return true }
-  }
+    get (key) {
+      return flatOptions[key]
+    },
+    validate () {
+      return true
+    },
+  },
 }
 
 const usageUtil = () => 'usage instructions'
@@ -64,8 +68,10 @@ const usageUtil = () => 'usage instructions'
 const mocks = {
   '../../lib/utils/config.js': { defaults, types },
   '../../lib/npm.js': npm,
-  '../../lib/utils/output.js': msg => { result = msg },
-  '../../lib/utils/usage.js': usageUtil
+  '../../lib/utils/output.js': msg => {
+    result = msg
+  },
+  '../../lib/utils/usage.js': usageUtil,
 }
 
 const config = requireInject('../../lib/config.js', mocks)
@@ -99,9 +105,9 @@ t.test('config list overrides', t => {
   npm.config.data.set('user', {
     data: {
       'init.author.name': 'Foo',
-      '//private-reg.npmjs.org/:_authThoken': 'f00ba1'
+      '//private-reg.npmjs.org/:_authThoken': 'f00ba1',
     },
-    source: '~/.npmrc'
+    source: '~/.npmrc',
   })
   flatOptions['init.author.name'] = 'Bar'
   npm.config.find = () => 'cli'
@@ -144,7 +150,7 @@ t.test('config list --json', t => {
   result = ''
   npm.config.list = [{
     '//private-reg.npmjs.org/:_authThoken': 'f00ba1',
-    ...npm.config.data.get('cli').data
+    ...npm.config.data.get('cli').data,
   }]
   const npmConfigGet = npm.config.get
   npm.config.get = key => npm.config.list[0][key]
@@ -164,7 +170,7 @@ t.test('config list --json', t => {
         editor: 'vi',
         json: true,
         long: false,
-        global: false
+        global: false,
       },
       'should list configs usin json'
     )
@@ -413,7 +419,7 @@ t.test('config edit', t => {
 init.author.name=Foo
 sign-git-commit=true`
   npm.config.data.set('user', {
-    source: '~/.npmrc'
+    source: '~/.npmrc',
   })
   npm.config.save = async where => {
     t.equal(where, 'user', 'should save to user config by default')
@@ -422,25 +428,29 @@ sign-git-commit=true`
     ...mocks,
     'mkdirp-infer-owner': async () => null,
     fs: {
-      readFile (path, encoding, cb) { cb(null, npmrc) },
+      readFile (path, encoding, cb) {
+        cb(null, npmrc)
+      },
       writeFile (file, data, encoding, cb) {
         t.equal(file, '~/.npmrc', 'should save to expected file location')
         t.matchSnapshot(data, 'should write config file')
         cb()
-      }
+      },
     },
     editor: (file, { editor }, cb) => {
       t.equal(file, '~/.npmrc', 'should match user source data')
       t.equal(editor, 'vi', 'should use default editor')
       cb()
-    }
+    },
   }
   const config = requireInject('../../lib/config.js', editMocks)
   config(['edit'], (err) => {
     t.ifError(err, 'npm config edit')
 
     // test no config file result
-    editMocks.fs.readFile = (p, e, cb) => { cb(new Error('ERR')) }
+    editMocks.fs.readFile = (p, e, cb) => {
+      cb(new Error('ERR'))
+    }
     const config = requireInject('../../lib/config.js', editMocks)
     config(['edit'], (err) => {
       t.ifError(err, 'npm config edit')
@@ -459,7 +469,7 @@ t.test('config edit --global', t => {
   flatOptions.global = true
   const npmrc = 'init.author.name=Foo'
   npm.config.data.set('global', {
-    source: '/etc/npmrc'
+    source: '/etc/npmrc',
   })
   npm.config.save = async where => {
     t.equal(where, 'global', 'should save to global config')
@@ -468,18 +478,20 @@ t.test('config edit --global', t => {
     ...mocks,
     'mkdirp-infer-owner': async () => null,
     fs: {
-      readFile (path, encoding, cb) { cb(null, npmrc) },
+      readFile (path, encoding, cb) {
+        cb(null, npmrc)
+      },
       writeFile (file, data, encoding, cb) {
         t.equal(file, '/etc/npmrc', 'should save to global file location')
         t.matchSnapshot(data, 'should write global config file')
         cb()
-      }
+      },
     },
     editor: (file, { editor }, cb) => {
       t.equal(file, '/etc/npmrc', 'should match global source data')
       t.equal(editor, 'vi', 'should use default editor')
       cb()
-    }
+    },
   }
   const config = requireInject('../../lib/config.js', editMocks)
   config(['edit'], (err) => {
@@ -524,7 +536,7 @@ t.test('completion', t => {
     'ls',
     'rm',
     'edit',
-    'list'
+    'list',
   ])
   testComp(['npm', 'config', 'set', 'foo'], [])
   const possibleConfigKeys = [...Object.keys(types)]
@@ -539,10 +551,10 @@ t.test('completion', t => {
   completion({
     conf: {
       argv: {
-        remain: ['npm', 'config']
-      }
+        remain: ['npm', 'config'],
+      },
     },
-    partialWord: 'l'
+    partialWord: 'l',
   }, (er, res) => {
     t.ifError(er)
     t.strictSame(res, [
@@ -551,7 +563,7 @@ t.test('completion', t => {
       'delete',
       'ls',
       'rm',
-      'edit'
+      'edit',
     ], 'npm config')
   })
 
diff --git a/deps/npm/test/lib/dedupe.js b/deps/npm/test/lib/dedupe.js
index a88c41f6e9c674..ff2d2be5340524 100644
--- a/deps/npm/test/lib/dedupe.js
+++ b/deps/npm/test/lib/dedupe.js
@@ -1,5 +1,4 @@
 const { test } = require('tap')
-const dedupe = require('../../lib/dedupe.js')
 const requireInject = require('require-inject')
 
 test('should remove dupes using Arborist', (t) => {
@@ -7,8 +6,8 @@ test('should remove dupes using Arborist', (t) => {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        'dryRun': 'false'
-      }
+        dryRun: 'false',
+      },
     },
     '@npmcli/arborist': function (args) {
       t.ok(args, 'gets options object')
@@ -18,11 +17,13 @@ test('should remove dupes using Arborist', (t) => {
         t.ok(true, 'dedupe is called')
       }
     },
-    '../../lib/utils/reify-output.js': (arb) => {
+    '../../lib/utils/reify-finish.js': (arb) => {
       t.ok(arb, 'gets arborist tree')
-    }
+    },
   })
-  dedupe({ dryRun: true }, () => {
+  dedupe({ dryRun: true }, er => {
+    if (er)
+      throw er
     t.ok(true, 'callback is called')
     t.end()
   })
@@ -33,17 +34,16 @@ test('should remove dupes using Arborist - no arguments', (t) => {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        'dryRun': 'true'
-      }
+        dryRun: 'true',
+      },
     },
     '@npmcli/arborist': function (args) {
       t.ok(args.dryRun, 'gets dryRun from flatOptions')
       this.dedupe = () => {}
     },
-    '../../lib/utils/reify-output.js': () => {}
+    '../../lib/utils/reify-output.js': () => {},
   })
   dedupe(null, () => {
     t.end()
   })
 })
-
diff --git a/deps/npm/test/lib/deprecate.js b/deps/npm/test/lib/deprecate.js
new file mode 100644
index 00000000000000..3908254ed0d635
--- /dev/null
+++ b/deps/npm/test/lib/deprecate.js
@@ -0,0 +1,134 @@
+const { test } = require('tap')
+const requireInject = require('require-inject')
+
+let getIdentityImpl = () => 'someperson'
+let npmFetchBody = null
+
+const npmFetch = async (uri, opts) => {
+  npmFetchBody = opts.body
+}
+
+npmFetch.json = async (uri, opts) => {
+  return {
+    versions: {
+      '1.0.0': {},
+      '1.0.1': {},
+    },
+  }
+}
+
+const deprecate = requireInject('../../lib/deprecate.js', {
+  '../../lib/npm.js': {
+    flatOptions: { registry: 'https://registry.npmjs.org' },
+  },
+  '../../lib/utils/get-identity.js': async () => getIdentityImpl(),
+  '../../lib/utils/otplease.js': async (opts, fn) => fn(opts),
+  libnpmaccess: {
+    lsPackages: async () => ({ foo: 'write', bar: 'write', baz: 'write', buzz: 'read' }),
+  },
+  'npm-registry-fetch': npmFetch,
+})
+
+test('completion', async t => {
+  const defaultIdentityImpl = getIdentityImpl
+  t.teardown(() => {
+    getIdentityImpl = defaultIdentityImpl
+  })
+
+  const { completion } = deprecate
+
+  const testComp = (argv, expect) => {
+    return new Promise((resolve, reject) => {
+      completion({ conf: { argv: { remain: argv } } }, (err, res) => {
+        if (err)
+          return reject(err)
+
+        t.strictSame(res, expect, `completion: ${argv}`)
+        resolve()
+      })
+    })
+  }
+
+  await testComp([], ['foo', 'bar', 'baz'])
+  await testComp(['b'], ['bar', 'baz'])
+  await testComp(['fo'], ['foo'])
+  await testComp(['g'], [])
+  await testComp(['foo', 'something'], [])
+
+  getIdentityImpl = () => {
+    throw new Error('unknown failure')
+  }
+
+  t.rejects(testComp([], []), /unknown failure/)
+})
+
+test('no args', t => {
+  deprecate([], (err) => {
+    t.match(err, /Usage: npm deprecate/, 'logs usage')
+    t.end()
+  })
+})
+
+test('only one arg', t => {
+  deprecate(['foo'], (err) => {
+    t.match(err, /Usage: npm deprecate/, 'logs usage')
+    t.end()
+  })
+})
+
+test('invalid semver range', t => {
+  deprecate(['foo@notaversion', 'this will fail'], (err) => {
+    t.match(err, /invalid version range/, 'logs semver error')
+    t.end()
+  })
+})
+
+test('deprecates given range', t => {
+  t.teardown(() => {
+    npmFetchBody = null
+  })
+
+  deprecate(['foo@1.0.0', 'this version is deprecated'], (err) => {
+    if (err)
+      throw err
+
+    t.match(npmFetchBody, {
+      versions: {
+        '1.0.0': {
+          deprecated: 'this version is deprecated',
+        },
+        '1.0.1': {
+          // the undefined here is necessary to ensure that we absolutely
+          // did not assign this property
+          deprecated: undefined,
+        },
+      },
+    })
+
+    t.end()
+  })
+})
+
+test('deprecates all versions when no range is specified', t => {
+  t.teardown(() => {
+    npmFetchBody = null
+  })
+
+  deprecate(['foo', 'this version is deprecated'], (err) => {
+    if (err)
+      throw err
+
+    t.match(npmFetchBody, {
+      versions: {
+        '1.0.0': {
+          deprecated: 'this version is deprecated',
+        },
+        '1.0.1': {
+          deprecated: 'this version is deprecated',
+        },
+      },
+    })
+
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/dist-tag.js b/deps/npm/test/lib/dist-tag.js
index ad08c2be13f635..e9dde48062dc27 100644
--- a/deps/npm/test/lib/dist-tag.js
+++ b/deps/npm/test/lib/dist-tag.js
@@ -8,32 +8,33 @@ let log = ''
 // these declared opts are used in ./utils/read-local-package.js
 const _flatOptions = {
   global: false,
-  get prefix () { return prefix }
+  get prefix () {
+    return prefix
+  },
 }
 
 const routeMap = {
   '/-/package/@scoped%2fpkg/dist-tags': {
     latest: '1.0.0',
     a: '0.0.1',
-    b: '0.5.0'
+    b: '0.5.0',
   },
   '/-/package/@scoped%2fanother/dist-tags': {
     latest: '2.0.0',
     a: '0.0.2',
-    b: '0.6.0'
+    b: '0.6.0',
   },
   '/-/package/@scoped%2fanother/dist-tags/c': {
     latest: '7.7.7',
     a: '0.0.2',
     b: '0.6.0',
-    c: '7.7.7'
-  }
+    c: '7.7.7',
+  },
 }
 
 let npmRegistryFetchMock = (url, opts) => {
-  if (url === '/-/package/foo/dist-tags') {
+  if (url === '/-/package/foo/dist-tags')
     throw new Error('no package found')
-  }
 
   return routeMap[url]
 }
@@ -41,9 +42,9 @@ let npmRegistryFetchMock = (url, opts) => {
 npmRegistryFetchMock.json = async (url, opts) => routeMap[url]
 
 const logger = (...msgs) => {
-  for (const msg of [...msgs]) {
+  for (const msg of [...msgs])
     log += msg + ' '
-  }
+
   log += '\n'
 }
 
@@ -52,25 +53,29 @@ const distTag = requireInject('../../lib/dist-tag.js', {
     error: logger,
     info: logger,
     verbose: logger,
-    warn: logger
+    warn: logger,
+  },
+  get 'npm-registry-fetch' () {
+    return npmRegistryFetchMock
   },
-  get 'npm-registry-fetch' () { return npmRegistryFetchMock },
   '../../lib/npm.js': {
     flatOptions: _flatOptions,
     config: {
       get (key) {
         return _flatOptions[key]
-      }
-    }
+      },
+    },
+  },
+  '../../lib/utils/output.js': msg => {
+    result = msg
   },
-  '../../lib/utils/output.js': msg => { result = msg }
 })
 
 test('ls in current package', (t) => {
   prefix = t.testdir({
     'package.json': JSON.stringify({
-      name: '@scoped/pkg'
-    })
+      name: '@scoped/pkg',
+    }),
   })
   distTag(['ls'], (err) => {
     t.ifError(err, 'npm dist-tags ls')
@@ -87,8 +92,8 @@ test('ls in current package', (t) => {
 test('no args in current package', (t) => {
   prefix = t.testdir({
     'package.json': JSON.stringify({
-      name: '@scoped/pkg'
-    })
+      name: '@scoped/pkg',
+    }),
   })
   distTag([], (err) => {
     t.ifError(err, 'npm dist-tags ls')
@@ -146,8 +151,8 @@ test('ls on missing package', (t) => {
 test('ls on missing name in current package', (t) => {
   prefix = t.testdir({
     'package.json': JSON.stringify({
-      version: '1.0.0'
-    })
+      version: '1.0.0',
+    }),
   })
   distTag(['ls'], (err) => {
     t.matchSnapshot(
@@ -294,9 +299,9 @@ test('completion', t => {
   completion({
     conf: {
       argv: {
-        remain: ['npm', 'dist-tag']
-      }
-    }
+        remain: ['npm', 'dist-tag'],
+      },
+    },
   }, (err, res) => {
     t.ifError(err, 'npm dist-tags completion')
 
@@ -305,7 +310,7 @@ test('completion', t => {
       [
         'add',
         'rm',
-        'ls'
+        'ls',
       ],
       'should list npm dist-tag commands for completion'
     )
@@ -314,9 +319,9 @@ test('completion', t => {
   completion({
     conf: {
       argv: {
-        remain: ['npm', 'dist-tag', 'foobar']
-      }
-    }
+        remain: ['npm', 'dist-tag', 'foobar'],
+      },
+    },
   }, (err) => {
     t.notOk(err, 'should ignore any unkown name')
   })
diff --git a/deps/npm/test/lib/docs.js b/deps/npm/test/lib/docs.js
index 48ba9a3b57f442..b4ede873167d4f 100644
--- a/deps/npm/test/lib/docs.js
+++ b/deps/npm/test/lib/docs.js
@@ -5,30 +5,30 @@ const pacote = {
   manifest: async (spec, options) => {
     return spec === 'nodocs' ? {
       name: 'nodocs',
-      version: '1.2.3'
-    }
-    : spec === 'docsurl' ? {
-      name: 'docsurl',
-      version: '1.2.3',
-      homepage: 'https://bugzilla.localhost/docsurl'
-    }
-    : spec === 'repourl' ? {
-      name: 'repourl',
-      version: '1.2.3',
-      repository: 'https://github.com/foo/repourl'
-    }
-    : spec === 'repoobj' ? {
-      name: 'repoobj',
-      version: '1.2.3',
-      repository: { url: 'https://github.com/foo/repoobj' }
-    }
-    : spec === '.' ? {
-      name: 'thispkg',
       version: '1.2.3',
-      homepage: 'https://example.com'
     }
-    : null
-  }
+      : spec === 'docsurl' ? {
+        name: 'docsurl',
+        version: '1.2.3',
+        homepage: 'https://bugzilla.localhost/docsurl',
+      }
+      : spec === 'repourl' ? {
+        name: 'repourl',
+        version: '1.2.3',
+        repository: 'https://github.com/foo/repourl',
+      }
+      : spec === 'repoobj' ? {
+        name: 'repoobj',
+        version: '1.2.3',
+        repository: { url: 'https://github.com/foo/repoobj' },
+      }
+      : spec === '.' ? {
+        name: 'thispkg',
+        version: '1.2.3',
+        homepage: 'https://example.com',
+      }
+      : null
+  },
 }
 
 // keep a tally of which urls got opened
@@ -41,7 +41,7 @@ const openUrl = (url, errMsg, cb) => {
 
 const docs = requireInject('../../lib/docs.js', {
   pacote,
-  '../../lib/utils/open-url.js': openUrl
+  '../../lib/utils/open-url.js': openUrl,
 })
 
 t.test('completion', t => {
@@ -58,7 +58,7 @@ t.test('open docs urls', t => {
     docsurl: 'https://bugzilla.localhost/docsurl',
     repourl: 'https://github.com/foo/repourl#readme',
     repoobj: 'https://github.com/foo/repoobj#readme',
-    '.': 'https://example.com'
+    '.': 'https://example.com',
   }
   const keys = Object.keys(expect)
   t.plan(keys.length)
diff --git a/deps/npm/test/lib/doctor.js b/deps/npm/test/lib/doctor.js
new file mode 100644
index 00000000000000..c2c3fdb9781f29
--- /dev/null
+++ b/deps/npm/test/lib/doctor.js
@@ -0,0 +1,943 @@
+const { test } = require('tap')
+const requireInject = require('require-inject')
+
+const { join } = require('path')
+const fs = require('fs')
+const ansiTrim = require('../../lib/utils/ansi-trim.js')
+const isWindows = require('../../lib/utils/is-windows.js')
+
+// getuid and getgid do not exist in windows, so we shim them
+// to return 0, as that is the value that lstat will assign the
+// gid and uid properties for fs.Stats objects
+if (isWindows) {
+  process.getuid = () => 0
+  process.getgid = () => 0
+}
+
+const output = []
+
+let pingError
+const ping = async () => {
+  if (pingError)
+    throw pingError
+}
+
+const nodeVersions = [
+  { version: 'v14.0.0', lts: false },
+  { version: 'v13.0.0', lts: false },
+  // it's necessary to allow tests in node 10.x to not mark 12.x as lts
+  { version: 'v12.0.0', lts: false },
+  { version: 'v10.13.0', lts: 'Dubnium' },
+]
+
+const fetch = async () => {
+  return {
+    json: async () => {
+      return nodeVersions
+    },
+  }
+}
+
+const logs = {
+  info: [],
+}
+
+const clearLogs = (obj = logs) => {
+  output.length = 0
+  for (const key in obj) {
+    if (Array.isArray(obj[key]))
+      obj[key].length = 0
+    else
+      delete obj[key]
+  }
+}
+
+const npm = {
+  flatOptions: {
+    registry: 'https://registry.npmjs.org/',
+  },
+  log: {
+    info: (msg) => {
+      logs.info.push(msg)
+    },
+    newItem: (name) => {
+      logs[name] = {}
+
+      return {
+        info: (_, msg) => {
+          if (!logs[name].info)
+            logs[name].info = []
+          logs[name].info.push(msg)
+        },
+        warn: (_, msg) => {
+          if (!logs[name].warn)
+            logs[name].warn = []
+          logs[name].warn.push(msg)
+        },
+        error: (_, msg) => {
+          if (!logs[name].error)
+            logs[name].error = []
+          logs[name].error.push(msg)
+        },
+        silly: (_, msg) => {
+          if (!logs[name].silly)
+            logs[name].silly = []
+          logs[name].silly.push(msg)
+        },
+        completeWork: () => {},
+        finish: () => {
+          logs[name].finished = true
+        },
+      }
+    },
+    level: 'error',
+    levels: {
+      info: 1,
+      error: 0,
+    },
+  },
+  version: '7.1.0',
+}
+
+let latestNpm = npm.version
+const pacote = {
+  manifest: async () => {
+    return { version: latestNpm }
+  },
+}
+
+let whichError = null
+const which = async () => {
+  if (whichError)
+    throw whichError
+  return '/path/to/git'
+}
+
+let verifyResponse = { verifiedCount: 1, verifiedContent: 1 }
+const cacache = {
+  verify: async () => {
+    return verifyResponse
+  },
+}
+
+const doctor = requireInject('../../lib/doctor.js', {
+  '../../lib/utils/is-windows.js': false,
+  '../../lib/utils/ping.js': ping,
+  '../../lib/utils/output.js': (data) => {
+    output.push(data)
+  },
+  '../../lib/npm.js': npm,
+  cacache,
+  pacote,
+  'make-fetch-happen': fetch,
+  which,
+})
+
+test('npm doctor checks ok', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    if (err) {
+      t.fail(output)
+      return t.end()
+    }
+
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor supports silent', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  npm.log.level = 'info'
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    npm.log.level = 'error'
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    if (err) {
+      t.fail(err)
+      return t.end()
+    }
+
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.strictSame(output, [], 'did not print output')
+    t.end()
+  })
+})
+
+test('npm doctor supports color', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  npm.color = true
+  pingError = { message: 'generic error' }
+  const _consoleError = console.error
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    delete npm.color
+    pingError = null
+    console.error = _consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'detected the ping error')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping.*not ok/, 'ping output is ok')
+    t.match(output, /npm -v.*ok/, 'npm -v output is ok')
+    t.match(output, /node -v.*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry.*ok.*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git.*ok/, 'which git output is ok')
+    t.match(output, /cached files.*ok/, 'cached files are ok')
+    t.match(output, /local node_modules.*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules.*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder.*ok/, 'local bin is ok')
+    t.match(output, /global bin folder.*ok/, 'global bin is ok')
+    t.match(output, /cache contents.*ok/, 'cache contents is ok')
+    t.notEqual(output[0], ansiTrim(output[0]), 'output should contain color codes')
+    t.end()
+  })
+})
+
+test('npm doctor skips some tests in windows', t => {
+  const winDoctor = requireInject('../../lib/doctor.js', {
+    '../../lib/utils/is-windows.js': true,
+    '../../lib/utils/ping.js': ping,
+    '../../lib/utils/output.js': (data) => {
+      output.push(data)
+    },
+    '../../lib/npm.js': npm,
+    cacache,
+    pacote,
+    'make-fetch-happen': fetch,
+    which,
+  })
+
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    clearLogs()
+  })
+
+  winDoctor([], (err) => {
+    if (err) {
+      t.fail(output)
+      return t.end()
+    }
+
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: undefined,
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor ping error E{3}', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  pingError = { code: 'E111', message: 'this error is 111' }
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    pingError = null
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'detected the ping error')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*not ok\s*111 this error is 111/, 'ping output contains trimmed error')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor generic ping error', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  pingError = { message: 'generic error' }
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    pingError = null
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'detected the ping error')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*not ok\s*generic error/, 'ping output contains trimmed error')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor outdated npm version', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  latestNpm = '7.1.1'
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    latestNpm = npm.version
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'detected the out of date npm')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*not ok/, 'npm -v output is not ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor outdated nodejs version', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  nodeVersions.push({ version: process.version.replace(/\d+$/, '999'), lts: false })
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    nodeVersions.pop()
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'detected the out of date nodejs')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*not ok/, 'node -v output is not ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor file permission checks', t => {
+  const dir = t.testdir({
+    cache: {
+      one: 'one',
+      link: t.fixture('symlink', './one'),
+      unreadable: 'unreadable',
+      baddir: {},
+    },
+    local: {
+      two: 'two',
+      notmine: 'notmine',
+    },
+    global: {
+      three: 'three',
+      broken: 'broken',
+    },
+    localBin: {
+      four: 'four',
+      five: 'five',
+    },
+    globalBin: {
+      six: 'six',
+      seven: 'seven',
+    },
+  })
+
+  const _fsLstat = fs.lstat
+  fs.lstat = (p, cb) => {
+    let err = null
+    let stat = null
+
+    try {
+      stat = fs.lstatSync(p)
+    } catch (err) {
+      return cb(err)
+    }
+
+    switch (p) {
+      case join(dir, 'local', 'notmine'):
+        stat.uid += 1
+        stat.gid += 1
+        break
+      case join(dir, 'global', 'broken'):
+        err = new Error('broken')
+        break
+    }
+
+    return cb(err, stat)
+  }
+
+  const _fsReaddir = fs.readdir
+  fs.readdir = (p, cb) => {
+    let err = null
+    let result = null
+
+    try {
+      result = fs.readdirSync(p)
+    } catch (err) {
+      return cb(err)
+    }
+
+    if (p === join(dir, 'cache', 'baddir'))
+      err = new Error('broken')
+
+    return cb(err, result)
+  }
+
+  const _fsAccess = fs.access
+  fs.access = (p, mask, cb) => {
+    const err = new Error('failed')
+    switch (p) {
+      case join(dir, 'cache', 'unreadable'):
+      case join(dir, 'localBin', 'four'):
+      case join(dir, 'globalBin', 'six'):
+        return cb(err)
+      default:
+        return cb(null)
+    }
+  }
+
+  const doctor = requireInject('../../lib/doctor.js', {
+    '../../lib/utils/is-windows.js': false,
+    '../../lib/utils/ping.js': ping,
+    '../../lib/utils/output.js': (data) => {
+      output.push(data)
+    },
+    '../../lib/npm.js': npm,
+    cacache,
+    pacote,
+    'make-fetch-happen': fetch,
+    which,
+    fs,
+  })
+  // it's necessary to allow tests in node 10.x to not mark 12.x as lted
+
+  npm.cache = npm.flatOptions.cache = join(dir, 'cache')
+  npm.localDir = join(dir, 'local')
+  npm.globalDir = join(dir, 'global')
+  npm.localBin = join(dir, 'localBin')
+  npm.globalBin = join(dir, 'globalBin')
+  const _consoleError = console.error
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    console.error = _consoleError
+    fs.lstat = _fsLstat
+    fs.readdir = _fsReaddir
+    fs.access = _fsAccess
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'identified problems')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [join(dir, 'cache')]: { finished: true },
+      [join(dir, 'local')]: { finished: true },
+      [join(dir, 'global')]: { finished: true },
+      [join(dir, 'localBin')]: { finished: true },
+      [join(dir, 'globalBin')]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*not ok/, 'cached files are not ok')
+    t.match(output, /local node_modules\s*not ok/, 'local node_modules are not ok')
+    t.match(output, /global node_modules\s*not ok/, 'global node_modules are not ok')
+    t.match(output, /local bin folder\s*not ok/, 'local bin is not ok')
+    t.match(output, /global bin folder\s*not ok/, 'global bin is not ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor missing git', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  whichError = new Error('boom')
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    whichError = null
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    t.match(err, /Some problems found/, 'detected the missing git')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*not ok/, 'which git output is not ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
+
+test('npm doctor cache verification showed bad content', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  const _verifyResponse = verifyResponse
+  verifyResponse = {
+    ...verifyResponse,
+    badContentCount: 1,
+  }
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    verifyResponse = _verifyResponse
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    // cache verification problems get fixed and so do not throw an error
+    if (err) {
+      t.fail(output)
+      return t.end()
+    }
+
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is not ok')
+    t.end()
+  })
+})
+
+test('npm doctor cache verification showed reclaimed content', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  const _verifyResponse = verifyResponse
+  verifyResponse = {
+    ...verifyResponse,
+    reclaimedCount: 1,
+    reclaimedSize: 100,
+  }
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    verifyResponse = _verifyResponse
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    // cache verification problems get fixed and so do not throw an error
+    if (err) {
+      t.fail(output)
+      return t.end()
+    }
+
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is not ok')
+    t.end()
+  })
+})
+
+test('npm doctor cache verification showed missing content', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  const _verifyResponse = verifyResponse
+  verifyResponse = {
+    ...verifyResponse,
+    missingContent: 1,
+  }
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    verifyResponse = _verifyResponse
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    // cache verification problems get fixed and so do not throw an error
+    if (err) {
+      t.fail(output)
+      return t.end()
+    }
+
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*ok\s*using default/, 'npm config get registry output is ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is not ok')
+    t.end()
+  })
+})
+
+test('npm doctor not using default registry', t => {
+  const dir = t.testdir()
+  npm.cache = npm.flatOptions.cache = dir
+  npm.localDir = dir
+  npm.globalDir = dir
+  npm.localBin = dir
+  npm.globalBin = dir
+  const _currentRegistry = npm.flatOptions.registry
+  npm.flatOptions.registry = 'https://google.com'
+  const consoleError = console.error
+  // we just print an empty line here, so swallow it and ignore
+  console.error = () => {}
+
+  t.teardown(() => {
+    delete npm.cache
+    delete npm.flatOptions.cache
+    delete npm.localDir
+    delete npm.globalDir
+    delete npm.localBin
+    delete npm.globalBin
+    npm.flatOptions.registry = _currentRegistry
+    console.error = consoleError
+    clearLogs()
+  })
+
+  doctor([], (err) => {
+    // cache verification problems get fixed and so do not throw an error
+    t.match(err, /Some problems found/, 'detected the non-default registry')
+    t.match(logs, {
+      checkPing: { finished: true },
+      getLatestNpmVersion: { finished: true },
+      getLatestNodejsVersion: { finished: true },
+      getGitPath: { finished: true },
+      [dir]: { finished: true },
+      verifyCachedFiles: { finished: true },
+    }, 'trackers all finished')
+    t.match(output, /npm ping\s*ok/, 'ping output is ok')
+    t.match(output, /npm -v\s*ok/, 'npm -v output is ok')
+    t.match(output, /node -v\s*ok/, 'node -v output is ok')
+    t.match(output, /npm config get registry\s*not ok/, 'npm config get registry output is not ok')
+    t.match(output, /which git\s*ok/, 'which git output is ok')
+    t.match(output, /cached files\s*ok/, 'cached files are ok')
+    t.match(output, /local node_modules\s*ok/, 'local node_modules are ok')
+    t.match(output, /global node_modules\s*ok/, 'global node_modules are ok')
+    t.match(output, /local bin folder\s*ok/, 'local bin is ok')
+    t.match(output, /global bin folder\s*ok/, 'global bin is ok')
+    t.match(output, /cache contents\s*ok/, 'cache contents is ok')
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/exec.js b/deps/npm/test/lib/exec.js
index fb89776b55eaf9..25c3fe46331719 100644
--- a/deps/npm/test/lib/exec.js
+++ b/deps/npm/test/lib/exec.js
@@ -1,6 +1,8 @@
 const t = require('tap')
 const requireInject = require('require-inject')
 const { resolve, delimiter } = require('path')
+const OUTPUT = []
+const output = (...msg) => OUTPUT.push(msg)
 
 const ARB_CTOR = []
 const ARB_ACTUAL_TREE = {}
@@ -10,9 +12,11 @@ class Arborist {
     ARB_CTOR.push(options)
     this.path = options.path
   }
+
   async loadActual () {
     return ARB_ACTUAL_TREE[this.path]
   }
+
   async reify (options) {
     ARB_REIFY.push(options)
   }
@@ -26,18 +30,19 @@ const npm = {
     yes: true,
     call: '',
     package: [],
-    legacyPeerDeps: false
+    legacyPeerDeps: false,
+    shell: 'shell-cmd',
   },
   localPrefix: 'local-prefix',
   localBin: 'local-bin',
   globalBin: 'global-bin',
   config: {
     get: k => {
-      if (k !== 'cache') {
+      if (k !== 'cache')
         throw new Error('unexpected config get')
-      }
+
       return 'cache-dir'
-    }
+    },
   },
   log: {
     disableProgress: () => {
@@ -48,23 +53,22 @@ const npm = {
     },
     warn: (...args) => {
       LOG_WARN.push(args)
-    }
-  }
+    },
+  },
 }
 
 const RUN_SCRIPTS = []
 const runScript = async opt => {
   RUN_SCRIPTS.push(opt)
-  if (!PROGRESS_IGNORED && PROGRESS_ENABLED) {
+  if (!PROGRESS_IGNORED && PROGRESS_ENABLED)
     throw new Error('progress not disabled during run script!')
-  }
 }
 
 const MANIFESTS = {}
 const pacote = {
   manifest: async (spec, options) => {
     return MANIFESTS[spec]
-  }
+  },
 }
 
 const MKDIRPS = []
@@ -89,7 +93,8 @@ const mocks = {
   '../../lib/npm.js': npm,
   pacote,
   read,
-  'mkdirp-infer-owner': mkdirp
+  'mkdirp-infer-owner': mkdirp,
+  '../../lib/utils/output.js': output,
 }
 const exec = requireInject('../../lib/exec.js', mocks)
 
@@ -113,7 +118,7 @@ t.afterEach(cb => {
 
 t.test('npx foo, bin already exists locally', async t => {
   const path = t.testdir({
-    foo: 'just some file'
+    foo: 'just some file',
   })
 
   PROGRESS_IGNORED = true
@@ -122,22 +127,22 @@ t.test('npx foo, bin already exists locally', async t => {
   await exec(['foo'], er => {
     t.ifError(er, 'npm exec')
   })
-  t.strictSame(RUN_SCRIPTS, [{
+  t.match(RUN_SCRIPTS, [{
     pkg: { scripts: { npx: 'foo' }},
     banner: false,
     path: process.cwd(),
     stdioString: true,
     event: 'npx',
     env: {
-      PATH: [path, ...PATH].join(delimiter)
+      PATH: [path, ...PATH].join(delimiter),
     },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
 t.test('npx foo, bin already exists globally', async t => {
   const path = t.testdir({
-    foo: 'just some file'
+    foo: 'just some file',
   })
 
   PROGRESS_IGNORED = true
@@ -146,16 +151,16 @@ t.test('npx foo, bin already exists globally', async t => {
   await exec(['foo'], er => {
     t.ifError(er, 'npm exec')
   })
-  t.strictSame(RUN_SCRIPTS, [{
+  t.match(RUN_SCRIPTS, [{
     pkg: { scripts: { npx: 'foo' }},
     banner: false,
     path: process.cwd(),
     stdioString: true,
     event: 'npx',
     env: {
-      PATH: [path, ...PATH].join(delimiter)
+      PATH: [path, ...PATH].join(delimiter),
     },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
@@ -163,23 +168,22 @@ t.test('npm exec foo, already present locally', async t => {
   const path = t.testdir()
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   await exec(['foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [], 'no need to make any dirs')
-  t.match(ARB_CTOR, [ { package: ['foo'], path } ])
+  t.match(ARB_CTOR, [{ package: ['foo'], path }])
   t.strictSame(ARB_REIFY, [], 'no need to reify anything')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.match(RUN_SCRIPTS, [{
@@ -189,35 +193,100 @@ t.test('npm exec foo, already present locally', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH: process.env.PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
+t.test('npm exec <noargs>, run interactive shell', async t => {
+  CI_NAME = null
+  const { isTTY } = process.stdin
+  process.stdin.isTTY = true
+  t.teardown(() => process.stdin.isTTY = isTTY)
+
+  const run = async (t, doRun = true) => {
+    LOG_WARN.length = 0
+    ARB_CTOR.length = 0
+    MKDIRPS.length = 0
+    ARB_REIFY.length = 0
+    OUTPUT.length = 0
+    await exec([], er => {
+      if (er)
+        throw er
+    })
+    t.strictSame(MKDIRPS, [], 'no need to make any dirs')
+    t.strictSame(ARB_CTOR, [], 'no need to instantiate arborist')
+    t.strictSame(ARB_REIFY, [], 'no need to reify anything')
+    t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
+    if (doRun) {
+      t.match(RUN_SCRIPTS, [{
+        pkg: { scripts: { npx: 'shell-cmd' } },
+        banner: false,
+        path: process.cwd(),
+        stdioString: true,
+        event: 'npx',
+        env: { PATH: process.env.PATH },
+        stdio: 'inherit',
+      }])
+    } else
+      t.strictSame(RUN_SCRIPTS, [])
+    RUN_SCRIPTS.length = 0
+  }
+
+  t.test('print message when tty and not in CI', async t => {
+    CI_NAME = null
+    process.stdin.isTTY = true
+    await run(t)
+    t.strictSame(LOG_WARN, [])
+    t.strictSame(OUTPUT, [
+      ['\nEntering npm script environment\nType \'exit\' or ^D when finished\n'],
+    ], 'printed message about interactive shell')
+  })
+
+  t.test('no message when not TTY', async t => {
+    CI_NAME = null
+    process.stdin.isTTY = false
+    await run(t)
+    t.strictSame(LOG_WARN, [])
+    t.strictSame(OUTPUT, [], 'no message about interactive shell')
+  })
+
+  t.test('print warning when in CI and interactive', async t => {
+    CI_NAME = 'travis-ci'
+    process.stdin.isTTY = true
+    await run(t, false)
+    t.strictSame(LOG_WARN, [
+      ['exec', 'Interactive mode disabled in CI environment'],
+    ])
+    t.strictSame(OUTPUT, [], 'no message about interactive shell')
+  })
+
+  t.end()
+})
+
 t.test('npm exec foo, not present locally or in central loc', async t => {
   const path = t.testdir()
   const installDir = resolve('cache-dir/_npx/f7fbba6e0636f890')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   await exec(['foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: ['foo'], path } ])
+  t.match(ARB_CTOR, [{ package: ['foo'], path }])
   t.match(ARB_REIFY, [{add: ['foo@'], legacyPeerDeps: false}], 'need to install foo@')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -228,7 +297,7 @@ t.test('npm exec foo, not present locally or in central loc', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
@@ -237,26 +306,25 @@ t.test('npm exec foo, not present locally but in central loc', async t => {
   const installDir = resolve('cache-dir/_npx/f7fbba6e0636f890')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   await exec(['foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: ['foo'], path } ])
+  t.match(ARB_CTOR, [{ package: ['foo'], path }])
   t.match(ARB_REIFY, [], 'no need to install again, already there')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -267,7 +335,7 @@ t.test('npm exec foo, not present locally but in central loc', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
@@ -276,26 +344,25 @@ t.test('npm exec foo, present locally but wrong version', async t => {
   const installDir = resolve('cache-dir/_npx/2badf4630f1cfaad')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS['foo@2.x'] = {
     name: 'foo',
     version: '2.3.4',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@2.x'
+    _from: 'foo@2.x',
   }
   await exec(['foo@2.x'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: ['foo'], path } ])
+  t.match(ARB_CTOR, [{ package: ['foo'], path }])
   t.match(ARB_REIFY, [{ add: ['foo@2.x'], legacyPeerDeps: false }], 'need to add foo@2.x')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -306,7 +373,7 @@ t.test('npm exec foo, present locally but wrong version', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
@@ -314,24 +381,23 @@ t.test('npm exec --package=foo bar', async t => {
   const path = t.testdir()
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   npm.flatOptions.package = ['foo']
   await exec(['bar'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [], 'no need to make any dirs')
-  t.match(ARB_CTOR, [ { package: ['foo'], path } ])
+  t.match(ARB_CTOR, [{ package: ['foo'], path }])
   t.strictSame(ARB_REIFY, [], 'no need to reify anything')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.match(RUN_SCRIPTS, [{
@@ -341,7 +407,7 @@ t.test('npm exec --package=foo bar', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH: process.env.PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
@@ -351,28 +417,27 @@ t.test('npm exec @foo/bar -- --some=arg, locally installed', async t => {
     version: '1.2.3',
     bin: {
       foo: 'foo',
-      bar: 'bar'
-    }
+      bar: 'bar',
+    },
   }
   const path = t.testdir({
     node_modules: {
       '@foo/bar': {
-        'package.json': JSON.stringify(foobarManifest)
-      }
-    }
+        'package.json': JSON.stringify(foobarManifest),
+      },
+    },
   })
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map([['@foo/bar', { name: '@foo/bar', version: '1.2.3' }]])
+    children: new Map([['@foo/bar', { name: '@foo/bar', version: '1.2.3' }]]),
   }
   MANIFESTS['@foo/bar'] = foobarManifest
   await exec(['@foo/bar', '--some=arg'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [], 'no need to make any dirs')
-  t.match(ARB_CTOR, [ { package: ['@foo/bar'], path } ])
+  t.match(ARB_CTOR, [{ package: ['@foo/bar'], path }])
   t.strictSame(ARB_REIFY, [], 'no need to reify anything')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.match(RUN_SCRIPTS, [{
@@ -382,10 +447,77 @@ t.test('npm exec @foo/bar -- --some=arg, locally installed', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH: process.env.PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
+  }])
+})
+
+t.test('npm exec @foo/bar, with same bin alias and no unscoped named bin, locally installed', async t => {
+  const foobarManifest = {
+    name: '@foo/bar',
+    version: '1.2.3',
+    bin: {
+      baz: 'corge', // pick the first one
+      qux: 'corge',
+      quux: 'corge',
+    },
+  }
+  const path = t.testdir({
+    node_modules: {
+      '@foo/bar': {
+        'package.json': JSON.stringify(foobarManifest),
+      },
+    },
+  })
+  npm.localPrefix = path
+  ARB_ACTUAL_TREE[path] = {
+    children: new Map([['@foo/bar', { name: '@foo/bar', version: '1.2.3' }]]),
+  }
+  MANIFESTS['@foo/bar'] = foobarManifest
+  await exec(['@foo/bar'], er => {
+    if (er)
+      throw er
+  })
+  t.strictSame(MKDIRPS, [], 'no need to make any dirs')
+  t.match(ARB_CTOR, [{ package: ['@foo/bar'], path }])
+  t.strictSame(ARB_REIFY, [], 'no need to reify anything')
+  t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
+  t.match(RUN_SCRIPTS, [{
+    pkg: { scripts: { npx: 'baz' } },
+    banner: false,
+    path: process.cwd(),
+    stdioString: true,
+    event: 'npx',
+    env: { PATH: process.env.PATH },
+    stdio: 'inherit',
   }])
 })
 
+t.test('npm exec @foo/bar, with different bin alias and no unscoped named bin, locally installed', t => {
+  const path = t.testdir()
+  npm.localPrefix = path
+  ARB_ACTUAL_TREE[path] = {
+    children: new Map([['@foo/bar', { name: '@foo/bar', version: '1.2.3' }]]),
+  }
+  MANIFESTS['@foo/bar'] = {
+    name: '@foo/bar',
+    version: '1.2.3',
+    bin: {
+      foo: 'qux',
+      corge: 'qux',
+      baz: 'quux',
+    },
+    _from: 'foo@',
+    _id: '@foo/bar@1.2.3',
+  }
+  return t.rejects(exec(['@foo/bar'], er => {
+    if (er)
+      throw er
+  }), {
+    message: 'could not determine executable to run',
+    pkgid: '@foo/bar@1.2.3',
+  })
+})
+
 t.test('run command with 2 packages, need install, verify sort', t => {
   // test both directions, should use same install dir both times
   // also test the read() call here, verify that the prompts match
@@ -399,34 +531,33 @@ t.test('run command with 2 packages, need install, verify sort', t => {
       const installDir = resolve('cache-dir/_npx/07de77790e5f40f2')
       npm.localPrefix = path
       ARB_ACTUAL_TREE[path] = {
-        children: new Map()
+        children: new Map(),
       }
       ARB_ACTUAL_TREE[installDir] = {
-        children: new Map()
+        children: new Map(),
       }
       MANIFESTS.foo = {
         name: 'foo',
         version: '1.2.3',
         bin: {
-          foo: 'foo'
+          foo: 'foo',
         },
-        _from: 'foo@'
+        _from: 'foo@',
       }
       MANIFESTS.bar = {
         name: 'bar',
         version: '1.2.3',
         bin: {
-          bar: 'bar'
+          bar: 'bar',
         },
-        _from: 'bar@'
+        _from: 'bar@',
       }
       await exec(['foobar'], er => {
-        if (er) {
+        if (er)
           throw er
-        }
       })
       t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-      t.match(ARB_CTOR, [ { package: packages, path } ])
+      t.match(ARB_CTOR, [{ package: packages, path }])
       t.match(ARB_REIFY, [{add, legacyPeerDeps: false}], 'need to install both packages')
       t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
       const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -437,7 +568,7 @@ t.test('run command with 2 packages, need install, verify sort', t => {
         stdioString: true,
         event: 'npx',
         env: { PATH },
-        stdio: 'inherit'
+        stdio: 'inherit',
       }])
     })
   }
@@ -447,21 +578,20 @@ t.test('npm exec foo, no bin in package', t => {
   const path = t.testdir()
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     _from: 'foo@',
-    _id: 'foo@1.2.3'
+    _id: 'foo@1.2.3',
   }
   return t.rejects(exec(['foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   }), {
     message: 'could not determine executable to run',
-    pkgid: 'foo@1.2.3'
+    pkgid: 'foo@1.2.3',
   })
 })
 
@@ -469,25 +599,24 @@ t.test('npm exec foo, many bins in package, none named foo', t => {
   const path = t.testdir()
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
       bar: 'bar',
-      baz: 'baz'
+      baz: 'baz',
     },
     _from: 'foo@',
-    _id: 'foo@1.2.3'
+    _id: 'foo@1.2.3',
   }
   return t.rejects(exec(['foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   }), {
     message: 'could not determine executable to run',
-    pkgid: 'foo@1.2.3'
+    pkgid: 'foo@1.2.3',
   })
 })
 
@@ -497,20 +626,19 @@ t.test('npm exec -p foo -c "ls -laF"', async t => {
   npm.flatOptions.package = ['foo']
   npm.flatOptions.call = 'ls -laF'
   ARB_ACTUAL_TREE[path] = {
-    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]])
+    children: new Map([['foo', { name: 'foo', version: '1.2.3' }]]),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
-    _from: 'foo@'
+    _from: 'foo@',
   }
   await exec([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [], 'no need to make any dirs')
-  t.match(ARB_CTOR, [ { package: ['foo'], path } ])
+  t.match(ARB_CTOR, [{ package: ['foo'], path }])
   t.strictSame(ARB_REIFY, [], 'no need to reify anything')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.match(RUN_SCRIPTS, [{
@@ -520,7 +648,7 @@ t.test('npm exec -p foo -c "ls -laF"', async t => {
     stdioString: true,
     event: 'npx',
     env: { PATH: process.env.PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
 })
 
@@ -552,34 +680,33 @@ t.test('prompt when installs are needed if not already present and shell is a TT
   const installDir = resolve('cache-dir/_npx/07de77790e5f40f2')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   MANIFESTS.bar = {
     name: 'bar',
     version: '1.2.3',
     bin: {
-      bar: 'bar'
+      bar: 'bar',
     },
-    _from: 'bar@'
+    _from: 'bar@',
   }
   await exec(['foobar'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: packages, path } ])
+  t.match(ARB_CTOR, [{ package: packages, path }])
   t.match(ARB_REIFY, [{add, legacyPeerDeps: false}], 'need to install both packages')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -590,11 +717,11 @@ t.test('prompt when installs are needed if not already present and shell is a TT
     stdioString: true,
     event: 'npx',
     env: { PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
   t.strictSame(READ, [{
     prompt: 'Need to install the following packages:\n  bar\n  foo\nOk to proceed? ',
-    default: 'y'
+    default: 'y',
   }])
 })
 
@@ -621,34 +748,33 @@ t.test('skip prompt when installs are needed if not already present and shell is
   const installDir = resolve('cache-dir/_npx/07de77790e5f40f2')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   MANIFESTS.bar = {
     name: 'bar',
     version: '1.2.3',
     bin: {
-      bar: 'bar'
+      bar: 'bar',
     },
-    _from: 'bar@'
+    _from: 'bar@',
   }
   await exec(['foobar'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: packages, path } ])
+  t.match(ARB_CTOR, [{ package: packages, path }])
   t.match(ARB_REIFY, [{add, legacyPeerDeps: false}], 'need to install both packages')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -659,7 +785,7 @@ t.test('skip prompt when installs are needed if not already present and shell is
     stdioString: true,
     event: 'npx',
     env: { PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
   t.strictSame(READ, [], 'should not have prompted')
   t.strictSame(LOG_WARN, [['exec', 'The following packages were not found and will be installed: bar, foo']], 'should have printed a warning')
@@ -688,26 +814,25 @@ t.test('skip prompt when installs are needed if not already present and shell is
   const installDir = resolve('cache-dir/_npx/f7fbba6e0636f890')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   await exec(['foobar'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: packages, path } ])
+  t.match(ARB_CTOR, [{ package: packages, path }])
   t.match(ARB_REIFY, [{add, legacyPeerDeps: false}], 'need to install the package')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
@@ -718,7 +843,7 @@ t.test('skip prompt when installs are needed if not already present and shell is
     stdioString: true,
     event: 'npx',
     env: { PATH },
-    stdio: 'inherit'
+    stdio: 'inherit',
   }])
   t.strictSame(READ, [], 'should not have prompted')
   t.strictSame(LOG_WARN, [['exec', 'The following package was not found and will be installed: foo']], 'should have printed a warning')
@@ -742,43 +867,42 @@ t.test('abort if prompt rejected', async t => {
   npm.flatOptions.package = packages
   npm.flatOptions.yes = undefined
 
-  const add = packages.map(p => `${p}@`).sort((a, b) => a.localeCompare(b))
   const path = t.testdir()
   const installDir = resolve('cache-dir/_npx/07de77790e5f40f2')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   MANIFESTS.bar = {
     name: 'bar',
     version: '1.2.3',
     bin: {
-      bar: 'bar'
+      bar: 'bar',
     },
-    _from: 'bar@'
+    _from: 'bar@',
   }
   await exec(['foobar'], er => {
     t.equal(er, 'canceled', 'should be canceled')
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: packages, path } ])
+  t.match(ARB_CTOR, [{ package: packages, path }])
   t.strictSame(ARB_REIFY, [], 'no install performed')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.strictSame(RUN_SCRIPTS, [])
   t.strictSame(READ, [{
     prompt: 'Need to install the following packages:\n  bar\n  foo\nOk to proceed? ',
-    default: 'y'
+    default: 'y',
   }])
 })
 
@@ -800,43 +924,42 @@ t.test('abort if prompt false', async t => {
   npm.flatOptions.package = packages
   npm.flatOptions.yes = undefined
 
-  const add = packages.map(p => `${p}@`).sort((a, b) => a.localeCompare(b))
   const path = t.testdir()
   const installDir = resolve('cache-dir/_npx/07de77790e5f40f2')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   MANIFESTS.bar = {
     name: 'bar',
     version: '1.2.3',
     bin: {
-      bar: 'bar'
+      bar: 'bar',
     },
-    _from: 'bar@'
+    _from: 'bar@',
   }
   await exec(['foobar'], er => {
     t.equal(er, 'canceled', 'should be canceled')
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: packages, path } ])
+  t.match(ARB_CTOR, [{ package: packages, path }])
   t.strictSame(ARB_REIFY, [], 'no install performed')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.strictSame(RUN_SCRIPTS, [])
   t.strictSame(READ, [{
     prompt: 'Need to install the following packages:\n  bar\n  foo\nOk to proceed? ',
-    default: 'y'
+    default: 'y',
   }])
 })
 
@@ -857,37 +980,36 @@ t.test('abort if -n provided', async t => {
   npm.flatOptions.package = packages
   npm.flatOptions.yes = false
 
-  const add = packages.map(p => `${p}@`).sort((a, b) => a.localeCompare(b))
   const path = t.testdir()
   const installDir = resolve('cache-dir/_npx/07de77790e5f40f2')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   MANIFESTS.bar = {
     name: 'bar',
     version: '1.2.3',
     bin: {
-      bar: 'bar'
+      bar: 'bar',
     },
-    _from: 'bar@'
+    _from: 'bar@',
   }
   await exec(['foobar'], er => {
     t.equal(er, 'canceled', 'should be canceled')
   })
   t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
-  t.match(ARB_CTOR, [ { package: packages, path } ])
+  t.match(ARB_CTOR, [{ package: packages, path }])
   t.strictSame(ARB_REIFY, [], 'no install performed')
   t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
   t.strictSame(RUN_SCRIPTS, [])
@@ -899,25 +1021,24 @@ t.test('forward legacyPeerDeps opt', async t => {
   const installDir = resolve('cache-dir/_npx/f7fbba6e0636f890')
   npm.localPrefix = path
   ARB_ACTUAL_TREE[path] = {
-    children: new Map()
+    children: new Map(),
   }
   ARB_ACTUAL_TREE[installDir] = {
-    children: new Map()
+    children: new Map(),
   }
   MANIFESTS.foo = {
     name: 'foo',
     version: '1.2.3',
     bin: {
-      foo: 'foo'
+      foo: 'foo',
     },
-    _from: 'foo@'
+    _from: 'foo@',
   }
   npm.flatOptions.yes = true
   npm.flatOptions.legacyPeerDeps = true
   await exec(['foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.match(ARB_REIFY, [{add: ['foo@'], legacyPeerDeps: true}], 'need to install foo@ using legacyPeerDeps opt')
 })
diff --git a/deps/npm/test/lib/explain.js b/deps/npm/test/lib/explain.js
index a9db344f8b20ca..1eeca8c4c4f5d0 100644
--- a/deps/npm/test/lib/explain.js
+++ b/deps/npm/test/lib/explain.js
@@ -3,7 +3,7 @@ const requireInject = require('require-inject')
 const npm = {
   prefix: null,
   color: true,
-  flatOptions: {}
+  flatOptions: {},
 }
 const { resolve } = require('path')
 
@@ -20,8 +20,8 @@ const explain = requireInject('../../lib/explain.js', {
   '../../lib/utils/explain-dep.js': {
     explainNode: (expl, depth, color) => {
       return `${expl.name}@${expl.version} depth=${depth} color=${color}`
-    }
-  }
+    },
+  },
 })
 
 t.test('no args throws usage', async t => {
@@ -68,15 +68,15 @@ t.test('explain some nodes', async t => {
           name: 'foo',
           version: '1.2.3',
           dependencies: {
-            bar: '*'
-          }
-        })
+            bar: '*',
+          },
+        }),
       },
       bar: {
         'package.json': JSON.stringify({
           name: 'bar',
-          version: '1.2.3'
-        })
+          version: '1.2.3',
+        }),
       },
       baz: {
         'package.json': JSON.stringify({
@@ -84,40 +84,39 @@ t.test('explain some nodes', async t => {
           version: '1.2.3',
           dependencies: {
             foo: '*',
-            bar: '2'
-          }
+            bar: '2',
+          },
         }),
         node_modules: {
           bar: {
             'package.json': JSON.stringify({
               name: 'bar',
-              version: '2.3.4'
-            })
+              version: '2.3.4',
+            }),
           },
           extra: {
             'package.json': JSON.stringify({
               name: 'extra',
               version: '99.9999.999999',
-              description: 'extraneous package'
-            })
-          }
-        }
-      }
+              description: 'extraneous package',
+            }),
+          },
+        },
+      },
     },
     'package.json': JSON.stringify({
       dependencies: {
-        baz: '1'
-      }
-    })
+        baz: '1',
+      },
+    }),
   })
 
   // works with either a full actual path or the location
   const p = 'node_modules/foo'
   for (const path of [p, resolve(npm.prefix, p)]) {
     await explain([path], er => {
-      if (er) {
+      if (er)
         throw er
-      }
     })
     t.strictSame(OUTPUT, [['foo@1.2.3 depth=Infinity color=true']])
     OUTPUT.length = 0
@@ -125,44 +124,40 @@ t.test('explain some nodes', async t => {
 
   // finds all nodes by name
   await explain(['bar'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(OUTPUT, [[
     'bar@1.2.3 depth=Infinity color=true\n\n' +
-    'bar@2.3.4 depth=Infinity color=true'
+    'bar@2.3.4 depth=Infinity color=true',
   ]])
   OUTPUT.length = 0
 
   // finds only nodes that match the spec
   await explain(['bar@1'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(OUTPUT, [['bar@1.2.3 depth=Infinity color=true']])
   OUTPUT.length = 0
 
   // finds extraneous nodes
   await explain(['extra'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(OUTPUT, [['extra@99.9999.999999 depth=Infinity color=true']])
   OUTPUT.length = 0
 
   npm.flatOptions.json = true
   await explain(['node_modules/foo'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.match(JSON.parse(OUTPUT[0][0]), [{
     name: 'foo',
     version: '1.2.3',
-    dependents: Array
+    dependents: Array,
   }])
   OUTPUT.length = 0
   npm.flatOptions.json = false
@@ -174,4 +169,3 @@ t.test('explain some nodes', async t => {
     })
   })
 })
-
diff --git a/deps/npm/test/lib/explore.js b/deps/npm/test/lib/explore.js
index 03ad230489d17d..23eab1172a05e0 100644
--- a/deps/npm/test/lib/explore.js
+++ b/deps/npm/test/lib/explore.js
@@ -1,56 +1,73 @@
 const t = require('tap')
 const requireInject = require('require-inject')
 
-let STAT_ERROR = null
-let STAT_CALLED = ''
-const mockStat = (path, cb) => {
-  STAT_CALLED = path
-  cb(STAT_ERROR, {})
+let RPJ_ERROR = null
+let RPJ_CALLED = ''
+const mockRPJ = async path => {
+  if (RPJ_ERROR) {
+    try {
+      throw RPJ_ERROR
+    } finally {
+      RPJ_ERROR = null
+    }
+  }
+  RPJ_CALLED = path
+  return {some: 'package'}
 }
 
-let SPAWN_ERROR = null
-let SPAWN_EXIT_CODE = 0
-let SPAWN_SHELL_EXEC = null
-let SPAWN_SHELL_ARGS = null
-const mockSpawn = (sh, shellArgs, opts) => {
-  if (sh !== 'shell-command') {
-    throw new Error('got wrong shell command')
+let RUN_SCRIPT_ERROR = null
+let RUN_SCRIPT_EXIT_CODE = 0
+let RUN_SCRIPT_SIGNAL = null
+let RUN_SCRIPT_EXEC = null
+const mockRunScript = ({ pkg, banner, path, event, stdio }) => {
+  if (event !== '_explore')
+    throw new Error('got wrong event name')
+
+  RUN_SCRIPT_EXEC = pkg.scripts._explore
+
+  if (RUN_SCRIPT_ERROR) {
+    try {
+      return Promise.reject(RUN_SCRIPT_ERROR)
+    } finally {
+      RUN_SCRIPT_ERROR = null
+    }
   }
-  if (SPAWN_ERROR) {
-    return Promise.reject(SPAWN_ERROR)
+
+  if (RUN_SCRIPT_EXIT_CODE || RUN_SCRIPT_SIGNAL) {
+    return Promise.reject(Object.assign(new Error('command failed'), {
+      code: RUN_SCRIPT_EXIT_CODE,
+      signal: RUN_SCRIPT_SIGNAL,
+    }))
   }
-  SPAWN_SHELL_EXEC = sh
-  SPAWN_SHELL_ARGS = shellArgs
-  return Promise.resolve({ code: SPAWN_EXIT_CODE })
+
+  return Promise.resolve({ code: 0, signal: null })
 }
 
 const output = []
 let ERROR_HANDLER_CALLED = null
+const logs = []
 const getExplore = windows => requireInject('../../lib/explore.js', {
   '../../lib/utils/is-windows.js': windows,
-  '../../lib/utils/escape-arg.js': requireInject('../../lib/utils/escape-arg.js', {
-    '../../lib/utils/is-windows.js': windows
-  }),
   path: require('path')[windows ? 'win32' : 'posix'],
-  '../../lib/utils/escape-exec-path.js': requireInject('../../lib/utils/escape-arg.js', {
-    '../../lib/utils/is-windows.js': windows
-  }),
   '../../lib/utils/error-handler.js': er => {
     ERROR_HANDLER_CALLED = er
   },
-  fs: {
-    stat: mockStat
-  },
+  'read-package-json-fast': mockRPJ,
   '../../lib/npm.js': {
     dir: windows ? 'c:\\npm\\dir' : '/npm/dir',
+    log: {
+      error: (...msg) => logs.push(msg),
+      disableProgress: () => {},
+      enableProgress: () => {},
+    },
     flatOptions: {
-      shell: 'shell-command'
-    }
+      shell: 'shell-command',
+    },
   },
-  '@npmcli/promise-spawn': mockSpawn,
+  '@npmcli/run-script': mockRunScript,
   '../../lib/utils/output.js': out => {
     output.push(out)
-  }
+  },
 })
 
 const windowsExplore = getExplore(true)
@@ -63,42 +80,38 @@ t.test('basic interactive', t => {
   })
 
   t.test('windows', t => windowsExplore(['pkg'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: 'c:\\npm\\dir\\pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: []
+      RPJ_CALLED: 'c:\\npm\\dir\\pkg\\package.json',
+      RUN_SCRIPT_EXEC: 'shell-command',
     })
     t.strictSame(output, [
-      "\nExploring c:\\npm\\dir\\pkg\nType 'exit' or ^D when finished\n"
+      "\nExploring c:\\npm\\dir\\pkg\nType 'exit' or ^D when finished\n",
     ])
   }))
 
   t.test('posix', t => posixExplore(['pkg'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: '/npm/dir/pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: []
+      RPJ_CALLED: '/npm/dir/pkg/package.json',
+      RUN_SCRIPT_EXEC: 'shell-command',
     })
     t.strictSame(output, [
-      "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n"
+      "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n",
     ])
   }))
 
@@ -109,76 +122,93 @@ t.test('interactive tracks exit code', t => {
   const { exitCode } = process
   t.beforeEach((cb) => {
     process.exitCode = exitCode
-    SPAWN_EXIT_CODE = 99
+    RUN_SCRIPT_EXIT_CODE = 99
     cb()
   })
   t.afterEach((cb) => {
-    SPAWN_EXIT_CODE = 0
+    RUN_SCRIPT_EXIT_CODE = 0
     output.length = 0
     process.exitCode = exitCode
     cb()
   })
 
   t.test('windows', t => windowsExplore(['pkg'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: 'c:\\npm\\dir\\pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: []
+      RPJ_CALLED: 'c:\\npm\\dir\\pkg\\package.json',
+      RUN_SCRIPT_EXEC: 'shell-command',
     })
     t.strictSame(output, [
-      "\nExploring c:\\npm\\dir\\pkg\nType 'exit' or ^D when finished\n"
+      "\nExploring c:\\npm\\dir\\pkg\nType 'exit' or ^D when finished\n",
     ])
     t.equal(process.exitCode, 99)
   }))
 
   t.test('posix', t => posixExplore(['pkg'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: '/npm/dir/pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: []
+      RPJ_CALLED: '/npm/dir/pkg/package.json',
+      RUN_SCRIPT_EXEC: 'shell-command',
     })
     t.strictSame(output, [
-      "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n"
+      "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n",
     ])
     t.equal(process.exitCode, 99)
   }))
 
   t.test('posix spawn fail', t => {
-    t.teardown(() => {
-      SPAWN_ERROR = null
-    })
-    SPAWN_ERROR = Object.assign(new Error('glorb'), {
-      code: 33
+    RUN_SCRIPT_ERROR = Object.assign(new Error('glorb'), {
+      code: 33,
     })
     return posixExplore(['pkg'], er => {
-      if (er) {
-        throw er
-      }
+      t.match(er, { message: 'glorb', code: 33 })
       t.strictSame(output, [
-        "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n"
+        "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n",
       ])
       t.equal(process.exitCode, 33)
     })
   })
 
+  t.test('posix spawn fail, 0 exit code', t => {
+    RUN_SCRIPT_ERROR = Object.assign(new Error('glorb'), {
+      code: 0,
+    })
+    return posixExplore(['pkg'], er => {
+      t.match(er, { message: 'glorb', code: 0 })
+      t.strictSame(output, [
+        "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n",
+      ])
+      t.equal(process.exitCode, 1)
+    })
+  })
+
+  t.test('posix spawn fail, no exit code', t => {
+    RUN_SCRIPT_ERROR = Object.assign(new Error('command failed'), {
+      code: 'EPROBLEM',
+    })
+    return posixExplore(['pkg'], er => {
+      t.match(er, { message: 'command failed', code: 'EPROBLEM' })
+      t.strictSame(output, [
+        "\nExploring /npm/dir/pkg\nType 'exit' or ^D when finished\n",
+      ])
+      t.equal(process.exitCode, 1)
+    })
+  })
+
   t.end()
 })
 
@@ -189,42 +219,33 @@ t.test('basic non-interactive', t => {
   })
 
   t.test('windows', t => windowsExplore(['pkg', 'ls'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: 'c:\\npm\\dir\\pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: [
-        '/d',
-        '/s',
-        '/c',
-        '"ls"',
-      ]
+      RPJ_CALLED: 'c:\\npm\\dir\\pkg\\package.json',
+      RUN_SCRIPT_EXEC: 'ls',
     })
     t.strictSame(output, [])
   }))
 
   t.test('posix', t => posixExplore(['pkg', 'ls'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: '/npm/dir/pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: ['-c', 'ls']
+      RPJ_CALLED: '/npm/dir/pkg/package.json',
+      RUN_SCRIPT_EXEC: 'ls',
     })
     t.strictSame(output, [])
   }))
@@ -232,51 +253,111 @@ t.test('basic non-interactive', t => {
   t.end()
 })
 
-t.test('usage if no pkg provided', t => {
-  t.teardown(() => {
+t.test('signal fails non-interactive', t => {
+  const { exitCode } = process
+  t.afterEach((cb) => {
     output.length = 0
-    ERROR_HANDLER_CALLED = null
+    logs.length = 0
+    cb()
   })
-  t.plan(1)
-  posixExplore([], er => {
-    if (er) {
-      throw er
-    }
+
+  t.beforeEach(cb => {
+    RUN_SCRIPT_SIGNAL = 'SIGPROBLEM'
+    RUN_SCRIPT_EXIT_CODE = null
+    process.exitCode = exitCode
+    cb()
+  })
+  t.afterEach(cb => {
+    process.exitCode = exitCode
+    cb()
+  })
+
+  t.test('windows', t => windowsExplore(['pkg', 'ls'], er => {
+    t.match(er, {
+      message: 'command failed',
+      signal: 'SIGPROBLEM',
+    })
+
     t.strictSame({
-      ERROR_HANDLER_CALLED: null,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
-      ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: '/npm/dir/pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: ['-c', 'ls']
+      RPJ_CALLED: 'c:\\npm\\dir\\pkg\\package.json',
+      RUN_SCRIPT_EXEC: 'ls',
     })
-  }).catch(er => t.equal(er, 'npm explore <pkg> [ -- <command>]'))
+    t.strictSame(output, [])
+  }))
+
+  t.test('posix', t => posixExplore(['pkg', 'ls'], er => {
+    t.match(er, {
+      message: 'command failed',
+      signal: 'SIGPROBLEM',
+    })
+
+    t.strictSame({
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
+    }, {
+      RPJ_CALLED: '/npm/dir/pkg/package.json',
+      RUN_SCRIPT_EXEC: 'ls',
+    })
+    t.strictSame(output, [])
+  }))
+
+  t.end()
+})
+
+t.test('usage if no pkg provided', t => {
+  t.teardown(() => {
+    output.length = 0
+    ERROR_HANDLER_CALLED = null
+  })
+  const noPkg = [
+    [],
+    ['foo/../..'],
+    ['asdf/..'],
+    ['.'],
+    ['..'],
+    ['../..'],
+  ]
+  t.plan(noPkg.length)
+  for (const args of noPkg) {
+    t.test(JSON.stringify(args), t => posixExplore(args, er => {
+      t.equal(er, 'npm explore <pkg> [ -- <command>]')
+      t.strictSame({
+        ERROR_HANDLER_CALLED: null,
+        RPJ_CALLED,
+        RUN_SCRIPT_EXEC,
+      }, {
+        ERROR_HANDLER_CALLED: null,
+        RPJ_CALLED: '/npm/dir/pkg/package.json',
+        RUN_SCRIPT_EXEC: 'ls',
+      })
+    }))
+  }
 })
 
 t.test('pkg not installed', t => {
-  STAT_ERROR = new Error('plurple')
-  t.plan(1)
+  RPJ_ERROR = new Error('plurple')
+  t.plan(2)
 
   posixExplore(['pkg', 'ls'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame({
       ERROR_HANDLER_CALLED,
-      STAT_CALLED,
-      SPAWN_SHELL_EXEC,
-      SPAWN_SHELL_ARGS
+      RPJ_CALLED,
+      RUN_SCRIPT_EXEC,
     }, {
       ERROR_HANDLER_CALLED: null,
-      STAT_CALLED: '/npm/dir/pkg',
-      SPAWN_SHELL_EXEC: 'shell-command',
-      SPAWN_SHELL_ARGS: ['-c', 'ls']
+      RPJ_CALLED: '/npm/dir/pkg/package.json',
+      RUN_SCRIPT_EXEC: 'ls',
     })
     t.strictSame(output, [])
   }).catch(er => {
-    t.match(er, { message: `It doesn't look like pkg is installed.` })
+    t.match(er, { message: 'plurple' })
+    t.match(logs, [['explore', `It doesn't look like pkg is installed.`]])
+    logs.length = 0
   })
 })
diff --git a/deps/npm/test/lib/find-dupes.js b/deps/npm/test/lib/find-dupes.js
index 2f6272b90c1296..73c8fa2dc2793f 100644
--- a/deps/npm/test/lib/find-dupes.js
+++ b/deps/npm/test/lib/find-dupes.js
@@ -1,5 +1,4 @@
 const { test } = require('tap')
-const findDupes = require('../../lib/find-dupes.js')
 const requireInject = require('require-inject')
 
 test('should run dedupe in dryRun mode', (t) => {
@@ -7,11 +6,10 @@ test('should run dedupe in dryRun mode', (t) => {
     '../../lib/dedupe.js': function (args, cb) {
       t.ok(args.dryRun, 'dryRun is true')
       cb()
-    }
+    },
   })
   findDupes(null, () => {
     t.ok(true, 'callback is called')
     t.end()
   })
 })
-
diff --git a/deps/npm/test/lib/fund.js b/deps/npm/test/lib/fund.js
index fc6a63aa17752a..73f639b6ce6584 100644
--- a/deps/npm/test/lib/fund.js
+++ b/deps/npm/test/lib/fund.js
@@ -1,12 +1,10 @@
-'use strict'
-
 const { test } = require('tap')
 const requireInject = require('require-inject')
 
 const version = '1.0.0'
 const funding = {
   type: 'individual',
-  url: 'http://example.com/donate'
+  url: 'http://example.com/donate',
 }
 
 const maintainerOwnsAllDeps = {
@@ -16,8 +14,8 @@ const maintainerOwnsAllDeps = {
     funding,
     dependencies: {
       'dep-foo': '*',
-      'dep-bar': '*'
-    }
+      'dep-bar': '*',
+    },
   }),
   node_modules: {
     'dep-foo': {
@@ -26,27 +24,27 @@ const maintainerOwnsAllDeps = {
         version,
         funding,
         dependencies: {
-          'dep-sub-foo': '*'
-        }
+          'dep-sub-foo': '*',
+        },
       }),
       node_modules: {
         'dep-sub-foo': {
           'package.json': JSON.stringify({
             name: 'dep-sub-foo',
             version,
-            funding
-          })
-        }
-      }
+            funding,
+          }),
+        },
+      },
     },
     'dep-bar': {
       'package.json': JSON.stringify({
         name: 'dep-bar',
         version,
-        funding
-      })
-    }
-  }
+        funding,
+      }),
+    },
+  },
 }
 
 const nestedNoFundingPackages = {
@@ -54,11 +52,11 @@ const nestedNoFundingPackages = {
     name: 'nested-no-funding-packages',
     version,
     dependencies: {
-      foo: '*'
+      foo: '*',
     },
     devDependencies: {
-      lorem: '*'
-    }
+      lorem: '*',
+    },
   }),
   node_modules: {
     foo: {
@@ -66,38 +64,38 @@ const nestedNoFundingPackages = {
         name: 'foo',
         version,
         dependencies: {
-          bar: '*'
-        }
+          bar: '*',
+        },
       }),
       node_modules: {
         bar: {
           'package.json': JSON.stringify({
             name: 'bar',
             version,
-            funding
+            funding,
           }),
           node_modules: {
             'sub-bar': {
               'package.json': JSON.stringify({
                 name: 'sub-bar',
                 version,
-                funding: 'https://example.com/sponsor'
-              })
-            }
-          }
-        }
-      }
+                funding: 'https://example.com/sponsor',
+              }),
+            },
+          },
+        },
+      },
     },
     lorem: {
       'package.json': JSON.stringify({
         name: 'lorem',
         version,
         funding: {
-          url: 'https://example.com/lorem'
-        }
-      })
-    }
-  }
+          url: 'https://example.com/lorem',
+        },
+      }),
+    },
+  },
 }
 
 const nestedMultipleFundingPackages = {
@@ -106,14 +104,14 @@ const nestedMultipleFundingPackages = {
     version,
     funding: [
       'https://one.example.com',
-      'https://two.example.com'
+      'https://two.example.com',
     ],
     dependencies: {
-      foo: '*'
+      foo: '*',
     },
     devDependencies: {
-      bar: '*'
-    }
+      bar: '*',
+    },
   }),
   node_modules: {
     foo: {
@@ -123,9 +121,9 @@ const nestedMultipleFundingPackages = {
         funding: [
           'http://example.com',
           { url: 'http://sponsors.example.com/me' },
-          'http://collective.example.com'
-        ]
-      })
+          'http://collective.example.com',
+        ],
+      }),
     },
     bar: {
       'package.json': JSON.stringify({
@@ -133,11 +131,11 @@ const nestedMultipleFundingPackages = {
         version,
         funding: [
           'http://collective.example.com',
-          { url: 'http://sponsors.example.com/you' }
-        ]
-      })
-    }
-  }
+          { url: 'http://sponsors.example.com/you' },
+        ],
+      }),
+    },
+  },
 }
 
 const conflictingFundingPackages = {
@@ -145,19 +143,19 @@ const conflictingFundingPackages = {
     name: 'conflicting-funding-packages',
     version,
     dependencies: {
-      foo: '1.0.0'
+      foo: '1.0.0',
     },
     devDependencies: {
-      bar: '1.0.0'
-    }
+      bar: '1.0.0',
+    },
   }),
   node_modules: {
     foo: {
       'package.json': JSON.stringify({
         name: 'foo',
         version: '1.0.0',
-        funding: 'http://example.com/1'
-      })
+        funding: 'http://example.com/1',
+      }),
     },
     bar: {
       node_modules: {
@@ -165,19 +163,19 @@ const conflictingFundingPackages = {
           'package.json': JSON.stringify({
             name: 'foo',
             version: '2.0.0',
-            funding: 'http://example.com/2'
-          })
-        }
+            funding: 'http://example.com/2',
+          }),
+        },
       },
       'package.json': JSON.stringify({
         name: 'bar',
         version: '1.0.0',
         dependencies: {
-          foo: '2.0.0'
-        }
-      })
-    }
-  }
+          foo: '2.0.0',
+        },
+      }),
+    },
+  },
 }
 
 let result = ''
@@ -188,7 +186,7 @@ const _flatOptions = {
   global: false,
   prefix: undefined,
   unicode: false,
-  which: undefined
+  which: undefined,
 }
 const openUrl = (url, msg, cb) => {
   if (url === 'http://npmjs.org') {
@@ -198,35 +196,39 @@ const openUrl = (url, msg, cb) => {
   if (_flatOptions.json) {
     printUrl = JSON.stringify({
       title: msg,
-      url: url
+      url: url,
     })
-  } else {
+  } else
     printUrl = `${msg}:\n  ${url}`
-  }
+
   cb()
 }
 const fund = requireInject('../../lib/fund.js', {
   '../../lib/npm.js': {
     flatOptions: _flatOptions,
-    get prefix () { return _flatOptions.prefix }
+    get prefix () {
+      return _flatOptions.prefix
+    },
   },
   '../../lib/utils/open-url.js': openUrl,
-  '../../lib/utils/output.js': msg => { result += msg + '\n' },
+  '../../lib/utils/output.js': msg => {
+    result += msg + '\n'
+  },
   pacote: {
     manifest: (arg) => arg.name === 'ntl'
       ? Promise.resolve({
-        funding: 'http://example.com/pacote'
+        funding: 'http://example.com/pacote',
       })
-      : Promise.reject(new Error('ERROR'))
-  }
+      : Promise.reject(new Error('ERROR')),
+  },
 })
 
 test('fund with no package containing funding', t => {
   _flatOptions.prefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'no-funding-package',
-      version: '0.0.0'
-    })
+      version: '0.0.0',
+    }),
   })
 
   fund([], (err) => {
@@ -264,7 +266,7 @@ test('fund in which same maintainer owns all its deps, using --json option', t =
         dependencies: {
           'dep-bar': {
             version: '1.0.0',
-            funding: { type: 'individual', url: 'http://example.com/donate' }
+            funding: { type: 'individual', url: 'http://example.com/donate' },
           },
           'dep-foo': {
             version: '1.0.0',
@@ -272,11 +274,11 @@ test('fund in which same maintainer owns all its deps, using --json option', t =
             dependencies: {
               'dep-sub-foo': {
                 version: '1.0.0',
-                funding: { type: 'individual', url: 'http://example.com/donate' }
-              }
-            }
-          }
-        }
+                funding: { type: 'individual', url: 'http://example.com/donate' },
+              },
+            },
+          },
+        },
       },
       'should print stack packages together'
     )
@@ -317,13 +319,13 @@ test('fund containing multi-level nested deps with no funding, using --json opti
         dependencies: {
           lorem: {
             version: '1.0.0',
-            funding: { url: 'https://example.com/lorem' }
+            funding: { url: 'https://example.com/lorem' },
           },
           bar: {
             version: '1.0.0',
-            funding: { type: 'individual', url: 'http://example.com/donate' }
-          }
-        }
+            funding: { type: 'individual', url: 'http://example.com/donate' },
+          },
+        },
       },
       'should omit dependencies with no funding declared in json output'
     )
@@ -348,39 +350,39 @@ test('fund containing multi-level nested deps with no funding, using --json opti
         version: '1.0.0',
         funding: [
           {
-            url: 'https://one.example.com'
+            url: 'https://one.example.com',
           },
           {
-            url: 'https://two.example.com'
-          }
+            url: 'https://two.example.com',
+          },
         ],
         dependencies: {
           bar: {
             version: '1.0.0',
             funding: [
               {
-                url: 'http://collective.example.com'
+                url: 'http://collective.example.com',
               },
               {
-                url: 'http://sponsors.example.com/you'
-              }
-            ]
+                url: 'http://sponsors.example.com/you',
+              },
+            ],
           },
           foo: {
             version: '1.0.0',
             funding: [
               {
-                url: 'http://example.com'
+                url: 'http://example.com',
               },
               {
-                url: 'http://sponsors.example.com/me'
+                url: 'http://sponsors.example.com/me',
               },
               {
-                url: 'http://collective.example.com'
-              }
-            ]
-          }
-        }
+                url: 'http://collective.example.com',
+              },
+            ],
+          },
+        },
       },
       'should list multiple funding entries in json output'
     )
@@ -440,8 +442,8 @@ test('fund using string shorthand', t => {
     'package.json': JSON.stringify({
       name: 'funding-string-shorthand',
       version: '0.0.0',
-      funding: 'https://example.com/sponsor'
-    })
+      funding: 'https://example.com/sponsor',
+    }),
   })
 
   fund(['.'], (err) => {
@@ -469,18 +471,18 @@ test('fund using symlink ref', t => {
   _flatOptions.prefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'using-symlink-ref',
-      version: '1.0.0'
+      version: '1.0.0',
     }),
     a: {
       'package.json': JSON.stringify({
         name: 'a',
         version: '1.0.0',
-        funding: 'http://example.com/a'
-      })
+        funding: 'http://example.com/a',
+      }),
     },
     node_modules: {
-      a: t.fixture('symlink', '../a')
-    }
+      a: t.fixture('symlink', '../a'),
+    },
   })
 
   // using symlinked ref
@@ -515,33 +517,33 @@ test('fund using data from actual tree', t => {
   _flatOptions.prefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'using-actual-tree',
-      version: '1.0.0'
+      version: '1.0.0',
     }),
     node_modules: {
       a: {
         'package.json': JSON.stringify({
           name: 'a',
           version: '1.0.0',
-          funding: 'http://example.com/a'
-        })
+          funding: 'http://example.com/a',
+        }),
       },
       b: {
         'package.json': JSON.stringify({
           name: 'a',
           version: '1.0.0',
-          funding: 'http://example.com/b'
+          funding: 'http://example.com/b',
         }),
         node_modules: {
           a: {
             'package.json': JSON.stringify({
               name: 'a',
               version: '1.0.1',
-              funding: 'http://example.com/_AAA'
-            })
-          }
-        }
-      }
-    }
+              funding: 'http://example.com/_AAA',
+            }),
+          },
+        },
+      },
+    },
   })
 
   // using symlinked ref
@@ -595,7 +597,7 @@ test('fund using package argument with no browser, using --json option', t => {
       JSON.parse(printUrl),
       {
         title: 'individual funding available at the following URL',
-        url: 'http://example.com/donate'
+        url: 'http://example.com/donate',
       },
       'should open funding url using json output'
     )
@@ -676,8 +678,8 @@ test('fund pkg missing version number', t => {
   _flatOptions.prefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'foo',
-      funding: 'http://example.com/foo'
-    })
+      funding: 'http://example.com/foo',
+    }),
   })
 
   fund([], (err) => {
@@ -693,8 +695,8 @@ test('fund a package throws on openUrl', t => {
     'package.json': JSON.stringify({
       name: 'foo',
       version: '1.0.0',
-      funding: 'http://npmjs.org'
-    })
+      funding: 'http://npmjs.org',
+    }),
   })
 
   fund(['.'], (err) => {
@@ -711,14 +713,14 @@ test('fund a package with type and multiple sources', t => {
       funding: [
         {
           type: 'Foo',
-          url: 'http://example.com/foo'
+          url: 'http://example.com/foo',
         },
         {
           type: 'Lorem',
-          url: 'http://example.com/foo-lorem'
-        }
-      ]
-    })
+          url: 'http://example.com/foo-lorem',
+        },
+      ],
+    }),
   })
 
   fund(['.'], (err) => {
@@ -738,16 +740,16 @@ test('fund colors', t => {
       dependencies: {
         a: '^1.0.0',
         b: '^1.0.0',
-        c: '^1.0.0'
-      }
+        c: '^1.0.0',
+      },
     }),
     node_modules: {
       a: {
         'package.json': JSON.stringify({
           name: 'a',
           version: '1.0.0',
-          funding: 'http://example.com/a'
-        })
+          funding: 'http://example.com/a',
+        }),
       },
       b: {
         'package.json': JSON.stringify({
@@ -756,32 +758,32 @@ test('fund colors', t => {
           funding: 'http://example.com/b',
           dependencies: {
             d: '^1.0.0',
-            e: '^1.0.0'
-          }
-        })
+            e: '^1.0.0',
+          },
+        }),
       },
       c: {
         'package.json': JSON.stringify({
           name: 'c',
           version: '1.0.0',
-          funding: 'http://example.com/b'
-        })
+          funding: 'http://example.com/b',
+        }),
       },
       d: {
         'package.json': JSON.stringify({
           name: 'd',
           version: '1.0.0',
-          funding: 'http://example.com/d'
-        })
+          funding: 'http://example.com/d',
+        }),
       },
       e: {
         'package.json': JSON.stringify({
           name: 'e',
           version: '1.0.0',
-          funding: 'http://example.com/e'
-        })
-      }
-    }
+          funding: 'http://example.com/e',
+        }),
+      },
+    },
   })
   _flatOptions.color = true
 
@@ -802,8 +804,8 @@ test('sub dep with fund info and a parent with no funding info', t => {
       version: '1.0.0',
       dependencies: {
         a: '^1.0.0',
-        b: '^1.0.0'
-      }
+        b: '^1.0.0',
+      },
     }),
     node_modules: {
       a: {
@@ -811,16 +813,16 @@ test('sub dep with fund info and a parent with no funding info', t => {
           name: 'a',
           version: '1.0.0',
           dependencies: {
-            c: '^1.0.0'
-          }
-        })
+            c: '^1.0.0',
+          },
+        }),
       },
       b: {
         'package.json': JSON.stringify({
           name: 'b',
           version: '1.0.0',
-          funding: 'http://example.com/b'
-        })
+          funding: 'http://example.com/b',
+        }),
       },
       c: {
         'package.json': JSON.stringify({
@@ -828,11 +830,11 @@ test('sub dep with fund info and a parent with no funding info', t => {
           version: '1.0.0',
           funding: [
             'http://example.com/c',
-            'http://example.com/c-other'
-          ]
-        })
-      }
-    }
+            'http://example.com/c-other',
+          ],
+        }),
+      },
+    },
   })
 
   fund([], (err) => {
diff --git a/deps/npm/test/lib/get.js b/deps/npm/test/lib/get.js
index 5f2f29bd922ae1..5260c00bae795c 100644
--- a/deps/npm/test/lib/get.js
+++ b/deps/npm/test/lib/get.js
@@ -9,9 +9,9 @@ test('should retrieve values from npm.commands.config', (t) => {
           t.equal(action, 'get', 'should use config get action')
           t.equal(arg, 'foo', 'should use expected key')
           t.end()
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   get(['foo'])
diff --git a/deps/npm/test/lib/init.js b/deps/npm/test/lib/init.js
new file mode 100644
index 00000000000000..e73cc4b30988cc
--- /dev/null
+++ b/deps/npm/test/lib/init.js
@@ -0,0 +1,236 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+
+let result = ''
+const npmLog = {
+  disableProgress: () => null,
+  enableProgress: () => null,
+  info: () => null,
+  pause: () => null,
+  resume: () => null,
+  silly: () => null,
+}
+const npm = {
+  config: { set () {} },
+  flatOptions: {},
+  log: npmLog,
+}
+const mocks = {
+  'init-package-json': (dir, initFile, config, cb) => cb(null, 'data'),
+  '../../lib/npm.js': npm,
+  '../../lib/utils/usage.js': () => 'usage instructions',
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
+}
+const init = requireInject('../../lib/init.js', mocks)
+
+t.afterEach(cb => {
+  result = ''
+  npm.config = { get: () => '', set () {} }
+  npm.commands = {}
+  Object.defineProperty(npm, 'flatOptions', { value: {} })
+  npm.log = npmLog
+  cb()
+})
+
+t.test('classic npm init no args', t => {
+  npm.config = {
+    get () {
+      return '~/.npm-init.js'
+    },
+  }
+  init([], err => {
+    t.ifError(err, 'npm init no args')
+    t.matchSnapshot(result, 'should print helper info')
+    t.end()
+  })
+})
+
+t.test('classic npm init -y', t => {
+  t.plan(7)
+  npm.config = {
+    get: () => '~/.npm-init.js',
+  }
+  Object.defineProperty(npm, 'flatOptions', { value: { yes: true} })
+  npm.log = { ...npm.log }
+  npm.log.silly = (title, msg) => {
+    t.equal(title, 'package data', 'should print title')
+    t.equal(msg, 'data', 'should print pkg data info')
+  }
+  npm.log.resume = () => {
+    t.ok('should resume logs')
+  }
+  npm.log.info = (title, msg) => {
+    t.equal(title, 'init', 'should print title')
+    t.equal(msg, 'written successfully', 'should print done info')
+  }
+  init([], err => {
+    t.ifError(err, 'npm init -y')
+    t.equal(result, '')
+  })
+})
+
+t.test('npm init <arg>', t => {
+  t.plan(4)
+  npm.config = {
+    set (key, val) {
+      t.equal(key, 'package', 'should set package key')
+      t.deepEqual(val, [], 'should set empty array value')
+    },
+  }
+  npm.commands.exec = (arr, cb) => {
+    t.deepEqual(
+      arr,
+      ['create-react-app'],
+      'should npx with listed packages'
+    )
+    cb()
+  }
+  init(['react-app'], err => {
+    t.ifError(err, 'npm init react-app')
+  })
+})
+
+t.test('npm init @scope/name', t => {
+  t.plan(2)
+  npm.commands.exec = (arr, cb) => {
+    t.deepEqual(
+      arr,
+      ['@npmcli/create-something'],
+      'should npx with scoped packages'
+    )
+    cb()
+  }
+  init(['@npmcli/something'], err => {
+    t.ifError(err, 'npm init init @scope/name')
+  })
+})
+
+t.test('npm init git spec', t => {
+  t.plan(2)
+  npm.commands.exec = (arr, cb) => {
+    t.deepEqual(
+      arr,
+      ['npm/create-something'],
+      'should npx with git-spec packages'
+    )
+    cb()
+  }
+  init(['npm/something'], err => {
+    t.ifError(err, 'npm init init @scope/name')
+  })
+})
+
+t.test('npm init @scope', t => {
+  t.plan(2)
+  npm.commands.exec = (arr, cb) => {
+    t.deepEqual(
+      arr,
+      ['@npmcli/create'],
+      'should npx with @scope/create pkgs'
+    )
+    cb()
+  }
+  init(['@npmcli'], err => {
+    t.ifError(err, 'npm init init @scope/create')
+  })
+})
+
+t.test('npm init tgz', t => {
+  init(['something.tgz'], err => {
+    t.match(
+      err,
+      /Error: Unrecognized initializer: something.tgz/,
+      'should throw error when using an unsupported spec'
+    )
+    t.end()
+  })
+})
+
+t.test('npm init <arg>@next', t => {
+  t.plan(2)
+  npm.commands.exec = (arr, cb) => {
+    t.deepEqual(
+      arr,
+      ['create-something@next'],
+      'should npx with something@next'
+    )
+    cb()
+  }
+  init(['something@next'], err => {
+    t.ifError(err, 'npm init init something@next')
+  })
+})
+
+t.test('npm init exec error', t => {
+  npm.commands.exec = (arr, cb) => {
+    cb(new Error('ERROR'))
+  }
+  init(['something@next'], err => {
+    t.match(
+      err,
+      /ERROR/,
+      'should exit with exec error'
+    )
+    t.end()
+  })
+})
+
+t.test('should not rewrite flatOptions', t => {
+  t.plan(4)
+  Object.defineProperty(npm, 'flatOptions', {
+    get: () => ({}),
+    set () {
+      throw new Error('Should not set flatOptions')
+    },
+  })
+  npm.config = {
+    set (key, val) {
+      t.equal(key, 'package', 'should set package key')
+      t.deepEqual(val, [], 'should set empty array value')
+    },
+  }
+  npm.commands.exec = (arr, cb) => {
+    t.deepEqual(
+      arr,
+      ['create-react-app', 'my-app'],
+      'should npx with extra args'
+    )
+    cb()
+  }
+  init(['react-app', 'my-app'], err => {
+    t.ifError(err, 'npm init react-app')
+  })
+})
+
+t.test('npm init cancel', t => {
+  t.plan(3)
+  const init = requireInject('../../lib/init.js', {
+    ...mocks,
+    'init-package-json': (dir, initFile, config, cb) => cb(
+      new Error('canceled')
+    ),
+  })
+  npm.log = { ...npm.log }
+  npm.log.warn = (title, msg) => {
+    t.equal(title, 'init', 'should have init title')
+    t.equal(msg, 'canceled', 'should log canceled')
+  }
+  init([], err => {
+    t.ifError(err, 'npm init cancel')
+  })
+})
+
+t.test('npm init error', t => {
+  const init = requireInject('../../lib/init.js', {
+    ...mocks,
+    'init-package-json': (dir, initFile, config, cb) => cb(
+      new Error('Unknown Error')
+    ),
+  })
+  init([], err => {
+    t.match(err, /Unknown Error/, 'should throw error')
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/install.js b/deps/npm/test/lib/install.js
index 1650dcb8c0a32e..7e243e7ff35f28 100644
--- a/deps/npm/test/lib/install.js
+++ b/deps/npm/test/lib/install.js
@@ -14,17 +14,17 @@ test('should install using Arborist', (t) => {
       globalDir: 'path/to/node_modules/',
       prefix: 'foo',
       flatOptions: {
-        global: false
+        global: false,
       },
       config: {
-        get: () => true
-      }
+        get: () => true,
+      },
     },
     '@npmcli/run-script': ({ event }) => {
       SCRIPTS.push(event)
     },
-    'npmlog': {
-      warn: () => {}
+    npmlog: {
+      warn: () => {},
     },
     '@npmcli/arborist': function (args) {
       ARB_ARGS = args
@@ -33,15 +33,16 @@ test('should install using Arborist', (t) => {
         REIFY_CALLED = true
       }
     },
-    '../../lib/utils/reify-output.js': arb => {
-      if (arb !== ARB_OBJ) {
-        throw new Error('got wrong object passed to reify-output')
-      }
-    }
+    '../../lib/utils/reify-finish.js': arb => {
+      if (arb !== ARB_OBJ)
+        throw new Error('got wrong object passed to reify-finish')
+    },
   })
 
   t.test('with args', t => {
-    install(['fizzbuzz'], () => {
+    install(['fizzbuzz'], er => {
+      if (er)
+        throw er
       t.match(ARB_ARGS, { global: false, path: 'foo' })
       t.equal(REIFY_CALLED, true, 'called reify')
       t.strictSame(SCRIPTS, [], 'no scripts when adding dep')
@@ -50,7 +51,9 @@ test('should install using Arborist', (t) => {
   })
 
   t.test('just a local npm install', t => {
-    install([], () => {
+    install([], er => {
+      if (er)
+        throw er
       t.match(ARB_ARGS, { global: false, path: 'foo' })
       t.equal(REIFY_CALLED, true, 'called reify')
       t.strictSame(SCRIPTS, [
@@ -60,7 +63,7 @@ test('should install using Arborist', (t) => {
         'prepublish',
         'preprepare',
         'prepare',
-        'postprepare'
+        'postprepare',
       ], 'exec scripts when doing local build')
       t.end()
     })
@@ -71,42 +74,45 @@ test('should install using Arborist', (t) => {
 
 test('should install globally using Arborist', (t) => {
   const install = requireInject('../../lib/install.js', {
+    '../../lib/utils/reify-finish.js': async () => {},
     '../../lib/npm.js': {
       globalDir: 'path/to/node_modules/',
       prefix: 'foo',
       flatOptions: {
-        'global': 'true',
+        global: 'true',
       },
       config: {
-        get: () => false
-      }
+        get: () => false,
+      },
     },
     '@npmcli/arborist': function () {
       this.reify = () => {}
     },
   })
-  install([], () => {
+  install([], er => {
+    if (er)
+      throw er
     t.end()
   })
 })
 
 test('completion to folder', (t) => {
   const install = requireInject('../../lib/install.js', {
-    'util': {
-      'promisify': (fn) => fn
+    '../../lib/utils/reify-finish.js': async () => {},
+    util: {
+      promisify: (fn) => fn,
     },
-    'fs': {
-      'readdir': (path) => {
-        if (path === '/') {
+    fs: {
+      readdir: (path) => {
+        if (path === '/')
           return ['arborist']
-        } else {
+        else
           return ['package.json']
-        }
-      }
-    }
+      },
+    },
   })
   install.completion({
-    partialWord: '/ar'
+    partialWord: '/ar',
   }, (er, res) => {
     t.equal(er, null)
     const expect = process.platform === 'win32' ? '\\arborist' : '/arborist'
@@ -117,17 +123,18 @@ test('completion to folder', (t) => {
 
 test('completion to folder - invalid dir', (t) => {
   const install = requireInject('../../lib/install.js', {
-    'util': {
-      'promisify': (fn) => fn
+    '../../lib/utils/reify-finish.js': async () => {},
+    util: {
+      promisify: (fn) => fn,
     },
-    'fs': {
-      'readdir': () => {
+    fs: {
+      readdir: () => {
         throw new Error('EONT')
-      }
-    }
+      },
+    },
   })
   install.completion({
-    partialWord: 'path/to/folder'
+    partialWord: 'path/to/folder',
   }, (er, res) => {
     t.equal(er, null)
     t.strictSame(res, [], 'invalid dir: no matching')
@@ -137,17 +144,18 @@ test('completion to folder - invalid dir', (t) => {
 
 test('completion to folder - no matches', (t) => {
   const install = requireInject('../../lib/install.js', {
-    'util': {
-      'promisify': (fn) => fn
+    '../../lib/utils/reify-finish.js': async () => {},
+    util: {
+      promisify: (fn) => fn,
     },
-    'fs': {
-      'readdir': (path) => {
+    fs: {
+      readdir: (path) => {
         return ['foobar']
-      }
-    }
+      },
+    },
   })
   install.completion({
-    partialWord: '/pa'
+    partialWord: '/pa',
   }, (er, res) => {
     t.equal(er, null)
     t.strictSame(res, [], 'no name match')
@@ -157,21 +165,21 @@ test('completion to folder - no matches', (t) => {
 
 test('completion to folder - match is not a package', (t) => {
   const install = requireInject('../../lib/install.js', {
-    'util': {
-      'promisify': (fn) => fn
+    '../../lib/utils/reify-finish.js': async () => {},
+    util: {
+      promisify: (fn) => fn,
     },
-    'fs': {
-      'readdir': (path) => {
-        if (path === '/') {
+    fs: {
+      readdir: (path) => {
+        if (path === '/')
           return ['arborist']
-        } else {
+        else
           throw new Error('EONT')
-        }
-      }
-    }
+      },
+    },
   })
   install.completion({
-    partialWord: '/ar'
+    partialWord: '/ar',
   }, (er, res) => {
     t.equal(er, null)
     t.strictSame(res, [], 'no name match')
@@ -181,7 +189,7 @@ test('completion to folder - match is not a package', (t) => {
 
 test('completion to url', (t) => {
   install.completion({
-    partialWord: 'http://path/to/url'
+    partialWord: 'http://path/to/url',
   }, (er, res) => {
     t.equal(er, null)
     t.strictSame(res, [])
@@ -191,7 +199,7 @@ test('completion to url', (t) => {
 
 test('completion', (t) => {
   install.completion({
-    partialWord: 'toto'
+    partialWord: 'toto',
   }, (er, res) => {
     t.notOk(er)
     t.notOk(res)
diff --git a/deps/npm/test/lib/link.js b/deps/npm/test/lib/link.js
index aafdb8188e85cf..a478259f7b409a 100644
--- a/deps/npm/test/lib/link.js
+++ b/deps/npm/test/lib/link.js
@@ -20,8 +20,11 @@ const npm = {
   prefix: null,
   flatOptions: {},
   config: {
-    get () { return false }
-  }
+    get () {
+      return false
+    },
+    find () {},
+  },
 }
 const printLinks = async (opts) => {
   let res = ''
@@ -30,16 +33,15 @@ const printLinks = async (opts) => {
   const linkedItems = [...tree.inventory.values()]
     .sort((a, b) => a.pkgid.localeCompare(b.pkgid))
   for (const item of linkedItems) {
-    if (item.target) {
+    if (item.target)
       res += `${item.path} -> ${item.target.path}\n`
-    }
   }
   return res
 }
 
 const mocks = {
   '../../lib/npm.js': npm,
-  '../../lib/utils/reify-output.js': () => reifyOutput()
+  '../../lib/utils/reify-output.js': () => reifyOutput(),
 }
 
 const link = requireInject('../../lib/link.js', mocks)
@@ -54,18 +56,18 @@ t.test('link to globalDir when in current working dir of pkg and no args', (t) =
           a: {
             'package.json': JSON.stringify({
               name: 'a',
-              version: '1.0.0'
-            })
-          }
-        }
-      }
+              version: '1.0.0',
+            }),
+          },
+        },
+      },
     },
     'test-pkg-link': {
       'package.json': JSON.stringify({
         name: 'test-pkg-link',
-        version: '1.0.0'
-      })
-    }
+        version: '1.0.0',
+      }),
+    },
   })
   npm.globalDir = resolve(testdir, 'global-prefix', 'lib', 'node_modules')
   npm.prefix = resolve(testdir, 'test-pkg-link')
@@ -75,7 +77,7 @@ t.test('link to globalDir when in current working dir of pkg and no args', (t) =
 
     const links = await printLinks({
       path: resolve(npm.globalDir, '..'),
-      global: true
+      global: true,
     })
 
     t.matchSnapshot(links, 'should create a global link to current pkg')
@@ -97,68 +99,68 @@ t.test('link global linked pkg to local nm when using args', (t) => {
             foo: {
               'package.json': JSON.stringify({
                 name: '@myscope/foo',
-                version: '1.0.0'
-              })
+                version: '1.0.0',
+              }),
             },
             bar: {
               'package.json': JSON.stringify({
                 name: '@myscope/bar',
-                version: '1.0.0'
-              })
+                version: '1.0.0',
+              }),
             },
-            linked: t.fixture('symlink', '../../../../scoped-linked')
+            linked: t.fixture('symlink', '../../../../scoped-linked'),
           },
           a: {
             'package.json': JSON.stringify({
               name: 'a',
-              version: '1.0.0'
-            })
+              version: '1.0.0',
+            }),
           },
           b: {
             'package.json': JSON.stringify({
               name: 'b',
-              version: '1.0.0'
-            })
+              version: '1.0.0',
+            }),
           },
-          'test-pkg-link': t.fixture('symlink', '../../../test-pkg-link')
-        }
-      }
+          'test-pkg-link': t.fixture('symlink', '../../../test-pkg-link'),
+        },
+      },
     },
     'test-pkg-link': {
       'package.json': JSON.stringify({
         name: 'test-pkg-link',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     'link-me-too': {
       'package.json': JSON.stringify({
         name: 'link-me-too',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     'scoped-linked': {
       'package.json': JSON.stringify({
         name: '@myscope/linked',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     'my-project': {
       'package.json': JSON.stringify({
         name: 'my-project',
         version: '1.0.0',
         dependencies: {
-          foo: '^1.0.0'
-        }
+          foo: '^1.0.0',
+        },
       }),
       node_modules: {
         foo: {
           'package.json': JSON.stringify({
             name: 'foo',
-            version: '1.0.0'
-          })
-        }
-      }
-    }
+            version: '1.0.0',
+          }),
+        },
+      },
+    },
   })
   npm.globalDir = resolve(testdir, 'global-prefix', 'lib', 'node_modules')
   npm.prefix = resolve(testdir, 'my-project')
@@ -171,7 +173,7 @@ t.test('link global linked pkg to local nm when using args', (t) => {
     process.chdir(_cwd)
 
     const links = await printLinks({
-      path: npm.prefix
+      path: npm.prefix,
     })
 
     t.matchSnapshot(links, 'should create a local symlink to global pkg')
@@ -188,52 +190,61 @@ t.test('link global linked pkg to local nm when using args', (t) => {
     '@myscope/linked',
     '@myscope/bar',
     'a',
-    'file:../link-me-too'
+    'file:../link-me-too',
   ], (err) => {
     t.ifError(err, 'should not error out')
   })
 })
 
 t.test('link pkg already in global space', (t) => {
-  t.plan(2)
+  t.plan(3)
 
   const testdir = t.testdir({
     'global-prefix': {
       lib: {
         node_modules: {
           '@myscope': {
-            linked: t.fixture('symlink', '../../../../scoped-linked')
-          }
-        }
-      }
+            linked: t.fixture('symlink', '../../../../scoped-linked'),
+          },
+        },
+      },
     },
     'scoped-linked': {
       'package.json': JSON.stringify({
         name: '@myscope/linked',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     'my-project': {
       'package.json': JSON.stringify({
         name: 'my-project',
-        version: '1.0.0'
-      })
-    }
+        version: '1.0.0',
+      }),
+    },
   })
   npm.globalDir = resolve(testdir, 'global-prefix', 'lib', 'node_modules')
   npm.prefix = resolve(testdir, 'my-project')
 
+  npm.config.find = () => 'default'
+
   const _cwd = process.cwd()
   process.chdir(npm.prefix)
 
   reifyOutput = async () => {
     reifyOutput = undefined
     process.chdir(_cwd)
+    npm.config.find = () => null
 
     const links = await printLinks({
-      path: npm.prefix
+      path: npm.prefix,
     })
 
+    t.equal(
+      require(resolve(testdir, 'my-project', 'package.json')).dependencies,
+      undefined,
+      'should not save to package.json upon linking'
+    )
+
     t.matchSnapshot(links, 'should create a local symlink to global pkg')
   }
 
@@ -256,10 +267,10 @@ t.test('completion', (t) => {
           foo: {},
           bar: {},
           lorem: {},
-          ipsum: {}
-        }
-      }
-    }
+          ipsum: {},
+        },
+      },
+    },
   })
   npm.globalDir = resolve(testdir, 'global-prefix', 'lib', 'node_modules')
 
@@ -276,7 +287,9 @@ t.test('completion', (t) => {
 
 t.test('--global option', (t) => {
   const _config = npm.config
-  npm.config = { get () { return true } }
+  npm.config = { get () {
+    return true
+  } }
   link([], (err) => {
     npm.config = _config
 
diff --git a/deps/npm/test/lib/ll.js b/deps/npm/test/lib/ll.js
index 989800944f6cb3..7d4e2b94f2b7e2 100644
--- a/deps/npm/test/lib/ll.js
+++ b/deps/npm/test/lib/ll.js
@@ -7,15 +7,15 @@ const ll = requireInject('../../lib/ll.js', {
     config: {
       set: (k, v) => {
         configs[k] = v
-      }
+      },
     },
     commands: {
       ls: (args, cb) => {
         lsCalled = true
         cb()
-      }
-    }
-  }
+      },
+    },
+  },
 })
 
 const ls = require('../../lib/ls.js')
diff --git a/deps/npm/test/lib/load-all-commands.js b/deps/npm/test/lib/load-all-commands.js
index 1669f435e9b097..fa73b8a78d8fa2 100644
--- a/deps/npm/test/lib/load-all-commands.js
+++ b/deps/npm/test/lib/load-all-commands.js
@@ -4,9 +4,8 @@ const t = require('tap')
 const { cmdList } = require('../../lib/utils/cmd-list.js')
 
 t.test('load npm', t => npm.load(er => {
-  if (er) {
+  if (er)
     throw er
-  }
 }))
 
 t.test('load each command', t => {
diff --git a/deps/npm/test/lib/load-all.js b/deps/npm/test/lib/load-all.js
index 72879c2c4448aa..02736c18ccc387 100644
--- a/deps/npm/test/lib/load-all.js
+++ b/deps/npm/test/lib/load-all.js
@@ -4,9 +4,9 @@ const { resolve } = require('path')
 
 const full = process.env.npm_lifecycle_event === 'check-coverage'
 
-if (!full) {
+if (!full)
   t.pass('nothing to do here, not checking for full coverage')
-} else {
+else {
   // some files do config.get() on load, so have to load npm first
   const npm = require('../../lib/npm.js')
   t.test('load npm first', t => npm.load(t.end))
diff --git a/deps/npm/test/lib/logout.js b/deps/npm/test/lib/logout.js
index 0d00422dc83366..96b1bcc7fe8c41 100644
--- a/deps/npm/test/lib/logout.js
+++ b/deps/npm/test/lib/logout.js
@@ -3,7 +3,7 @@ const { test } = require('tap')
 
 const _flatOptions = {
   registry: 'https://registry.npmjs.org/',
-  scope: ''
+  scope: '',
 }
 
 const config = {}
@@ -19,8 +19,8 @@ const mocks = {
   'npm-registry-fetch': npmFetch,
   '../../lib/npm.js': {
     flatOptions: _flatOptions,
-    config
-  }
+    config,
+  },
 }
 
 const logout = requireInject('../../lib/logout.js', mocks)
@@ -64,8 +64,8 @@ test('token logout', async (t) => {
             scope: '',
             token: '@foo/',
             method: 'DELETE',
-            ignoreBody: true
-          }
+            ignoreBody: true,
+          },
         },
         'should call npm-registry-fetch with expected values'
       )
@@ -134,8 +134,8 @@ test('token scoped logout', async (t) => {
             scope: '@myscope',
             token: '@foo/',
             method: 'DELETE',
-            ignoreBody: true
-          }
+            ignoreBody: true,
+          },
         },
         'should call npm-registry-fetch with expected values'
       )
@@ -241,8 +241,8 @@ test('ignore invalid scoped registry config', async (t) => {
             '@myscope:registry': '',
             token: '@foo/',
             method: 'DELETE',
-            ignoreBody: true
-          }
+            ignoreBody: true,
+          },
         },
         'should call npm-registry-fetch with expected values'
       )
diff --git a/deps/npm/test/lib/ls.js b/deps/npm/test/lib/ls.js
index 6a91e8c3520cd0..256ebf3534302e 100644
--- a/deps/npm/test/lib/ls.js
+++ b/deps/npm/test/lib/ls.js
@@ -7,28 +7,28 @@ t.cleanSnapshot = str => str.split(/\r\n/).join('\n')
 
 const simpleNmFixture = {
   node_modules: {
-    'foo': {
+    foo: {
       'package.json': JSON.stringify({
         name: 'foo',
         version: '1.0.0',
         dependencies: {
-          'bar': '^1.0.0'
-        }
-      })
+          bar: '^1.0.0',
+        },
+      }),
     },
-    'bar': {
+    bar: {
       'package.json': JSON.stringify({
         name: 'bar',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
-    'lorem': {
+    lorem: {
       'package.json': JSON.stringify({
         name: 'lorem',
-        version: '1.0.0'
-      })
-    }
-  }
+        version: '1.0.0',
+      }),
+    },
+  },
 }
 
 const diffDepTypesNmFixture = {
@@ -39,9 +39,9 @@ const diffDepTypesNmFixture = {
         description: 'A DEV dep kind of dep',
         version: '1.0.0',
         dependencies: {
-          'foo': '^1.0.0'
-        }
-      })
+          foo: '^1.0.0',
+        },
+      }),
     },
     'prod-dep': {
       'package.json': JSON.stringify({
@@ -49,35 +49,35 @@ const diffDepTypesNmFixture = {
         description: 'A PROD dep kind of dep',
         version: '1.0.0',
         dependencies: {
-          'bar': '^2.0.0'
-        }
+          bar: '^2.0.0',
+        },
       }),
       node_modules: {
         bar: {
           'package.json': JSON.stringify({
             name: 'bar',
             description: 'A dep that bars',
-            version: '2.0.0'
-          })
-        }
-      }
+            version: '2.0.0',
+          }),
+        },
+      },
     },
     'optional-dep': {
       'package.json': JSON.stringify({
         name: 'optional-dep',
         description: 'Maybe a dep?',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     'peer-dep': {
       'package.json': JSON.stringify({
         name: 'peer-dep',
         description: 'Peer-dep description here',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
-    ...simpleNmFixture.node_modules
-  }
+    ...simpleNmFixture.node_modules,
+  },
 }
 
 let prefix
@@ -95,24 +95,32 @@ const _flatOptions = {
   link: false,
   only: null,
   parseable: false,
-  get prefix () { return prefix },
-  production: false
+  get prefix () {
+    return prefix
+  },
+  production: false,
 }
 const ls = requireInject('../../lib/ls.js', {
   '../../lib/npm.js': {
     flatOptions: _flatOptions,
     limit: {
-      fetch: 3
+      fetch: 3,
+    },
+    get prefix () {
+      return _flatOptions.prefix
+    },
+    get globalDir () {
+      return globalDir
     },
-    get prefix () { return _flatOptions.prefix },
-    get globalDir () { return globalDir },
     config: {
       get (key) {
         return _flatOptions[key]
-      }
-    }
+      },
+    },
+  },
+  '../../lib/utils/output.js': msg => {
+    result = msg
   },
-  '../../lib/utils/output.js': msg => { result = msg }
 })
 
 const redactCwd = res =>
@@ -136,10 +144,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -150,7 +158,7 @@ t.test('ls', (t) => {
 
   t.test('missing package.json', (t) => {
     prefix = t.testdir({
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -169,10 +177,10 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          foo: '^1.0.0'
-        }
+          foo: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.equal(err.code, 'ELSPROBLEMS', 'should have error code')
@@ -194,10 +202,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['lorem'], (err) => {
       t.ifError(err, 'npm ls')
@@ -216,10 +224,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['.'], (err) => {
       t.ifError(err, 'should not throw on missing dep above current level')
@@ -237,10 +245,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['bar'], (err) => {
       t.ifError(err, 'npm ls')
@@ -257,18 +265,18 @@ t.test('ls', (t) => {
         dependencies: {
           foo: '^1.0.0',
           lorem: '^1.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
       node_modules: {
         ...simpleNmFixture.node_modules,
         ipsum: {
           'package.json': JSON.stringify({
             name: 'ipsum',
-            version: '1.0.0'
-          })
-        }
-      }
+            version: '1.0.0',
+          }),
+        },
+      },
     })
     ls(['bar@*', 'lorem@1.0.0'], (err) => {
       t.ifError(err, 'npm ls')
@@ -284,10 +292,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['notadep'], (err) => {
       t.ifError(err, 'npm ls')
@@ -311,10 +319,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -334,10 +342,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -357,8 +365,8 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           a: '^1.0.0',
-          e: '^1.0.0'
-        }
+          e: '^1.0.0',
+        },
       }),
       node_modules: {
         a: {
@@ -366,9 +374,9 @@ t.test('ls', (t) => {
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
+              b: '^1.0.0',
+            },
+          }),
         },
         b: {
           'package.json': JSON.stringify({
@@ -376,29 +384,29 @@ t.test('ls', (t) => {
             version: '1.0.0',
             dependencies: {
               c: '^1.0.0',
-              d: '*'
-            }
-          })
+              d: '*',
+            },
+          }),
         },
         c: {
           'package.json': JSON.stringify({
             name: 'c',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         d: {
           'package.json': JSON.stringify({
             name: 'd',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         e: {
           'package.json': JSON.stringify({
             name: 'e',
-            version: '1.0.0'
-          })
-        }
-      }
+            version: '1.0.0',
+          }),
+        },
+      },
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -416,10 +424,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^2.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.equal(err.code, 'ELSPROBLEMS', 'should have error code')
@@ -443,10 +451,10 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^2.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.equal(err.code, 'ELSPROBLEMS', 'should have error code')
@@ -464,19 +472,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing dev deps')
@@ -493,19 +501,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing only development deps')
@@ -522,29 +530,29 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0',
-          'linked-dep': '^1.0.0'
+          lorem: '^1.0.0',
+          'linked-dep': '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
       'linked-dep': {
         'package.json': JSON.stringify({
           name: 'linked-dep',
-          version: '1.0.0'
-        })
+          version: '1.0.0',
+        }),
       },
       node_modules: {
         'linked-dep': t.fixture('symlink', '../linked-dep'),
-        ...diffDepTypesNmFixture.node_modules
-      }
+        ...diffDepTypesNmFixture.node_modules,
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing linked deps')
@@ -559,15 +567,15 @@ t.test('ls', (t) => {
         name: 'print-deduped-symlinks',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0',
-          'b': '^1.0.0'
-        }
+          a: '^1.0.0',
+          b: '^1.0.0',
+        },
       }),
-      'b': {
+      b: {
         'package.json': JSON.stringify({
           name: 'b',
-          version: '1.0.0'
-        })
+          version: '1.0.0',
+        }),
       },
       node_modules: {
         a: {
@@ -575,12 +583,12 @@ t.test('ls', (t) => {
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
+              b: '^1.0.0',
+            },
+          }),
         },
-        'b': t.fixture('symlink', '../b')
-      }
+        b: t.fixture('symlink', '../b'),
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing linked deps')
@@ -597,19 +605,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing production deps')
@@ -626,19 +634,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing only prod deps')
@@ -655,19 +663,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree info with descriptions')
@@ -686,19 +694,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing top-level deps with descriptions')
@@ -711,7 +719,7 @@ t.test('ls', (t) => {
 
   t.test('json read problems', (t) => {
     prefix = t.testdir({
-      'package.json': '{broken json'
+      'package.json': '{broken json',
     })
     ls([], (err) => {
       t.match(err, { code: 'EJSONPARSE' }, 'should throw EJSONPARSE error')
@@ -736,19 +744,19 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^2.0.0' // mismatching version #
-        }
+          'peer-dep': '^2.0.0', // mismatching version #
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree signaling mismatching peer dep in problems')
@@ -763,9 +771,9 @@ t.test('ls', (t) => {
         name: 'invalid-deduped-dep',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0',
-          'b': '^2.0.0'
-        }
+          a: '^1.0.0',
+          b: '^2.0.0',
+        },
       }),
       node_modules: {
         a: {
@@ -773,17 +781,17 @@ t.test('ls', (t) => {
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^2.0.0'
-            }
-          })
+              b: '^2.0.0',
+            },
+          }),
         },
         b: {
           'package.json': JSON.stringify({
             name: 'b',
-            version: '1.0.0'
-          })
-        }
-      }
+            version: '1.0.0',
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree signaling mismatching peer dep in problems')
@@ -798,9 +806,9 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0',
-          'b': '^1.0.0'
-        }
+          a: '^1.0.0',
+          b: '^1.0.0',
+        },
       }),
       node_modules: {
         a: {
@@ -808,11 +816,11 @@ t.test('ls', (t) => {
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
-        }
-      }
+              b: '^1.0.0',
+            },
+          }),
+        },
+      },
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -828,9 +836,9 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         peerDependencies: {
-          'peer-dep': '*'
-        }
-      })
+          'peer-dep': '*',
+        },
+      }),
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -848,20 +856,20 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
           'missing-optional-dep': '^1.0.0',
-          'optional-dep': '^2.0.0' // mismatching version #
+          'optional-dep': '^2.0.0', // mismatching version #
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -878,29 +886,29 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0'
-        }
+          a: '^1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
+              b: '^1.0.0',
+            },
+          }),
         },
-        'b': {
+        b: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             dependencies: {
-              a: '^1.0.0'
-            }
-          })
-        }
-      }
+              a: '^1.0.0',
+            },
+          }),
+        },
+      },
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -916,29 +924,29 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0'
-        }
+          a: '^1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
+              b: '^1.0.0',
+            },
+          }),
         },
-        'b': {
+        b: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             dependencies: {
-              a: '^1.0.0'
-            }
-          })
-        }
-      }
+              a: '^1.0.0',
+            },
+          }),
+        },
+      },
     })
     ls(['a'], (err) => {
       t.ifError(err, 'npm ls')
@@ -956,37 +964,37 @@ t.test('ls', (t) => {
         dependencies: {
           '@npmcli/a': '^1.0.0',
           '@npmcli/b': '^1.0.0',
-          '@npmcli/c': '^1.0.0'
-        }
+          '@npmcli/c': '^1.0.0',
+        },
       }),
       node_modules: {
         '@npmcli': {
-          'a': {
+          a: {
             'package.json': JSON.stringify({
               name: '@npmcli/a',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/b': '^1.0.0'
-              }
-            })
+                '@npmcli/b': '^1.0.0',
+              },
+            }),
           },
-          'b': {
+          b: {
             'package.json': JSON.stringify({
               name: '@npmcli/b',
-              version: '1.1.2'
-            })
+              version: '1.1.2',
+            }),
           },
-          'c': {
+          c: {
             'package.json': JSON.stringify({
               name: '@npmcli/c',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/b': '^1.0.0'
-              }
-            })
-          }
-        }
-      }
+                '@npmcli/b': '^1.0.0',
+              },
+            }),
+          },
+        },
+      },
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1005,37 +1013,37 @@ t.test('ls', (t) => {
         dependencies: {
           '@npmcli/a': '^1.0.0',
           '@npmcli/b': '^1.0.0',
-          '@npmcli/c': '^1.0.0'
-        }
+          '@npmcli/c': '^1.0.0',
+        },
       }),
       node_modules: {
         '@npmcli': {
-          'a': {
+          a: {
             'package.json': JSON.stringify({
               name: '@npmcli/a',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/b': '^1.0.0'
-              }
-            })
+                '@npmcli/b': '^1.0.0',
+              },
+            }),
           },
-          'b': {
+          b: {
             'package.json': JSON.stringify({
               name: '@npmcli/b',
-              version: '1.1.2'
-            })
+              version: '1.1.2',
+            }),
           },
-          'c': {
+          c: {
             'package.json': JSON.stringify({
               name: '@npmcli/c',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/b': '^1.0.0'
-              }
-            })
-          }
-        }
-      }
+                '@npmcli/b': '^1.0.0',
+              },
+            }),
+          },
+        },
+      },
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1055,37 +1063,37 @@ t.test('ls', (t) => {
         dependencies: {
           '@npmcli/a': '^1.0.0',
           '@npmcli/b': '^1.0.0',
-          '@npmcli/c': '^1.0.0'
-        }
+          '@npmcli/c': '^1.0.0',
+        },
       }),
       node_modules: {
         '@npmcli': {
-          'a': {
+          a: {
             'package.json': JSON.stringify({
               name: '@npmcli/a',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/b': '^1.0.0'
-              }
-            })
+                '@npmcli/b': '^1.0.0',
+              },
+            }),
           },
-          'b': {
+          b: {
             'package.json': JSON.stringify({
               name: '@npmcli/b',
-              version: '1.1.2'
-            })
+              version: '1.1.2',
+            }),
           },
-          'c': {
+          c: {
             'package.json': JSON.stringify({
               name: '@npmcli/c',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/b': '^1.0.0'
-              }
-            })
-          }
-        }
-      }
+                '@npmcli/b': '^1.0.0',
+              },
+            }),
+          },
+        },
+      },
     })
     ls(['@npmcli/b'], (err) => {
       t.ifError(err, 'npm ls')
@@ -1103,37 +1111,37 @@ t.test('ls', (t) => {
         dependencies: {
           '@npmcli/a': '^1.0.0',
           '@npmcli/b': '^1.0.0',
-          '@npmcli/c': '^1.0.0'
-        }
+          '@npmcli/c': '^1.0.0',
+        },
       }),
       node_modules: {
         '@npmcli': {
-          'a': {
+          a: {
             'package.json': JSON.stringify({
               name: '@npmcli/a',
               version: '1.0.0',
               dependencies: {
-                '@npmcli/c': '^1.0.0'
-              }
-            })
+                '@npmcli/c': '^1.0.0',
+              },
+            }),
           },
-          'b': {
+          b: {
             'package.json': JSON.stringify({
               name: '@npmcli/b',
               version: '1.1.2',
               dependencies: {
-                '@npmcli/c': '^1.0.0'
-              }
-            })
+                '@npmcli/c': '^1.0.0',
+              },
+            }),
           },
-          'c': {
+          c: {
             'package.json': JSON.stringify({
               name: '@npmcli/c',
-              version: '1.0.0'
-            })
-          }
-        }
-      }
+              version: '1.0.0',
+            }),
+          },
+        },
+      },
     })
     ls(['@npmcli/c'], (err) => {
       t.ifError(err, 'npm ls')
@@ -1148,22 +1156,22 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          a: 'npm:b@1.0.0'
-        }
+          a: 'npm:b@1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             _from: 'a@npm:b',
             _resolved: 'https://localhost:8080/abbrev/-/abbrev-1.1.1.tgz',
             _requested: {
-              type: 'alias'
-            }
-          })
-        }
-      }
+              type: 'alias',
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing aliases')
@@ -1177,11 +1185,11 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'abbrev': 'git+https://github.com/isaacs/abbrev-js.git'
-        }
+          abbrev: 'git+https://github.com/isaacs/abbrev-js.git',
+        },
       }),
       node_modules: {
-        'abbrev': {
+        abbrev: {
           'package.json': JSON.stringify({
             name: 'abbrev',
             version: '1.1.1',
@@ -1194,11 +1202,11 @@ t.test('ls', (t) => {
               rawSpec: 'git+https:github.com/isaacs/abbrev-js.git',
               saveSpec: 'git+https://github.com/isaacs/abbrev-js.git',
               fetchSpec: 'https://github.com/isaacs/abbrev-js.git',
-              gitCommittish: null
-            }
-          })
-        }
-      }
+              gitCommittish: null,
+            },
+          }),
+        },
+      },
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1213,36 +1221,36 @@ t.test('ls', (t) => {
         a: {
           'package.json': JSON.stringify({
             name: 'a',
-            version: '1.0.1'
-          })
-        }
+            version: '1.0.1',
+          }),
+        },
       },
       'package-lock.json': JSON.stringify({
-        'name': 'npm-broken-resolved-field-test',
-        'version': '1.0.0',
-        'lockfileVersion': 2,
-        'requires': true,
-        'packages': {
+        name: 'npm-broken-resolved-field-test',
+        version: '1.0.0',
+        lockfileVersion: 2,
+        requires: true,
+        packages: {
           '': {
-            'name': 'a',
-            'version': '1.0.1'
-          }
+            name: 'a',
+            version: '1.0.1',
+          },
         },
-        'dependencies': {
+        dependencies: {
           a: {
-            'version': '1.0.1',
-            'resolved': 'foo@bar://b8f3a2fc0c3bb8ffd8b0d0072cc6b5a3667e963c',
-            'integrity': 'sha512-8AN9lNCcBt5Xeje7fMEEpp5K3rgcAzIpTtAjYb/YMUYu8SbIVF6wz0WqACDVKvpQOUcSfNHZQNLNmue0QSwXOQ=='
-          }
-        }
-      }),
-      'package.json': JSON.stringify({
-        'name': 'npm-broken-resolved-field-test',
-        'version': '1.0.0',
-        'dependencies': {
-          'a': '^1.0.1'
-        }
-      })
+            version: '1.0.1',
+            resolved: 'foo@bar://b8f3a2fc0c3bb8ffd8b0d0072cc6b5a3667e963c',
+            integrity: 'sha512-8AN9lNCcBt5Xeje7fMEEpp5K3rgcAzIpTtAjYb/YMUYu8SbIVF6wz0WqACDVKvpQOUcSfNHZQNLNmue0QSwXOQ==',
+          },
+        },
+      }),
+      'package.json': JSON.stringify({
+        name: 'npm-broken-resolved-field-test',
+        version: '1.0.0',
+        dependencies: {
+          a: '^1.0.1',
+        },
+      }),
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1257,8 +1265,8 @@ t.test('ls', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'simple-output': '^2.0.0'
-        }
+          'simple-output': '^2.0.0',
+        },
       }),
       node_modules: {
         'simple-output': {
@@ -1276,17 +1284,17 @@ t.test('ls', (t) => {
               escapedName: 'simple-output',
               rawSpec: '',
               saveSpec: null,
-              fetchSpec: 'latest'
+              fetchSpec: 'latest',
             },
             _requiredBy: [
               '#USER',
-              '/'
+              '/',
             ],
             _shasum: '3c07708ec9ef3e3c985cf0ddd67df09ab8ec2abc',
-            _spec: 'simple-output'
-          })
-        }
-      }
+            _spec: 'simple-output',
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should not be printed in tree output')
@@ -1301,24 +1309,24 @@ t.test('ls', (t) => {
         a: {
           'package.json': JSON.stringify({
             name: 'a',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         b: {
           'package.json': JSON.stringify({
             name: 'b',
-            version: '1.0.0'
+            version: '1.0.0',
           }),
           node_modules: {
             c: {
               'package.json': JSON.stringify({
                 name: 'c',
-                version: '1.0.0'
-              })
-            }
-          }
-        }
-      }
+                version: '1.0.0',
+              }),
+            },
+          },
+        },
+      },
     })
 
     // mimics lib/npm.js globalDir getter but pointing to fixtures
@@ -1338,8 +1346,8 @@ t.test('ls', (t) => {
         name: 'filter-by-child-of-missing-dep',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0'
-        }
+          a: '^1.0.0',
+        },
       }),
       node_modules: {
         b: {
@@ -1347,34 +1355,34 @@ t.test('ls', (t) => {
             name: 'b',
             version: '1.0.0',
             dependencies: {
-              c: '^1.0.0'
-            }
-          })
+              c: '^1.0.0',
+            },
+          }),
         },
         c: {
           'package.json': JSON.stringify({
             name: 'c',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         d: {
           'package.json': JSON.stringify({
             name: 'd',
             version: '1.0.0',
             dependencies: {
-              c: '^2.0.0'
-            }
+              c: '^2.0.0',
+            },
           }),
           node_modules: {
             c: {
               'package.json': JSON.stringify({
                 name: 'c',
-                version: '2.0.0'
-              })
-            }
-          }
-        }
-      }
+                version: '2.0.0',
+              }),
+            },
+          },
+        },
+      },
     })
 
     ls(['c'], (err) => {
@@ -1391,8 +1399,8 @@ t.test('ls', (t) => {
         version: '1.0.0',
         workspaces: [
           './a',
-          './b'
-        ]
+          './b',
+        ],
       }),
       node_modules: {
         a: t.fixture('symlink', '../a'),
@@ -1400,25 +1408,25 @@ t.test('ls', (t) => {
         c: {
           'package.json': JSON.stringify({
             name: 'c',
-            version: '1.0.0'
-          })
-        }
+            version: '1.0.0',
+          }),
+        },
       },
       a: {
         'package.json': JSON.stringify({
           name: 'a',
           version: '1.0.0',
           dependencies: {
-            c: '^1.0.0'
-          }
-        })
+            c: '^1.0.0',
+          },
+        }),
       },
       b: {
         'package.json': JSON.stringify({
           name: 'b',
-          version: '1.0.0'
-        })
-      }
+          version: '1.0.0',
+        }),
+      },
     })
 
     ls([], (err) => {
@@ -1443,44 +1451,44 @@ t.test('ls', (t) => {
         version: '1.0.0',
         dependencies: {
           a: '^1.0.0',
-          b: '^1.0.0'
-        }
+          b: '^1.0.0',
+        },
       }),
       node_modules: {
         a: {
           'package.json': JSON.stringify({
             name: 'a',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         b: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             dependencies: {
-              c: '^1.0.0'
-            }
-          })
+              c: '^1.0.0',
+            },
+          }),
         },
         c: {
           'package.json': JSON.stringify({
             name: 'c',
             version: '1.0.0',
             dependencies: {
-              d: '^1.0.0'
-            }
-          })
+              d: '^1.0.0',
+            },
+          }),
         },
         d: {
           'package.json': JSON.stringify({
             name: 'd',
             version: '1.0.0',
             dependencies: {
-              a: '^1.0.0'
-            }
-          })
-        }
-      }
+              a: '^1.0.0',
+            },
+          }),
+        },
+      },
     })
 
     t.plan(6)
@@ -1521,10 +1529,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1535,7 +1543,7 @@ t.test('ls --parseable', (t) => {
 
   t.test('missing package.json', (t) => {
     prefix = t.testdir({
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -1554,10 +1562,10 @@ t.test('ls --parseable', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          foo: '^1.0.0'
-        }
+          foo: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.equal(err.code, 'ELSPROBLEMS', 'should have error code')
@@ -1573,10 +1581,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['lorem'], (err) => {
       t.ifError(err, 'npm ls')
@@ -1592,10 +1600,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['bar'], (err) => {
       t.ifError(err, 'npm ls')
@@ -1612,18 +1620,18 @@ t.test('ls --parseable', (t) => {
         dependencies: {
           foo: '^1.0.0',
           lorem: '^1.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
       node_modules: {
         ...simpleNmFixture.node_modules,
         ipsum: {
           'package.json': JSON.stringify({
             name: 'ipsum',
-            version: '1.0.0'
-          })
-        }
-      }
+            version: '1.0.0',
+          }),
+        },
+      },
     })
     ls(['bar@*', 'lorem@1.0.0'], (err) => {
       t.ifError(err, 'npm ls')
@@ -1639,10 +1647,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['notadep'], (err) => {
       t.ifError(err, 'npm ls')
@@ -1666,10 +1674,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1689,10 +1697,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1712,10 +1720,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -1733,10 +1741,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^2.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.match(err, { code: 'ELSPROBLEMS' }, 'should list dep problems')
@@ -1753,19 +1761,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing dev deps')
@@ -1782,19 +1790,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing only development deps')
@@ -1811,29 +1819,29 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0',
-          'linked-dep': '^1.0.0'
+          lorem: '^1.0.0',
+          'linked-dep': '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
       'linked-dep': {
         'package.json': JSON.stringify({
           name: 'linked-dep',
-          version: '1.0.0'
-        })
+          version: '1.0.0',
+        }),
       },
       node_modules: {
         'linked-dep': t.fixture('symlink', '../linked-dep'),
-        ...diffDepTypesNmFixture.node_modules
-      }
+        ...diffDepTypesNmFixture.node_modules,
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing linked deps')
@@ -1850,19 +1858,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing production deps')
@@ -1879,19 +1887,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing only prod deps')
@@ -1908,19 +1916,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree info with descriptions')
@@ -1935,10 +1943,10 @@ t.test('ls --parseable', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          foo: '^1.0.0'
-        }
+          foo: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.equal(err.code, 'ELSPROBLEMS', 'should have error code')
@@ -1956,10 +1964,10 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^2.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.match(err, { code: 'ELSPROBLEMS' }, 'should list dep problems')
@@ -1977,29 +1985,29 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0',
-          'linked-dep': '^1.0.0'
+          lorem: '^1.0.0',
+          'linked-dep': '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
       'linked-dep': {
         'package.json': JSON.stringify({
           name: 'linked-dep',
-          version: '1.0.0'
-        })
+          version: '1.0.0',
+        }),
       },
       node_modules: {
         'linked-dep': t.fixture('symlink', '../linked-dep'),
-        ...diffDepTypesNmFixture.node_modules
-      }
+        ...diffDepTypesNmFixture.node_modules,
+      },
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -2019,19 +2027,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing top-level deps with descriptions')
@@ -2044,7 +2052,7 @@ t.test('ls --parseable', (t) => {
 
   t.test('json read problems', (t) => {
     prefix = t.testdir({
-      'package.json': '{broken json'
+      'package.json': '{broken json',
     })
     ls([], (err) => {
       t.match(err, { code: 'EJSONPARSE' }, 'should throw EJSONPARSE error')
@@ -2069,19 +2077,19 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^2.0.0' // mismatching version #
-        }
+          'peer-dep': '^2.0.0', // mismatching version #
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output parseable signaling missing peer dep in problems')
@@ -2096,20 +2104,20 @@ t.test('ls --parseable', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
           'missing-optional-dep': '^1.0.0',
-          'optional-dep': '^2.0.0' // mismatching version #
+          'optional-dep': '^2.0.0', // mismatching version #
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -2125,29 +2133,29 @@ t.test('ls --parseable', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0'
-        }
+          a: '^1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
+              b: '^1.0.0',
+            },
+          }),
         },
-        'b': {
+        b: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             dependencies: {
-              a: '^1.0.0'
-            }
-          })
-        }
-      }
+              a: '^1.0.0',
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should print tree output ommiting deduped ref')
@@ -2161,22 +2169,22 @@ t.test('ls --parseable', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          a: 'npm:b@1.0.0'
-        }
+          a: 'npm:b@1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             _from: 'a@npm:b',
             _resolved: 'https://localhost:8080/abbrev/-/abbrev-1.1.1.tgz',
             _requested: {
-              type: 'alias'
-            }
-          })
-        }
-      }
+              type: 'alias',
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing aliases')
@@ -2190,11 +2198,11 @@ t.test('ls --parseable', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'abbrev': 'git+https://github.com/isaacs/abbrev-js.git'
-        }
+          abbrev: 'git+https://github.com/isaacs/abbrev-js.git',
+        },
       }),
       node_modules: {
-        'abbrev': {
+        abbrev: {
           'package.json': JSON.stringify({
             name: 'abbrev',
             version: '1.1.1',
@@ -2207,11 +2215,11 @@ t.test('ls --parseable', (t) => {
               rawSpec: 'git+https:github.com/isaacs/abbrev-js.git',
               saveSpec: 'git+https://github.com/isaacs/abbrev-js.git',
               fetchSpec: 'https://github.com/isaacs/abbrev-js.git',
-              gitCommittish: null
-            }
-          })
-        }
-      }
+              gitCommittish: null,
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should output tree containing git refs')
@@ -2225,8 +2233,8 @@ t.test('ls --parseable', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'simple-output': '^2.0.0'
-        }
+          'simple-output': '^2.0.0',
+        },
       }),
       node_modules: {
         'simple-output': {
@@ -2244,17 +2252,17 @@ t.test('ls --parseable', (t) => {
               escapedName: 'simple-output',
               rawSpec: '',
               saveSpec: null,
-              fetchSpec: 'latest'
+              fetchSpec: 'latest',
             },
             _requiredBy: [
               '#USER',
-              '/'
+              '/',
             ],
             _shasum: '3c07708ec9ef3e3c985cf0ddd67df09ab8ec2abc',
-            _spec: 'simple-output'
-          })
-        }
-      }
+            _spec: 'simple-output',
+          }),
+        },
+      },
     })
     ls([], () => {
       t.matchSnapshot(redactCwd(result), 'should not be printed in tree output')
@@ -2269,24 +2277,24 @@ t.test('ls --parseable', (t) => {
         a: {
           'package.json': JSON.stringify({
             name: 'a',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         b: {
           'package.json': JSON.stringify({
             name: 'b',
-            version: '1.0.0'
+            version: '1.0.0',
           }),
           node_modules: {
             c: {
               'package.json': JSON.stringify({
                 name: 'c',
-                version: '1.0.0'
-              })
-            }
-          }
-        }
-      }
+                version: '1.0.0',
+              }),
+            },
+          },
+        },
+      },
     })
 
     // mimics lib/npm.js globalDir getter but pointing to fixtures
@@ -2314,10 +2322,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -2326,19 +2334,19 @@ t.test('ls --json', (t) => {
         {
           name: 'test-npm-ls',
           version: '1.0.0',
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0',
-              'dependencies': {
-                'bar': {
-                  'version': '1.0.0'
-                }
-              }
-            },
-            'lorem': {
-              'version': '1.0.0'
-            }
-          }
+          dependencies: {
+            foo: {
+              version: '1.0.0',
+              dependencies: {
+                bar: {
+                  version: '1.0.0',
+                },
+              },
+            },
+            lorem: {
+              version: '1.0.0',
+            },
+          },
         },
         'should output json representation of dependencies structure'
       )
@@ -2348,46 +2356,46 @@ t.test('ls --json', (t) => {
 
   t.test('missing package.json', (t) => {
     prefix = t.testdir({
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.match(err, { code: 'ELSPROBLEMS' }, 'should list dep problems')
       t.deepEqual(
         jsonParse(result),
         {
-          'problems': [
+          problems: [
             'extraneous: bar@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/bar',
             'extraneous: foo@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/foo',
-            'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/lorem'
+            'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/lorem',
           ],
-          'dependencies': {
-            'bar': {
-              'version': '1.0.0',
-              'extraneous': true,
-              'problems': [
-                'extraneous: bar@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/bar'
-              ]
-            },
-            'foo': {
-              'version': '1.0.0',
-              'extraneous': true,
-              'problems': [
-                'extraneous: foo@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/foo'
+          dependencies: {
+            bar: {
+              version: '1.0.0',
+              extraneous: true,
+              problems: [
+                'extraneous: bar@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/bar',
+              ],
+            },
+            foo: {
+              version: '1.0.0',
+              extraneous: true,
+              problems: [
+                'extraneous: foo@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/foo',
+              ],
+              dependencies: {
+                bar: {
+                  version: '1.0.0',
+                },
+              },
+            },
+            lorem: {
+              version: '1.0.0',
+              extraneous: true,
+              problems: [
+                'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/lorem',
               ],
-              'dependencies': {
-                'bar': {
-                  'version': '1.0.0'
-                }
-              }
-            },
-            'lorem': {
-              'version': '1.0.0',
-              'extraneous': true,
-              'problems': [
-                'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-package-json/node_modules/lorem'
-              ]
-            }
-          }
+            },
+          },
         },
         'should output json missing name/version of top-level package'
       )
@@ -2401,10 +2409,10 @@ t.test('ls --json', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          foo: '^1.0.0'
-        }
+          foo: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.equal(
@@ -2422,26 +2430,26 @@ t.test('ls --json', (t) => {
         {
           name: 'test-npm-ls',
           version: '1.0.0',
-          'problems': [
-            'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-extraneous-deps/node_modules/lorem'
+          problems: [
+            'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-extraneous-deps/node_modules/lorem',
           ],
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0',
-              'dependencies': {
-                'bar': {
-                  'version': '1.0.0'
-                }
-              }
-            },
-            'lorem': {
-              'version': '1.0.0',
-              'extraneous': true,
-              'problems': [
-                'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-extraneous-deps/node_modules/lorem'
-              ]
-            }
-          }
+          dependencies: {
+            foo: {
+              version: '1.0.0',
+              dependencies: {
+                bar: {
+                  version: '1.0.0',
+                },
+              },
+            },
+            lorem: {
+              version: '1.0.0',
+              extraneous: true,
+              problems: [
+                'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-extraneous-deps/node_modules/lorem',
+              ],
+            },
+          },
         },
         'should output json containing problems info'
       )
@@ -2456,10 +2464,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['lorem'], (err) => {
       t.ifError(err, 'npm ls')
@@ -2468,11 +2476,11 @@ t.test('ls --json', (t) => {
         {
           name: 'test-npm-ls',
           version: '1.0.0',
-          'dependencies': {
-            'lorem': {
-              'version': '1.0.0'
-            }
-          }
+          dependencies: {
+            lorem: {
+              version: '1.0.0',
+            },
+          },
         },
         'should output json contaning only occurences of filtered by package'
       )
@@ -2492,10 +2500,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['bar'], (err) => {
       t.ifError(err, 'npm ls')
@@ -2509,11 +2517,11 @@ t.test('ls --json', (t) => {
               version: '1.0.0',
               dependencies: {
                 bar: {
-                  version: '1.0.0'
-                }
-              }
-            }
-          }
+                  version: '1.0.0',
+                },
+              },
+            },
+          },
         },
         'should output json contaning only occurences of filtered by package'
       )
@@ -2529,39 +2537,39 @@ t.test('ls --json', (t) => {
         dependencies: {
           foo: '^1.0.0',
           lorem: '^1.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
       node_modules: {
         ...simpleNmFixture.node_modules,
         ipsum: {
           'package.json': JSON.stringify({
             name: 'ipsum',
-            version: '1.0.0'
-          })
-        }
-      }
+            version: '1.0.0',
+          }),
+        },
+      },
     })
     ls(['bar@*', 'lorem@1.0.0'], (err) => {
       t.ifError(err, 'npm ls')
       t.deepEqual(
         jsonParse(result),
         {
-          'version': '1.0.0',
-          'name': 'test-npm-ls',
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0',
-              'dependencies': {
-                'bar': {
-                  'version': '1.0.0'
-                }
-              }
-            },
-            'lorem': {
-              'version': '1.0.0'
-            }
-          }
+          version: '1.0.0',
+          name: 'test-npm-ls',
+          dependencies: {
+            foo: {
+              version: '1.0.0',
+              dependencies: {
+                bar: {
+                  version: '1.0.0',
+                },
+              },
+            },
+            lorem: {
+              version: '1.0.0',
+            },
+          },
         },
         'should output json contaning only occurences of multiple filtered packages and their ancestors'
       )
@@ -2576,10 +2584,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls(['notadep'], (err) => {
       t.ifError(err, 'npm ls')
@@ -2587,7 +2595,7 @@ t.test('ls --json', (t) => {
         jsonParse(result),
         {
           name: 'test-npm-ls',
-          version: '1.0.0'
+          version: '1.0.0',
         },
         'should output json containing no dependencies info'
       )
@@ -2610,10 +2618,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -2622,14 +2630,14 @@ t.test('ls --json', (t) => {
         {
           name: 'test-npm-ls',
           version: '1.0.0',
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0'
+          dependencies: {
+            foo: {
+              version: '1.0.0',
             },
-            'lorem': {
-              'version': '1.0.0'
-            }
-          }
+            lorem: {
+              version: '1.0.0',
+            },
+          },
         },
         'should output json containing only top-level dependencies'
       )
@@ -2648,10 +2656,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -2660,14 +2668,14 @@ t.test('ls --json', (t) => {
         {
           name: 'test-npm-ls',
           version: '1.0.0',
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0'
+          dependencies: {
+            foo: {
+              version: '1.0.0',
             },
-            'lorem': {
-              'version': '1.0.0'
-            }
-          }
+            lorem: {
+              version: '1.0.0',
+            },
+          },
         },
         'should output json containing only top-level dependencies'
       )
@@ -2686,10 +2694,10 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^1.0.0',
-          lorem: '^1.0.0'
-        }
+          lorem: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.ifError(err, 'npm ls')
@@ -2698,19 +2706,19 @@ t.test('ls --json', (t) => {
         {
           name: 'test-npm-ls',
           version: '1.0.0',
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0',
-              'dependencies': {
-                'bar': {
-                  'version': '1.0.0'
-                }
-              }
-            },
-            'lorem': {
-              'version': '1.0.0'
-            }
-          }
+          dependencies: {
+            foo: {
+              version: '1.0.0',
+              dependencies: {
+                bar: {
+                  version: '1.0.0',
+                },
+              },
+            },
+            lorem: {
+              version: '1.0.0',
+            },
+          },
         },
         'should output json containing top-level deps and their deps only'
       )
@@ -2727,51 +2735,51 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           foo: '^2.0.0',
-          ipsum: '^1.0.0'
-        }
+          ipsum: '^1.0.0',
+        },
       }),
-      ...simpleNmFixture
+      ...simpleNmFixture,
     })
     ls([], (err) => {
       t.match(err, { code: 'ELSPROBLEMS' }, 'should list dep problems')
       t.deepEqual(
         jsonParse(result),
         {
-          'name': 'test-npm-ls',
-          'version': '1.0.0',
-          'problems': [
+          name: 'test-npm-ls',
+          version: '1.0.0',
+          problems: [
             'invalid: foo@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/foo',
             'missing: ipsum@^1.0.0, required by test-npm-ls@1.0.0',
-            'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/lorem'
+            'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/lorem',
           ],
-          'dependencies': {
-            'foo': {
-              'version': '1.0.0',
-              'invalid': true,
-              'problems': [
-                'invalid: foo@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/foo'
+          dependencies: {
+            foo: {
+              version: '1.0.0',
+              invalid: true,
+              problems: [
+                'invalid: foo@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/foo',
+              ],
+              dependencies: {
+                bar: {
+                  version: '1.0.0',
+                },
+              },
+            },
+            lorem: {
+              version: '1.0.0',
+              extraneous: true,
+              problems: [
+                'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/lorem',
+              ],
+            },
+            ipsum: {
+              required: '^1.0.0',
+              missing: true,
+              problems: [
+                'missing: ipsum@^1.0.0, required by test-npm-ls@1.0.0',
               ],
-              'dependencies': {
-                'bar': {
-                  'version': '1.0.0'
-                }
-              }
-            },
-            'lorem': {
-              'version': '1.0.0',
-              'extraneous': true,
-              'problems': [
-                'extraneous: lorem@1.0.0 {CWD}/ls-ls-json-missing-invalid-extraneous/node_modules/lorem'
-              ]
-            },
-            'ipsum': {
-              'required': '^1.0.0',
-              'missing': true,
-              'problems': [
-                'missing: ipsum@^1.0.0, required by test-npm-ls@1.0.0'
-              ]
-            }
-          }
+            },
+          },
         },
         'should output json containing top-level deps and their deps only'
       )
@@ -2787,19 +2795,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.deepEqual(
@@ -2813,11 +2821,11 @@ t.test('ls --json', (t) => {
               dependencies: {
                 foo: {
                   version: '1.0.0',
-                  dependencies: { bar: { version: '1.0.0' } }
-                }
-              }
-            }
-          }
+                  dependencies: { bar: { version: '1.0.0' } },
+                },
+              },
+            },
+          },
         },
         'should output json containing dev deps'
       )
@@ -2834,19 +2842,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.deepEqual(
@@ -2860,11 +2868,11 @@ t.test('ls --json', (t) => {
               dependencies: {
                 foo: {
                   version: '1.0.0',
-                  dependencies: { bar: { version: '1.0.0' } }
-                }
-              }
-            }
-          }
+                  dependencies: { bar: { version: '1.0.0' } },
+                },
+              },
+            },
+          },
         },
         'should output json containing only development deps'
       )
@@ -2881,29 +2889,29 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0',
-          'linked-dep': '^1.0.0'
+          lorem: '^1.0.0',
+          'linked-dep': '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
       'linked-dep': {
         'package.json': JSON.stringify({
           name: 'linked-dep',
-          version: '1.0.0'
-        })
+          version: '1.0.0',
+        }),
       },
       node_modules: {
         'linked-dep': t.fixture('symlink', '../linked-dep'),
-        ...diffDepTypesNmFixture.node_modules
-      }
+        ...diffDepTypesNmFixture.node_modules,
+      },
     })
     ls([], () => {
       t.deepEqual(
@@ -2914,9 +2922,9 @@ t.test('ls --json', (t) => {
           dependencies: {
             'linked-dep': {
               version: '1.0.0',
-              resolved: 'file:../linked-dep'
-            }
-          }
+              resolved: 'file:../linked-dep',
+            },
+          },
         },
         'should output json containing linked deps'
       )
@@ -2933,19 +2941,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.deepEqual(
@@ -2956,8 +2964,8 @@ t.test('ls --json', (t) => {
           dependencies: {
             lorem: { version: '1.0.0' },
             'optional-dep': { version: '1.0.0' },
-            'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } }
-          }
+            'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } },
+          },
         },
         'should output json containing production deps'
       )
@@ -2974,19 +2982,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.deepEqual(
@@ -2997,8 +3005,8 @@ t.test('ls --json', (t) => {
           dependencies: {
             lorem: { version: '1.0.0' },
             'optional-dep': { version: '1.0.0' },
-            'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } }
-          }
+            'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } },
+          },
         },
         'should output json containing only prod deps'
       )
@@ -3014,121 +3022,121 @@ t.test('ls --json', (t) => {
           'dedupe-tests-a': {
             'package.json': JSON.stringify({
               name: '@isaacs/dedupe-tests-a',
-              version: '1.0.1'
+              version: '1.0.1',
             }),
             node_modules: {
               '@isaacs': {
                 'dedupe-tests-b': {
                   name: '@isaacs/dedupe-tests-b',
-                  version: '1.0.0'
-                }
-              }
-            }
+                  version: '1.0.0',
+                },
+              },
+            },
           },
           'dedupe-tests-b': {
             'package.json': JSON.stringify({
               name: '@isaacs/dedupe-tests-b',
-              version: '2.0.0'
-            })
-          }
-        }
+              version: '2.0.0',
+            }),
+          },
+        },
       },
       'package-lock.json': JSON.stringify({
-        'name': 'dedupe-lockfile',
-        'version': '1.0.0',
-        'lockfileVersion': 2,
-        'requires': true,
-        'packages': {
+        name: 'dedupe-lockfile',
+        version: '1.0.0',
+        lockfileVersion: 2,
+        requires: true,
+        packages: {
           '': {
-            'name': 'dedupe-lockfile',
-            'version': '1.0.0',
-            'dependencies': {
+            name: 'dedupe-lockfile',
+            version: '1.0.0',
+            dependencies: {
               '@isaacs/dedupe-tests-a': '1.0.1',
-              '@isaacs/dedupe-tests-b': '1||2'
-            }
+              '@isaacs/dedupe-tests-b': '1||2',
+            },
           },
           'node_modules/@isaacs/dedupe-tests-a': {
-            'name': '@isaacs/dedupe-tests-a',
-            'version': '1.0.1',
-            'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-a/-/dedupe-tests-a-1.0.1.tgz',
-            'integrity': 'sha512-8AN9lNCcBt5Xeje7fMEEpp5K3rgcAzIpTtAjYb/YMUYu8SbIVF6wz0WqACDVKvpQOUcSfNHZQNLNmue0QSwXOQ==',
-            'dependencies': {
-              '@isaacs/dedupe-tests-b': '1'
-            }
+            name: '@isaacs/dedupe-tests-a',
+            version: '1.0.1',
+            resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-a/-/dedupe-tests-a-1.0.1.tgz',
+            integrity: 'sha512-8AN9lNCcBt5Xeje7fMEEpp5K3rgcAzIpTtAjYb/YMUYu8SbIVF6wz0WqACDVKvpQOUcSfNHZQNLNmue0QSwXOQ==',
+            dependencies: {
+              '@isaacs/dedupe-tests-b': '1',
+            },
           },
           'node_modules/@isaacs/dedupe-tests-a/node_modules/@isaacs/dedupe-tests-b': {
-            'name': '@isaacs/dedupe-tests-b',
-            'version': '1.0.0',
-            'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-1.0.0.tgz',
-            'integrity': 'sha512-3nmvzIb8QL8OXODzipwoV3U8h9OQD9g9RwOPuSBQqjqSg9JZR1CCFOWNsDUtOfmwY8HFUJV9EAZ124uhqVxq+w=='
+            name: '@isaacs/dedupe-tests-b',
+            version: '1.0.0',
+            resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-1.0.0.tgz',
+            integrity: 'sha512-3nmvzIb8QL8OXODzipwoV3U8h9OQD9g9RwOPuSBQqjqSg9JZR1CCFOWNsDUtOfmwY8HFUJV9EAZ124uhqVxq+w==',
           },
           'node_modules/@isaacs/dedupe-tests-b': {
-            'name': '@isaacs/dedupe-tests-b',
-            'version': '2.0.0',
-            'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-2.0.0.tgz',
-            'integrity': 'sha512-KTYkpRv9EzlmCg4Gsm/jpclWmRYFCXow8GZKJXjK08sIZBlElTZEa5Bw/UQxIvEfcKmWXczSqItD49Kr8Ax4UA=='
-          }
+            name: '@isaacs/dedupe-tests-b',
+            version: '2.0.0',
+            resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-2.0.0.tgz',
+            integrity: 'sha512-KTYkpRv9EzlmCg4Gsm/jpclWmRYFCXow8GZKJXjK08sIZBlElTZEa5Bw/UQxIvEfcKmWXczSqItD49Kr8Ax4UA==',
+          },
         },
-        'dependencies': {
+        dependencies: {
           '@isaacs/dedupe-tests-a': {
-            'version': '1.0.1',
-            'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-a/-/dedupe-tests-a-1.0.1.tgz',
-            'integrity': 'sha512-8AN9lNCcBt5Xeje7fMEEpp5K3rgcAzIpTtAjYb/YMUYu8SbIVF6wz0WqACDVKvpQOUcSfNHZQNLNmue0QSwXOQ==',
-            'requires': {
-              '@isaacs/dedupe-tests-b': '1'
+            version: '1.0.1',
+            resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-a/-/dedupe-tests-a-1.0.1.tgz',
+            integrity: 'sha512-8AN9lNCcBt5Xeje7fMEEpp5K3rgcAzIpTtAjYb/YMUYu8SbIVF6wz0WqACDVKvpQOUcSfNHZQNLNmue0QSwXOQ==',
+            requires: {
+              '@isaacs/dedupe-tests-b': '1',
             },
-            'dependencies': {
+            dependencies: {
               '@isaacs/dedupe-tests-b': {
-                'version': '1.0.0',
-                'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-1.0.0.tgz',
-                'integrity': 'sha512-3nmvzIb8QL8OXODzipwoV3U8h9OQD9g9RwOPuSBQqjqSg9JZR1CCFOWNsDUtOfmwY8HFUJV9EAZ124uhqVxq+w=='
-              }
-            }
+                version: '1.0.0',
+                resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-1.0.0.tgz',
+                integrity: 'sha512-3nmvzIb8QL8OXODzipwoV3U8h9OQD9g9RwOPuSBQqjqSg9JZR1CCFOWNsDUtOfmwY8HFUJV9EAZ124uhqVxq+w==',
+              },
+            },
           },
           '@isaacs/dedupe-tests-b': {
-            'version': '2.0.0',
-            'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-2.0.0.tgz',
-            'integrity': 'sha512-KTYkpRv9EzlmCg4Gsm/jpclWmRYFCXow8GZKJXjK08sIZBlElTZEa5Bw/UQxIvEfcKmWXczSqItD49Kr8Ax4UA=='
-          }
-        }
+            version: '2.0.0',
+            resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-2.0.0.tgz',
+            integrity: 'sha512-KTYkpRv9EzlmCg4Gsm/jpclWmRYFCXow8GZKJXjK08sIZBlElTZEa5Bw/UQxIvEfcKmWXczSqItD49Kr8Ax4UA==',
+          },
+        },
       }),
       'package.json': JSON.stringify({
-        'name': 'dedupe-lockfile',
-        'version': '1.0.0',
-        'dependencies': {
+        name: 'dedupe-lockfile',
+        version: '1.0.0',
+        dependencies: {
           '@isaacs/dedupe-tests-a': '1.0.1',
-          '@isaacs/dedupe-tests-b': '1||2'
-        }
-      })
+          '@isaacs/dedupe-tests-b': '1||2',
+        },
+      }),
     })
     ls([], () => {
       t.deepEqual(
         jsonParse(result),
         {
-          'version': '1.0.0',
-          'name': 'dedupe-lockfile',
-          'dependencies': {
+          version: '1.0.0',
+          name: 'dedupe-lockfile',
+          dependencies: {
             '@isaacs/dedupe-tests-a': {
-              'version': '1.0.1',
-              'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-a/-/dedupe-tests-a-1.0.1.tgz',
-              'dependencies': {
+              version: '1.0.1',
+              resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-a/-/dedupe-tests-a-1.0.1.tgz',
+              dependencies: {
                 '@isaacs/dedupe-tests-b': {
-                  'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-1.0.0.tgz',
-                  'extraneous': true,
-                  'problems': [
-                    'extraneous: @isaacs/dedupe-tests-b@ {CWD}/ls-ls-json-from-lockfile/node_modules/@isaacs/dedupe-tests-a/node_modules/@isaacs/dedupe-tests-b'
-                  ]
-                }
-              }
+                  resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-1.0.0.tgz',
+                  extraneous: true,
+                  problems: [
+                    'extraneous: @isaacs/dedupe-tests-b@ {CWD}/ls-ls-json-from-lockfile/node_modules/@isaacs/dedupe-tests-a/node_modules/@isaacs/dedupe-tests-b',
+                  ],
+                },
+              },
             },
             '@isaacs/dedupe-tests-b': {
-              'version': '2.0.0',
-              'resolved': 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-2.0.0.tgz'
-            }
+              version: '2.0.0',
+              resolved: 'https://registry.npmjs.org/@isaacs/dedupe-tests-b/-/dedupe-tests-b-2.0.0.tgz',
+            },
           },
-          'problems': [
-            'extraneous: @isaacs/dedupe-tests-b@ {CWD}/ls-ls-json-from-lockfile/node_modules/@isaacs/dedupe-tests-a/node_modules/@isaacs/dedupe-tests-b'
-          ]
+          problems: [
+            'extraneous: @isaacs/dedupe-tests-b@ {CWD}/ls-ls-json-from-lockfile/node_modules/@isaacs/dedupe-tests-a/node_modules/@isaacs/dedupe-tests-b',
+          ],
         },
         'should output json containing only prod deps'
       )
@@ -3144,19 +3152,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.deepEqual(
@@ -3174,7 +3182,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: {},
               path: '{CWD}/ls-ls-json--long/node_modules/peer-dep',
-              extraneous: false
+              extraneous: false,
             },
             'dev-dep': {
               name: 'dev-dep',
@@ -3193,23 +3201,23 @@ t.test('ls --json', (t) => {
                       peerDependencies: {},
                       _dependencies: {},
                       path: '{CWD}/ls-ls-json--long/node_modules/bar',
-                      extraneous: false
-                    }
+                      extraneous: false,
+                    },
                   },
                   _id: 'foo@1.0.0',
                   devDependencies: {},
                   peerDependencies: {},
                   _dependencies: { bar: '^1.0.0' },
                   path: '{CWD}/ls-ls-json--long/node_modules/foo',
-                  extraneous: false
-                }
+                  extraneous: false,
+                },
               },
               _id: 'dev-dep@1.0.0',
               devDependencies: {},
               peerDependencies: {},
               _dependencies: { foo: '^1.0.0' },
               path: '{CWD}/ls-ls-json--long/node_modules/dev-dep',
-              extraneous: false
+              extraneous: false,
             },
             lorem: {
               name: 'lorem',
@@ -3219,7 +3227,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: {},
               path: '{CWD}/ls-ls-json--long/node_modules/lorem',
-              extraneous: false
+              extraneous: false,
             },
             'optional-dep': {
               name: 'optional-dep',
@@ -3230,7 +3238,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: {},
               path: '{CWD}/ls-ls-json--long/node_modules/optional-dep',
-              extraneous: false
+              extraneous: false,
             },
             'prod-dep': {
               name: 'prod-dep',
@@ -3246,16 +3254,16 @@ t.test('ls --json', (t) => {
                   peerDependencies: {},
                   _dependencies: {},
                   path: '{CWD}/ls-ls-json--long/node_modules/prod-dep/node_modules/bar',
-                  extraneous: false
-                }
+                  extraneous: false,
+                },
               },
               _id: 'prod-dep@1.0.0',
               devDependencies: {},
               peerDependencies: {},
               _dependencies: { bar: '^2.0.0' },
               path: '{CWD}/ls-ls-json--long/node_modules/prod-dep',
-              extraneous: false
-            }
+              extraneous: false,
+            },
           },
           devDependencies: { 'dev-dep': '^1.0.0' },
           optionalDependencies: { 'optional-dep': '^1.0.0' },
@@ -3263,7 +3271,7 @@ t.test('ls --json', (t) => {
           _id: 'test-npm-ls@1.0.0',
           _dependencies: { 'prod-dep': '^1.0.0', lorem: '^1.0.0', 'optional-dep': '^1.0.0' },
           path: '{CWD}/ls-ls-json--long',
-          extraneous: false
+          extraneous: false,
         },
         'should output long json info'
       )
@@ -3282,19 +3290,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], () => {
       t.deepEqual(
@@ -3312,7 +3320,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: {},
               path: '{CWD}/ls-ls-json--long-depth-0/node_modules/peer-dep',
-              extraneous: false
+              extraneous: false,
             },
             'dev-dep': {
               name: 'dev-dep',
@@ -3323,7 +3331,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: { foo: '^1.0.0' },
               path: '{CWD}/ls-ls-json--long-depth-0/node_modules/dev-dep',
-              extraneous: false
+              extraneous: false,
             },
             lorem: {
               name: 'lorem',
@@ -3333,7 +3341,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: {},
               path: '{CWD}/ls-ls-json--long-depth-0/node_modules/lorem',
-              extraneous: false
+              extraneous: false,
             },
             'optional-dep': {
               name: 'optional-dep',
@@ -3344,7 +3352,7 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: {},
               path: '{CWD}/ls-ls-json--long-depth-0/node_modules/optional-dep',
-              extraneous: false
+              extraneous: false,
             },
             'prod-dep': {
               name: 'prod-dep',
@@ -3355,8 +3363,8 @@ t.test('ls --json', (t) => {
               peerDependencies: {},
               _dependencies: { bar: '^2.0.0' },
               path: '{CWD}/ls-ls-json--long-depth-0/node_modules/prod-dep',
-              extraneous: false
-            }
+              extraneous: false,
+            },
           },
           devDependencies: { 'dev-dep': '^1.0.0' },
           optionalDependencies: { 'optional-dep': '^1.0.0' },
@@ -3364,7 +3372,7 @@ t.test('ls --json', (t) => {
           _id: 'test-npm-ls@1.0.0',
           _dependencies: { 'prod-dep': '^1.0.0', lorem: '^1.0.0', 'optional-dep': '^1.0.0' },
           path: '{CWD}/ls-ls-json--long-depth-0',
-          extraneous: false
+          extraneous: false,
         },
         'should output json containing top-level deps in long format'
       )
@@ -3377,7 +3385,7 @@ t.test('ls --json', (t) => {
 
   t.test('json read problems', (t) => {
     prefix = t.testdir({
-      'package.json': '{broken json'
+      'package.json': '{broken json',
     })
     ls([], (err) => {
       t.match(err.message, 'Failed to parse root package.json', 'should have missin root package.json msg')
@@ -3387,8 +3395,8 @@ t.test('ls --json', (t) => {
         {
           invalid: true,
           problems: [
-            'error in {CWD}/ls-ls-json-json-read-problems: Failed to parse root package.json'
-          ]
+            'error in {CWD}/ls-ls-json-json-read-problems: Failed to parse root package.json',
+          ],
         },
         'should print empty json result'
       )
@@ -3416,19 +3424,19 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
-          'optional-dep': '^1.0.0'
+          'optional-dep': '^1.0.0',
         },
         peerDependencies: {
-          'peer-dep': '^2.0.0' // mismatching version #
-        }
+          'peer-dep': '^2.0.0', // mismatching version #
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'Should have ELSPROBLEMS error code')
@@ -3438,29 +3446,29 @@ t.test('ls --json', (t) => {
           name: 'test-npm-ls',
           version: '1.0.0',
           problems: [
-            'invalid: peer-dep@1.0.0 {CWD}/ls-ls-json-unmet-peer-dep/node_modules/peer-dep'
+            'invalid: peer-dep@1.0.0 {CWD}/ls-ls-json-unmet-peer-dep/node_modules/peer-dep',
           ],
           dependencies: {
             'peer-dep': {
               version: '1.0.0',
               invalid: true,
               problems: [
-                'invalid: peer-dep@1.0.0 {CWD}/ls-ls-json-unmet-peer-dep/node_modules/peer-dep'
-              ]
+                'invalid: peer-dep@1.0.0 {CWD}/ls-ls-json-unmet-peer-dep/node_modules/peer-dep',
+              ],
             },
             'dev-dep': {
               version: '1.0.0',
               dependencies: {
                 foo: {
                   version: '1.0.0',
-                  dependencies: { bar: { version: '1.0.0' } }
-                }
-              }
+                  dependencies: { bar: { version: '1.0.0' } },
+                },
+              },
             },
             lorem: { version: '1.0.0' },
             'optional-dep': { version: '1.0.0' },
-            'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } }
-          }
+            'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } },
+          },
         },
         'should output json signaling missing peer dep in problems'
       )
@@ -3475,20 +3483,20 @@ t.test('ls --json', (t) => {
         version: '1.0.0',
         dependencies: {
           'prod-dep': '^1.0.0',
-          'lorem': '^1.0.0'
+          lorem: '^1.0.0',
         },
         devDependencies: {
-          'dev-dep': '^1.0.0'
+          'dev-dep': '^1.0.0',
         },
         optionalDependencies: {
           'missing-optional-dep': '^1.0.0',
-          'optional-dep': '^2.0.0' // mismatching version #
+          'optional-dep': '^2.0.0', // mismatching version #
         },
         peerDependencies: {
-          'peer-dep': '^1.0.0'
-        }
+          'peer-dep': '^1.0.0',
+        },
       }),
-      ...diffDepTypesNmFixture
+      ...diffDepTypesNmFixture,
     })
     ls([], (err) => {
       t.match(err.code, 'ELSPROBLEMS', 'should have ELSPROBLEMS error code')
@@ -3499,32 +3507,32 @@ t.test('ls --json', (t) => {
           name: 'test-npm-ls',
           version: '1.0.0',
           problems: [
-            'invalid: optional-dep@1.0.0 {CWD}/ls-ls-json-unmet-optional-dep/node_modules/optional-dep' // mismatching optional deps get flagged in problems
+            'invalid: optional-dep@1.0.0 {CWD}/ls-ls-json-unmet-optional-dep/node_modules/optional-dep', // mismatching optional deps get flagged in problems
           ],
           dependencies: {
             'optional-dep': {
               version: '1.0.0',
               invalid: true,
               problems: [
-                'invalid: optional-dep@1.0.0 {CWD}/ls-ls-json-unmet-optional-dep/node_modules/optional-dep'
-              ]
+                'invalid: optional-dep@1.0.0 {CWD}/ls-ls-json-unmet-optional-dep/node_modules/optional-dep',
+              ],
             },
             'peer-dep': {
-              version: '1.0.0'
+              version: '1.0.0',
             },
             'dev-dep': {
               version: '1.0.0',
               dependencies: {
                 foo: {
                   version: '1.0.0',
-                  dependencies: { bar: { version: '1.0.0' } }
-                }
-              }
+                  dependencies: { bar: { version: '1.0.0' } },
+                },
+              },
             },
             lorem: { version: '1.0.0' },
             'prod-dep': { version: '1.0.0', dependencies: { bar: { version: '2.0.0' } } },
-            'missing-optional-dep': {} // missing optional dep has an empty entry in json output
-          }
+            'missing-optional-dep': {}, // missing optional dep has an empty entry in json output
+          },
         },
         'should output json with empty entry for missing optional deps'
       )
@@ -3538,29 +3546,29 @@ t.test('ls --json', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'a': '^1.0.0'
-        }
+          a: '^1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'a',
             version: '1.0.0',
             dependencies: {
-              b: '^1.0.0'
-            }
-          })
+              b: '^1.0.0',
+            },
+          }),
         },
-        'b': {
+        b: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             dependencies: {
-              a: '^1.0.0'
-            }
-          })
-        }
-      }
+              a: '^1.0.0',
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.deepEqual(
@@ -3575,12 +3583,12 @@ t.test('ls --json', (t) => {
                 b: {
                   version: '1.0.0',
                   dependencies: {
-                    a: { version: '1.0.0' }
-                  }
-                }
-              }
-            }
-          }
+                    a: { version: '1.0.0' },
+                  },
+                },
+              },
+            },
+          },
         },
         'should print json output containing deduped ref'
       )
@@ -3594,22 +3602,22 @@ t.test('ls --json', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          a: 'npm:b@1.0.0'
-        }
+          a: 'npm:b@1.0.0',
+        },
       }),
       node_modules: {
-        'a': {
+        a: {
           'package.json': JSON.stringify({
             name: 'b',
             version: '1.0.0',
             _from: 'a@npm:b',
             _resolved: 'https://localhost:8080/abbrev/-/abbrev-1.1.1.tgz',
             _requested: {
-              type: 'alias'
-            }
-          })
-        }
-      }
+              type: 'alias',
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.deepEqual(
@@ -3620,9 +3628,9 @@ t.test('ls --json', (t) => {
           dependencies: {
             a: {
               version: '1.0.0',
-              resolved: 'https://localhost:8080/abbrev/-/abbrev-1.1.1.tgz'
-            }
-          }
+              resolved: 'https://localhost:8080/abbrev/-/abbrev-1.1.1.tgz',
+            },
+          },
         },
         'should output json containing aliases'
       )
@@ -3636,11 +3644,11 @@ t.test('ls --json', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'abbrev': 'git+https://github.com/isaacs/abbrev-js.git'
-        }
+          abbrev: 'git+https://github.com/isaacs/abbrev-js.git',
+        },
       }),
       node_modules: {
-        'abbrev': {
+        abbrev: {
           'package.json': JSON.stringify({
             name: 'abbrev',
             version: '1.1.1',
@@ -3653,11 +3661,11 @@ t.test('ls --json', (t) => {
               rawSpec: 'git+https:github.com/isaacs/abbrev-js.git',
               saveSpec: 'git+https://github.com/isaacs/abbrev-js.git',
               fetchSpec: 'https://github.com/isaacs/abbrev-js.git',
-              gitCommittish: null
-            }
-          })
-        }
-      }
+              gitCommittish: null,
+            },
+          }),
+        },
+      },
     })
     ls([], () => {
       t.deepEqual(
@@ -3668,9 +3676,9 @@ t.test('ls --json', (t) => {
           dependencies: {
             abbrev: {
               version: '1.1.1',
-              resolved: 'git+ssh://git@github.com/isaacs/abbrev-js.git#b8f3a2fc0c3bb8ffd8b0d0072cc6b5a3667e963c'
-            }
-          }
+              resolved: 'git+ssh://git@github.com/isaacs/abbrev-js.git#b8f3a2fc0c3bb8ffd8b0d0072cc6b5a3667e963c',
+            },
+          },
         },
         'should output json containing git refs'
       )
@@ -3684,8 +3692,8 @@ t.test('ls --json', (t) => {
         name: 'test-npm-ls',
         version: '1.0.0',
         dependencies: {
-          'simple-output': '^2.0.0'
-        }
+          'simple-output': '^2.0.0',
+        },
       }),
       node_modules: {
         'simple-output': {
@@ -3703,17 +3711,17 @@ t.test('ls --json', (t) => {
               escapedName: 'simple-output',
               rawSpec: '',
               saveSpec: null,
-              fetchSpec: 'latest'
+              fetchSpec: 'latest',
             },
             _requiredBy: [
               '#USER',
-              '/'
+              '/',
             ],
             _shasum: '3c07708ec9ef3e3c985cf0ddd67df09ab8ec2abc',
-            _spec: 'simple-output'
-          })
-        }
-      }
+            _spec: 'simple-output',
+          }),
+        },
+      },
     })
     ls([], () => {
       t.deepEqual(
@@ -3724,9 +3732,9 @@ t.test('ls --json', (t) => {
           dependencies: {
             'simple-output': {
               version: '2.1.1',
-              resolved: 'https://registry.npmjs.org/simple-output/-/simple-output-2.1.1.tgz'
-            }
-          }
+              resolved: 'https://registry.npmjs.org/simple-output/-/simple-output-2.1.1.tgz',
+            },
+          },
         },
         'should be printed in json output'
       )
@@ -3737,15 +3745,15 @@ t.test('ls --json', (t) => {
   t.test('node.name fallback if missing root package name', (t) => {
     prefix = t.testdir({
       'package.json': JSON.stringify({
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     })
     ls([], () => {
       t.deepEqual(
         jsonParse(result),
         {
-          'version': '1.0.0',
-          'name': 'ls-ls-json-node-name-fallback-if-missing-root-package-name'
+          version: '1.0.0',
+          name: 'ls-ls-json-node-name-fallback-if-missing-root-package-name',
         },
         'should use node.name as key in json result obj'
       )
@@ -3760,24 +3768,24 @@ t.test('ls --json', (t) => {
         a: {
           'package.json': JSON.stringify({
             name: 'a',
-            version: '1.0.0'
-          })
+            version: '1.0.0',
+          }),
         },
         b: {
           'package.json': JSON.stringify({
             name: 'b',
-            version: '1.0.0'
+            version: '1.0.0',
           }),
           node_modules: {
             c: {
               'package.json': JSON.stringify({
                 name: 'c',
-                version: '1.0.0'
-              })
-            }
-          }
-        }
-      }
+                version: '1.0.0',
+              }),
+            },
+          },
+        },
+      },
     })
 
     // mimics lib/npm.js globalDir getter but pointing to fixtures
@@ -3787,19 +3795,19 @@ t.test('ls --json', (t) => {
       t.deepEqual(
         jsonParse(result),
         {
-          'dependencies': {
-            'a': {
-              'version': '1.0.0'
-            },
-            'b': {
-              'version': '1.0.0',
-              'dependencies': {
-                'c': {
-                  'version': '1.0.0'
-                }
-              }
-            }
-          }
+          dependencies: {
+            a: {
+              version: '1.0.0',
+            },
+            b: {
+              version: '1.0.0',
+              dependencies: {
+                c: {
+                  version: '1.0.0',
+                },
+              },
+            },
+          },
         },
         'should print json output for global deps'
       )
diff --git a/deps/npm/test/lib/npm.js b/deps/npm/test/lib/npm.js
index b2be5543fa1ea6..2c71d229a7be33 100644
--- a/deps/npm/test/lib/npm.js
+++ b/deps/npm/test/lib/npm.js
@@ -1,4 +1,3 @@
-'use strict'
 const t = require('tap')
 const fs = require('fs')
 
@@ -8,11 +7,16 @@ const event = process.env.npm_lifecycle_event
 for (const env of Object.keys(process.env).filter(e => /^npm_/.test(e))) {
   if (env === 'npm_command') {
     // should only be running this in the 'test' or 'run-script' command!
-    // if the lifecycle event is 'test', then it'll be 'test', otherwise
-    // it should always be run-script.  Of course, it'll be missing if this
-    // test is just run directly, which is also acceptable.
-    const cmd = event === 'test' ? 'test' : 'run-script'
-    t.match(process.env[env], cmd)
+    // if the lifecycle event is 'test', then it'll be either 'test' or 'run',
+    // otherwise it should always be run-script. Of course, it'll be missing
+    // if this test is just run directly, which is also acceptable.
+    if (event === 'test') {
+      t.ok(
+        ['test', 'run-script'].some(i => i === event),
+        'should match "npm test" or "npm run test"'
+      )
+    } else
+      t.match(process.env[env], 'run-script')
   }
   delete process.env[env]
 }
@@ -24,14 +28,14 @@ const actualPlatform = process.platform
 const beWindows = () => {
   Object.defineProperty(process, 'platform', {
     value: 'win32',
-    configurable: true
+    configurable: true,
   })
 }
 
 const bePosix = () => {
   Object.defineProperty(process, 'platform', {
     value: 'posix',
-    configurable: true
+    configurable: true,
   })
 }
 
@@ -41,9 +45,9 @@ const npmPath = resolve(__dirname, '..', '..')
 const Config = require('@npmcli/config')
 const { types, defaults, shorthands } = require('../../lib/utils/config.js')
 const freshConfig = (opts = {}) => {
-  for (const env of Object.keys(process.env).filter(e => /^npm_/.test(e))) {
+  for (const env of Object.keys(process.env).filter(e => /^npm_/.test(e)))
     delete process.env[env]
-  }
+
   process.env.npm_config_cache = CACHE
 
   npm.config = new Config({
@@ -52,14 +56,13 @@ const freshConfig = (opts = {}) => {
     shorthands,
     npmPath,
     log: npmlog,
-    ...opts
+    ...opts,
   })
 }
 
 const logs = []
-for (const level of ['silly', 'verbose', 'timing', 'notice', 'warn', 'error']) {
+for (const level of ['silly', 'verbose', 'timing', 'notice', 'warn', 'error'])
   npmlog[level] = (...msg) => logs.push([level, ...msg])
-}
 
 const npm = require('../../lib/npm.js')
 
@@ -73,7 +76,7 @@ t.test('not yet loaded', t => {
     config: {
       loaded: false,
       get: Function,
-      set: Function
+      set: Function,
     },
     version: String,
   })
@@ -103,7 +106,9 @@ t.test('npm.load', t => {
   t.test('load error', t => {
     const { load } = npm.config
     const loadError = new Error('load error')
-    npm.config.load = async () => { throw loadError }
+    npm.config.load = async () => {
+      throw loadError
+    }
     npm.load(er => {
       t.equal(er, loadError)
       t.equal(npm.loadErr, loadError)
@@ -120,13 +125,13 @@ t.test('npm.load', t => {
 
   t.test('basic loading', t => {
     const dir = t.testdir({
-      node_modules: {}
+      node_modules: {},
     })
     let firstCalled = false
     const first = (er) => {
-      if (er) {
+      if (er)
         throw er
-      }
+
       firstCalled = true
       t.equal(npm.loaded, true)
       t.equal(npm.config.loaded, true)
@@ -134,7 +139,9 @@ t.test('npm.load', t => {
     }
 
     let secondCalled = false
-    const second = () => { secondCalled = true }
+    const second = () => {
+      secondCalled = true
+    }
 
     t.equal(npm.loading, false, 'not loading yet')
     const p = npm.load(first).then(() => {
@@ -142,16 +149,18 @@ t.test('npm.load', t => {
       t.match(npm, {
         loaded: true,
         loading: false,
-        flatOptions: {}
+        flatOptions: {},
       })
       t.equal(firstCalled, true, 'first callback got called')
       t.equal(secondCalled, true, 'second callback got called')
       let thirdCalled = false
-      const third = () => { thirdCalled = true }
+      const third = () => {
+        thirdCalled = true
+      }
       npm.load(third)
       t.equal(thirdCalled, true, 'third callbback got called')
       t.match(logs, [
-        ['timing', 'npm:load', /Completed in [0-9]+ms/]
+        ['timing', 'npm:load', /Completed in [0-9]+ms/],
       ])
       logs.length = 0
 
@@ -216,22 +225,22 @@ t.test('npm.load', t => {
 
   t.test('forceful loading', t => {
     // also, don't get thrown off if argv[0] isn't found for some reason
-    const [ argv0 ] = process.argv
+    const [argv0] = process.argv
     t.teardown(() => {
       process.argv[0] = argv0
     })
     freshConfig({ argv: [...process.argv, '--force', '--color', 'always'] })
     process.argv[0] = 'this exe does not exist or else this test will fail'
     return npm.load(er => {
-      if (er) {
+      if (er)
         throw er
-      }
+
       t.match(logs.filter(l => l[0] !== 'timing'), [
         [
           'warn',
           'using --force',
-          'Recommended protections disabled.'
-        ]
+          'Recommended protections disabled.',
+        ],
       ])
       logs.length = 0
     })
@@ -240,7 +249,7 @@ t.test('npm.load', t => {
   t.test('node is a symlink', async t => {
     const node = actualPlatform === 'win32' ? 'node.exe' : 'node'
     const dir = t.testdir({
-      '.npmrc': 'foo = bar'
+      '.npmrc': 'foo = bar',
     })
 
     // create manually to set the 'file' option in windows
@@ -256,7 +265,10 @@ t.test('npm.load', t => {
       '--prefix', dir,
       '--userconfig', `${dir}/.npmrc`,
       '--usage',
-      '--scope=foo'
+      '--scope=foo',
+      'token',
+      'revoke',
+      'blergggg',
     ]
 
     freshConfig()
@@ -276,16 +288,16 @@ t.test('npm.load', t => {
     logs.length = 0
 
     await npm.load(er => {
-      if (er) {
+      if (er)
         throw er
-      }
+
       t.equal(npm.config.get('scope'), '@foo', 'added the @ sign to scope')
       t.equal(npm.config.get('metrics-registry'), 'http://example.com')
       t.match(logs.filter(l => l[0] !== 'timing' || !/^config:/.test(l[1])), [
         [
           'verbose',
           'node symlink',
-          resolve(dir, node)
+          resolve(dir, node),
         ],
         [
           'timing',
@@ -298,9 +310,9 @@ t.test('npm.load', t => {
     })
 
     await npm.commands.ll([], (er) => {
-      if (er) {
+      if (er)
         throw er
-      }
+
       t.same(consoleLogs, [[require('../../lib/ls.js').usage]], 'print usage')
       consoleLogs.length = 0
       npm.config.set('usage', false)
@@ -309,9 +321,9 @@ t.test('npm.load', t => {
     })
 
     await npm.commands.get(['scope', '\u2010not-a-dash'], (er) => {
-      if (er) {
+      if (er)
         throw er
-      }
+
       t.match(logs, [
         [
           'error',
@@ -353,3 +365,91 @@ t.test('loading as main will load the cli', t => {
     t.end()
   })
 })
+
+t.test('set process.title', t => {
+  const { argv: processArgv } = process
+  const { log } = console
+  const titleDesc = Object.getOwnPropertyDescriptor(process, 'title')
+  Object.defineProperty(process, 'title', {
+    value: '',
+    settable: true,
+    enumerable: true,
+    configurable: true,
+  })
+  const consoleLogs = []
+  console.log = (...msg) => consoleLogs.push(msg)
+
+  t.teardown(() => {
+    console.log = log
+    process.argv = processArgv
+    Object.defineProperty(process, 'title', titleDesc)
+    freshConfig()
+  })
+
+  t.afterEach(cb => {
+    consoleLogs.length = 0
+    cb()
+  })
+
+  t.test('basic title setting', async t => {
+    freshConfig({
+      argv: [
+        process.execPath,
+        process.argv[1],
+        '--metrics-registry', 'http://example.com',
+        '--usage',
+        '--scope=foo',
+        'ls',
+      ],
+    })
+    await npm.load(er => {
+      if (er)
+        throw er
+      t.equal(npm.title, 'npm ls')
+      t.equal(process.title, 'npm ls')
+    })
+  })
+
+  t.test('do not expose token being revoked', async t => {
+    freshConfig({
+      argv: [
+        process.execPath,
+        process.argv[1],
+        '--metrics-registry', 'http://example.com',
+        '--usage',
+        '--scope=foo',
+        'token',
+        'revoke',
+        'deadbeefcafebad',
+      ],
+    })
+    await npm.load(er => {
+      if (er)
+        throw er
+      t.equal(npm.title, 'npm token revoke ***')
+      t.equal(process.title, 'npm token revoke ***')
+    })
+  })
+
+  t.test('do show *** unless a token is actually being revoked', async t => {
+    freshConfig({
+      argv: [
+        process.execPath,
+        process.argv[1],
+        '--metrics-registry', 'http://example.com',
+        '--usage',
+        '--scope=foo',
+        'token',
+        'revoke',
+      ],
+    })
+    await npm.load(er => {
+      if (er)
+        throw er
+      t.equal(npm.title, 'npm token revoke')
+      t.equal(process.title, 'npm token revoke')
+    })
+  })
+
+  t.end()
+})
diff --git a/deps/npm/test/lib/outdated.js b/deps/npm/test/lib/outdated.js
index 0cba04d5471304..7a5bd8f0ef870c 100644
--- a/deps/npm/test/lib/outdated.js
+++ b/deps/npm/test/lib/outdated.js
@@ -6,58 +6,57 @@ const packument = spec => {
     alpha: {
       name: 'alpha',
       'dist-tags': {
-        latest: '1.0.1'
+        latest: '1.0.1',
       },
       versions: {
         '1.0.1': {
           version: '1.0.1',
           dependencies: {
-            gamma: '2.0.0'
-          }
-        }
-      }
+            gamma: '2.0.0',
+          },
+        },
+      },
     },
     beta: {
       name: 'beta',
       'dist-tags': {
-        latest: '1.0.1'
+        latest: '1.0.1',
       },
       versions: {
         '1.0.1': {
-          version: '1.0.1'
-        }
-      }
+          version: '1.0.1',
+        },
+      },
     },
     gamma: {
       name: 'gamma',
       'dist-tags': {
-        latest: '2.0.0'
+        latest: '2.0.0',
       },
       versions: {
         '1.0.1': {
-          version: '1.0.1'
+          version: '1.0.1',
         },
         '2.0.0': {
-          version: '2.0.0'
-        }
-      }
+          version: '2.0.0',
+        },
+      },
     },
     theta: {
       name: 'theta',
       'dist-tags': {
-        latest: '1.0.1'
+        latest: '1.0.1',
       },
       versions: {
         '1.0.1': {
-          version: '1.0.1'
-        }
-      }
-    }
+          version: '1.0.1',
+        },
+      },
+    },
   }
 
-  if (spec.name === 'eta') {
+  if (spec.name === 'eta')
     throw new Error('There is an error with this package.')
-  }
 
   if (!mocks[spec.name]) {
     const err = new Error()
@@ -87,10 +86,10 @@ const globalDir = t.testdir({
     alpha: {
       'package.json': JSON.stringify({
         name: 'alpha',
-        version: '1.0.0'
-      }, null, 2)
-    }
-  }
+        version: '1.0.0',
+      }, null, 2),
+    },
+  },
 })
 
 const outdated = (dir, opts) => requireInject(
@@ -99,11 +98,11 @@ const outdated = (dir, opts) => requireInject(
     '../../lib/npm.js': {
       prefix: dir,
       globalDir: `${globalDir}/node_modules`,
-      flatOptions: opts
+      flatOptions: opts,
     },
     pacote: {
-      packument
-    }
+      packument,
+    },
   }
 )
 
@@ -127,14 +126,14 @@ t.test('should display outdated deps', t => {
       dependencies: {
         alpha: '^1.0.0',
         gamma: '^1.0.0',
-        theta: '^1.0.0'
+        theta: '^1.0.0',
       },
       devDependencies: {
-        zeta: '^1.0.0'
+        zeta: '^1.0.0',
       },
       peerDependencies: {
-        beta: '^1.0.0'
-      }
+        beta: '^1.0.0',
+      },
     }, null, 2),
     node_modules: {
       alpha: {
@@ -142,42 +141,42 @@ t.test('should display outdated deps', t => {
           name: 'alpha',
           version: '1.0.0',
           dependencies: {
-            gamma: '2.0.0'
-          }
+            gamma: '2.0.0',
+          },
         }, null, 2),
         node_modules: {
           gamma: {
             'package.json': JSON.stringify({
               name: 'gamma',
-              version: '2.0.0'
-            }, null, 2)
-          }
-        }
+              version: '2.0.0',
+            }, null, 2),
+          },
+        },
       },
       beta: {
         'package.json': JSON.stringify({
           name: 'beta',
-          version: '1.0.0'
-        }, null, 2)
+          version: '1.0.0',
+        }, null, 2),
       },
       gamma: {
         'package.json': JSON.stringify({
           name: 'gamma',
-          version: '1.0.1'
-        }, null, 2)
+          version: '1.0.1',
+        }, null, 2),
       },
       zeta: {
         'package.json': JSON.stringify({
           name: 'zeta',
-          version: '1.0.0'
-        }, null, 2)
-      }
-    }
+          version: '1.0.0',
+        }, null, 2),
+      },
+    },
   })
 
   t.test('outdated global', t => {
     outdated(null, {
-      global: true
+      global: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -187,7 +186,7 @@ t.test('should display outdated deps', t => {
   t.test('outdated', t => {
     outdated(testDir, {
       global: false,
-      color: true
+      color: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -198,7 +197,7 @@ t.test('should display outdated deps', t => {
     outdated(testDir, {
       global: false,
       color: true,
-      omit: ['dev']
+      omit: ['dev'],
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -209,7 +208,7 @@ t.test('should display outdated deps', t => {
     outdated(testDir, {
       global: false,
       color: true,
-      omit: ['dev', 'peer']
+      omit: ['dev', 'peer'],
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -220,7 +219,7 @@ t.test('should display outdated deps', t => {
     outdated(testDir, {
       global: false,
       color: true,
-      omit: ['prod']
+      omit: ['prod'],
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -230,7 +229,7 @@ t.test('should display outdated deps', t => {
   t.test('outdated --long', t => {
     outdated(testDir, {
       global: false,
-      long: true
+      long: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -240,7 +239,7 @@ t.test('should display outdated deps', t => {
   t.test('outdated --json', t => {
     outdated(testDir, {
       global: false,
-      json: true
+      json: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -251,7 +250,7 @@ t.test('should display outdated deps', t => {
     outdated(testDir, {
       global: false,
       json: true,
-      long: true
+      long: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -261,7 +260,7 @@ t.test('should display outdated deps', t => {
   t.test('outdated --parseable', t => {
     outdated(testDir, {
       global: false,
-      parseable: true
+      parseable: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -272,7 +271,7 @@ t.test('should display outdated deps', t => {
     outdated(testDir, {
       global: false,
       parseable: true,
-      long: true
+      long: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -281,7 +280,7 @@ t.test('should display outdated deps', t => {
 
   t.test('outdated --all', t => {
     outdated(testDir, {
-      all: true
+      all: true,
     })([], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -290,7 +289,7 @@ t.test('should display outdated deps', t => {
 
   t.test('outdated specific dep', t => {
     outdated(testDir, {
-      global: false
+      global: false,
     })(['alpha'], () => {
       t.matchSnapshot(logs)
       t.end()
@@ -306,21 +305,21 @@ t.test('should return if no outdated deps', t => {
       name: 'delta',
       version: '1.0.0',
       dependencies: {
-        alpha: '^1.0.0'
-      }
+        alpha: '^1.0.0',
+      },
     }, null, 2),
     node_modules: {
       alpha: {
         'package.json': JSON.stringify({
           name: 'alpha',
-          version: '1.0.1'
-        }, null, 2)
-      }
-    }
+          version: '1.0.1',
+        }, null, 2),
+      },
+    },
   })
 
   outdated(testDir, {
-    global: false
+    global: false,
   })([], () => {
     t.equals(logs.length, 0, 'no logs')
     t.end()
@@ -333,21 +332,21 @@ t.test('throws if error with a dep', t => {
       name: 'delta',
       version: '1.0.0',
       dependencies: {
-        eta: '^1.0.0'
-      }
+        eta: '^1.0.0',
+      },
     }, null, 2),
     node_modules: {
       eta: {
         'package.json': JSON.stringify({
           name: 'eta',
-          version: '1.0.1'
-        }, null, 2)
-      }
-    }
+          version: '1.0.1',
+        }, null, 2),
+      },
+    },
   })
 
   outdated(testDir, {
-    global: false
+    global: false,
   })([], (err) => {
     t.equals(err.message, 'There is an error with this package.')
     t.end()
@@ -360,14 +359,14 @@ t.test('should skip missing non-prod deps', t => {
       name: 'delta',
       version: '1.0.0',
       devDependencies: {
-        beta: '^1.0.0'
-      }
+        beta: '^1.0.0',
+      },
     }, null, 2),
-    node_modules: {}
+    node_modules: {},
   })
 
   outdated(testDir, {
-    global: false
+    global: false,
   })([], () => {
     t.equals(logs.length, 0, 'no logs')
     t.end()
@@ -380,17 +379,17 @@ t.test('should skip invalid pkg ranges', t => {
       name: 'delta',
       version: '1.0.0',
       dependencies: {
-        alpha: '>=^2'
-      }
+        alpha: '>=^2',
+      },
     }, null, 2),
     node_modules: {
       alpha: {
         'package.json': JSON.stringify({
           name: 'alpha',
-          version: '1.0.0'
-        }, null, 2)
-      }
-    }
+          version: '1.0.0',
+        }, null, 2),
+      },
+    },
   })
 
   outdated(testDir, {})([], () => {
@@ -405,17 +404,17 @@ t.test('should skip git specs', t => {
       name: 'delta',
       version: '1.0.0',
       dependencies: {
-        alpha: 'github:username/foo'
-      }
+        alpha: 'github:username/foo',
+      },
     }, null, 2),
     node_modules: {
       alpha: {
         'package.json': JSON.stringify({
           name: 'alpha',
-          version: '1.0.0'
-        }, null, 2)
-      }
-    }
+          version: '1.0.0',
+        }, null, 2),
+      },
+    },
   })
 
   outdated(testDir, {})([], () => {
diff --git a/deps/npm/test/lib/owner.js b/deps/npm/test/lib/owner.js
index dc179e4662028c..e217533f0de241 100644
--- a/deps/npm/test/lib/owner.js
+++ b/deps/npm/test/lib/owner.js
@@ -16,17 +16,19 @@ const mocks = {
   'npm-registry-fetch': npmFetch,
   pacote,
   '../../lib/npm.js': npm,
-  '../../lib/utils/output.js': (...msg) => { result += msg.join('\n') },
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
   '../../lib/utils/otplease.js': async (opts, fn) => fn({ otp: '123456', opts }),
   '../../lib/utils/read-local-package.js': async () => readLocalPkgResponse,
-  '../../lib/utils/usage.js': () => 'usage instructions'
+  '../../lib/utils/usage.js': () => 'usage instructions',
 }
 
 const npmcliMaintainers = [
   { email: 'quitlahok@gmail.com', name: 'nlf' },
   { email: 'ruyadorno@hotmail.com', name: 'ruyadorno' },
   { email: 'darcy@darcyclarke.me', name: 'darcyclarke' },
-  { email: 'i@izs.me', name: 'isaacs' }
+  { email: 'i@izs.me', name: 'isaacs' },
 ]
 
 const owner = requireInject('../../lib/owner.js', mocks)
@@ -59,7 +61,7 @@ t.test('owner ls no args', t => {
       opts,
       {
         ...npm.flatOptions,
-        fullMetadata: true
+        fullMetadata: true,
       },
       'should forward expected options to pacote.packument'
     )
@@ -132,7 +134,7 @@ t.test('owner ls <pkg>', t => {
       opts,
       {
         ...npm.flatOptions,
-        fullMetadata: true
+        fullMetadata: true,
       },
       'should forward expected options to pacote.packument'
     )
@@ -178,7 +180,7 @@ t.test('owner add <user> <pkg>', t => {
       return {
         _id: 'org.couchdb.user:foo',
         email: 'foo@github.com',
-        name: 'foo'
+        name: 'foo',
       }
     } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
       t.ok('should put changed owner')
@@ -187,12 +189,12 @@ t.test('owner add <user> <pkg>', t => {
         method: 'PUT',
         body: {
           _rev: '1-foobaaa1',
-          maintainers: npmcliMaintainers
+          maintainers: npmcliMaintainers,
         },
         otp: '123456',
         spec: {
-          name: '@npmcli/map-workspaces'
-        }
+          name: '@npmcli/map-workspaces',
+        },
       }, 'should use expected opts')
       t.deepEqual(
         opts.body.maintainers,
@@ -200,15 +202,14 @@ t.test('owner add <user> <pkg>', t => {
           ...npmcliMaintainers,
           {
             name: 'foo',
-            email: 'foo@github.com'
-          }
+            email: 'foo@github.com',
+          },
         ],
         'should contain expected new owners, adding requested user'
       )
       return {}
-    } else {
+    } else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => {
     t.equal(spec.name, '@npmcli/map-workspaces', 'should use expect pkg name')
@@ -216,13 +217,13 @@ t.test('owner add <user> <pkg>', t => {
       opts,
       {
         ...npm.flatOptions,
-        fullMetadata: true
+        fullMetadata: true,
       },
       'should forward expected options to pacote.packument'
     )
     return {
       _rev: '1-foobaaa1',
-      maintainers: npmcliMaintainers
+      maintainers: npmcliMaintainers,
     }
   }
   t.teardown(() => {
@@ -246,17 +247,16 @@ t.test('owner add <user> cwd package', t => {
       return {
         _id: 'org.couchdb.user:foo',
         email: 'foo@github.com',
-        name: 'foo'
+        name: 'foo',
       }
-    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
+    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1')
       return {}
-    } else {
+    else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => ({
     _rev: '1-foobaaa1',
-    maintainers: npmcliMaintainers
+    maintainers: npmcliMaintainers,
   })
   t.teardown(() => {
     result = ''
@@ -290,16 +290,15 @@ t.test('owner add <user> <pkg> already an owner', t => {
       return {
         _id: 'org.couchdb.user:ruyadorno',
         email: 'ruyadorno@hotmail.com',
-        name: 'ruyadorno'
+        name: 'ruyadorno',
       }
-    } else {
+    } else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => {
     return {
       _rev: '1-foobaaa1',
-      maintainers: npmcliMaintainers
+      maintainers: npmcliMaintainers,
     }
   }
   t.teardown(() => {
@@ -319,17 +318,16 @@ t.test('owner add <user> <pkg> fails to retrieve user', t => {
   readLocalPkgResponse =
   npmFetch.json = async (uri, opts) => {
     // retrieve borked user info from couchdb request
-    if (uri === '/-/user/org.couchdb.user:foo') {
+    if (uri === '/-/user/org.couchdb.user:foo')
       return { ok: false }
-    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
+    else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1')
       return {}
-    } else {
+    else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => ({
     _rev: '1-foobaaa1',
-    maintainers: npmcliMaintainers
+    maintainers: npmcliMaintainers,
   })
   t.teardown(() => {
     result = ''
@@ -357,22 +355,21 @@ t.test('owner add <user> <pkg> fails to PUT updates', t => {
       return {
         _id: 'org.couchdb.user:foo',
         email: 'foo@github.com',
-        name: 'foo'
+        name: 'foo',
       }
     } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
       return {
         error: {
           status: '418',
-          message: "I'm a teapot"
-        }
+          message: "I'm a teapot",
+        },
       }
-    } else {
+    } else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => ({
     _rev: '1-foobaaa1',
-    maintainers: npmcliMaintainers
+    maintainers: npmcliMaintainers,
   })
   t.teardown(() => {
     result = ''
@@ -406,13 +403,12 @@ t.test('owner add <user> <pkg> fails to retrieve user info', t => {
         new Error("I'm a teapot"),
         { status: 418 }
       )
-    } else {
+    } else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => ({
     _rev: '1-foobaaa1',
-    maintainers: npmcliMaintainers
+    maintainers: npmcliMaintainers,
   })
   t.teardown(() => {
     result = ''
@@ -438,18 +434,17 @@ t.test('owner add <user> <pkg> no previous maintainers property from server', t
       return {
         _id: 'org.couchdb.user:foo',
         email: 'foo@github.com',
-        name: 'foo'
+        name: 'foo',
       }
-    } else if (uri === '/@npmcli%2fno-owners-pkg/-rev/1-foobaaa1') {
+    } else if (uri === '/@npmcli%2fno-owners-pkg/-rev/1-foobaaa1')
       return {}
-    } else {
+    else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => {
     return {
       _rev: '1-foobaaa1',
-      maintainers: null
+      maintainers: null,
     }
   }
   t.teardown(() => {
@@ -509,7 +504,7 @@ t.test('owner rm <user> <pkg>', t => {
       return {
         _id: 'org.couchdb.user:ruyadorno',
         email: 'ruyadorno@hotmail.com',
-        name: 'ruyadorno'
+        name: 'ruyadorno',
       }
     } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
       t.ok('should put changed owner')
@@ -517,12 +512,12 @@ t.test('owner rm <user> <pkg>', t => {
         ...npm.flatOptions,
         method: 'PUT',
         body: {
-          _rev: '1-foobaaa1'
+          _rev: '1-foobaaa1',
         },
         otp: '123456',
         spec: {
-          name: '@npmcli/map-workspaces'
-        }
+          name: '@npmcli/map-workspaces',
+        },
       }, 'should use expected opts')
       t.deepEqual(
         opts.body.maintainers,
@@ -530,9 +525,8 @@ t.test('owner rm <user> <pkg>', t => {
         'should contain expected new owners, removing requested user'
       )
       return {}
-    } else {
+    } else
       t.fail(`unexpected fetch json call to: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => {
     t.equal(spec.name, '@npmcli/map-workspaces', 'should use expect pkg name')
@@ -540,13 +534,13 @@ t.test('owner rm <user> <pkg>', t => {
       opts,
       {
         ...npm.flatOptions,
-        fullMetadata: true
+        fullMetadata: true,
       },
       'should forward expected options to pacote.packument'
     )
     return {
       _rev: '1-foobaaa1',
-      maintainers: npmcliMaintainers
+      maintainers: npmcliMaintainers,
     }
   }
   t.teardown(() => {
@@ -575,18 +569,17 @@ t.test('owner rm <user> <pkg> not a current owner', t => {
       return {
         _id: 'org.couchdb.user:foo',
         email: 'foo@github.com',
-        name: 'foo'
+        name: 'foo',
       }
-    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
+    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1')
       return {}
-    } else {
+    else
       t.fail(`unexpected fetch json call to: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => {
     return {
       _rev: '1-foobaaa1',
-      maintainers: npmcliMaintainers
+      maintainers: npmcliMaintainers,
     }
   }
   t.teardown(() => {
@@ -610,17 +603,16 @@ t.test('owner rm <user> cwd package', t => {
       return {
         _id: 'org.couchdb.user:ruyadorno',
         email: 'ruyadorno@hotmail.com',
-        name: 'ruyadorno'
+        name: 'ruyadorno',
       }
-    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1') {
+    } else if (uri === '/@npmcli%2fmap-workspaces/-rev/1-foobaaa1')
       return {}
-    } else {
+    else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => ({
     _rev: '1-foobaaa1',
-    maintainers: npmcliMaintainers
+    maintainers: npmcliMaintainers,
   })
   t.teardown(() => {
     result = ''
@@ -645,18 +637,17 @@ t.test('owner rm <user> only user', t => {
       return {
         _id: 'org.couchdb.user:ruyadorno',
         email: 'ruyadorno@hotmail.com',
-        name: 'ruyadorno'
+        name: 'ruyadorno',
       }
-    } else {
+    } else
       t.fail(`unexpected fetch json call to uri: ${uri}`)
-    }
   }
   pacote.packument = async (spec, opts) => ({
     _rev: '1-foobaaa1',
     maintainers: [{
       name: 'ruyadorno',
-      email: 'ruyadorno@hotmail.com'
-    }]
+      email: 'ruyadorno@hotmail.com',
+    }],
   })
   t.teardown(() => {
     result = ''
@@ -722,7 +713,7 @@ t.test('completion', t => {
   testComp(['npm', 'owner'], [
     'add',
     'rm',
-    'ls'
+    'ls',
   ])
   testComp(['npm', 'owner', 'add'], [])
   testComp(['npm', 'owner', 'ls'], [])
@@ -735,7 +726,7 @@ t.test('completion', t => {
     pacote.packument = async spec => {
       t.equal(spec.name, readLocalPkgResponse, 'should use package spec')
       return {
-        maintainers: npmcliMaintainers
+        maintainers: npmcliMaintainers,
       }
     }
     t.teardown(() => {
@@ -751,7 +742,7 @@ t.test('completion', t => {
           'nlf',
           'ruyadorno',
           'darcyclarke',
-          'isaacs'
+          'isaacs',
         ],
         'should return list of current owners'
       )
@@ -772,7 +763,7 @@ t.test('completion', t => {
     pacote.packument = async spec => {
       t.equal(spec.name, readLocalPkgResponse, 'should use package spec')
       return {
-        maintainers: []
+        maintainers: [],
       }
     }
     t.teardown(() => {
diff --git a/deps/npm/test/lib/pack.js b/deps/npm/test/lib/pack.js
index 097204ea92bea3..851174d259cb35 100644
--- a/deps/npm/test/lib/pack.js
+++ b/deps/npm/test/lib/pack.js
@@ -4,11 +4,10 @@ const requireInject = require('require-inject')
 const OUTPUT = []
 const output = (...msg) => OUTPUT.push(msg)
 
-const libnpmpackActual = require('libnpmpack')
 const libnpmpack = async (spec, opts) => {
- if (!opts) {
+  if (!opts)
     throw new Error('expected options object')
-  }
+
   return ''
 }
 
@@ -24,21 +23,21 @@ t.test('should pack current directory with no arguments', (t) => {
       flatOptions: {
         unicode: false,
         json: false,
-        dryRun: false
-      }
+        dryRun: false,
+      },
     },
     libnpmpack,
     npmlog: {
       notice: () => {},
       showProgress: () => {},
-      clearProgress: () => {}
-    }
+      clearProgress: () => {},
+    },
   })
 
   return pack([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     const filename = `npm-${require('../../package.json').version}.tgz`
     t.strictSame(OUTPUT, [[filename]])
   })
@@ -48,8 +47,8 @@ t.test('should pack given directory', (t) => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
       name: 'my-cool-pkg',
-      version: '1.0.0'
-    }, null, 2)
+      version: '1.0.0',
+    }, null, 2),
   })
 
   const pack = requireInject('../../lib/pack.js', {
@@ -58,21 +57,21 @@ t.test('should pack given directory', (t) => {
       flatOptions: {
         unicode: true,
         json: true,
-        dryRun: true
-      }
+        dryRun: true,
+      },
     },
     libnpmpack,
     npmlog: {
       notice: () => {},
-      'showProgress': () => {},
-      'clearProgress': () => {}
-    }
+      showProgress: () => {},
+      clearProgress: () => {},
+    },
   })
 
   return pack([testDir], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     const filename = 'my-cool-pkg-1.0.0.tgz'
     t.strictSame(OUTPUT, [[filename]])
   })
@@ -82,8 +81,8 @@ t.test('should pack given directory for scoped package', (t) => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
       name: '@cool/my-pkg',
-      version: '1.0.0'
-    }, null, 2)
+      version: '1.0.0',
+    }, null, 2),
   })
 
   const pack = requireInject('../../lib/pack.js', {
@@ -92,21 +91,21 @@ t.test('should pack given directory for scoped package', (t) => {
       flatOptions: {
         unicode: true,
         json: true,
-        dryRun: true
-      }
+        dryRun: true,
+      },
     },
     libnpmpack,
     npmlog: {
       notice: () => {},
-      'showProgress': () => {},
-      'clearProgress': () => {}
-    }
+      showProgress: () => {},
+      clearProgress: () => {},
+    },
   })
 
   return pack([testDir], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     const filename = 'cool-my-pkg-1.0.0.tgz'
     t.strictSame(OUTPUT, [[filename]])
   })
@@ -119,27 +118,27 @@ t.test('should log pack contents', (t) => {
       ...require('../../lib/utils/tar.js'),
       logTar: () => {
         t.ok(true, 'logTar is called')
-      } 
+      },
     },
     '../../lib/npm.js': {
       flatOptions: {
         unicode: false,
         json: false,
-        dryRun: false
-      }
+        dryRun: false,
+      },
     },
     libnpmpack,
     npmlog: {
       notice: () => {},
-      'showProgress': () => {},
-      'clearProgress': () => {}
-    }
+      showProgress: () => {},
+      clearProgress: () => {},
+    },
   })
 
   return pack([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     const filename = `npm-${require('../../package.json').version}.tgz`
     t.strictSame(OUTPUT, [[filename]])
   })
diff --git a/deps/npm/test/lib/ping.js b/deps/npm/test/lib/ping.js
index d27bf4d603cf11..a185919dddc332 100644
--- a/deps/npm/test/lib/ping.js
+++ b/deps/npm/test/lib/ping.js
@@ -22,8 +22,8 @@ test('pings', (t) => {
           t.equal(type, 'PONG', 'should log a PONG')
           t.match(spec, /\d+ms/, 'should log the elapsed milliseconds')
         }
-      }
-    }
+      },
+    },
   })
 
   ping([], (err) => {
@@ -51,7 +51,7 @@ test('pings and logs details', (t) => {
         if (noticeCalls === 1) {
           t.equal(type, 'PING', 'should log a PING')
           t.equal(spec, flatOptions.registry, 'should log the registry url')
-        } else if (noticeCalls == 2) {
+        } else if (noticeCalls === 2) {
           t.equal(type, 'PONG', 'should log a PONG')
           t.match(spec, /\d+ms/, 'should log the elapsed milliseconds')
         } else {
@@ -59,8 +59,8 @@ test('pings and logs details', (t) => {
           const parsed = JSON.parse(spec)
           t.match(parsed, details, 'should log JSON stringified details')
         }
-      }
-    }
+      },
+    },
   })
 
   ping([], (err) => {
@@ -98,8 +98,8 @@ test('pings and returns json', (t) => {
           t.equal(type, 'PONG', 'should log a PONG')
           t.match(spec, /\d+ms/, 'should log the elapsed milliseconds')
         }
-      }
-    }
+      },
+    },
   })
 
   ping([], (err) => {
diff --git a/deps/npm/test/lib/prefix.js b/deps/npm/test/lib/prefix.js
index a6e4d731ab1871..83e2d636808596 100644
--- a/deps/npm/test/lib/prefix.js
+++ b/deps/npm/test/lib/prefix.js
@@ -9,7 +9,7 @@ test('prefix', (t) => {
     '../../lib/npm.js': { prefix: dir },
     '../../lib/utils/output.js': (output) => {
       t.equal(output, dir, 'prints the correct directory')
-    }
+    },
   })
 
   prefix([], (err) => {
diff --git a/deps/npm/test/lib/prune.js b/deps/npm/test/lib/prune.js
index 27c16355fa6412..074f4eac6eeee2 100644
--- a/deps/npm/test/lib/prune.js
+++ b/deps/npm/test/lib/prune.js
@@ -1,5 +1,4 @@
 const { test } = require('tap')
-const prune = require('../../lib/prune.js')
 const requireInject = require('require-inject')
 
 test('should prune using Arborist', (t) => {
@@ -7,8 +6,8 @@ test('should prune using Arborist', (t) => {
     '../../lib/npm.js': {
       prefix: 'foo',
       flatOptions: {
-        'foo': 'bar'
-      }
+        foo: 'bar',
+      },
     },
     '@npmcli/arborist': function (args) {
       t.ok(args, 'gets options object')
@@ -17,13 +16,14 @@ test('should prune using Arborist', (t) => {
         t.ok(true, 'prune is called')
       }
     },
-    '../../lib/utils/reify-output.js': (arb) => {
+    '../../lib/utils/reify-finish.js': (arb) => {
       t.ok(arb, 'gets arborist tree')
-    }
+    },
   })
-  prune(null, () => {
+  prune(null, er => {
+    if (er)
+      throw er
     t.ok(true, 'callback is called')
     t.end()
   })
 })
-
diff --git a/deps/npm/test/lib/rebuild.js b/deps/npm/test/lib/rebuild.js
new file mode 100644
index 00000000000000..dbc37d57af5665
--- /dev/null
+++ b/deps/npm/test/lib/rebuild.js
@@ -0,0 +1,222 @@
+const fs = require('fs')
+const { resolve } = require('path')
+const t = require('tap')
+const requireInject = require('require-inject')
+
+let result = ''
+
+const npm = {
+  globalDir: '',
+  flatOptions: {
+    global: false,
+  },
+  prefix: '',
+}
+const mocks = {
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+const rebuild = requireInject('../../lib/rebuild.js', mocks)
+
+t.afterEach(cb => {
+  npm.prefix = ''
+  npm.flatOptions.global = false
+  npm.globalDir = ''
+  result = ''
+  cb()
+})
+
+t.test('no args', t => {
+  const path = t.testdir({
+    node_modules: {
+      a: {
+        'package.json': JSON.stringify({
+          name: 'a',
+          version: '1.0.0',
+          bin: 'cwd',
+          scripts: {
+            preinstall: `node -e 'require("fs").writeFileSync("cwd", "")'`,
+          },
+        }),
+      },
+      b: {
+        'package.json': JSON.stringify({
+          name: 'b',
+          version: '1.0.0',
+          bin: 'cwd',
+          scripts: {
+            preinstall: `node -e 'require("fs").writeFileSync("cwd", "")'`,
+          },
+        }),
+      },
+    },
+  })
+
+  const aBuildFile = resolve(path, 'node_modules/a/cwd')
+  const bBuildFile = resolve(path, 'node_modules/b/cwd')
+  const aBinFile = resolve(path, 'node_modules/.bin/a')
+  const bBinFile = resolve(path, 'node_modules/.bin/b')
+  t.throws(() => fs.statSync(aBuildFile))
+  t.throws(() => fs.statSync(bBuildFile))
+  t.throws(() => fs.statSync(aBinFile))
+  t.throws(() => fs.statSync(bBinFile))
+
+  npm.prefix = path
+
+  rebuild([], err => {
+    if (err)
+      throw err
+
+    t.ok(() => fs.statSync(aBuildFile))
+    t.ok(() => fs.statSync(bBuildFile))
+    t.ok(() => fs.statSync(aBinFile))
+    t.ok(() => fs.statSync(bBinFile))
+
+    t.equal(
+      result,
+      'rebuilt dependencies successfully',
+      'should output success msg'
+    )
+
+    t.end()
+  })
+})
+
+t.test('filter by pkg name', t => {
+  const path = t.testdir({
+    node_modules: {
+      a: {
+        'index.js': '',
+        'package.json': JSON.stringify({
+          name: 'a',
+          version: '1.0.0',
+          bin: 'index.js',
+        }),
+      },
+      b: {
+        'index.js': '',
+        'package.json': JSON.stringify({
+          name: 'b',
+          version: '1.0.0',
+          bin: 'index.js',
+        }),
+      },
+    },
+  })
+
+  npm.prefix = path
+
+  const aBinFile = resolve(path, 'node_modules/.bin/a')
+  const bBinFile = resolve(path, 'node_modules/.bin/b')
+  t.throws(() => fs.statSync(aBinFile))
+  t.throws(() => fs.statSync(bBinFile))
+
+  rebuild(['b'], err => {
+    if (err)
+      throw err
+
+    t.throws(() => fs.statSync(aBinFile), 'should not link a bin')
+    t.ok(() => fs.statSync(bBinFile), 'should link filtered pkg bin')
+
+    t.end()
+  })
+})
+
+t.test('filter by pkg@<range>', t => {
+  const path = t.testdir({
+    node_modules: {
+      a: {
+        'index.js': '',
+        'package.json': JSON.stringify({
+          name: 'a',
+          version: '1.0.0',
+          bin: 'index.js',
+        }),
+        node_modules: {
+          b: {
+            'index.js': '',
+            'package.json': JSON.stringify({
+              name: 'b',
+              version: '2.0.0',
+              bin: 'index.js',
+            }),
+          },
+        },
+      },
+      b: {
+        'index.js': '',
+        'package.json': JSON.stringify({
+          name: 'b',
+          version: '1.0.0',
+          bin: 'index.js',
+        }),
+      },
+    },
+  })
+
+  npm.prefix = path
+
+  const bBinFile = resolve(path, 'node_modules/.bin/b')
+  const nestedBinFile = resolve(path, 'node_modules/a/node_modules/.bin/b')
+
+  rebuild(['b@2'], err => {
+    if (err)
+      throw err
+
+    t.throws(() => fs.statSync(bBinFile), 'should not link b bin')
+    t.ok(() => fs.statSync(nestedBinFile), 'should link filtered pkg bin')
+
+    t.end()
+  })
+})
+
+t.test('filter must be a semver version/range', t => {
+  rebuild(['b:git+ssh://github.com/npm/arborist'], err => {
+    t.match(
+      err,
+      /Error: `npm rebuild` only supports SemVer version\/range specifiers/,
+      'should throw type error'
+    )
+
+    t.end()
+  })
+})
+
+t.test('global prefix', t => {
+  const globalPath = t.testdir({
+    lib: {
+      node_modules: {
+        a: {
+          'index.js': '',
+          'package.json': JSON.stringify({
+            name: 'a',
+            version: '1.0.0',
+            bin: 'index.js',
+          }),
+        },
+      },
+    },
+  })
+
+  npm.flatOptions.global = true
+  npm.globalDir = resolve(globalPath, 'lib', 'node_modules')
+
+  rebuild([], err => {
+    if (err)
+      throw err
+
+    t.ok(() => fs.statSync(resolve(globalPath, 'lib/node_modules/.bin/a')))
+
+    t.equal(
+      result,
+      'rebuilt dependencies successfully',
+      'should output success msg'
+    )
+
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/repo.js b/deps/npm/test/lib/repo.js
index fcc95f343890eb..c4b1b46e7342b7 100644
--- a/deps/npm/test/lib/repo.js
+++ b/deps/npm/test/lib/repo.js
@@ -5,105 +5,105 @@ const pacote = {
   manifest: async (spec, options) => {
     return spec === 'norepo' ? {
       name: 'norepo',
-      version: '1.2.3'
+      version: '1.2.3',
     }
 
-    : spec === 'repoobbj-nourl' ? {
-      name: 'repoobj-nourl',
-      repository: { no: 'url' }
-    }
+      : spec === 'repoobbj-nourl' ? {
+        name: 'repoobj-nourl',
+        repository: { no: 'url' },
+      }
 
-    : spec === 'hostedgit' ? {
-      repository: 'git://github.com/foo/hostedgit'
-    }
-    : spec === 'hostedgitat' ? {
-      repository: 'git@github.com:foo/hostedgitat'
-    }
-    : spec === 'hostedssh' ? {
-      repository: 'ssh://git@github.com/foo/hostedssh'
-    }
-    : spec === 'hostedgitssh' ? {
-      repository: 'git+ssh://git@github.com/foo/hostedgitssh'
-    }
-    : spec === 'hostedgithttp' ? {
-      repository: 'git+http://github.com/foo/hostedgithttp'
-    }
-    : spec === 'hostedgithttps' ? {
-      repository: 'git+https://github.com/foo/hostedgithttps'
-    }
+      : spec === 'hostedgit' ? {
+        repository: 'git://github.com/foo/hostedgit',
+      }
+      : spec === 'hostedgitat' ? {
+        repository: 'git@github.com:foo/hostedgitat',
+      }
+      : spec === 'hostedssh' ? {
+        repository: 'ssh://git@github.com/foo/hostedssh',
+      }
+      : spec === 'hostedgitssh' ? {
+        repository: 'git+ssh://git@github.com/foo/hostedgitssh',
+      }
+      : spec === 'hostedgithttp' ? {
+        repository: 'git+http://github.com/foo/hostedgithttp',
+      }
+      : spec === 'hostedgithttps' ? {
+        repository: 'git+https://github.com/foo/hostedgithttps',
+      }
 
-    : spec === 'hostedgitobj' ? {
-      repository: { url: 'git://github.com/foo/hostedgitobj' }
-    }
-    : spec === 'hostedgitatobj' ? {
-      repository: { url: 'git@github.com:foo/hostedgitatobj' }
-    }
-    : spec === 'hostedsshobj' ? {
-      repository: { url: 'ssh://git@github.com/foo/hostedsshobj' }
-    }
-    : spec === 'hostedgitsshobj' ? {
-      repository: { url: 'git+ssh://git@github.com/foo/hostedgitsshobj' }
-    }
-    : spec === 'hostedgithttpobj' ? {
-      repository: { url: 'git+http://github.com/foo/hostedgithttpobj' }
-    }
-    : spec === 'hostedgithttpsobj' ? {
-      repository: { url: 'git+https://github.com/foo/hostedgithttpsobj' }
-    }
+      : spec === 'hostedgitobj' ? {
+        repository: { url: 'git://github.com/foo/hostedgitobj' },
+      }
+      : spec === 'hostedgitatobj' ? {
+        repository: { url: 'git@github.com:foo/hostedgitatobj' },
+      }
+      : spec === 'hostedsshobj' ? {
+        repository: { url: 'ssh://git@github.com/foo/hostedsshobj' },
+      }
+      : spec === 'hostedgitsshobj' ? {
+        repository: { url: 'git+ssh://git@github.com/foo/hostedgitsshobj' },
+      }
+      : spec === 'hostedgithttpobj' ? {
+        repository: { url: 'git+http://github.com/foo/hostedgithttpobj' },
+      }
+      : spec === 'hostedgithttpsobj' ? {
+        repository: { url: 'git+https://github.com/foo/hostedgithttpsobj' },
+      }
 
-    : spec === 'unhostedgit' ? {
-      repository: 'git://gothib.com/foo/unhostedgit'
-    }
-    : spec === 'unhostedgitat' ? {
-      repository: 'git@gothib.com:foo/unhostedgitat'
-    }
-    : spec === 'unhostedssh' ? {
-      repository: 'ssh://git@gothib.com/foo/unhostedssh'
-    }
-    : spec === 'unhostedgitssh' ? {
-      repository: 'git+ssh://git@gothib.com/foo/unhostedgitssh'
-    }
-    : spec === 'unhostedgithttp' ? {
-      repository: 'git+http://gothib.com/foo/unhostedgithttp'
-    }
-    : spec === 'unhostedgithttps' ? {
-      repository: 'git+https://gothib.com/foo/unhostedgithttps'
-    }
+      : spec === 'unhostedgit' ? {
+        repository: 'git://gothib.com/foo/unhostedgit',
+      }
+      : spec === 'unhostedgitat' ? {
+        repository: 'git@gothib.com:foo/unhostedgitat',
+      }
+      : spec === 'unhostedssh' ? {
+        repository: 'ssh://git@gothib.com/foo/unhostedssh',
+      }
+      : spec === 'unhostedgitssh' ? {
+        repository: 'git+ssh://git@gothib.com/foo/unhostedgitssh',
+      }
+      : spec === 'unhostedgithttp' ? {
+        repository: 'git+http://gothib.com/foo/unhostedgithttp',
+      }
+      : spec === 'unhostedgithttps' ? {
+        repository: 'git+https://gothib.com/foo/unhostedgithttps',
+      }
 
-    : spec === 'unhostedgitobj' ? {
-      repository: { url: 'git://gothib.com/foo/unhostedgitobj' }
-    }
-    : spec === 'unhostedgitatobj' ? {
-      repository: { url: 'git@gothib.com:foo/unhostedgitatobj' }
-    }
-    : spec === 'unhostedsshobj' ? {
-      repository: { url: 'ssh://git@gothib.com/foo/unhostedsshobj' }
-    }
-    : spec === 'unhostedgitsshobj' ? {
-      repository: { url: 'git+ssh://git@gothib.com/foo/unhostedgitsshobj' }
-    }
-    : spec === 'unhostedgithttpobj' ? {
-      repository: { url: 'git+http://gothib.com/foo/unhostedgithttpobj' }
-    }
-    : spec === 'unhostedgithttpsobj' ? {
-      repository: { url: 'git+https://gothib.com/foo/unhostedgithttpsobj' }
-    }
+      : spec === 'unhostedgitobj' ? {
+        repository: { url: 'git://gothib.com/foo/unhostedgitobj' },
+      }
+      : spec === 'unhostedgitatobj' ? {
+        repository: { url: 'git@gothib.com:foo/unhostedgitatobj' },
+      }
+      : spec === 'unhostedsshobj' ? {
+        repository: { url: 'ssh://git@gothib.com/foo/unhostedsshobj' },
+      }
+      : spec === 'unhostedgitsshobj' ? {
+        repository: { url: 'git+ssh://git@gothib.com/foo/unhostedgitsshobj' },
+      }
+      : spec === 'unhostedgithttpobj' ? {
+        repository: { url: 'git+http://gothib.com/foo/unhostedgithttpobj' },
+      }
+      : spec === 'unhostedgithttpsobj' ? {
+        repository: { url: 'git+https://gothib.com/foo/unhostedgithttpsobj' },
+      }
 
-    : spec === 'directory' ? {
-      repository: {
-        type: 'git',
-        url: 'git+https://github.com/foo/test-repo-with-directory.git',
-        directory: 'some/directory'
+      : spec === 'directory' ? {
+        repository: {
+          type: 'git',
+          url: 'git+https://github.com/foo/test-repo-with-directory.git',
+          directory: 'some/directory',
+        },
       }
-    }
 
-    : spec === '.' ? {
-      name: 'thispkg',
-      version: '1.2.3',
-      repository: 'https://example.com/thispkg.git'
-    }
-    : null
-  }
+      : spec === '.' ? {
+        name: 'thispkg',
+        version: '1.2.3',
+        repository: 'https://example.com/thispkg.git',
+      }
+      : null
+  },
 }
 
 // keep a tally of which urls got opened
@@ -116,7 +116,7 @@ const openUrl = (url, errMsg, cb) => {
 
 const repo = requireInject('../../lib/repo.js', {
   pacote,
-  '../../lib/utils/open-url.js': openUrl
+  '../../lib/utils/open-url.js': openUrl,
 })
 
 t.test('completion', t => {
@@ -152,7 +152,7 @@ t.test('open repo urls', t => {
     unhostedgithttpobj: 'http://gothib.com/foo/unhostedgithttpobj',
     unhostedgithttpsobj: 'https://gothib.com/foo/unhostedgithttpsobj',
     directory: 'https://github.com/foo/test-repo-with-directory/tree/master/some/directory',
-    '.': 'https://example.com/thispkg'
+    '.': 'https://example.com/thispkg',
   }
   const keys = Object.keys(expect)
   t.plan(keys.length)
@@ -174,7 +174,7 @@ t.test('fail if cannot figure out repo url', t => {
     'norepo',
     'repoobbj-nourl',
     'unhostedgitat',
-    'unhostedgitatobj'
+    'unhostedgitatobj',
   ]
 
   t.plan(cases.length)
diff --git a/deps/npm/test/lib/root.js b/deps/npm/test/lib/root.js
index 210e9b029121c8..8c23152b3efca9 100644
--- a/deps/npm/test/lib/root.js
+++ b/deps/npm/test/lib/root.js
@@ -9,7 +9,7 @@ test('root', (t) => {
     '../../lib/npm.js': { dir },
     '../../lib/utils/output.js': (output) => {
       t.equal(output, dir, 'prints the correct directory')
-    }
+    },
   })
 
   root([], (err) => {
diff --git a/deps/npm/test/lib/run-script.js b/deps/npm/test/lib/run-script.js
index 7a034aff01561b..bad8a63c0d7783 100644
--- a/deps/npm/test/lib/run-script.js
+++ b/deps/npm/test/lib/run-script.js
@@ -1,37 +1,38 @@
 const t = require('tap')
 const requireInject = require('require-inject')
 
-let RUN_FAIL = null
 const RUN_SCRIPTS = []
 const npm = {
   localPrefix: __dirname,
   flatOptions: {
     scriptShell: undefined,
     json: false,
-    parseable: false
+    parseable: false,
   },
   config: {
     settings: {
-      'if-present': false
+      'if-present': false,
     },
     get: k => npm.config.settings[k],
     set: (k, v) => {
       npm.config.settings[k] = v
-    }
-  }
+    },
+  },
 }
 
 const output = []
 
 const npmlog = { level: 'warn' }
 const getRS = windows => requireInject('../../lib/run-script.js', {
-  '@npmcli/run-script': async opts => {
+  '@npmcli/run-script': Object.assign(async opts => {
     RUN_SCRIPTS.push(opts)
-  },
+  }, {
+    isServerPackage: require('@npmcli/run-script').isServerPackage,
+  }),
   npmlog,
   '../../lib/npm.js': npm,
   '../../lib/utils/is-windows-shell.js': windows,
-  '../../lib/utils/output.js': (...msg) => output.push(msg)
+  '../../lib/utils/output.js': (...msg) => output.push(msg),
 })
 
 const runScript = getRS(false)
@@ -42,41 +43,41 @@ t.test('completion', t => {
   const dir = t.testdir()
   npm.localPrefix = dir
   t.test('already have a script name', t => {
-    runScript.completion({conf:{argv:{remain: ['npm','run','x']}}}, (er, results) => {
-      if (er) {
+    runScript.completion({conf: {argv: {remain: ['npm', 'run', 'x']}}}, (er, results) => {
+      if (er)
         throw er
-      }
+
       t.equal(results, undefined)
       t.end()
     })
   })
   t.test('no package.json', t => {
-    runScript.completion({conf:{argv:{remain: ['npm','run']}}}, (er, results) => {
-      if (er) {
+    runScript.completion({conf: {argv: {remain: ['npm', 'run']}}}, (er, results) => {
+      if (er)
         throw er
-      }
+
       t.strictSame(results, [])
       t.end()
     })
   })
   t.test('has package.json, no scripts', t => {
     writeFileSync(`${dir}/package.json`, JSON.stringify({}))
-    runScript.completion({conf:{argv:{remain: ['npm', 'run']}}}, (er, results) => {
-      if (er) {
+    runScript.completion({conf: {argv: {remain: ['npm', 'run']}}}, (er, results) => {
+      if (er)
         throw er
-      }
+
       t.strictSame(results, [])
       t.end()
     })
   })
   t.test('has package.json, with scripts', t => {
     writeFileSync(`${dir}/package.json`, JSON.stringify({
-      scripts: { hello: 'echo hello', world: 'echo world' }
+      scripts: { hello: 'echo hello', world: 'echo world' },
     }))
-    runScript.completion({conf:{argv:{remain: ['npm', 'run']}}}, (er, results) => {
-      if (er) {
+    runScript.completion({conf: {argv: {remain: ['npm', 'run']}}}, (er, results) => {
+      if (er)
         throw er
-      }
+
       t.strictSame(results, ['hello', 'world'])
       t.end()
     })
@@ -90,15 +91,34 @@ t.test('fail if no package.json', async t => {
   await runScript(['test'], er => t.match(er, { code: 'ENOENT' }))
 })
 
-t.test('default env and restart scripts', async t => {
+t.test('default env, start, and restart scripts', async t => {
   npm.localPrefix = t.testdir({
-    'package.json': JSON.stringify({ name: 'x', version: '1.2.3' })
+    'package.json': JSON.stringify({ name: 'x', version: '1.2.3' }),
+    'server.js': 'console.log("hello, world")',
   })
 
+  await runScript(['start'], er => {
+    if (er)
+      throw er
+
+    t.match(RUN_SCRIPTS, [
+      {
+        path: npm.localPrefix,
+        args: [],
+        scriptShell: undefined,
+        stdio: 'inherit',
+        stdioString: true,
+        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {}},
+        event: 'start',
+      },
+    ])
+  })
+  RUN_SCRIPTS.length = 0
+
   await runScript(['env'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.match(RUN_SCRIPTS, [
       {
         path: npm.localPrefix,
@@ -106,19 +126,22 @@ t.test('default env and restart scripts', async t => {
         scriptShell: undefined,
         stdio: 'inherit',
         stdioString: true,
-        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {
-          env: 'env'
-        } },
-        event: 'env'
-      }
+        pkg: { name: 'x',
+          version: '1.2.3',
+          _id: 'x@1.2.3',
+          scripts: {
+            env: 'env',
+          } },
+        event: 'env',
+      },
     ])
   })
   RUN_SCRIPTS.length = 0
 
   await runScriptWin(['env'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.match(RUN_SCRIPTS, [
       {
         path: npm.localPrefix,
@@ -126,19 +149,22 @@ t.test('default env and restart scripts', async t => {
         scriptShell: undefined,
         stdio: 'inherit',
         stdioString: true,
-        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {
-          env: 'SET'
-        } },
-        event: 'env'
-      }
+        pkg: { name: 'x',
+          version: '1.2.3',
+          _id: 'x@1.2.3',
+          scripts: {
+            env: 'SET',
+          } },
+        event: 'env',
+      },
     ])
   })
   RUN_SCRIPTS.length = 0
 
   await runScript(['restart'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.match(RUN_SCRIPTS, [
       {
         path: npm.localPrefix,
@@ -146,11 +172,14 @@ t.test('default env and restart scripts', async t => {
         scriptShell: undefined,
         stdio: 'inherit',
         stdioString: true,
-        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {
-          restart: 'npm stop --if-present && npm start'
-        } },
-        event: 'restart'
-      }
+        pkg: { name: 'x',
+          version: '1.2.3',
+          _id: 'x@1.2.3',
+          scripts: {
+            restart: 'npm stop --if-present && npm start',
+          } },
+        event: 'restart',
+      },
     ])
   })
   RUN_SCRIPTS.length = 0
@@ -159,29 +188,29 @@ t.test('default env and restart scripts', async t => {
 t.test('try to run missing script', t => {
   npm.localPrefix = t.testdir({
     'package.json': JSON.stringify({
-      scripts: { hello: 'world' }
-    })
+      scripts: { hello: 'world' },
+    }),
   })
   t.test('no suggestions', async t => {
     await runScript(['notevenclose'], er => {
       t.match(er, {
-        message: 'missing script: notevenclose'
+        message: 'missing script: notevenclose',
       })
     })
   })
   t.test('suggestions', async t => {
     await runScript(['helo'], er => {
       t.match(er, {
-        message: 'missing script: helo\n\nDid you mean this?\n    hello'
+        message: 'missing script: helo\n\nDid you mean this?\n    hello',
       })
     })
   })
   t.test('with --if-present', async t => {
     npm.config.set('if-present', true)
     await runScript(['goodbye'], er => {
-      if (er) {
+      if (er)
         throw er
-      }
+
       t.strictSame(RUN_SCRIPTS, [], 'did not try to run anything')
     })
   })
@@ -195,15 +224,15 @@ t.test('run pre/post hooks', async t => {
       version: '1.2.3',
       scripts: {
         preenv: 'echo before the env',
-        postenv: 'echo after the env'
-      }
-    })
+        postenv: 'echo after the env',
+      },
+    }),
   })
 
   await runScript(['env'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.match(RUN_SCRIPTS, [
       { event: 'preenv' },
       {
@@ -212,12 +241,15 @@ t.test('run pre/post hooks', async t => {
         scriptShell: undefined,
         stdio: 'inherit',
         stdioString: true,
-        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {
-          env: 'env'
-        } },
-        event: 'env'
+        pkg: { name: 'x',
+          version: '1.2.3',
+          _id: 'x@1.2.3',
+          scripts: {
+            env: 'env',
+          } },
+        event: 'env',
       },
-      { event: 'postenv' }
+      { event: 'postenv' },
     ])
   })
   RUN_SCRIPTS.length = 0
@@ -232,15 +264,15 @@ t.test('skip pre/post hooks when using ignoreScripts', async t => {
       version: '1.2.3',
       scripts: {
         preenv: 'echo before the env',
-        postenv: 'echo after the env'
-      }
-    })
+        postenv: 'echo after the env',
+      },
+    }),
   })
 
   await runScript(['env'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.deepEqual(RUN_SCRIPTS, [
       {
         path: npm.localPrefix,
@@ -248,14 +280,17 @@ t.test('skip pre/post hooks when using ignoreScripts', async t => {
         scriptShell: undefined,
         stdio: 'inherit',
         stdioString: true,
-        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {
-          preenv: 'echo before the env',
-          postenv: 'echo after the env',
-          env: 'env'
-        } },
+        pkg: { name: 'x',
+          version: '1.2.3',
+          _id: 'x@1.2.3',
+          scripts: {
+            preenv: 'echo before the env',
+            postenv: 'echo after the env',
+            env: 'env',
+          } },
         banner: true,
-        event: 'env'
-      }
+        event: 'env',
+      },
     ])
 
     delete npm.flatOptions.ignoreScripts
@@ -265,7 +300,9 @@ t.test('skip pre/post hooks when using ignoreScripts', async t => {
 
 t.test('run silent', async t => {
   npmlog.level = 'silent'
-  t.teardown(() => { npmlog.level = 'warn' })
+  t.teardown(() => {
+    npmlog.level = 'warn'
+  })
 
   npm.localPrefix = t.testdir({
     'package.json': JSON.stringify({
@@ -273,19 +310,19 @@ t.test('run silent', async t => {
       version: '1.2.3',
       scripts: {
         preenv: 'echo before the env',
-        postenv: 'echo after the env'
-      }
-    })
+        postenv: 'echo after the env',
+      },
+    }),
   })
 
   await runScript(['env'], er => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.match(RUN_SCRIPTS, [
       {
         event: 'preenv',
-        stdio: 'inherit'
+        stdio: 'inherit',
       },
       {
         path: npm.localPrefix,
@@ -293,16 +330,19 @@ t.test('run silent', async t => {
         scriptShell: undefined,
         stdio: 'inherit',
         stdioString: true,
-        pkg: { name: 'x', version: '1.2.3', _id: 'x@1.2.3', scripts: {
-          env: 'env'
-        } },
+        pkg: { name: 'x',
+          version: '1.2.3',
+          _id: 'x@1.2.3',
+          scripts: {
+            env: 'env',
+          } },
         event: 'env',
-        banner: false
+        banner: false,
       },
       {
         event: 'postenv',
-        stdio: 'inherit'
-      }
+        stdio: 'inherit',
+      },
     ])
   })
   RUN_SCRIPTS.length = 0
@@ -314,46 +354,43 @@ t.test('list scripts', async t => {
     start: 'node server.js',
     stop: 'node kill-server.js',
     preenv: 'echo before the env',
-    postenv: 'echo after the env'
+    postenv: 'echo after the env',
   }
   npm.localPrefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'x',
       version: '1.2.3',
-      scripts
-    })
+      scripts,
+    }),
   })
 
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [
-    [ 'Lifecycle scripts included in x:' ],
-    [ '  test\n    exit 2' ],
-    [ '  start\n    node server.js' ],
-    [ '  stop\n    node kill-server.js' ],
-    [ '\navailable via `npm run-script`:' ],
-    [ '  preenv\n    echo before the env' ],
-    [ '  postenv\n    echo after the env' ]
+    ['Lifecycle scripts included in x:'],
+    ['  test\n    exit 2'],
+    ['  start\n    node server.js'],
+    ['  stop\n    node kill-server.js'],
+    ['\navailable via `npm run-script`:'],
+    ['  preenv\n    echo before the env'],
+    ['  postenv\n    echo after the env'],
   ], 'basic report')
   output.length = 0
 
   npmlog.level = 'silent'
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [])
   npmlog.level = 'warn'
 
   npm.flatOptions.json = true
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [[JSON.stringify(scripts, 0, 2)]], 'json report')
   output.length = 0
@@ -361,16 +398,15 @@ t.test('list scripts', async t => {
 
   npm.flatOptions.parseable = true
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [
-    [ 'test:exit 2' ],
-    [ 'start:node server.js' ],
-    [ 'stop:node kill-server.js' ],
-    [ 'preenv:echo before the env' ],
-    [ 'postenv:echo after the env' ]
+    ['test:exit 2'],
+    ['start:node server.js'],
+    ['stop:node kill-server.js'],
+    ['preenv:echo before the env'],
+    ['postenv:echo after the env'],
   ])
   output.length = 0
   npm.flatOptions.parseable = false
@@ -380,14 +416,13 @@ t.test('list scripts when no scripts', async t => {
   npm.localPrefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'x',
-      version: '1.2.3'
-    })
+      version: '1.2.3',
+    }),
   })
 
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [], 'nothing to report')
   output.length = 0
@@ -398,18 +433,17 @@ t.test('list scripts, only commands', async t => {
     'package.json': JSON.stringify({
       name: 'x',
       version: '1.2.3',
-      scripts: { preversion: 'echo doing the version dance' }
-    })
+      scripts: { preversion: 'echo doing the version dance' },
+    }),
   })
 
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [
-    ["Lifecycle scripts included in x:"],
-    ["  preversion\n    echo doing the version dance"],
+    ['Lifecycle scripts included in x:'],
+    ['  preversion\n    echo doing the version dance'],
   ])
   output.length = 0
 })
@@ -419,18 +453,17 @@ t.test('list scripts, only non-commands', async t => {
     'package.json': JSON.stringify({
       name: 'x',
       version: '1.2.3',
-      scripts: { glorp: 'echo doing the glerp glop' }
-    })
+      scripts: { glorp: 'echo doing the glerp glop' },
+    }),
   })
 
   await runScript([], er => {
-    if (er) {
+    if (er)
       throw er
-    }
   })
   t.strictSame(output, [
-    ["Scripts available in x via `npm run-script`:"],
-    ["  glorp\n    echo doing the glerp glop"]
+    ['Scripts available in x via `npm run-script`:'],
+    ['  glorp\n    echo doing the glerp glop'],
   ])
   output.length = 0
 })
diff --git a/deps/npm/test/lib/search.js b/deps/npm/test/lib/search.js
new file mode 100644
index 00000000000000..1dba1250e08f01
--- /dev/null
+++ b/deps/npm/test/lib/search.js
@@ -0,0 +1,193 @@
+const Minipass = require('minipass')
+const t = require('tap')
+const requireInject = require('require-inject')
+const libnpmsearchResultFixture =
+  require('../fixtures/libnpmsearch-stream-result.js')
+
+let result = ''
+const flatOptions = {
+  search: {
+    exclude: null,
+    limit: 20,
+    opts: '',
+  },
+}
+const npm = { flatOptions: { ...flatOptions } }
+const npmlog = {
+  silly () {},
+  clearProgress () {},
+}
+const libnpmsearch = {
+  stream () {},
+}
+const mocks = {
+  npmlog,
+  libnpmsearch,
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
+  '../../lib/utils/usage.js': () => 'usage instructions',
+  // '../../lib/search/format-package-stream.js': a => a,
+}
+
+t.afterEach(cb => {
+  result = ''
+  npm.flatOptions = flatOptions
+  cb()
+})
+
+const search = requireInject('../../lib/search.js', mocks)
+
+t.test('no args', t => {
+  search([], err => {
+    t.match(
+      err,
+      /search must be called with arguments/,
+      'should throw usage instructions'
+    )
+    t.end()
+  })
+})
+
+t.test('search <name>', t => {
+  const src = new Minipass()
+  src.objectMode = true
+  const libnpmsearch = {
+    stream () {
+      return src
+    },
+  }
+
+  const search = requireInject('../../lib/search.js', {
+    ...mocks,
+    libnpmsearch,
+  })
+
+  search(['libnpm'], err => {
+    if (err)
+      throw err
+
+    t.matchSnapshot(result, 'should have expected search results')
+
+    t.end()
+  })
+
+  for (const i of libnpmsearchResultFixture)
+    src.write(i)
+
+  src.end()
+})
+
+t.test('search <name> --searchexclude --searchopts', t => {
+  npm.flatOptions.search = {
+    ...flatOptions.search,
+    exclude: '',
+  }
+
+  const src = new Minipass()
+  src.objectMode = true
+  const libnpmsearch = {
+    stream () {
+      return src
+    },
+  }
+
+  const search = requireInject('../../lib/search.js', {
+    ...mocks,
+    libnpmsearch,
+  })
+
+  search(['foo'], err => {
+    if (err)
+      throw err
+
+    t.matchSnapshot(result, 'should have filtered expected search results')
+
+    t.end()
+  })
+
+  src.write({
+    name: 'foo',
+    scope: 'unscoped',
+    version: '1.0.0',
+    description: '',
+    keywords: [],
+    date: null,
+    author: { name: 'Foo', email: 'foo@npmjs.com' },
+    publisher: { name: 'Foo', email: 'foo@npmjs.com' },
+    maintainers: [
+      { username: 'foo', email: 'foo@npmjs.com' },
+    ],
+  })
+  src.write({
+    name: 'libnpmversion',
+    scope: 'unscoped',
+    version: '1.0.0',
+    description: '',
+    keywords: [],
+    date: null,
+    author: { name: 'Foo', email: 'foo@npmjs.com' },
+    publisher: { name: 'Foo', email: 'foo@npmjs.com' },
+    maintainers: [
+      { username: 'foo', email: 'foo@npmjs.com' },
+    ],
+  })
+
+  src.end()
+})
+
+t.test('empty search results', t => {
+  const src = new Minipass()
+  src.objectMode = true
+  const libnpmsearch = {
+    stream () {
+      return src
+    },
+  }
+
+  const search = requireInject('../../lib/search.js', {
+    ...mocks,
+    libnpmsearch,
+  })
+
+  search(['foo'], err => {
+    if (err)
+      throw err
+
+    t.matchSnapshot(result, 'should have expected search results')
+
+    t.end()
+  })
+
+  src.end()
+})
+
+t.test('search api response error', t => {
+  const src = new Minipass()
+  src.objectMode = true
+  const libnpmsearch = {
+    stream () {
+      return src
+    },
+  }
+
+  const search = requireInject('../../lib/search.js', {
+    ...mocks,
+    libnpmsearch,
+  })
+
+  search(['foo'], err => {
+    t.match(
+      err,
+      /ERR/,
+      'should throw response error'
+    )
+
+    t.end()
+  })
+
+  src.emit('error', new Error('ERR'))
+
+  src.end()
+})
diff --git a/deps/npm/test/lib/set-script.js b/deps/npm/test/lib/set-script.js
new file mode 100644
index 00000000000000..ab25ba968a92c3
--- /dev/null
+++ b/deps/npm/test/lib/set-script.js
@@ -0,0 +1,154 @@
+const test = require('tap')
+const requireInject = require('require-inject')
+const setScriptDefault = require('../../lib/set-script.js')
+const parseJSON = require('json-parse-even-better-errors')
+
+test.type(setScriptDefault, 'function', 'command is function')
+test.equal(setScriptDefault.completion, require('../../lib/utils/completion/none.js'), 'empty completion')
+test.equal(setScriptDefault.usage, 'npm set-script [<script>] [<command>]', 'usage matches')
+test.test('fails on invalid arguments', (t) => {
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {},
+    npmlog: {},
+  })
+  t.plan(3)
+  setScript(['arg1'], (fail) => t.match(fail, /Expected 2 arguments: got 1/))
+  setScript(['arg1', 'arg2', 'arg3'], (fail) => t.match(fail, /Expected 2 arguments: got 3/))
+  setScript(['arg1', 'arg2', 'arg3', 'arg4'], (fail) => t.match(fail, /Expected 2 arguments: got 4/))
+})
+test.test('fails if run in postinstall script', (t) => {
+  var originalVar = process.env.npm_lifecycle_event
+  process.env.npm_lifecycle_event = 'postinstall'
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {},
+    npmlog: {},
+  })
+  t.plan(1)
+  setScript(['arg1', 'arg2'], (fail) => t.equal(fail.toString(), 'Error: Scripts can’t set from the postinstall script'))
+  process.env.npm_lifecycle_event = originalVar
+})
+test.test('fails when package.json not found', (t) => {
+  const setScript = requireInject('../../lib/set-script.js', {
+    '../../lib/npm.js': {
+      localPrefix: 'IDONTEXIST',
+    },
+  })
+  t.plan(1)
+  setScript(['arg1', 'arg2'], (fail) => t.match(fail, /package.json not found/))
+})
+test.test('fails on invalid JSON', (t) => {
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {
+      readFileSync: (name, charcode) => {
+        return 'iamnotjson'
+      },
+    },
+  })
+  t.plan(1)
+  setScript(['arg1', 'arg2'], (fail) => t.match(fail, /Invalid package.json: JSONParseError/))
+})
+test.test('creates scripts object', (t) => {
+  var mockFile = ''
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {
+      readFileSync: (name, charcode) => {
+        return '{}'
+      },
+      writeFileSync: (location, inner) => {
+        mockFile = inner
+      },
+    },
+    'read-package-json-fast': async function (filename) {
+      return {
+        [Symbol.for('indent')]: '  ',
+        [Symbol.for('newline')]: '\n',
+      }
+    },
+  })
+  t.plan(2)
+  setScript(['arg1', 'arg2'], (error) => {
+    t.equal(error, undefined)
+    t.assert(parseJSON(mockFile), {scripts: {arg1: 'arg2'}})
+  })
+})
+test.test('warns before overwriting', (t) => {
+  var warningListened = ''
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {
+      readFileSync: (name, charcode) => {
+        return JSON.stringify({
+          scripts: {
+            arg1: 'blah',
+          },
+        })
+      },
+      writeFileSync: (name, content) => {},
+    },
+    'read-package-json-fast': async function (filename) {
+      return {
+        [Symbol.for('indent')]: '  ',
+        [Symbol.for('newline')]: '\n',
+      }
+    },
+    npmlog: {
+      warn: (prefix, message) => {
+        warningListened = message
+      },
+    },
+  })
+  t.plan(2)
+  setScript(['arg1', 'arg2'], (error) => {
+    t.equal(error, undefined, 'no error')
+    t.equal(warningListened, 'Script "arg1" was overwritten')
+  })
+})
+test.test('provided indentation and eol is used', (t) => {
+  var mockFile = ''
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {
+      readFileSync: (name, charcode) => {
+        return '{}'
+      },
+      writeFileSync: (name, content) => {
+        mockFile = content
+      },
+    },
+    'read-package-json-fast': async function (filename) {
+      return {
+        [Symbol.for('indent')]: ' '.repeat(6),
+        [Symbol.for('newline')]: '\r\n',
+      }
+    },
+  })
+  t.plan(3)
+  setScript(['arg1', 'arg2'], (error) => {
+    t.equal(error, undefined)
+    t.equal(mockFile.split('\r\n').length > 1, true)
+    t.equal(mockFile.split('\r\n').every((value) => !value.startsWith(' ') || value.startsWith(' '.repeat(6))), true)
+  })
+})
+test.test('goes to default when undefined indent and eol provided', (t) => {
+  var mockFile = ''
+  const setScript = requireInject('../../lib/set-script.js', {
+    fs: {
+      readFileSync: (name, charcode) => {
+        return '{}'
+      },
+      writeFileSync: (name, content) => {
+        mockFile = content
+      },
+    },
+    'read-package-json-fast': async function (filename) {
+      return {
+        [Symbol.for('indent')]: undefined,
+        [Symbol.for('newline')]: undefined,
+      }
+    },
+  })
+  t.plan(3)
+  setScript(['arg1', 'arg2'], (error) => {
+    t.equal(error, undefined)
+    t.equal(mockFile.split('\n').length > 1, true)
+    t.equal(mockFile.split('\n').every((value) => !value.startsWith(' ') || value.startsWith('  ')), true)
+  })
+})
diff --git a/deps/npm/test/lib/shrinkwrap.js b/deps/npm/test/lib/shrinkwrap.js
new file mode 100644
index 00000000000000..65b16b14762d1d
--- /dev/null
+++ b/deps/npm/test/lib/shrinkwrap.js
@@ -0,0 +1,329 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+
+const npm = {
+  lockfileVersion: 2,
+  globalDir: '',
+  flatOptions: {
+    depth: 0,
+    global: false,
+  },
+  prefix: '',
+}
+const tree = {
+  meta: {
+    hiddenLockfile: null,
+    loadedFromDisk: false,
+    filename: '',
+    originalLockfileVersion: 2,
+    save () {},
+  },
+}
+const mocks = {
+  npmlog: { notice () {} },
+  '@npmcli/arborist': class {
+    loadVirtual () {
+      return tree
+    }
+
+    loadActual () {
+      return tree
+    }
+  },
+  '../../lib/npm.js': npm,
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+t.afterEach(cb => {
+  npm.prefix = ''
+  npm.flatOptions.global = false
+  npm.globalDir = ''
+  cb()
+})
+
+t.test('no args', t => {
+  t.plan(4)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    async loadVirtual () {
+      t.ok('should load virtual tree')
+      return {
+        ...tree,
+        meta: {
+          ...tree.meta,
+          save () {
+            t.ok('should save the lockfile')
+          },
+        },
+      }
+    }
+  }
+
+  const npmlog = {
+    notice (title, msg) {
+      t.equal(
+        msg,
+        'created a lockfile as npm-shrinkwrap.json',
+        'should log notice msg that file was successfully created'
+      )
+    },
+  }
+
+  const shrinkwrap = requireInject('../../lib/shrinkwrap.js', {
+    ...mocks,
+    npmlog,
+    '@npmcli/arborist': Arborist,
+  })
+
+  shrinkwrap([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('no virtual tree', t => {
+  t.plan(4)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    async loadVirtual () {
+      throw new Error('ERR')
+    }
+
+    async loadActual () {
+      t.ok('should load actual tree')
+      return {
+        ...tree,
+        meta: {
+          ...tree.meta,
+          save () {
+            t.ok('should save the lockfile')
+          },
+        },
+      }
+    }
+  }
+
+  const npmlog = {
+    notice (title, msg) {
+      t.equal(
+        msg,
+        'created a lockfile as npm-shrinkwrap.json',
+        'should log notice msg that file was successfully created'
+      )
+    },
+  }
+
+  const shrinkwrap = requireInject('../../lib/shrinkwrap.js', {
+    ...mocks,
+    npmlog,
+    '@npmcli/arborist': Arborist,
+  })
+
+  shrinkwrap([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('existing package-json file', t => {
+  t.plan(5)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    async loadVirtual () {
+      t.ok('should load virtual tree')
+      return {
+        ...tree,
+        meta: {
+          hiddenLockfile: false,
+          loadedFromDisk: true,
+          filename: 'package-lock.json',
+          save () {
+            t.ok('should save the lockfile')
+          },
+        },
+      }
+    }
+  }
+
+  const npmlog = {
+    notice (title, msg) {
+      t.equal(
+        msg,
+        'package-lock.json has been renamed to npm-shrinkwrap.json',
+        'should log notice msg that file was renamed'
+      )
+    },
+  }
+
+  const fs = {
+    promises: {
+      unlink (filename) {
+        t.equal(filename, 'package-lock.json', 'should remove old lockfile')
+      },
+    },
+  }
+
+  const shrinkwrap = requireInject('../../lib/shrinkwrap.js', {
+    ...mocks,
+    fs,
+    npmlog,
+    '@npmcli/arborist': Arborist,
+  })
+
+  shrinkwrap([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('update shrinkwrap file version', t => {
+  t.plan(4)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    async loadVirtual () {
+      t.ok('should load virtual tree')
+      return {
+        ...tree,
+        meta: {
+          hiddenLockfile: false,
+          loadedFromDisk: true,
+          filename: 'npm-shrinkwrap.json',
+          originalLockfileVersion: 1,
+          save () {
+            t.ok('should save the lockfile')
+          },
+        },
+      }
+    }
+  }
+
+  const npmlog = {
+    notice (title, msg) {
+      t.equal(
+        msg,
+        'npm-shrinkwrap.json updated to version 2',
+        'should log notice msg that file was updated'
+      )
+    },
+  }
+
+  const shrinkwrap = requireInject('../../lib/shrinkwrap.js', {
+    ...mocks,
+    npmlog,
+    '@npmcli/arborist': Arborist,
+  })
+
+  shrinkwrap([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('update to date shrinkwrap file', t => {
+  t.plan(4)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    async loadVirtual () {
+      t.ok('should load virtual tree')
+      return {
+        ...tree,
+        meta: {
+          hiddenLockfile: false,
+          loadedFromDisk: true,
+          filename: 'npm-shrinkwrap.json',
+          originalLockfileVersion: 2,
+          save () {
+            t.ok('should save the lockfile')
+          },
+        },
+      }
+    }
+  }
+
+  const npmlog = {
+    notice (title, msg) {
+      t.equal(
+        msg,
+        'npm-shrinkwrap.json up to date',
+        'should log notice msg shrinkwrap up to date'
+      )
+    },
+  }
+
+  const shrinkwrap = requireInject('../../lib/shrinkwrap.js', {
+    ...mocks,
+    npmlog,
+    '@npmcli/arborist': Arborist,
+  })
+
+  shrinkwrap([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('shrinkwrap --global', t => {
+  const shrinkwrap = requireInject('../../lib/shrinkwrap.js', mocks)
+
+  npm.flatOptions.global = true
+
+  shrinkwrap([], err => {
+    t.match(
+      err,
+      /does not work for global packages/,
+      'should throw no global support msg'
+    )
+    t.equal(err.code, 'ESHRINKWRAPGLOBAL', 'should throw expected error code')
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/star.js b/deps/npm/test/lib/star.js
new file mode 100644
index 00000000000000..ea5e07b94f9a8c
--- /dev/null
+++ b/deps/npm/test/lib/star.js
@@ -0,0 +1,144 @@
+const requireInject = require('require-inject')
+const t = require('tap')
+
+let result = ''
+
+const noop = () => null
+const npm = { config: { get () {} }, flatOptions: { unicode: false } }
+const npmFetch = { json: noop }
+const npmlog = { error: noop, info: noop, verbose: noop }
+const mocks = {
+  npmlog,
+  'npm-registry-fetch': npmFetch,
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
+  '../../lib/utils/get-identity.js': async () => 'foo',
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+const star = requireInject('../../lib/star.js', mocks)
+
+t.afterEach(cb => {
+  npm.config = { get () {} }
+  npm.flatOptions.unicode = false
+  npmlog.info = noop
+  result = ''
+  cb()
+})
+
+t.test('no args', t => {
+  star([], err => {
+    t.match(
+      err,
+      /usage instructions/,
+      'should throw usage instructions'
+    )
+    t.end()
+  })
+})
+
+t.test('star a package', t => {
+  t.plan(4)
+  const pkgName = '@npmcli/arborist'
+  npmFetch.json = async (uri, opts) => ({
+    _id: pkgName,
+    _rev: 'hash',
+    users: (
+      opts.method === 'PUT'
+        ? { foo: true }
+        : {}
+    ),
+  })
+  npmlog.info = (title, msg, id) => {
+    t.equal(title, 'star', 'should use expected title')
+    t.equal(msg, 'starring', 'should use expected msg')
+    t.equal(id, pkgName, 'should use expected id')
+  }
+  star([pkgName], err => {
+    if (err)
+      throw err
+    t.equal(
+      result,
+      '(*) @npmcli/arborist',
+      'should output starred package msg'
+    )
+  })
+})
+
+t.test('unstar a package', t => {
+  t.plan(4)
+  const pkgName = '@npmcli/arborist'
+  npm.config.get = key => key === 'star.unstar'
+  npmFetch.json = async (uri, opts) => ({
+    _id: pkgName,
+    _rev: 'hash',
+    ...(opts.method === 'PUT'
+      ? {}
+      : { foo: true }
+    ),
+  })
+  npmlog.info = (title, msg, id) => {
+    t.equal(title, 'unstar', 'should use expected title')
+    t.equal(msg, 'unstarring', 'should use expected msg')
+    t.equal(id, pkgName, 'should use expected id')
+  }
+  star([pkgName], err => {
+    if (err)
+      throw err
+    t.equal(
+      result,
+      '( ) @npmcli/arborist',
+      'should output unstarred package msg'
+    )
+  })
+})
+
+t.test('unicode', async t => {
+  t.test('star a package', t => {
+    npm.flatOptions.unicode = true
+    npmFetch.json = async (uri, opts) => ({})
+    star(['pkg'], err => {
+      if (err)
+        throw err
+      t.equal(
+        result,
+        '\u2605  pkg',
+        'should output unicode starred package msg'
+      )
+      t.end()
+    })
+  })
+
+  t.test('unstar a package', t => {
+    npm.flatOptions.unicode = true
+    npm.config.get = key => key === 'star.unstar'
+    npmFetch.json = async (uri, opts) => ({})
+    star(['pkg'], err => {
+      if (err)
+        throw err
+      t.equal(
+        result,
+        '\u2606  pkg',
+        'should output unstarred package msg'
+      )
+      t.end()
+    })
+  })
+})
+
+t.test('logged out user', t => {
+  const star = requireInject('../../lib/star.js', {
+    ...mocks,
+    '../../lib/utils/get-identity.js': async () => undefined,
+  })
+  star(['@npmcli/arborist'], err => {
+    t.match(
+      err,
+      /You need to be logged in/,
+      'should throw login required error'
+    )
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/stars.js b/deps/npm/test/lib/stars.js
new file mode 100644
index 00000000000000..ff636a5e5496f7
--- /dev/null
+++ b/deps/npm/test/lib/stars.js
@@ -0,0 +1,151 @@
+const requireInject = require('require-inject')
+const t = require('tap')
+
+let result = ''
+
+const noop = () => null
+const npm = { config: { get () {} }, flatOptions: {} }
+const npmFetch = { json: noop }
+const npmlog = { warn: noop }
+const mocks = {
+  npmlog,
+  'npm-registry-fetch': npmFetch,
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    result = [result, ...msg].join('\n')
+  },
+  '../../lib/utils/get-identity.js': async () => 'foo',
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+const stars = requireInject('../../lib/stars.js', mocks)
+
+t.afterEach(cb => {
+  npm.config = { get () {} }
+  npmlog.warn = noop
+  result = ''
+  cb()
+})
+
+t.test('no args', t => {
+  npmFetch.json = async (uri, opts) => {
+    t.equal(uri, '/-/_view/starredByUser', 'should fetch from expected uri')
+    t.equal(opts.query.key, '"foo"', 'should match logged in username')
+
+    return {
+      rows: [
+        { value: '@npmcli/arborist' },
+        { value: '@npmcli/map-workspaces' },
+        { value: 'libnpmfund' },
+        { value: 'libnpmpublish' },
+        { value: 'ipt' },
+      ],
+    }
+  }
+
+  stars([], err => {
+    if (err)
+      throw err
+
+    t.matchSnapshot(
+      result,
+      'should output a list of starred packages'
+    )
+
+    t.end()
+  })
+})
+
+t.test('npm star <user>', t => {
+  t.plan(3)
+  npmFetch.json = async (uri, opts) => {
+    t.equal(uri, '/-/_view/starredByUser', 'should fetch from expected uri')
+    t.equal(opts.query.key, '"ruyadorno"', 'should match username')
+
+    return {
+      rows: [{ value: '@npmcli/arborist' }],
+    }
+  }
+
+  stars(['ruyadorno'], err => {
+    if (err)
+      throw err
+
+    t.match(
+      result,
+      '@npmcli/arborist',
+      'should output expected list of starred packages'
+    )
+  })
+})
+
+t.test('unauthorized request', t => {
+  t.plan(4)
+  npmFetch.json = async () => {
+    throw Object.assign(
+      new Error('Not logged in'),
+      { code: 'ENEEDAUTH' }
+    )
+  }
+
+  npmlog.warn = (title, msg) => {
+    t.equal(title, 'stars', 'should use expected title')
+    t.equal(
+      msg,
+      'auth is required to look up your username',
+      'should warn auth required msg'
+    )
+  }
+
+  stars([], err => {
+    t.match(
+      err,
+      /Not logged in/,
+      'should throw unauthorized request msg'
+    )
+
+    t.equal(
+      result,
+      '',
+      'should have empty output'
+    )
+  })
+})
+
+t.test('unexpected error', t => {
+  npmFetch.json = async () => {
+    throw new Error('ERROR')
+  }
+
+  npmlog.warn = (title, msg) => {
+    throw new Error('Should not output extra warning msgs')
+  }
+
+  stars([], err => {
+    t.match(
+      err,
+      /ERROR/,
+      'should throw unexpected error message'
+    )
+    t.end()
+  })
+})
+
+t.test('no pkg starred', t => {
+  t.plan(2)
+  npmFetch.json = async (uri, opts) => ({ rows: [] })
+
+  npmlog.warn = (title, msg) => {
+    t.equal(title, 'stars', 'should use expected title')
+    t.equal(
+      msg,
+      'user has not starred any packages',
+      'should warn no starred packages msg'
+    )
+  }
+
+  stars([], err => {
+    if (err)
+      throw err
+  })
+})
diff --git a/deps/npm/test/lib/team.js b/deps/npm/test/lib/team.js
new file mode 100644
index 00000000000000..c534cc83271b6c
--- /dev/null
+++ b/deps/npm/test/lib/team.js
@@ -0,0 +1,572 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+
+let result = ''
+const libnpmteam = {
+  async add () {},
+  async create () {},
+  async destroy () {},
+  async lsTeams () {},
+  async lsUsers () {},
+  async rm () {},
+}
+const npm = { flatOptions: {} }
+const mocks = {
+  libnpmteam,
+  'cli-columns': a => a.join(' '),
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
+  '../../lib/utils/otplease.js': async (opts, fn) => fn(opts),
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+t.afterEach(cb => {
+  result = ''
+  npm.flatOptions = {}
+  cb()
+})
+
+const team = requireInject('../../lib/team.js', mocks)
+
+t.test('no args', t => {
+  team([], err => {
+    t.match(
+      err,
+      'usage instructions',
+      'should throw usage instructions'
+    )
+    t.end()
+  })
+})
+
+t.test('team add <scope:team> <user>', t => {
+  t.test('default output', t => {
+    team(['add', '@npmcli:developers', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should output success result for add user')
+      t.end()
+    })
+  })
+
+  t.test('--parseable', t => {
+    npm.flatOptions.parseable = true
+
+    team(['add', '@npmcli:developers', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(
+        result,
+        'should output success result for parseable add user'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--json', t => {
+    npm.flatOptions.json = true
+
+    team(['add', '@npmcli:developers', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(
+        JSON.parse(result),
+        {
+          added: true,
+          team: 'npmcli:developers',
+          user: 'foo',
+        },
+        'should output success result for add user json'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--silent', t => {
+    npm.flatOptions.silent = true
+
+    team(['add', '@npmcli:developers', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(result, '', 'should not output success if silent')
+      t.end()
+    })
+  })
+
+  t.end()
+})
+
+t.test('team create <scope:team>', t => {
+  t.test('default output', t => {
+    team(['create', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should output success result for create team')
+      t.end()
+    })
+  })
+
+  t.test('--parseable', t => {
+    npm.flatOptions.parseable = true
+
+    team(['create', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(
+        result,
+        'should output parseable success result for create team'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--json', t => {
+    npm.flatOptions.json = true
+
+    team(['create', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(
+        JSON.parse(result),
+        {
+          created: true,
+          team: 'npmcli:newteam',
+        },
+        'should output success result for create team'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--silent', t => {
+    npm.flatOptions.silent = true
+
+    team(['create', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(result, '', 'should not output create success if silent')
+      t.end()
+    })
+  })
+
+  t.end()
+})
+
+t.test('team destroy <scope:team>', t => {
+  t.test('default output', t => {
+    team(['destroy', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should output success result for destroy team')
+      t.end()
+    })
+  })
+
+  t.test('--parseable', t => {
+    npm.flatOptions.parseable = true
+
+    team(['destroy', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should output parseable result for destroy team')
+      t.end()
+    })
+  })
+
+  t.test('--json', t => {
+    npm.flatOptions.json = true
+
+    team(['destroy', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(
+        JSON.parse(result),
+        {
+          deleted: true,
+          team: 'npmcli:newteam',
+        },
+        'should output parseable result for destroy team'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--silent', t => {
+    npm.flatOptions.silent = true
+
+    team(['destroy', '@npmcli:newteam'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(result, '', 'should not output destroy if silent')
+      t.end()
+    })
+  })
+
+  t.end()
+})
+
+t.test('team ls <scope>', t => {
+  const libnpmteam = {
+    async lsTeams () {
+      return [
+        'npmcli:developers',
+        'npmcli:designers',
+        'npmcli:product',
+      ]
+    },
+  }
+
+  const team = requireInject('../../lib/team.js', {
+    ...mocks,
+    libnpmteam,
+  })
+
+  t.test('default output', t => {
+    team(['ls', '@npmcli'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list teams for a given scope')
+      t.end()
+    })
+  })
+
+  t.test('--parseable', t => {
+    npm.flatOptions.parseable = true
+
+    team(['ls', '@npmcli'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list teams for a parseable scope')
+      t.end()
+    })
+  })
+
+  t.test('--json', t => {
+    npm.flatOptions.json = true
+
+    team(['ls', '@npmcli'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(
+        JSON.parse(result),
+        [
+          'npmcli:designers',
+          'npmcli:developers',
+          'npmcli:product',
+        ],
+        'should json list teams for a scope json'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--silent', t => {
+    npm.flatOptions.silent = true
+
+    team(['ls', '@npmcli'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(result, '', 'should not list teams if silent')
+      t.end()
+    })
+  })
+
+  t.test('no teams', t => {
+    const libnpmteam = {
+      async lsTeams () {
+        return []
+      },
+    }
+
+    const team = requireInject('../../lib/team.js', {
+      ...mocks,
+      libnpmteam,
+    })
+
+    team(['ls', '@npmcli'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list no teams for a given scope')
+      t.end()
+    })
+  })
+
+  t.test('single team', t => {
+    const libnpmteam = {
+      async lsTeams () {
+        return ['npmcli:developers']
+      },
+    }
+
+    const team = requireInject('../../lib/team.js', {
+      ...mocks,
+      libnpmteam,
+    })
+
+    team(['ls', '@npmcli'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list single team for a given scope')
+      t.end()
+    })
+  })
+
+  t.end()
+})
+
+t.test('team ls <scope:team>', t => {
+  const libnpmteam = {
+    async lsUsers () {
+      return ['nlf', 'ruyadorno', 'darcyclarke', 'isaacs']
+    },
+  }
+  const team = requireInject('../../lib/team.js', {
+    ...mocks,
+    libnpmteam,
+  })
+
+  t.test('default output', t => {
+    team(['ls', '@npmcli:developers'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list users for a given scope:team')
+      t.end()
+    })
+  })
+
+  t.test('--parseable', t => {
+    npm.flatOptions.parseable = true
+
+    team(['ls', '@npmcli:developers'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list users for a parseable scope:team')
+      t.end()
+    })
+  })
+
+  t.test('--json', t => {
+    npm.flatOptions.json = true
+
+    team(['ls', '@npmcli:developers'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(
+        JSON.parse(result),
+        [
+          'darcyclarke',
+          'isaacs',
+          'nlf',
+          'ruyadorno',
+        ],
+        'should list users for a scope:team json'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--silent', t => {
+    npm.flatOptions.silent = true
+
+    team(['ls', '@npmcli:developers'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(result, '', 'should not output users if silent')
+      t.end()
+    })
+  })
+
+  t.test('no users', t => {
+    const libnpmteam = {
+      async lsUsers () {
+        return []
+      },
+    }
+
+    const team = requireInject('../../lib/team.js', {
+      ...mocks,
+      libnpmteam,
+    })
+
+    team(['ls', '@npmcli:developers'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list no users for a given scope')
+      t.end()
+    })
+  })
+
+  t.test('single user', t => {
+    const libnpmteam = {
+      async lsUsers () {
+        return ['foo']
+      },
+    }
+
+    const team = requireInject('../../lib/team.js', {
+      ...mocks,
+      libnpmteam,
+    })
+
+    team(['ls', '@npmcli:developers'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should list single user for a given scope')
+      t.end()
+    })
+  })
+
+  t.end()
+})
+
+t.test('team rm <scope:team> <user>', t => {
+  t.test('default output', t => {
+    team(['rm', '@npmcli:newteam', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should output success result for remove user')
+      t.end()
+    })
+  })
+
+  t.test('--parseable', t => {
+    npm.flatOptions.parseable = true
+
+    team(['rm', '@npmcli:newteam', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.matchSnapshot(result, 'should output parseable result for remove user')
+      t.end()
+    })
+  })
+
+  t.test('--json', t => {
+    npm.flatOptions.json = true
+
+    team(['rm', '@npmcli:newteam', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(
+        JSON.parse(result),
+        {
+          removed: true,
+          team: 'npmcli:newteam',
+          user: 'foo',
+        },
+        'should output json result for remove user'
+      )
+      t.end()
+    })
+  })
+
+  t.test('--silent', t => {
+    npm.flatOptions.silent = true
+
+    team(['rm', '@npmcli:newteam', 'foo'], err => {
+      if (err)
+        throw err
+
+      t.deepEqual(result, '', 'should not output rm result if silent')
+      t.end()
+    })
+  })
+
+  t.end()
+})
+
+t.test('completion', t => {
+  const { completion } = team
+
+  t.test('npm team autocomplete', t => {
+    completion({
+      conf: {
+        argv: {
+          remain: ['npm', 'team'],
+        },
+      },
+    }, (err, res) => {
+      if (err)
+        throw err
+
+      t.strictSame(
+        res,
+        ['create', 'destroy', 'add', 'rm', 'ls'],
+        'should auto complete with subcommands'
+      )
+
+      t.end()
+    })
+  })
+
+  t.test('npm team <subcommand> autocomplete', async t => {
+    const check = (subcmd) => new Promise((res, rej) =>
+      completion({
+        conf: {
+          argv: {
+            remain: ['npm', 'team', subcmd],
+          },
+        },
+      }, (err, response) => {
+        if (err)
+          rej(err)
+
+        t.strictSame(
+          response,
+          [],
+          `should not autocomplete ${subcmd} subcommand`
+        )
+        res()
+      }))
+
+    await ['create', 'destroy', 'add', 'rm', 'ls'].map(check)
+  })
+
+  t.test('npm team unknown subcommand autocomplete', t => {
+    completion({
+      conf: {
+        argv: {
+          remain: ['npm', 'team', 'missing-subcommand'],
+        },
+      },
+    }, (err, res) => {
+      t.match(
+        err,
+        /missing-subcommand not recognized/,
+        'should throw a a not recognized error'
+      )
+
+      t.end()
+    })
+  })
+
+  t.end()
+})
diff --git a/deps/npm/test/lib/test.js b/deps/npm/test/lib/test.js
index 8b6d0662659cfe..9a44e4760a2a51 100644
--- a/deps/npm/test/lib/test.js
+++ b/deps/npm/test/lib/test.js
@@ -6,11 +6,11 @@ const npmock = {
     run: (args, cb) => {
       RUN_ARGS = args
       cb()
-    }
-  }
+    },
+  },
 }
 const test = requireInject('../../lib/test.js', {
-  '../../lib/npm.js': npmock
+  '../../lib/npm.js': npmock,
 })
 
 t.test('run a test', t => {
@@ -22,7 +22,7 @@ t.test('run a test', t => {
   })
 
   const lcErr = Object.assign(new Error('should not see this'), {
-    code: 'ELIFECYCLE'
+    code: 'ELIFECYCLE',
   })
   const otherErr = new Error('should see this')
 
diff --git a/deps/npm/test/lib/token.js b/deps/npm/test/lib/token.js
index dc5a8ad05e4448..f9888107223d9b 100644
--- a/deps/npm/test/lib/token.js
+++ b/deps/npm/test/lib/token.js
@@ -6,7 +6,7 @@ const mocks = {
   profile: {},
   output: () => {},
   log: {},
-  readUserInfo: {}
+  readUserInfo: {},
 }
 
 const tokenMock = requireInject('../../lib/token.js', {
@@ -17,28 +17,26 @@ const tokenMock = requireInject('../../lib/token.js', {
   },
   '../../lib/utils/read-user-info.js': mocks.readUserInfo,
   'npm-profile': mocks.profile,
-  'npmlog': mocks.log
+  npmlog: mocks.log,
 })
 
 const tokenWithMocks = (mockRequests) => {
   for (const mod in mockRequests) {
-    if (typeof mockRequests[mod] === 'function') {
+    if (typeof mockRequests[mod] === 'function')
       mocks[mod] = mockRequests[mod]
-    } else {
-      for (const key in mockRequests[mod]) {
+    else {
+      for (const key in mockRequests[mod])
         mocks[mod][key] = mockRequests[mod][key]
-      }
     }
   }
 
   const reset = () => {
     for (const mod in mockRequests) {
-      if (typeof mockRequests[mod] === 'function') {
+      if (typeof mockRequests[mod] === 'function')
         mocks[mod] = () => {}
-      } else {
-        for (const key in mockRequests[mod]) {
+      else {
+        for (const key in mockRequests[mod])
           delete mocks[mod][key]
-        }
       }
     }
   }
@@ -51,9 +49,8 @@ test('completion', (t) => {
 
   const testComp = (argv, expect) => {
     tokenMock.completion({ conf: { argv: { remain: argv } } }, (err, res) => {
-      if (err) {
+      if (err)
         throw err
-      }
 
       t.strictSame(res, expect, argv.join(' '))
     })
@@ -62,14 +59,14 @@ test('completion', (t) => {
   testComp(['npm', 'token'], [
     'list',
     'revoke',
-    'create'
+    'create',
   ])
 
   testComp(['npm', 'token', 'list'], [])
   testComp(['npm', 'token', 'revoke'], [])
   testComp(['npm', 'token', 'create'], [])
 
-  tokenMock.completion({ conf: { argv: { remain: ['npm', 'token', 'foobar' ] } } }, (err) => {
+  tokenMock.completion({ conf: { argv: { remain: ['npm', 'token', 'foobar'] } } }, (err) => {
     t.match(err, { message: 'foobar not recognized' })
   })
 })
@@ -77,14 +74,14 @@ test('completion', (t) => {
 test('token foobar', (t) => {
   t.plan(2)
 
-  const [token, reset] = tokenWithMocks({
+  const [, reset] = tokenWithMocks({
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'shows a gauge')
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   t.tearDown(reset)
@@ -104,14 +101,14 @@ test('token list', (t) => {
     cidr_whitelist: null,
     readonly: false,
     created: now,
-    updated: now
+    updated: now,
   }, {
     key: 'abcd1256',
     token: 'hgfe8765',
     cidr_whitelist: ['192.168.1.1/32'],
     readonly: true,
     created: now,
-    updated: now
+    updated: now,
   }]
 
   const [token, reset] = tokenWithMocks({
@@ -121,25 +118,25 @@ test('token list', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     profile: {
       listTokens: (conf) => {
         t.same(conf.auth, { token: 'thisisnotarealtoken', otp: '123456' })
         return tokens
-      }
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token')
-        }
+        },
       },
       info: (type, msg) => {
         t.equal(type, 'token')
         t.equal(msg, 'getting list')
-      }
+      },
     },
     output: (spec) => {
       const lines = spec.split(/\r?\n/)
@@ -152,7 +149,7 @@ test('token list', (t) => {
       t.match(lines[5], ` ${now.slice(0, 10)} `, 'includes the trimmed creation timestamp')
       t.match(lines[5], ' yes ', 'includes the "no" string for readonly state')
       t.match(lines[5], ` ${tokens[1].cidr_whitelist.join(',')} `, 'includes the cidr whitelist')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -172,7 +169,7 @@ test('token list json output', (t) => {
     cidr_whitelist: null,
     readonly: false,
     created: now,
-    updated: now
+    updated: now,
   }]
 
   const [token, reset] = tokenWithMocks({
@@ -182,31 +179,31 @@ test('token list json output', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { username: 'foo', password: 'bar' }
-        }
-      }
+        },
+      },
     },
     profile: {
       listTokens: (conf) => {
         t.same(conf.auth, { basic: { username: 'foo', password: 'bar' } }, 'passes the correct auth')
         return tokens
-      }
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token')
-        }
+        },
       },
       info: (type, msg) => {
         t.equal(type, 'token')
         t.equal(msg, 'getting list')
-      }
+      },
     },
     output: (spec) => {
       t.type(spec, 'string', 'is called with a string')
       const parsed = JSON.parse(spec)
       t.match(parsed, tokens, 'prints the json parsed tokens')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -226,14 +223,14 @@ test('token list parseable output', (t) => {
     cidr_whitelist: null,
     readonly: false,
     created: now,
-    updated: now
+    updated: now,
   }, {
     key: 'efgh5678ijkl9101',
     token: 'hgfe8765',
     cidr_whitelist: ['192.168.1.1/32'],
     readonly: true,
     created: now,
-    updated: now
+    updated: now,
   }]
 
   let callCount = 0
@@ -245,37 +242,36 @@ test('token list parseable output', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { auth: Buffer.from('foo:bar').toString('base64') }
-        }
-      }
+        },
+      },
     },
     profile: {
       listTokens: (conf) => {
         t.same(conf.auth, { basic: { username: 'foo', password: 'bar' } }, 'passes the correct auth')
         return tokens
-      }
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token')
-        }
+        },
       },
       info: (type, msg) => {
         t.equal(type, 'token')
         t.equal(msg, 'getting list')
-      }
+      },
     },
     output: (spec) => {
       ++callCount
       t.type(spec, 'string', 'is called with a string')
-      if (callCount === 1) {
+      if (callCount === 1)
         t.equal(spec, ['key', 'token', 'created', 'readonly', 'CIDR whitelist'].join('\t'), 'prints header')
-      } else if (callCount === 2) {
+      else if (callCount === 2)
         t.equal(spec, [tokens[0].key, tokens[0].token, tokens[0].created, tokens[0].readonly, ''].join('\t'), 'prints token info')
-      } else {
+      else
         t.equal(spec, [tokens[1].key, tokens[1].token, tokens[1].created, tokens[1].readonly, tokens[1].cidr_whitelist.join(',')].join('\t'), 'prints token info')
-      }
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -295,14 +291,14 @@ test('token revoke', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return {}
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -311,24 +307,24 @@ test('token revoke', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: (conf) => {
         t.same(conf.auth, {}, 'passes the correct empty auth')
         return Promise.resolve([
-          { key: 'abcd1234' }
+          { key: 'abcd1234' },
         ])
       },
       removeToken: (key) => {
         t.equal(key, 'abcd1234', 'deletes the correct token')
-      }
+      },
     },
     output: (spec) => {
       t.equal(spec, 'Removed 1 token')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -348,14 +344,14 @@ test('token revoke multiple tokens', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -364,23 +360,23 @@ test('token revoke multiple tokens', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: () => Promise.resolve([
         { key: 'abcd1234' },
-        { key: 'efgh5678' }
+        { key: 'efgh5678' },
       ]),
       removeToken: (key) => {
         // this will run twice
         t.ok(['abcd1234', 'efgh5678'].includes(key), 'deletes the correct token')
-      }
+      },
     },
     output: (spec) => {
       t.equal(spec, 'Removed 2 tokens')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -400,14 +396,14 @@ test('token revoke json output', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -416,23 +412,23 @@ test('token revoke json output', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: () => Promise.resolve([
-        { key: 'abcd1234' }
+        { key: 'abcd1234' },
       ]),
       removeToken: (key) => {
         t.equal(key, 'abcd1234', 'deletes the correct token')
-      }
+      },
     },
     output: (spec) => {
       t.type(spec, 'string', 'is given a string')
       const parsed = JSON.parse(spec)
       t.same(parsed, ['abcd1234'], 'logs the token as json')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -452,14 +448,14 @@ test('token revoke parseable output', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -468,21 +464,21 @@ test('token revoke parseable output', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: () => Promise.resolve([
-        { key: 'abcd1234' }
+        { key: 'abcd1234' },
       ]),
       removeToken: (key) => {
         t.equal(key, 'abcd1234', 'deletes the correct token')
-      }
+      },
     },
     output: (spec) => {
       t.equal(spec, 'abcd1234', 'logs the token as a string')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -502,14 +498,14 @@ test('token revoke by token', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -518,21 +514,21 @@ test('token revoke by token', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: () => Promise.resolve([
-        { key: 'abcd1234', token: 'efgh5678' }
+        { key: 'abcd1234', token: 'efgh5678' },
       ]),
       removeToken: (key) => {
         t.equal(key, 'efgh5678', 'passes through user input')
-      }
+      },
     },
     output: (spec) => {
       t.equal(spec, 'Removed 1 token')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -550,9 +546,9 @@ test('token revoke requires an id', (t) => {
       gauge: {
         show: (name) => {
           t.equal(name, 'token')
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   t.tearDown(reset)
@@ -572,14 +568,14 @@ test('token revoke ambiguous id errors', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -588,16 +584,16 @@ test('token revoke ambiguous id errors', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: () => Promise.resolve([
         { key: 'abcd1234' },
-        { key: 'abcd5678' }
-      ])
-    }
+        { key: 'abcd5678' },
+      ]),
+    },
   })
 
   t.tearDown(reset)
@@ -617,14 +613,14 @@ test('token revoke unknown id errors', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       newItem: (action, len) => {
         t.equal(action, 'removing tokens')
@@ -633,15 +629,15 @@ test('token revoke unknown id errors', (t) => {
           info: (name, progress) => {
             t.equal(name, 'token')
             t.equal(progress, 'getting existing list')
-          }
+          },
         }
-      }
+      },
     },
     profile: {
       listTokens: () => Promise.resolve([
-        { key: 'abcd1234' }
-      ])
-    }
+        { key: 'abcd1234' },
+      ]),
+    },
   })
 
   t.tearDown(reset)
@@ -664,22 +660,22 @@ test('token create', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       info: (name, message) => {
         t.equal(name, 'token')
         t.equal(message, 'creating')
-      }
+      },
     },
     readUserInfo: {
-      password: () => Promise.resolve(password)
+      password: () => Promise.resolve(password),
     },
     profile: {
       createToken: (pw, readonly, cidr) => {
@@ -692,9 +688,9 @@ test('token create', (t) => {
           created: now,
           updated: now,
           readonly: false,
-          cidr_whitelist: []
+          cidr_whitelist: [],
         }
-      }
+      },
     },
     output: (spec) => {
       const lines = spec.split(/\r?\n/)
@@ -705,7 +701,7 @@ test('token create', (t) => {
       t.match(lines[5], 'readonly')
       t.match(lines[5], 'false', 'prints the readonly flag')
       t.match(lines[7], 'cidr_whitelist')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -728,22 +724,22 @@ test('token create json output', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       info: (name, message) => {
         t.equal(name, 'token')
         t.equal(message, 'creating')
-      }
+      },
     },
     readUserInfo: {
-      password: () => Promise.resolve(password)
+      password: () => Promise.resolve(password),
     },
     profile: {
       createToken: (pw, readonly, cidr) => {
@@ -756,15 +752,15 @@ test('token create json output', (t) => {
           created: now,
           updated: now,
           readonly: false,
-          cidr_whitelist: []
+          cidr_whitelist: [],
         }
-      }
+      },
     },
     output: (spec) => {
       t.type(spec, 'string', 'outputs a string')
       const parsed = JSON.parse(spec)
       t.same(parsed, { token: 'efgh5678', created: now, readonly: false, cidr_whitelist: [] }, 'outputs the correct object')
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -788,22 +784,22 @@ test('token create parseable output', (t) => {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
+        },
       },
       info: (name, message) => {
         t.equal(name, 'token')
         t.equal(message, 'creating')
-      }
+      },
     },
     readUserInfo: {
-      password: () => Promise.resolve(password)
+      password: () => Promise.resolve(password),
     },
     profile: {
       createToken: (pw, readonly, cidr) => {
@@ -816,22 +812,21 @@ test('token create parseable output', (t) => {
           created: now,
           updated: now,
           readonly: false,
-          cidr_whitelist: []
+          cidr_whitelist: [],
         }
-      }
+      },
     },
     output: (spec) => {
       ++callCount
-      if (callCount === 1) {
+      if (callCount === 1)
         t.match(spec, 'token\tefgh5678', 'prints the token')
-      } else if (callCount === 2) {
+      else if (callCount === 2)
         t.match(spec, `created\t${now}`, 'prints the created timestamp')
-      } else if (callCount === 3) {
+      else if (callCount === 3)
         t.match(spec, 'readonly\tfalse', 'prints the readonly flag')
-      } else {
+      else
         t.match(spec, 'cidr_whitelist\t', 'prints the cidr whitelist')
-      }
-    }
+    },
   })
 
   t.tearDown(reset)
@@ -844,28 +839,28 @@ test('token create parseable output', (t) => {
 test('token create ipv6 cidr', (t) => {
   t.plan(4)
 
-  const now = new Date().toISOString()
   const password = 'thisisnotreallyapassword'
 
   const [token, reset] = tokenWithMocks({
     npm: {
-      flatOptions: { registry: 'https://registry.npmjs.org', cidr: '::1/128' }, config: {
+      flatOptions: { registry: 'https://registry.npmjs.org', cidr: '::1/128' },
+      config: {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
-      }
+        },
+      },
     },
     readUserInfo: {
-      password: () => Promise.resolve(password)
-    }
+      password: () => Promise.resolve(password),
+    },
   })
 
   t.tearDown(reset)
@@ -879,28 +874,28 @@ test('token create ipv6 cidr', (t) => {
 test('token create invalid cidr', (t) => {
   t.plan(4)
 
-  const now = new Date().toISOString()
   const password = 'thisisnotreallyapassword'
 
   const [token, reset] = tokenWithMocks({
     npm: {
-      flatOptions: { registry: 'https://registry.npmjs.org', cidr: 'apple/cider' }, config: {
+      flatOptions: { registry: 'https://registry.npmjs.org', cidr: 'apple/cider' },
+      config: {
         getCredentialsByURI: (uri) => {
           t.equal(uri, 'https://registry.npmjs.org', 'requests correct registry')
           return { token: 'thisisnotarealtoken' }
-        }
-      }
+        },
+      },
     },
     log: {
       gauge: {
         show: (name) => {
           t.equal(name, 'token', 'starts a gauge')
-        }
-      }
+        },
+      },
     },
     readUserInfo: {
-      password: () => Promise.resolve(password)
-    }
+      password: () => Promise.resolve(password),
+    },
   })
 
   t.tearDown(reset)
diff --git a/deps/npm/test/lib/uninstall.js b/deps/npm/test/lib/uninstall.js
new file mode 100644
index 00000000000000..69040c0f25aecc
--- /dev/null
+++ b/deps/npm/test/lib/uninstall.js
@@ -0,0 +1,253 @@
+const fs = require('fs')
+const { resolve } = require('path')
+const t = require('tap')
+const requireInject = require('require-inject')
+
+const npm = {
+  globalDir: '',
+  flatOptions: {
+    global: false,
+    prefix: '',
+  },
+  localPrefix: '',
+}
+const mocks = {
+  '../../lib/npm.js': npm,
+  '../../lib/utils/reify-finish.js': () => Promise.resolve(),
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+const uninstall = requireInject('../../lib/uninstall.js', mocks)
+
+t.afterEach(cb => {
+  npm.globalDir = ''
+  npm.prefix = ''
+  npm.flatOptions.global = false
+  npm.flatOptions.prefix = ''
+  cb()
+})
+
+t.test('remove single installed lib', t => {
+  const path = t.testdir({
+    'package.json': JSON.stringify({
+      name: 'test-rm-single-lib',
+      version: '1.0.0',
+      dependencies: {
+        a: '*',
+        b: '*',
+      },
+    }),
+    node_modules: {
+      a: {
+        'package.json': JSON.stringify({
+          name: 'a',
+          version: '1.0.0',
+        }),
+      },
+      b: {
+        'package.json': JSON.stringify({
+          name: 'b',
+          version: '1.0.0',
+        }),
+      },
+    },
+    'package-lock.json': JSON.stringify({
+      name: 'test-rm-single-lib',
+      version: '1.0.0',
+      lockfileVersion: 2,
+      requires: true,
+      packages: {
+        '': {
+          name: 'test-rm-single-lib',
+          version: '1.0.0',
+          dependencies: {
+            a: '*',
+          },
+        },
+        'node_modules/a': {
+          version: '1.0.0',
+        },
+        'node_modules/b': {
+          version: '1.0.0',
+        },
+      },
+      dependencies: {
+        a: {
+          version: '1.0.0',
+        },
+        b: {
+          version: '1.0.0',
+        },
+      },
+    }),
+  })
+
+  const b = resolve(path, 'node_modules/b')
+  t.ok(() => fs.statSync(b))
+
+  npm.flatOptions.prefix = path
+
+  uninstall(['b'], err => {
+    if (err)
+      throw err
+
+    t.throws(() => fs.statSync(b), 'should have removed package from nm')
+    t.end()
+  })
+})
+
+t.test('remove multiple installed libs', t => {
+  const path = t.testdir({
+    node_modules: {
+      a: {
+        'package.json': JSON.stringify({
+          name: 'a',
+          version: '1.0.0',
+        }),
+      },
+      b: {
+        'package.json': JSON.stringify({
+          name: 'b',
+          version: '1.0.0',
+        }),
+      },
+    },
+    'package-lock.json': JSON.stringify({
+      name: 'test-rm-single-lib',
+      version: '1.0.0',
+      lockfileVersion: 2,
+      requires: true,
+      packages: {
+        '': {
+          name: 'test-rm-single-lib',
+          version: '1.0.0',
+          dependencies: {
+            a: '*',
+          },
+        },
+        'node_modules/a': {
+          version: '1.0.0',
+        },
+        'node_modules/b': {
+          version: '1.0.0',
+        },
+      },
+      dependencies: {
+        a: {
+          version: '1.0.0',
+        },
+        b: {
+          version: '1.0.0',
+        },
+      },
+    }),
+  })
+
+  const a = resolve(path, 'node_modules/a')
+  const b = resolve(path, 'node_modules/b')
+  t.ok(() => fs.statSync(a))
+  t.ok(() => fs.statSync(b))
+
+  npm.flatOptions.prefix = path
+
+  uninstall(['b'], err => {
+    if (err)
+      throw err
+
+    t.throws(() => fs.statSync(a), 'should have removed a package from nm')
+    t.throws(() => fs.statSync(b), 'should have removed b package from nm')
+    t.end()
+  })
+})
+
+t.test('no args local', t => {
+  const path = t.testdir()
+
+  npm.flatOptions.prefix = path
+
+  uninstall([], err => {
+    t.match(
+      err,
+      /Must provide a package name to remove/,
+      'should throw package name required error'
+    )
+
+    t.end()
+  })
+})
+
+t.test('no args global', t => {
+  const path = t.testdir({
+    lib: {
+      node_modules: {
+        a: t.fixture('symlink', '../../projects/a'),
+      },
+    },
+    projects: {
+      a: {
+        'package.json': JSON.stringify({
+          name: 'a',
+          version: '1.0.0',
+        }),
+      },
+    },
+  })
+
+  npm.localPrefix = resolve(path, 'projects', 'a')
+  npm.globalDir = resolve(path, 'lib', 'node_modules')
+  npm.flatOptions.global = true
+  npm.flatOptions.prefix = path
+
+  const a = resolve(path, 'lib/node_modules/a')
+  t.ok(() => fs.statSync(a))
+
+  uninstall([], err => {
+    if (err)
+      throw err
+
+    t.throws(() => fs.statSync(a), 'should have removed global nm symlink')
+
+    t.end()
+  })
+})
+
+t.test('no args global but no package.json', t => {
+  const path = t.testdir({})
+
+  npm.prefix = path
+  npm.localPrefix = path
+  npm.flatOptions.global = true
+
+  uninstall([], err => {
+    t.match(
+      err,
+      'usage instructions',
+      'should throw usage instructions'
+    )
+
+    t.end()
+  })
+})
+
+t.test('unknown error reading from localPrefix package.json', t => {
+  const path = t.testdir({})
+
+  const uninstall = requireInject('../../lib/uninstall.js', {
+    ...mocks,
+    'read-package-json-fast': () => Promise.reject(new Error('ERR')),
+  })
+
+  npm.prefix = path
+  npm.localPrefix = path
+  npm.flatOptions.global = true
+
+  uninstall([], err => {
+    t.match(
+      err,
+      /ERR/,
+      'should throw unknown error'
+    )
+
+    t.end()
+  })
+})
diff --git a/deps/npm/test/lib/unpublish.js b/deps/npm/test/lib/unpublish.js
new file mode 100644
index 00000000000000..11e24714d814c6
--- /dev/null
+++ b/deps/npm/test/lib/unpublish.js
@@ -0,0 +1,506 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+
+let result = ''
+const noop = () => null
+const npm = {
+  localPrefix: '',
+  flatOptions: {
+    force: false,
+    silent: false,
+    loglevel: 'silly',
+  },
+}
+const mocks = {
+  npmlog: { silly () {}, verbose () {} },
+  libnpmaccess: { lsPackages: noop },
+  libnpmpublish: { unpublish: noop },
+  'npm-package-arg': noop,
+  'npm-registry-fetch': { json: noop },
+  'read-package-json': cb => cb(),
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    result += msg.join('\n')
+  },
+  '../../lib/utils/otplease.js': async (opts, fn) => fn(opts),
+  '../../lib/utils/usage.js': () => 'usage instructions',
+  '../../lib/utils/get-identity.js': async () => 'foo',
+}
+
+t.afterEach(cb => {
+  result = ''
+  npm.flatOptions.force = false
+  npm.flatOptions.loglevel = 'silly'
+  npm.flatOptions.silent = false
+  cb()
+})
+
+t.test('no args --force', t => {
+  t.plan(9)
+
+  npm.flatOptions.force = true
+
+  const npmlog = {
+    silly (title) {
+      t.equal(title, 'unpublish', 'should silly log args')
+    },
+    verbose (title, msg) {
+      t.equal(title, 'unpublish', 'should have expected title')
+      t.match(
+        msg,
+        { name: 'pkg', version: '1.0.0' },
+        'should have msg printing package.json contents'
+      )
+    },
+  }
+
+  const npa = {
+    resolve (name, version) {
+      t.equal(name, 'pkg', 'should npa.resolve package name')
+      t.equal(version, '1.0.0', 'should npa.resolve package version')
+      return 'pkg@1.0.0'
+    },
+  }
+
+  const libnpmpublish = {
+    unpublish (spec, opts) {
+      t.equal(spec, 'pkg@1.0.0', 'should unpublish expected spec')
+      t.deepEqual(
+        opts,
+        {
+          force: true,
+          silent: false,
+          loglevel: 'silly',
+          publishConfig: undefined,
+        },
+        'should unpublish with expected opts'
+      )
+    },
+  }
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    npmlog,
+    libnpmpublish,
+    'npm-package-arg': npa,
+    'read-package-json': (path, cb) => cb(null, {
+      name: 'pkg',
+      version: '1.0.0',
+    }),
+  })
+
+  unpublish([], err => {
+    if (err)
+      throw err
+
+    t.equal(
+      result,
+      '- pkg@1.0.0',
+      'should output removed pkg@version on success'
+    )
+  })
+})
+
+t.test('no args --force missing package.json', t => {
+  npm.flatOptions.force = true
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    'read-package-json': (path, cb) => cb(Object.assign(
+      new Error('ENOENT'),
+      { code: 'ENOENT' }
+    )),
+  })
+
+  unpublish([], err => {
+    t.match(
+      err,
+      /usage instructions/,
+      'should throw usage instructions on missing package.json'
+    )
+    t.end()
+  })
+})
+
+t.test('no args --force unknown error reading package.json', t => {
+  npm.flatOptions.force = true
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    'read-package-json': (path, cb) => cb(new Error('ERR')),
+  })
+
+  unpublish([], err => {
+    t.match(
+      err,
+      /ERR/,
+      'should throw unknown error from reading package.json'
+    )
+    t.end()
+  })
+})
+
+t.test('no args', t => {
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+  })
+
+  unpublish([], err => {
+    t.match(
+      err,
+      /Refusing to delete entire project/,
+      'should throw --force required error on no args'
+    )
+    t.end()
+  })
+})
+
+t.test('too many args', t => {
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+  })
+
+  unpublish(['a', 'b'], err => {
+    t.match(
+      err,
+      /usage instructions/,
+      'should throw usage instructions if too many args'
+    )
+    t.end()
+  })
+})
+
+t.test('unpublish <pkg>@version', t => {
+  t.plan(7)
+
+  const pa = {
+    name: 'pkg',
+    rawSpec: '1.0.0',
+    type: 'version',
+  }
+
+  const npmlog = {
+    silly (title, key, value) {
+      t.equal(title, 'unpublish', 'should silly log args')
+      if (key === 'spec')
+        t.equal(value, pa, 'should log parsed npa object')
+      else
+        t.equal(value, 'pkg@1.0.0', 'should log originally passed arg')
+    },
+  }
+
+  const npa = () => pa
+
+  const libnpmpublish = {
+    unpublish (spec, opts) {
+      t.equal(spec, pa, 'should unpublish expected parsed spec')
+      t.deepEqual(
+        opts,
+        {
+          force: false,
+          silent: false,
+          loglevel: 'silly',
+        },
+        'should unpublish with expected opts'
+      )
+    },
+  }
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    npmlog,
+    libnpmpublish,
+    'npm-package-arg': npa,
+  })
+
+  unpublish(['pkg@1.0.0'], err => {
+    if (err)
+      throw err
+
+    t.equal(
+      result,
+      '- pkg@1.0.0',
+      'should output removed pkg@version on success'
+    )
+  })
+})
+
+t.test('no version found in package.json', t => {
+  npm.flatOptions.force = true
+
+  const npa = () => ({
+    name: 'pkg',
+    type: 'version',
+  })
+
+  npa.resolve = () => ''
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    'npm-package-arg': npa,
+    'read-package-json': (path, cb) => cb(null, {
+      name: 'pkg',
+    }),
+  })
+
+  unpublish([], err => {
+    if (err)
+      throw err
+
+    t.equal(
+      result,
+      '- pkg',
+      'should output removed pkg on success'
+    )
+    t.end()
+  })
+})
+
+t.test('unpublish <pkg> --force no version set', t => {
+  npm.flatOptions.force = true
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    'npm-package-arg': () => ({
+      name: 'pkg',
+      rawSpec: '',
+      type: 'tag',
+    }),
+  })
+
+  unpublish(['pkg'], err => {
+    if (err)
+      throw err
+
+    t.equal(
+      result,
+      '- pkg',
+      'should output pkg removed'
+    )
+    t.end()
+  })
+})
+
+t.test('silent', t => {
+  npm.flatOptions.loglevel = 'silent'
+
+  const npa = () => ({
+    name: 'pkg',
+    rawSpec: '1.0.0',
+    type: 'version',
+  })
+
+  npa.resolve = () => ''
+
+  const unpublish = requireInject('../../lib/unpublish.js', {
+    ...mocks,
+    'npm-package-arg': npa,
+  })
+
+  unpublish(['pkg@1.0.0'], err => {
+    if (err)
+      throw err
+
+    t.equal(
+      result,
+      '',
+      'should have no output'
+    )
+    t.end()
+  })
+})
+
+t.test('completion', t => {
+  const testComp = (t, { completion, argv, partialWord, expect, title }) =>
+    new Promise((resolve, rej) => {
+      completion({conf: {argv: {remain: argv}}, partialWord}, (er, res) => {
+        if (er)
+          rej(er)
+        t.strictSame(res, expect, title || argv.join(' '))
+        resolve()
+      })
+    })
+
+  t.test('completing with multiple versions from the registry', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      libnpmaccess: {
+        async lsPackages () {
+          return {
+            pkg: 'write',
+            bar: 'write',
+          }
+        },
+      },
+      'npm-package-arg': require('npm-package-arg'),
+      'npm-registry-fetch': {
+        async json () {
+          return {
+            versions: {
+              '1.0.0': {},
+              '1.0.1': {},
+              '2.0.0': {},
+            },
+          }
+        },
+      },
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: 'pkg',
+      expect: [
+        'pkg@1.0.0',
+        'pkg@1.0.1',
+        'pkg@2.0.0',
+      ],
+    })
+  })
+
+  t.test('no versions retrieved', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      libnpmaccess: {
+        async lsPackages () {
+          return {
+            pkg: 'write',
+            bar: 'write',
+          }
+        },
+      },
+      'npm-package-arg': require('npm-package-arg'),
+      'npm-registry-fetch': {
+        async json () {
+          return {
+            versions: {},
+          }
+        },
+      },
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: 'pkg',
+      expect: [
+        'pkg',
+      ],
+      title: 'should autocomplete package name only',
+    })
+  })
+
+  t.test('packages starting with same letters', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      libnpmaccess: {
+        async lsPackages () {
+          return {
+            pkg: 'write',
+            pkga: 'write',
+            pkgb: 'write',
+          }
+        },
+      },
+      'npm-package-arg': require('npm-package-arg'),
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: 'pkg',
+      expect: [
+        'pkg',
+        'pkga',
+        'pkgb',
+      ],
+    })
+  })
+
+  t.test('no packages retrieved', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      libnpmaccess: {
+        async lsPackages () {
+          return {}
+        },
+      },
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: 'pkg',
+      expect: [],
+      title: 'should have no autocompletion',
+    })
+  })
+
+  t.test('no pkg name to complete', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      libnpmaccess: {
+        async lsPackages () {
+          return {
+            pkg: {},
+            bar: {},
+          }
+        },
+      },
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: undefined,
+      expect: ['pkg', 'bar'],
+      title: 'should autocomplete with available package names from user',
+    })
+  })
+
+  t.test('no pkg names retrieved from user account', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      libnpmaccess: {
+        async lsPackages () {
+          return null
+        },
+      },
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: 'pkg',
+      expect: [],
+      title: 'should have no autocomplete',
+    })
+  })
+
+  t.test('logged out user', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', {
+      ...mocks,
+      '../../lib/utils/get-identity.js': () => Promise.reject(new Error('ERR')),
+    })
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish'],
+      partialWord: 'pkg',
+      expect: [],
+    })
+  })
+
+  t.test('too many args', async t => {
+    const { completion } = requireInject('../../lib/unpublish.js', mocks)
+
+    await testComp(t, {
+      completion,
+      argv: ['npm', 'unpublish', 'foo'],
+      partialWord: undefined,
+      expect: [],
+    })
+  })
+
+  t.end()
+})
diff --git a/deps/npm/test/lib/unstar.js b/deps/npm/test/lib/unstar.js
new file mode 100644
index 00000000000000..63b2028a18eeec
--- /dev/null
+++ b/deps/npm/test/lib/unstar.js
@@ -0,0 +1,28 @@
+const requireInject = require('require-inject')
+const t = require('tap')
+
+t.test('unstar', t => {
+  t.plan(3)
+
+  const unstar = requireInject('../../lib/unstar.js', {
+    '../../lib/npm.js': {
+      config: {
+        set: (key, value) => {
+          t.equal(key, 'star.unstar', 'should set unstar config value')
+          t.equal(value, true, 'should set a truthy value')
+        },
+      },
+      commands: {
+        star: (args, cb) => {
+          t.deepEqual(args, ['pkg'], 'should forward packages')
+          cb()
+        },
+      },
+    },
+  })
+
+  unstar(['pkg'], err => {
+    if (err)
+      throw err
+  })
+})
diff --git a/deps/npm/test/lib/update.js b/deps/npm/test/lib/update.js
new file mode 100644
index 00000000000000..993fbbab563c5e
--- /dev/null
+++ b/deps/npm/test/lib/update.js
@@ -0,0 +1,162 @@
+const { resolve } = require('path')
+const t = require('tap')
+const requireInject = require('require-inject')
+
+const noop = () => null
+const npm = {
+  globalDir: '',
+  flatOptions: {
+    depth: 0,
+    global: false,
+  },
+  prefix: '',
+}
+const mocks = {
+  npmlog: { warn () {} },
+  '@npmcli/arborist': class {
+    reify () {}
+  },
+  '../../lib/npm.js': npm,
+  '../../lib/utils/reify-finish.js': noop,
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+t.afterEach(cb => {
+  npm.prefix = ''
+  npm.flatOptions.global = false
+  npm.globalDir = ''
+  cb()
+})
+
+t.test('no args', t => {
+  t.plan(3)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    reify ({ update }) {
+      t.equal(update, true, 'should update all deps')
+    }
+  }
+
+  const update = requireInject('../../lib/update.js', {
+    ...mocks,
+    '../../lib/utils/reify-finish.js': (arb) => {
+      t.isLike(arb, Arborist, 'should reify-finish with arborist instance')
+    },
+    '@npmcli/arborist': Arborist,
+  })
+
+  update([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('with args', t => {
+  t.plan(3)
+
+  npm.prefix = '/project/a'
+
+  class Arborist {
+    constructor (args) {
+      t.deepEqual(
+        args,
+        { ...npm.flatOptions, path: npm.prefix },
+        'should call arborist contructor with expected args'
+      )
+    }
+
+    reify ({ update }) {
+      t.deepEqual(update, ['ipt'], 'should update listed deps')
+    }
+  }
+
+  const update = requireInject('../../lib/update.js', {
+    ...mocks,
+    '../../lib/utils/reify-finish.js': (arb) => {
+      t.isLike(arb, Arborist, 'should reify-finish with arborist instance')
+    },
+    '@npmcli/arborist': Arborist,
+  })
+
+  update(['ipt'], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('update --depth=<number>', t => {
+  t.plan(2)
+
+  npm.prefix = '/project/a'
+  npm.flatOptions.depth = 1
+
+  const update = requireInject('../../lib/update.js', {
+    ...mocks,
+    npmlog: {
+      warn: (title, msg) => {
+        t.equal(title, 'update', 'should print expected title')
+        t.match(
+          msg,
+          /The --depth option no longer has any effect/,
+          'should print expected warning message'
+        )
+      },
+    },
+  })
+
+  update([], err => {
+    if (err)
+      throw err
+  })
+})
+
+t.test('update --global', t => {
+  t.plan(2)
+
+  const normalizePath = p => p.replace(/\\+/g, '/')
+  const redactCwd = (path) => normalizePath(path)
+    .replace(new RegExp(normalizePath(process.cwd()), 'g'), '{CWD}')
+
+  npm.prefix = '/project/a'
+  npm.globalDir = resolve(process.cwd(), 'global/lib/node_modules')
+  npm.flatOptions.global = true
+
+  class Arborist {
+    constructor (args) {
+      const { path, ...opts } = args
+      t.deepEqual(
+        opts,
+        npm.flatOptions,
+        'should call arborist contructor with expected options'
+      )
+
+      t.equal(
+        redactCwd(path),
+        '{CWD}/global/lib',
+        'should run with expected prefix'
+      )
+    }
+
+    reify () {}
+  }
+
+  const update = requireInject('../../lib/update.js', {
+    ...mocks,
+    '@npmcli/arborist': Arborist,
+  })
+
+  update([], err => {
+    if (err)
+      throw err
+  })
+})
diff --git a/deps/npm/test/lib/utils/audit-error.js b/deps/npm/test/lib/utils/audit-error.js
index f183a16e8d005f..cc5f4c006e14fc 100644
--- a/deps/npm/test/lib/utils/audit-error.js
+++ b/deps/npm/test/lib/utils/audit-error.js
@@ -6,14 +6,14 @@ const npm = {
   command: null,
   flatOptions: {},
   log: {
-    warn: (...msg) => LOGS.push(msg)
-  }
+    warn: (...msg) => LOGS.push(msg),
+  },
 }
 const OUTPUT = []
 const output = (...msg) => OUTPUT.push(msg)
 const auditError = requireInject('../../../lib/utils/audit-error.js', {
   '../../../lib/npm.js': npm,
-  '../../../lib/utils/output.js': output
+  '../../../lib/utils/output.js': output,
 })
 
 t.afterEach(cb => {
@@ -40,10 +40,10 @@ t.test('error, not audit command', t => {
       method: 'POST',
       uri: 'https://example.com/not/a/registry',
       headers: {
-        head: ['ers']
+        head: ['ers'],
       },
-      statusCode: '420'
-    }
+      statusCode: '420',
+    },
   }), true, 'had error')
   t.strictSame(OUTPUT, [], 'no output')
   t.strictSame(LOGS, [], 'no warnings')
@@ -60,14 +60,14 @@ t.test('error, audit command, not json', t => {
       method: 'POST',
       uri: 'https://example.com/not/a/registry',
       headers: {
-        head: ['ers']
+        head: ['ers'],
       },
-      statusCode: '420'
-    }
+      statusCode: '420',
+    },
   }))
 
-  t.strictSame(OUTPUT, [ [ 'body' ] ], 'some output')
-  t.strictSame(LOGS, [ [ 'audit', 'message' ] ], 'some warnings')
+  t.strictSame(OUTPUT, [['body']], 'some output')
+  t.strictSame(LOGS, [['audit', 'message']], 'some warnings')
   t.end()
 })
 
@@ -81,10 +81,10 @@ t.test('error, audit command, json', t => {
       method: 'POST',
       uri: 'https://example.com/not/a/registry',
       headers: {
-        head: ['ers']
+        head: ['ers'],
       },
-      statusCode: '420'
-    }
+      statusCode: '420',
+    },
   }))
 
   t.strictSame(OUTPUT, [
@@ -102,9 +102,9 @@ t.test('error, audit command, json', t => {
         '  "body": {\n' +
         '    "response": "body"\n' +
         '  }\n' +
-        '}'
-    ]
+        '}',
+    ],
   ], 'some output')
-  t.strictSame(LOGS, [ [ 'audit', 'message' ] ], 'some warnings')
+  t.strictSame(LOGS, [['audit', 'message']], 'some warnings')
   t.end()
 })
diff --git a/deps/npm/test/lib/utils/cleanup-log-files.js b/deps/npm/test/lib/utils/cleanup-log-files.js
index ee2c11e62ab7ae..7af0633fe715dd 100644
--- a/deps/npm/test/lib/utils/cleanup-log-files.js
+++ b/deps/npm/test/lib/utils/cleanup-log-files.js
@@ -6,7 +6,7 @@ const rimraf = require('rimraf')
 const mocks = { glob, rimraf }
 const cleanup = requireInject('../../../lib/utils/cleanup-log-files.js', {
   glob: (...args) => mocks.glob(...args),
-  rimraf: (...args) => mocks.rimraf(...args)
+  rimraf: (...args) => mocks.rimraf(...args),
 })
 const { basename } = require('path')
 
@@ -19,15 +19,15 @@ t.test('clean up those files', t => {
       '2-debug.log': 'hello',
       '3-debug.log': 'hello',
       '4-debug.log': 'hello',
-      '5-debug.log': 'hello'
-    }
+      '5-debug.log': 'hello',
+    },
   })
   const warn = (...warning) => t.fail('failed cleanup', { warning })
   return cleanup(cache, 3, warn).then(() => {
     t.strictSame(fs.readdirSync(cache + '/_logs').sort(), [
       '3-debug.log',
       '4-debug.log',
-      '5-debug.log'
+      '5-debug.log',
     ])
   })
 })
@@ -36,14 +36,14 @@ t.test('nothing to clean up', t => {
   const cache = t.testdir({
     _logs: {
       '4-debug.log': 'hello',
-      '5-debug.log': 'hello'
-    }
+      '5-debug.log': 'hello',
+    },
   })
   const warn = (...warning) => t.fail('failed cleanup', { warning })
   return cleanup(cache, 3, warn).then(() => {
     t.strictSame(fs.readdirSync(cache + '/_logs').sort(), [
       '4-debug.log',
-      '5-debug.log'
+      '5-debug.log',
     ])
   })
 })
@@ -66,15 +66,15 @@ t.test('rimraf fail', t => {
       '2-debug.log': 'hello',
       '3-debug.log': 'hello',
       '4-debug.log': 'hello',
-      '5-debug.log': 'hello'
-    }
+      '5-debug.log': 'hello',
+    },
   })
   const warnings = []
   const warn = (...warning) => warnings.push(basename(warning[2]))
   return cleanup(cache, 3, warn).then(() => {
     t.strictSame(warnings.sort((a, b) => a.localeCompare(b)), [
       '1-debug.log',
-      '2-debug.log'
+      '2-debug.log',
     ])
   })
 })
diff --git a/deps/npm/test/lib/utils/completion/installed-deep.js b/deps/npm/test/lib/utils/completion/installed-deep.js
index 74c15e8f77c9f8..a2a3756104f4b7 100644
--- a/deps/npm/test/lib/utils/completion/installed-deep.js
+++ b/deps/npm/test/lib/utils/completion/installed-deep.js
@@ -7,19 +7,25 @@ let globalDir = 'MISSING_GLOBAL_DIR'
 const _flatOptions = {
   depth: Infinity,
   global: false,
-  get prefix () { return prefix }
+  get prefix () {
+    return prefix
+  },
 }
 const installedDeep = requireInject('../../../../lib/utils/completion/installed-deep.js', {
   '../../../../lib/npm.js': {
     flatOptions: _flatOptions,
-    get prefix () { return _flatOptions.prefix },
-    get globalDir () { return globalDir },
+    get prefix () {
+      return _flatOptions.prefix
+    },
+    get globalDir () {
+      return globalDir
+    },
     config: {
       get (key) {
         return _flatOptions[key]
-      }
-    }
-  }
+      },
+    },
+  },
 })
 
 const fixture = {
@@ -29,14 +35,14 @@ const fixture = {
     dependencies: {
       a: '^1.0.0',
       b: '^1.0.0',
-      c: '^1.0.0'
+      c: '^1.0.0',
     },
     devDependencies: {
-      d: '^1.0.0'
+      d: '^1.0.0',
     },
     peerDependencies: {
-      e: '^1.0.0'
-    }
+      e: '^1.0.0',
+    },
   }),
   node_modules: {
     a: {
@@ -44,33 +50,33 @@ const fixture = {
         name: 'a',
         version: '1.0.0',
         dependencies: {
-          f: '^1.0.0'
-        }
-      })
+          f: '^1.0.0',
+        },
+      }),
     },
     b: {
       'package.json': JSON.stringify({
         name: 'b',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     c: {
       'package.json': JSON.stringify({
         name: 'c',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     d: {
       'package.json': JSON.stringify({
         name: 'd',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     e: {
       'package.json': JSON.stringify({
         name: 'e',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     f: {
       'package.json': JSON.stringify({
@@ -78,8 +84,8 @@ const fixture = {
         version: '1.0.0',
         dependencies: {
           g: '^1.0.0',
-          e: '^2.0.0'
-        }
+          e: '^2.0.0',
+        },
       }),
       node_modules: {
         e: {
@@ -87,27 +93,27 @@ const fixture = {
             name: 'e',
             version: '2.0.0',
             dependencies: {
-              bb: '^1.0.0'
-            }
+              bb: '^1.0.0',
+            },
           }),
           node_modules: {
             bb: {
               'package.json': JSON.stringify({
                 name: 'bb',
-                version: '1.0.0'
-              })
-            }
-          }
-        }
-      }
+                version: '1.0.0',
+              }),
+            },
+          },
+        },
+      },
     },
     g: {
       'package.json': JSON.stringify({
         name: 'g',
-        version: '1.0.0'
-      })
-    }
-  }
+        version: '1.0.0',
+      }),
+    },
+  },
 }
 
 const globalFixture = {
@@ -115,33 +121,33 @@ const globalFixture = {
     foo: {
       'package.json': JSON.stringify({
         name: 'foo',
-        version: '1.0.0'
-      })
+        version: '1.0.0',
+      }),
     },
     bar: {
       'package.json': JSON.stringify({
         name: 'bar',
         version: '1.0.0',
         dependencies: {
-          'a-bar': '^1.0.0'
-        }
+          'a-bar': '^1.0.0',
+        },
       }),
       node_modules: {
         'a-bar': {
           'package.json': JSON.stringify({
             name: 'a-bar',
-            version: '1.0.0'
-          })
-        }
-      }
-    }
-  }
+            version: '1.0.0',
+          }),
+        },
+      },
+    },
+  },
 }
 
 test('get list of package names', (t) => {
   const fix = t.testdir({
     local: fixture,
-    global: globalFixture
+    global: globalFixture,
   })
 
   prefix = resolve(fix, 'local')
@@ -152,12 +158,12 @@ test('get list of package names', (t) => {
     t.deepEqual(
       res,
       [
-        [ 'bar', '-g' ],
-        [ 'foo', '-g' ],
-        [ 'a-bar', '-g' ],
+        ['bar', '-g'],
+        ['foo', '-g'],
+        ['a-bar', '-g'],
         'a', 'b', 'c',
         'd', 'e', 'f',
-        'g', 'bb'
+        'g', 'bb',
       ],
       'should return list of package names and global flag'
     )
@@ -168,7 +174,7 @@ test('get list of package names', (t) => {
 test('get list of package names as global', (t) => {
   const fix = t.testdir({
     local: fixture,
-    global: globalFixture
+    global: globalFixture,
   })
 
   prefix = resolve(fix, 'local')
@@ -183,7 +189,7 @@ test('get list of package names as global', (t) => {
       [
         'bar',
         'foo',
-        'a-bar'
+        'a-bar',
       ],
       'should return list of global packages with no extra flags'
     )
@@ -195,7 +201,7 @@ test('get list of package names as global', (t) => {
 test('limit depth', (t) => {
   const fix = t.testdir({
     local: fixture,
-    global: globalFixture
+    global: globalFixture,
   })
 
   prefix = resolve(fix, 'local')
@@ -208,12 +214,12 @@ test('limit depth', (t) => {
     t.deepEqual(
       res,
       [
-        [ 'bar', '-g' ],
-        [ 'foo', '-g' ],
+        ['bar', '-g'],
+        ['foo', '-g'],
         'a', 'b',
         'c', 'd',
         'e', 'f',
-        'g'
+        'g',
       ],
       'should print only packages up to the specified depth'
     )
@@ -225,7 +231,7 @@ test('limit depth', (t) => {
 test('limit depth as global', (t) => {
   const fix = t.testdir({
     local: fixture,
-    global: globalFixture
+    global: globalFixture,
   })
 
   prefix = resolve(fix, 'local')
@@ -240,7 +246,7 @@ test('limit depth as global', (t) => {
       res,
       [
         'bar',
-        'foo'
+        'foo',
       ],
       'should reorder so that packages above that level depth goes last'
     )
diff --git a/deps/npm/test/lib/utils/completion/installed-shallow.js b/deps/npm/test/lib/utils/completion/installed-shallow.js
index eb628a8ce81e31..1d6369bc782545 100644
--- a/deps/npm/test/lib/utils/completion/installed-shallow.js
+++ b/deps/npm/test/lib/utils/completion/installed-shallow.js
@@ -6,7 +6,7 @@ const { resolve } = require('path')
 
 const p = '../../../../lib/utils/completion/installed-shallow.js'
 const installed = requireInject(p, {
-  '../../../../lib/npm.js': npm
+  '../../../../lib/npm.js': npm,
 })
 
 t.test('global not set, include globals with -g', t => {
@@ -15,32 +15,32 @@ t.test('global not set, include globals with -g', t => {
       node_modules: {
         x: {},
         '@scope': {
-          y: {}
-        }
-      }
+          y: {},
+        },
+      },
     },
     local: {
       node_modules: {
         a: {},
         '@scope': {
-          b: {}
-        }
-      }
-    }
+          b: {},
+        },
+      },
+    },
   })
   npm.globalDir = resolve(dir, 'global/node_modules')
   npm.localDir = resolve(dir, 'local/node_modules')
   flatOptions.global = false
   const opt = { conf: { argv: { remain: [] } } }
   installed(opt, (er, res) => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame(res.sort(), [
       '@scope/y -g',
       'x -g',
       'a',
-      '@scope/b'
+      '@scope/b',
     ].sort())
     t.end()
   })
@@ -52,18 +52,18 @@ t.test('global set, include globals and not locals', t => {
       node_modules: {
         x: {},
         '@scope': {
-          y: {}
-        }
-      }
+          y: {},
+        },
+      },
     },
     local: {
       node_modules: {
         a: {},
         '@scope': {
-          b: {}
-        }
-      }
-    }
+          b: {},
+        },
+      },
+    },
   })
   npm.globalDir = resolve(dir, 'global/node_modules')
   npm.localDir = resolve(dir, 'local/node_modules')
@@ -72,7 +72,7 @@ t.test('global set, include globals and not locals', t => {
   installed(opt, (er, res) => {
     t.strictSame(res.sort(), [
       '@scope/y',
-      'x'
+      'x',
     ].sort())
     t.end()
   })
@@ -84,27 +84,27 @@ t.test('more than 3 items in argv, skip it', t => {
       node_modules: {
         x: {},
         '@scope': {
-          y: {}
-        }
-      }
+          y: {},
+        },
+      },
     },
     local: {
       node_modules: {
         a: {},
         '@scope': {
-          b: {}
-        }
-      }
-    }
+          b: {},
+        },
+      },
+    },
   })
   npm.globalDir = resolve(dir, 'global/node_modules')
   npm.localDir = resolve(dir, 'local/node_modules')
   flatOptions.global = false
   const opt = { conf: { argv: { remain: [1, 2, 3, 4, 5, 6] } } }
   installed(opt, (er, res) => {
-    if (er) {
+    if (er)
       throw er
-    }
+
     t.strictSame(res, null)
     t.end()
   })
diff --git a/deps/npm/test/lib/utils/completion/none.js b/deps/npm/test/lib/utils/completion/none.js
index 27f713b81e16b8..70488be07ec159 100644
--- a/deps/npm/test/lib/utils/completion/none.js
+++ b/deps/npm/test/lib/utils/completion/none.js
@@ -1,6 +1,6 @@
 const t = require('tap')
 const none = require('../../../../lib/utils/completion/none.js')
-none({any:'thing'}, (er, res) => {
+none({any: 'thing'}, (er, res) => {
   t.equal(er, null)
   t.strictSame(res, [])
 })
diff --git a/deps/npm/test/lib/utils/config.js b/deps/npm/test/lib/utils/config.js
index e8133eecb24f1b..38fbe6753e75b0 100644
--- a/deps/npm/test/lib/utils/config.js
+++ b/deps/npm/test/lib/utils/config.js
@@ -4,25 +4,25 @@ Object.defineProperty(process, 'umask', {
   value: () => 0o26,
   writable: true,
   configurable: true,
-  enumerable: true
+  enumerable: true,
 })
 
 // have to fake the node version, or else it'll only pass on this one
 Object.defineProperty(process, 'version', {
-  value: 'v14.8.0'
+  value: 'v14.8.0',
 })
 
 t.formatSnapshot = obj => {
-  if (typeof obj !== 'object' || !obj || !obj.types) {
+  if (typeof obj !== 'object' || !obj || !obj.types)
     return obj
-  }
+
   return {
     ...obj,
     defaults: {
       ...obj.defaults,
-      cache: '{CACHE DIR} ' + path.basename(obj.defaults.cache)
+      cache: '{CACHE DIR} ' + path.basename(obj.defaults.cache),
     },
-    types: formatTypes(obj.types)
+    types: formatTypes(obj.types),
   }
 }
 
@@ -38,19 +38,18 @@ const formatTypes = (types) => Object.entries(types).map(([key, value]) => {
 }, {})
 
 const formatTypeValue = (value) => {
-  if (Array.isArray(value)) {
+  if (Array.isArray(value))
     return value.map(formatTypeValue)
-  } else if (value === url) {
+  else if (value === url)
     return '{URL MODULE}'
-  } else if (value === path) {
+  else if (value === path)
     return '{PATH MODULE}'
-  } else if (value === semver) {
+  else if (value === semver)
     return '{SEMVER MODULE}'
-  } else if (typeof value === 'function') {
+  else if (typeof value === 'function')
     return `{${value.name} TYPE}`
-  } else {
+  else
     return value
-  }
 }
 
 process.env.ComSpec = 'cmd.exe'
@@ -65,8 +64,8 @@ const networkInterfacesThrow = () => {
   throw new Error('no network interfaces for some reason')
 }
 const networkInterfaces = () => ({
-  'eth420': [{ address: '127.0.0.1' }],
-  'eth69': [{ address: 'no place like home' }]
+  eth420: [{ address: '127.0.0.1' }],
+  eth69: [{ address: 'no place like home' }],
 })
 const tmpdir = () => '/tmp'
 const os = { networkInterfaces, tmpdir }
@@ -77,7 +76,7 @@ t.test('working network interfaces, not windows', t => {
     os,
     '@npmcli/ci-detect': () => false,
     '../../../lib/utils/is-windows.js': false,
-    '../../../package.json': pkg
+    '../../../package.json': pkg,
   })
   t.matchSnapshot(config)
   t.end()
@@ -88,7 +87,7 @@ t.test('no working network interfaces, on windows', t => {
     os: { tmpdir, networkInterfaces: networkInterfacesThrow },
     '@npmcli/ci-detect': () => false,
     '../../../lib/utils/is-windows.js': true,
-    '../../../package.json': pkg
+    '../../../package.json': pkg,
   })
   t.matchSnapshot(config)
   t.end()
@@ -99,21 +98,21 @@ t.test('no process.umask() method', t => {
     value: null,
     writable: true,
     configurable: true,
-    enumerable: true
+    enumerable: true,
   })
   t.teardown(() => {
     Object.defineProperty(process, 'umask', {
       value: () => 0o26,
       writable: true,
       configurable: true,
-      enumerable: true
+      enumerable: true,
     })
   })
   const config = requireInject('../../../lib/utils/config.js', {
     os: { tmpdir, networkInterfaces: networkInterfacesThrow },
     '@npmcli/ci-detect': () => false,
     '../../../lib/utils/is-windows.js': true,
-    '../../../package.json': pkg
+    '../../../package.json': pkg,
   })
   t.equal(config.defaults.umask, 0o22)
   t.matchSnapshot(config)
@@ -125,7 +124,7 @@ t.test('no comspec on windows', t => {
   const config = requireInject('../../../lib/utils/config.js', {
     os: { tmpdir, networkInterfaces: networkInterfacesThrow },
     '@npmcli/ci-detect': () => false,
-    '../../../lib/utils/is-windows.js': true
+    '../../../lib/utils/is-windows.js': true,
   })
   t.equal(config.defaults.shell, 'cmd')
   t.end()
@@ -136,7 +135,7 @@ t.test('no shell on posix', t => {
   const config = requireInject('../../../lib/utils/config.js', {
     os,
     '@npmcli/ci-detect': () => false,
-    '../../../lib/utils/is-windows.js': false
+    '../../../lib/utils/is-windows.js': false,
   })
   t.equal(config.defaults.shell, 'sh')
   t.end()
@@ -147,7 +146,7 @@ t.test('no EDITOR env, use VISUAL', t => {
   const config = requireInject('../../../lib/utils/config.js', {
     os,
     '@npmcli/ci-detect': () => false,
-    '../../../lib/utils/is-windows.js': false
+    '../../../lib/utils/is-windows.js': false,
   })
   t.equal(config.defaults.editor, 'mate')
   t.end()
@@ -158,7 +157,7 @@ t.test('no VISUAL, use system default, not windows', t => {
   const config = requireInject('../../../lib/utils/config.js', {
     os,
     '@npmcli/ci-detect': () => false,
-    '../../../lib/utils/is-windows.js': false
+    '../../../lib/utils/is-windows.js': false,
   })
   t.equal(config.defaults.editor, 'vi')
   t.end()
@@ -169,7 +168,7 @@ t.test('no VISUAL, use system default, not windows', t => {
   const config = requireInject('../../../lib/utils/config.js', {
     os,
     '@npmcli/ci-detect': () => false,
-    '../../../lib/utils/is-windows.js': true
+    '../../../lib/utils/is-windows.js': true,
   })
   t.equal(config.defaults.editor, 'notepad.exe')
   t.end()
diff --git a/deps/npm/test/lib/utils/error-handler.js b/deps/npm/test/lib/utils/error-handler.js
index 840b3a35650313..2dc116a4d31711 100644
--- a/deps/npm/test/lib/utils/error-handler.js
+++ b/deps/npm/test/lib/utils/error-handler.js
@@ -26,23 +26,23 @@ t.cleanSnapshot = (str) => redactCwd(str)
 // internal modules mocks
 const cacheFile = {
   append: () => null,
-  write: () => null
+  write: () => null,
 }
 const config = {
   values: {
     cache: 'cachefolder',
-    timing: true
+    timing: true,
   },
   loaded: true,
   updateNotification: null,
   get (key) {
     return this.values[key]
-  }
+  },
 }
 
 const npm = {
   version: '1.0.0',
-  config
+  config,
 }
 
 const npmlog = {
@@ -52,26 +52,34 @@ const npmlog = {
       id: this.record.length,
       level,
       message: args.reduce((res, i) => `${res} ${i.message ? i.message : i}`, ''),
-      prefix: level !== 'verbose' ? 'foo' : ''
+      prefix: level !== 'verbose' ? 'foo' : '',
     })
   },
-  error (...args) { this.log('error', ...args) },
-  info (...args) { this.log('info', ...args) },
+  error (...args) {
+    this.log('error', ...args)
+  },
+  info (...args) {
+    this.log('info', ...args)
+  },
   level: 'silly',
   levels: {
     silly: 0,
     verbose: 1,
     info: 2,
     error: 3,
-    silent: 4
+    silent: 4,
+  },
+  notice (...args) {
+    this.log('notice', ...args)
   },
-  notice (...args) { this.log('notice', ...args) },
   record: [],
-  verbose (...args) { this.log('verbose', ...args) }
+  verbose (...args) {
+    this.log('verbose', ...args)
+  },
 }
 
 const metrics = {
-  stop: () => null
+  stop: () => null,
 }
 
 // overrides OS type/release for cross platform snapshots
@@ -96,8 +104,10 @@ process = Object.assign(
     exit () {},
     exitCode: 0,
     version: 'v1.0.0',
-    stdout: { write (_, cb) { cb() } },
-    stderr: { write () {} }
+    stdout: { write (_, cb) {
+      cb()
+    } },
+    stderr: { write () {} },
   }
 )
 // needs to put process back in its place
@@ -112,10 +122,10 @@ const mocks = {
   '../../../lib/utils/error-message.js': (err) => ({
     ...err,
     summary: [['ERR', err.message]],
-    detail: [['ERR', err.message]]
+    detail: [['ERR', err.message]],
   }),
   '../../../lib/utils/metrics.js': metrics,
-  '../../../lib/utils/cache-file.js': cacheFile
+  '../../../lib/utils/cache-file.js': cacheFile,
 }
 
 requireInject.installGlobally('../../../lib/utils/error-handler.js', mocks)
@@ -218,16 +228,16 @@ t.test('console.log output using --json', (t) => {
 
   config.values.json = true
 
-  const _log = console.log
-  console.log = (jsonOutput) => {
+  const _error = console.error
+  console.error = (jsonOutput) => {
     t.deepEqual(
       JSON.parse(jsonOutput),
       {
         error: {
           code: 'EBADTHING', // should default error code to E[A-Z]+
           summary: 'Error: EBADTHING Something happened',
-          detail: 'Error: EBADTHING Something happened'
-        }
+          detail: 'Error: EBADTHING Something happened',
+        },
       },
       'should output expected json output'
     )
@@ -236,7 +246,7 @@ t.test('console.log output using --json', (t) => {
   errorHandler(new Error('Error: EBADTHING Something happened'))
 
   t.teardown(() => {
-    console.log = _log
+    console.error = _error
     delete config.values.json
   })
 })
@@ -246,7 +256,7 @@ t.test('throw a non-error obj', (t) => {
 
   const weirdError = {
     code: 'ESOMETHING',
-    message: 'foo bar'
+    message: 'foo bar',
   }
 
   const _logError = npmlog.error
@@ -379,7 +389,7 @@ t.test('uses code from errno', (t) => {
   errorHandler(Object.assign(
     new Error('Error with errno'),
     {
-      errno: 127
+      errno: 127,
     }
   ))
 
@@ -408,7 +418,7 @@ t.test('uses exitCode as code if using a number', (t) => {
   errorHandler(Object.assign(
     new Error('Error with code type number'),
     {
-      code: 404
+      code: 404,
     }
   ))
 
@@ -464,7 +474,7 @@ t.test('defaults to log error msg if stack is missing', (t) => {
     new Error('Error with no stack'),
     {
       code: 'ENOSTACK',
-      errno: 127
+      errno: 127,
     }
   )
   delete noStackErr.stack
diff --git a/deps/npm/test/lib/utils/error-message.js b/deps/npm/test/lib/utils/error-message.js
index 2647a8e1994ea1..86db7c94bad496 100644
--- a/deps/npm/test/lib/utils/error-message.js
+++ b/deps/npm/test/lib/utils/error-message.js
@@ -7,13 +7,13 @@ process.getgid = () => 420
 
 Object.defineProperty(process, 'arch', {
   value: 'x64',
-  configurable: true
+  configurable: true,
 })
 
 const beWindows = () => {
   Object.defineProperty(process, 'platform', {
     value: 'win32',
-    configurable: true
+    configurable: true,
   })
   delete require.cache[require.resolve('../../../lib/utils/is-windows.js')]
 }
@@ -21,7 +21,7 @@ const beWindows = () => {
 const bePosix = () => {
   Object.defineProperty(process, 'platform', {
     value: 'posix',
-    configurable: true
+    configurable: true,
   })
   delete require.cache[require.resolve('../../../lib/utils/is-windows.js')]
 }
@@ -33,22 +33,21 @@ npm.config = {
   loaded: false,
   localPrefix: '/some/prefix/dir',
   get: key => {
-    if (key === 'cache') {
+    if (key === 'cache')
       return CACHE
-    } else if (key === 'node-version') {
+    else if (key === 'node-version')
       return '99.99.99'
-    } else if (key === 'global') {
+    else if (key === 'global')
       return false
-    } else {
+    else
       throw new Error('unexpected config lookup: ' + key)
-    }
-  }
+  },
 }
 
 npm.version = '123.69.420-npm'
 Object.defineProperty(process, 'version', {
   value: '123.69.420-node',
-  configurable: true
+  configurable: true,
 })
 
 const npmlog = require('npmlog')
@@ -64,8 +63,8 @@ const errorMessage = requireInject('../../../lib/utils/error-message.js', {
     report: (...args) => {
       EXPLAIN_CALLED.push(args)
       return 'explanation'
-    }
-  }
+    },
+  },
 })
 
 t.test('just simple messages', t => {
@@ -92,7 +91,7 @@ t.test('just simple messages', t => {
     'EINVALIDTYPE',
     'ETOOMANYARGS',
     'ETARGET',
-    'E403'
+    'E403',
   ]
   t.plan(codes.length)
   codes.forEach(code => {
@@ -100,13 +99,12 @@ t.test('just simple messages', t => {
     const pkgid = 'some@package'
     const file = '/some/file'
     const stack = 'dummy stack trace'
-    const required = { node: '1.2.3', npm: '4.2.0' }
     const er = Object.assign(new Error('foo'), {
       code,
       path,
       pkgid,
       file,
-      stack
+      stack,
     })
     t.matchSnapshot(errorMessage(er))
   })
@@ -132,18 +130,19 @@ t.test('replace message/stack sensistive info', t => {
 
 t.test('bad engine with config loaded', t => {
   npm.config.loaded = true
-  t.teardown(() => { npm.config.loaded = false })
+  t.teardown(() => {
+    npm.config.loaded = false
+  })
   const path = '/some/path'
   const pkgid = 'some@package'
   const file = '/some/file'
   const stack = 'dummy stack trace'
-  const required = { node: '1.2.3', npm: '4.2.0' }
   const er = Object.assign(new Error('foo'), {
     code: 'EBADENGINE',
     path,
     pkgid,
     file,
-    stack
+    stack,
   })
   t.matchSnapshot(errorMessage(er))
   t.end()
@@ -152,14 +151,12 @@ t.test('bad engine with config loaded', t => {
 t.test('enoent without a file', t => {
   const path = '/some/path'
   const pkgid = 'some@package'
-  const file = '/some/file'
   const stack = 'dummy stack trace'
-  const required = { node: '1.2.3', npm: '4.2.0' }
   const er = Object.assign(new Error('foo'), {
     code: 'ENOENT',
     path,
     pkgid,
-    stack
+    stack,
   })
   t.matchSnapshot(errorMessage(er))
   t.end()
@@ -171,13 +168,12 @@ t.test('enolock without a command', t => {
   const pkgid = 'some@package'
   const file = '/some/file'
   const stack = 'dummy stack trace'
-  const required = { node: '1.2.3', npm: '4.2.0' }
   const er = Object.assign(new Error('foo'), {
     code: 'ENOLOCK',
     path,
     pkgid,
     file,
-    stack
+    stack,
   })
   t.matchSnapshot(errorMessage(er))
   t.end()
@@ -191,18 +187,18 @@ t.test('default message', t => {
     signal: 'SIGYOLO',
     args: ['a', 'r', 'g', 's'],
     stdout: 'stdout',
-    stderr: 'stderr'
+    stderr: 'stderr',
   })))
   t.end()
 })
 
 t.test('eacces/eperm', t => {
   const runTest = (windows, loaded, cachePath, cacheDest) => t => {
-    if (windows) {
+    if (windows)
       beWindows()
-    } else {
+    else
       bePosix()
-    }
+
     npm.config.loaded = loaded
     const path = `${cachePath ? CACHE : '/not/cache/dir'}/path`
     const dest = `${cacheDest ? CACHE : '/not/cache/dir'}/dest`
@@ -210,7 +206,7 @@ t.test('eacces/eperm', t => {
       code: 'EACCES',
       path,
       dest,
-      stack: 'dummy stack trace'
+      stack: 'dummy stack trace',
     })
     verboseLogs.length = 0
     t.matchSnapshot(errorMessage(er))
@@ -272,36 +268,36 @@ t.test('json parse', t => {
     }
   }
 }
-`
+`,
     })
     const { prefix } = npm
     const { argv } = process
     t.teardown(() => {
       Object.defineProperty(npm, 'prefix', {
         value: prefix,
-        configurable: true
+        configurable: true,
       })
       process.argv = argv
     })
     Object.defineProperty(npm, 'prefix', { value: dir, configurable: true })
     process.argv = ['arg', 'v']
-    const ok = t.matchSnapshot(errorMessage(Object.assign(new Error('conflicted'), {
+    t.matchSnapshot(errorMessage(Object.assign(new Error('conflicted'), {
       code: 'EJSONPARSE',
-      file: resolve(dir, 'package.json')
+      file: resolve(dir, 'package.json'),
     })))
     t.end()
   })
 
   t.test('just regular bad json in package.json', t => {
     const dir = t.testdir({
-      'package.json': 'not even slightly json'
+      'package.json': 'not even slightly json',
     })
     const { prefix } = npm
     const { argv } = process
     t.teardown(() => {
       Object.defineProperty(npm, 'prefix', {
         value: prefix,
-        configurable: true
+        configurable: true,
       })
       process.argv = argv
     })
@@ -309,14 +305,14 @@ t.test('json parse', t => {
     process.argv = ['arg', 'v']
     t.matchSnapshot(errorMessage(Object.assign(new Error('not json'), {
       code: 'EJSONPARSE',
-      file: resolve(dir, 'package.json')
+      file: resolve(dir, 'package.json'),
     })))
     t.end()
   })
 
   t.test('json somewhere else', t => {
     const dir = t.testdir({
-      'blerg.json': 'not even slightly json'
+      'blerg.json': 'not even slightly json',
     })
     const { argv } = process
     t.teardown(() => {
@@ -325,7 +321,7 @@ t.test('json parse', t => {
     process.argv = ['arg', 'v']
     t.matchSnapshot(errorMessage(Object.assign(new Error('not json'), {
       code: 'EJSONPARSE',
-      file: `${dir}/blerg.json`
+      file: `${dir}/blerg.json`,
     })))
     t.end()
   })
@@ -336,7 +332,7 @@ t.test('json parse', t => {
 t.test('eotp/e401', t => {
   t.test('401, no auth headers', t => {
     t.matchSnapshot(errorMessage(Object.assign(new Error('nope'), {
-      code: 'E401'
+      code: 'E401',
     })))
     t.end()
   })
@@ -350,7 +346,7 @@ t.test('eotp/e401', t => {
 
   t.test('one-time pass challenge code', t => {
     t.matchSnapshot(errorMessage(Object.assign(new Error('nope'), {
-      code: 'EOTP'
+      code: 'EOTP',
     })))
     t.end()
   })
@@ -358,7 +354,7 @@ t.test('eotp/e401', t => {
   t.test('one-time pass challenge message', t => {
     const message = 'one-time pass'
     t.matchSnapshot(errorMessage(Object.assign(new Error(message), {
-      code: 'E401'
+      code: 'E401',
     })))
     t.end()
   })
@@ -368,16 +364,16 @@ t.test('eotp/e401', t => {
       'Bearer realm=do, charset="UTF-8", challenge="yourself"',
       'Basic realm=by, charset="UTF-8", challenge="your friends"',
       'PickACardAnyCard realm=friday, charset="UTF-8"',
-      'WashYourHands, charset="UTF-8"'
+      'WashYourHands, charset="UTF-8"',
     ]
     t.plan(auths.length)
     for (const auth of auths) {
       t.test(auth, t => {
         const er = Object.assign(new Error('challenge!'), {
           headers: {
-            'www-authenticate': [ auth ]
+            'www-authenticate': [auth],
           },
-          code: 'E401'
+          code: 'E401',
         })
         t.matchSnapshot(errorMessage(er))
         t.end()
@@ -397,7 +393,7 @@ t.test('404', t => {
   t.test('you should publish it', t => {
     const er = Object.assign(new Error('404 not found'), {
       pkgid: 'yolo',
-      code: 'E404'
+      code: 'E404',
     })
     t.matchSnapshot(errorMessage(er))
     t.end()
@@ -405,7 +401,7 @@ t.test('404', t => {
   t.test('name with warning', t => {
     const er = Object.assign(new Error('404 not found'), {
       pkgid: new Array(215).fill('x').join(''),
-      code: 'E404'
+      code: 'E404',
     })
     t.matchSnapshot(errorMessage(er))
     t.end()
@@ -413,7 +409,7 @@ t.test('404', t => {
   t.test('name with error', t => {
     const er = Object.assign(new Error('404 not found'), {
       pkgid: 'node_modules',
-      code: 'E404'
+      code: 'E404',
     })
     t.matchSnapshot(errorMessage(er))
     t.end()
@@ -427,13 +423,13 @@ t.test('bad platform', t => {
       pkgid: 'lodash@1.0.0',
       current: {
         os: 'posix',
-        cpu: 'x64'
+        cpu: 'x64',
       },
       required: {
         os: '!yours',
-        cpu: 'x420'
+        cpu: 'x420',
       },
-      code: 'EBADPLATFORM'
+      code: 'EBADPLATFORM',
     })
     t.matchSnapshot(errorMessage(er))
     t.end()
@@ -443,13 +439,13 @@ t.test('bad platform', t => {
       pkgid: 'lodash@1.0.0',
       current: {
         os: 'posix',
-        cpu: 'x64'
+        cpu: 'x64',
       },
       required: {
         os: ['!yours', 'mine'],
-        cpu: ['x420', 'x69']
+        cpu: ['x420', 'x69'],
       },
-      code: 'EBADPLATFORM'
+      code: 'EBADPLATFORM',
     })
     t.matchSnapshot(errorMessage(er))
     t.end()
@@ -460,7 +456,7 @@ t.test('bad platform', t => {
 
 t.test('explain ERESOLVE errors', t => {
   const er = Object.assign(new Error('could not resolve'), {
-    code: 'ERESOLVE'
+    code: 'ERESOLVE',
   })
   t.matchSnapshot(errorMessage(er))
   t.strictSame(EXPLAIN_CALLED, [[er]])
diff --git a/deps/npm/test/lib/utils/escape-arg.js b/deps/npm/test/lib/utils/escape-arg.js
deleted file mode 100644
index 413fa47838bac6..00000000000000
--- a/deps/npm/test/lib/utils/escape-arg.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const requireInject = require('require-inject')
-const t = require('tap')
-const getEscape = win => requireInject('../../../lib/utils/escape-arg.js', {
-  '../../../lib/utils/is-windows.js': win,
-  path: require('path')[win ? 'win32' : 'posix']
-})
-
-const winEscape = getEscape(true)
-const nixEscape = getEscape(false)
-
-t.equal(winEscape('hello/to the/world'), '"hello\\to the\\world"')
-t.equal(nixEscape(`hello/to-the/world`), `hello/to-the/world`)
-t.equal(nixEscape(`hello/to the/world`), `'hello/to the/world'`)
-t.equal(nixEscape(`hello/to%the/world`), `'hello/to%the/world'`)
-t.equal(nixEscape(`hello/to'the/world`), `'hello/to'"'"'the/world'`)
diff --git a/deps/npm/test/lib/utils/escape-exec-path.js b/deps/npm/test/lib/utils/escape-exec-path.js
deleted file mode 100644
index 28fe75c2a98f4f..00000000000000
--- a/deps/npm/test/lib/utils/escape-exec-path.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const requireInject = require('require-inject')
-const t = require('tap')
-const getEscape = win => requireInject('../../../lib/utils/escape-exec-path.js', {
-  '../../../lib/utils/is-windows.js': win,
-  path: require('path')[win ? 'win32' : 'posix']
-})
-
-const winEscape = getEscape(true)
-const nixEscape = getEscape(false)
-
-t.equal(winEscape('hello/to the/world'), 'hello\\"to the"\\world')
-t.equal(nixEscape(`hello/to-the/world`), `hello/to-the/world`)
-t.equal(nixEscape(`hello/to the/world`), `'hello/to the/world'`)
-t.equal(nixEscape(`hello/to%the/world`), `'hello/to%the/world'`)
-t.equal(nixEscape(`hello/to'the/world`), `'hello/to'"'"'the/world'`)
diff --git a/deps/npm/test/lib/utils/explain-dep.js b/deps/npm/test/lib/utils/explain-dep.js
index e0305348653af0..28f14477ab709b 100644
--- a/deps/npm/test/lib/utils/explain-dep.js
+++ b/deps/npm/test/lib/utils/explain-dep.js
@@ -2,7 +2,7 @@ const t = require('tap')
 const requireInject = require('require-inject')
 const npm = {}
 const { explainNode, printNode } = requireInject('../../../lib/utils/explain-dep.js', {
-  '../../../lib/npm.js': npm
+  '../../../lib/npm.js': npm,
 })
 
 const cases = {
@@ -16,10 +16,10 @@ const cases = {
         name: 'prod-dep',
         spec: '1.x',
         from: {
-          location: '/path/to/project'
-        }
-      }
-    ]
+          location: '/path/to/project',
+        },
+      },
+    ],
   },
 
   deepDev: {
@@ -51,16 +51,16 @@ const cases = {
                     name: 'topdev',
                     spec: '4.x',
                     from: {
-                      location: '/path/to/project'
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      }
-    ]
+                      location: '/path/to/project',
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ],
   },
 
   optional: {
@@ -74,10 +74,10 @@ const cases = {
         name: 'optdep',
         spec: '1.0.0',
         from: {
-          location: '/path/to/project'
-        }
-      }
-    ]
+          location: '/path/to/project',
+        },
+      },
+    ],
   },
 
   peer: {
@@ -91,10 +91,10 @@ const cases = {
         name: 'peer',
         spec: '1.0.0',
         from: {
-          location: '/path/to/project'
-        }
-      }
-    ]
+          location: '/path/to/project',
+        },
+      },
+    ],
   },
 
   extraneous: {
@@ -102,8 +102,8 @@ const cases = {
     version: '1337.420.69-lol',
     location: 'node_modules/extra-neos',
     dependents: [],
-    extraneous: true
-  }
+    extraneous: true,
+  },
 }
 
 cases.manyDeps = {
@@ -114,31 +114,39 @@ cases.manyDeps = {
       type: 'prod',
       name: 'manydep',
       spec: '1.0.0',
-      from: cases.prodDep
+      from: cases.prodDep,
     },
     {
       type: 'optional',
       name: 'manydep',
       spec: '1.x',
-      from: cases.optional
+      from: cases.optional,
     },
     {
       type: 'prod',
       name: 'manydep',
       spec: '1.0.x',
-      from: cases.extraneous
+      from: cases.extraneous,
     },
     {
       type: 'dev',
       name: 'manydep',
       spec: '*',
-      from: cases.deepDev
+      from: cases.deepDev,
     },
     {
       type: 'peer',
       name: 'manydep',
       spec: '>1.0.0-beta <1.0.1',
-      from: cases.peer
+      from: cases.peer,
+    },
+    {
+      type: 'prod',
+      name: 'manydep',
+      spec: '>1.0.0-beta <1.0.1',
+      from: {
+        location: '/path/to/project',
+      },
     },
     {
       type: 'prod',
@@ -148,9 +156,9 @@ cases.manyDeps = {
         name: 'a package with a pretty long name',
         version: '1.2.3',
         dependents: {
-          location: '/path/to/project'
-        }
-      }
+          location: '/path/to/project',
+        },
+      },
     },
     {
       type: 'prod',
@@ -160,9 +168,9 @@ cases.manyDeps = {
         name: 'another package with a pretty long name',
         version: '1.2.3',
         dependents: {
-          location: '/path/to/project'
-        }
-      }
+          location: '/path/to/project',
+        },
+      },
     },
     {
       type: 'prod',
@@ -172,14 +180,13 @@ cases.manyDeps = {
         name: 'yet another a package with a pretty long name',
         version: '1.2.3',
         dependents: {
-          location: '/path/to/project'
-        }
-      }
+          location: '/path/to/project',
+        },
+      },
     },
-  ]
+  ],
 }
 
-
 for (const [name, expl] of Object.entries(cases)) {
   t.test(name, t => {
     npm.color = true
diff --git a/deps/npm/test/lib/utils/explain-eresolve.js b/deps/npm/test/lib/utils/explain-eresolve.js
index def13153d242dd..8dae1b92cd514f 100644
--- a/deps/npm/test/lib/utils/explain-eresolve.js
+++ b/deps/npm/test/lib/utils/explain-eresolve.js
@@ -2,7 +2,7 @@ const t = require('tap')
 const requireInject = require('require-inject')
 const npm = {}
 const { explain, report } = requireInject('../../../lib/utils/explain-eresolve.js', {
-  '../../../lib/npm.js': npm
+  '../../../lib/npm.js': npm,
 })
 const { statSync, readFileSync, unlinkSync } = require('fs')
 // strip out timestamps from reports
diff --git a/deps/npm/test/lib/utils/file-exists.js b/deps/npm/test/lib/utils/file-exists.js
index f247f564e0766a..473a4b050edef2 100644
--- a/deps/npm/test/lib/utils/file-exists.js
+++ b/deps/npm/test/lib/utils/file-exists.js
@@ -3,7 +3,7 @@ const fileExists = require('../../../lib/utils/file-exists.js')
 
 test('returns true when arg is a file', async (t) => {
   const path = t.testdir({
-    foo: 'just some file'
+    foo: 'just some file',
   })
 
   const result = await fileExists(`${path}/foo`)
@@ -13,7 +13,7 @@ test('returns true when arg is a file', async (t) => {
 
 test('returns false when arg is not a file', async (t) => {
   const path = t.testdir({
-    foo: {}
+    foo: {},
   })
 
   const result = await fileExists(`${path}/foo`)
diff --git a/deps/npm/test/lib/utils/flat-options.js b/deps/npm/test/lib/utils/flat-options.js
index d3b8b89bc865ab..ee7620fa784db7 100644
--- a/deps/npm/test/lib/utils/flat-options.js
+++ b/deps/npm/test/lib/utils/flat-options.js
@@ -1,6 +1,7 @@
 const t = require('tap')
 
 process.env.NODE = '/path/to/some/node'
+process.env.NODE_ENV = 'development'
 
 const logs = []
 const log = require('npmlog')
@@ -12,7 +13,7 @@ class Mocknpm {
     this.modes = {
       exec: 0o777,
       file: 0o666,
-      umask: 0o22
+      umask: 0o22,
     }
     this.color = true
     this.projectScope = '@npmcli'
@@ -65,7 +66,7 @@ class MockConfig {
       description: 'description',
       searchexclude: 'searchexclude',
       searchlimit: 'searchlimit',
-      searchopts: 'searchopts',
+      searchopts: 'from=1',
       searchstaleness: 'searchstaleness',
       'dry-run': 'dry-run',
       'engine-strict': 'engine-strict',
@@ -110,14 +111,16 @@ class MockConfig {
       'user-agent': 'user-agent',
       '@scope:registry': '@scope:registry',
       '//nerf.dart:_authToken': '//nerf.dart:_authToken',
-      'proxy': 'proxy',
-      'noproxy': 'noproxy',
-      ...opts
+      proxy: 'proxy',
+      noproxy: 'noproxy',
+      ...opts,
     }]
   }
+
   get (key) {
     return this.list[0][key]
   }
+
   set (key, val) {
     this.list[0][key] = val
   }
@@ -127,7 +130,7 @@ const flatOptions = require('../../../lib/utils/flat-options.js')
 t.match(logs, [[
   'verbose',
   'npm-session',
-  /^[0-9a-f]{16}$/
+  /^[0-9a-f]{16}$/,
 ]], 'logged npm session verbosely')
 logs.length = 0
 
@@ -139,7 +142,7 @@ t.test('basic', t => {
     npmBin: '/path/to/npm/bin.js',
     log: {},
     npmSession: '12345',
-    cache: generatedFlat.cache.replace(/\\/g, '/')
+    cache: generatedFlat.cache.replace(/\\/g, '/'),
   }
   t.matchSnapshot(clean, 'flat options')
   t.equal(generatedFlat.npmCommand, null, 'command not set yet')
@@ -158,7 +161,7 @@ t.test('basic', t => {
 t.test('get preferOffline from cache-min', t => {
   const npm = new Mocknpm({
     'cache-min': 9999999,
-    'prefer-offline': undefined
+    'prefer-offline': undefined,
   })
   const opts = flatOptions(npm)
   t.equal(opts.preferOffline, true, 'got preferOffline from cache min')
@@ -172,7 +175,7 @@ t.test('get preferOffline from cache-min', t => {
 t.test('get preferOnline from cache-max', t => {
   const npm = new Mocknpm({
     'cache-max': -1,
-    'prefer-online': undefined
+    'prefer-online': undefined,
   })
   const opts = flatOptions(npm)
   t.equal(opts.preferOnline, true, 'got preferOnline from cache min')
@@ -193,72 +196,93 @@ t.test('tag emits warning', t => {
 
 t.test('omit/include options', t => {
   t.test('omit explicitly', t => {
+    const { NODE_ENV } = process.env
     const npm = new Mocknpm({
-      omit: ['dev', 'optional', 'peer']
+      omit: ['dev', 'optional', 'peer'],
     })
     t.strictSame(flatOptions(npm).omit, ['dev', 'optional', 'peer'])
+    t.equal(process.env.NODE_ENV, 'production')
+    process.env.NODE_ENV = NODE_ENV
     t.end()
   })
 
   t.test('omit and include some', t => {
+    const { NODE_ENV } = process.env
     const npm = new Mocknpm({
       omit: ['dev', 'optional', 'peer'],
-      include: ['peer']
+      include: ['peer'],
     })
     t.strictSame(flatOptions(npm).omit, ['dev', 'optional'])
+    t.equal(process.env.NODE_ENV, 'production')
+    process.env.NODE_ENV = NODE_ENV
     t.end()
   })
 
   t.test('dev flag', t => {
+    const { NODE_ENV } = process.env
     const npm = new Mocknpm({
       omit: ['dev', 'optional', 'peer'],
       include: [],
-      dev: true
+      dev: true,
     })
     t.strictSame(flatOptions(npm).omit, ['optional', 'peer'])
+    t.equal(process.env.NODE_ENV, NODE_ENV)
+    process.env.NODE_ENV = NODE_ENV
     t.end()
   })
 
   t.test('production flag', t => {
+    const { NODE_ENV } = process.env
     const npm = new Mocknpm({
       omit: [],
       include: [],
-      production: true
+      production: true,
     })
     t.strictSame(flatOptions(npm).omit, ['dev'])
+    t.equal(process.env.NODE_ENV, 'production')
+    process.env.NODE_ENV = NODE_ENV
     t.end()
   })
 
   t.test('only', t => {
+    const { NODE_ENV } = process.env
     const cases = ['prod', 'production']
     t.plan(cases.length)
     cases.forEach(c => t.test(c, t => {
       const npm = new Mocknpm({
         omit: [],
         include: [],
-        only: c
+        only: c,
       })
       t.strictSame(flatOptions(npm).omit, ['dev'])
+      t.equal(process.env.NODE_ENV, 'production')
+      process.env.NODE_ENV = NODE_ENV
       t.end()
     }))
   })
 
   t.test('also dev', t => {
+    const { NODE_ENV } = process.env
     const npm = new Mocknpm({
       omit: ['dev', 'optional', 'peer'],
-      also: 'dev'
+      also: 'dev',
     })
     t.strictSame(flatOptions(npm).omit, ['optional', 'peer'])
+    t.equal(process.env.NODE_ENV, NODE_ENV)
+    process.env.NODE_ENV = NODE_ENV
     t.end()
   })
 
   t.test('no-optional', t => {
+    const { NODE_ENV } = process.env
     const npm = new Mocknpm({
       optional: false,
       omit: null,
-      include: null
+      include: null,
     })
     t.strictSame(flatOptions(npm).omit, ['optional'])
+    t.equal(process.env.NODE_ENV, NODE_ENV)
+    process.env.NODE_ENV = NODE_ENV
     t.end()
   })
 
@@ -276,9 +300,9 @@ t.test('various default values and falsey fallbacks', t => {
     'script-shell': false,
     registry: 'http://example.com',
     'metrics-registry': null,
-    'searchlimit': 0,
+    searchlimit: 0,
     'save-exact': false,
-    'save-prefix': '>='
+    'save-prefix': '>=',
   })
   const opts = flatOptions(npm)
   t.equal(opts.scriptShell, undefined, 'scriptShell is undefined if falsey')
@@ -291,12 +315,24 @@ t.test('various default values and falsey fallbacks', t => {
   t.end()
 })
 
+t.test('legacy _auth token', t => {
+  const npm = new Mocknpm({
+    _auth: 'asdfasdf',
+  })
+  t.strictSame(
+    flatOptions(npm)._auth,
+    'asdfasdf',
+    'should set legacy _auth token'
+  )
+  t.end()
+})
+
 t.test('save-type', t => {
   const base = {
     'save-optional': false,
     'save-peer': false,
     'save-dev': false,
-    'save-prod': false
+    'save-prod': false,
   }
   const cases = [
     ['peerOptional', {
@@ -304,23 +340,23 @@ t.test('save-type', t => {
       'save-peer': true,
     }],
     ['optional', {
-      'save-optional': true
+      'save-optional': true,
     }],
     ['dev', {
-      'save-dev': true
+      'save-dev': true,
     }],
     ['peer', {
-      'save-peer': true
+      'save-peer': true,
     }],
     ['prod', {
-      'save-prod': true
+      'save-prod': true,
     }],
-    [null, {}]
+    [null, {}],
   ]
   for (const [expect, options] of cases) {
     const opts = flatOptions(new Mocknpm({
       ...base,
-      ...options
+      ...options,
     }))
     t.equal(opts.saveType, expect, JSON.stringify(options))
   }
diff --git a/deps/npm/test/lib/utils/get-identity.js b/deps/npm/test/lib/utils/get-identity.js
index c72f48b2e8f62a..8a4de8835257a6 100644
--- a/deps/npm/test/lib/utils/get-identity.js
+++ b/deps/npm/test/lib/utils/get-identity.js
@@ -4,7 +4,7 @@ const requireInject = require('require-inject')
 test('throws ENOREGISTRY when no registry option is provided', async (t) => {
   t.plan(2)
   const getIdentity = requireInject('../../../lib/utils/get-identity.js', {
-    '../../../lib/npm.js': {}
+    '../../../lib/npm.js': {},
   })
 
   try {
@@ -23,9 +23,9 @@ test('returns username from uri when provided', async (t) => {
       config: {
         getCredentialsByURI: () => {
           return { username: 'foo' }
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   const identity = await getIdentity({ registry: 'https://registry.npmjs.org' })
@@ -37,22 +37,22 @@ test('calls registry whoami when token is provided', async (t) => {
 
   const options = {
     registry: 'https://registry.npmjs.org',
-    token: 'thisisnotreallyatoken'
+    token: 'thisisnotreallyatoken',
   }
 
   const getIdentity = requireInject('../../../lib/utils/get-identity.js', {
     '../../../lib/npm.js': {
       config: {
-        getCredentialsByURI: () => options
-      }
+        getCredentialsByURI: () => options,
+      },
     },
     'npm-registry-fetch': {
       json: (path, opts) => {
         t.equal(path, '/-/whoami', 'calls whoami')
         t.same(opts, options, 'passes through provided options')
         return { username: 'foo' }
-      }
-    }
+      },
+    },
   })
 
   const identity = await getIdentity(options)
@@ -64,22 +64,22 @@ test('throws ENEEDAUTH when response does not include a username', async (t) =>
 
   const options = {
     registry: 'https://registry.npmjs.org',
-    token: 'thisisnotreallyatoken'
+    token: 'thisisnotreallyatoken',
   }
 
   const getIdentity = requireInject('../../../lib/utils/get-identity.js', {
     '../../../lib/npm.js': {
       config: {
-        getCredentialsByURI: () => options
-      }
+        getCredentialsByURI: () => options,
+      },
     },
     'npm-registry-fetch': {
       json: (path, opts) => {
         t.equal(path, '/-/whoami', 'calls whoami')
         t.same(opts, options, 'passes through provided options')
         return {}
-      }
-    }
+      },
+    },
   })
 
   try {
@@ -94,9 +94,9 @@ test('throws ENEEDAUTH when neither username nor token is configured', async (t)
   const getIdentity = requireInject('../../../lib/utils/get-identity.js', {
     '../../../lib/npm.js': {
       config: {
-        getCredentialsByURI: () => ({})
-      }
-    }
+        getCredentialsByURI: () => ({}),
+      },
+    },
   })
 
   try {
diff --git a/deps/npm/test/lib/utils/get-project-scope.js b/deps/npm/test/lib/utils/get-project-scope.js
index 15ab2bdeff1054..9737b06433c227 100644
--- a/deps/npm/test/lib/utils/get-project-scope.js
+++ b/deps/npm/test/lib/utils/get-project-scope.js
@@ -3,7 +3,7 @@ const t = require('tap')
 
 t.test('package.json with scope', t => {
   const dir = t.testdir({
-    'package.json': JSON.stringify({ name: '@foo/bar' })
+    'package.json': JSON.stringify({ name: '@foo/bar' }),
   })
   t.equal(getProjectScope(dir), '@foo')
   t.end()
@@ -11,7 +11,7 @@ t.test('package.json with scope', t => {
 
 t.test('package.json with slash, but no @', t => {
   const dir = t.testdir({
-    'package.json': JSON.stringify({ name: 'foo/bar' })
+    'package.json': JSON.stringify({ name: 'foo/bar' }),
   })
   t.equal(getProjectScope(dir), '')
   t.end()
@@ -19,7 +19,7 @@ t.test('package.json with slash, but no @', t => {
 
 t.test('package.json without scope', t => {
   const dir = t.testdir({
-    'package.json': JSON.stringify({ name: 'foo' })
+    'package.json': JSON.stringify({ name: 'foo' }),
   })
   t.equal(getProjectScope(dir), '')
   t.end()
@@ -27,7 +27,7 @@ t.test('package.json without scope', t => {
 
 t.test('package.json without name', t => {
   const dir = t.testdir({
-    'package.json': JSON.stringify({})
+    'package.json': JSON.stringify({}),
   })
   t.equal(getProjectScope(dir), '')
   t.end()
@@ -35,7 +35,7 @@ t.test('package.json without name', t => {
 
 t.test('package.json not JSON', t => {
   const dir = t.testdir({
-    'package.json': 'hello'
+    'package.json': 'hello',
   })
   t.equal(getProjectScope(dir), '')
   t.end()
diff --git a/deps/npm/test/lib/utils/hosted-git-info-from-manifest.js b/deps/npm/test/lib/utils/hosted-git-info-from-manifest.js
index f87cb84eed8232..516d3d5867acbd 100644
--- a/deps/npm/test/lib/utils/hosted-git-info-from-manifest.js
+++ b/deps/npm/test/lib/utils/hosted-git-info-from-manifest.js
@@ -9,13 +9,13 @@ t.equal(hostedFromMani({ repository: 'not hosted anywhere' }), null)
 t.equal(hostedFromMani({ repository: { url: 'not hosted anywhere' } }), null)
 
 t.match(hostedFromMani({
-  repository: 'git+https://github.com/isaacs/abbrev-js'
+  repository: 'git+https://github.com/isaacs/abbrev-js',
 }), hostedGitInfo.fromUrl('git+https://github.com/isaacs/abbrev-js'))
 
 t.match(hostedFromMani({
-  repository: { url: 'git+https://github.com/isaacs/abbrev-js' }
+  repository: { url: 'git+https://github.com/isaacs/abbrev-js' },
 }), hostedGitInfo.fromUrl('https://github.com/isaacs/abbrev-js'))
 
 t.match(hostedFromMani({
-  repository: { url: 'git+ssh://git@github.com/isaacs/abbrev-js' }
+  repository: { url: 'git+ssh://git@github.com/isaacs/abbrev-js' },
 }), hostedGitInfo.fromUrl('ssh://git@github.com/isaacs/abbrev-js'))
diff --git a/deps/npm/test/lib/utils/is-windows-bash.js b/deps/npm/test/lib/utils/is-windows-bash.js
index 730dfe301bc764..94fde0ace17ce4 100644
--- a/deps/npm/test/lib/utils/is-windows-bash.js
+++ b/deps/npm/test/lib/utils/is-windows-bash.js
@@ -8,13 +8,13 @@ const isWindowsBash = () => {
 
 Object.defineProperty(process, 'platform', {
   value: 'posix',
-  configurable: true
+  configurable: true,
 })
 t.equal(isWindowsBash(), false, 'false when not windows')
 
 Object.defineProperty(process, 'platform', {
   value: 'win32',
-  configurable: true
+  configurable: true,
 })
 process.env.MSYSTEM = 'not ming'
 process.env.TERM = 'dumb'
diff --git a/deps/npm/test/lib/utils/is-windows-shell.js b/deps/npm/test/lib/utils/is-windows-shell.js
index e2164c222be67d..95519925c97ce6 100644
--- a/deps/npm/test/lib/utils/is-windows-shell.js
+++ b/deps/npm/test/lib/utils/is-windows-shell.js
@@ -1,6 +1,6 @@
 const t = require('tap')
 Object.defineProperty(process, 'platform', {
-  value: 'win32'
+  value: 'win32',
 })
 const isWindows = require('../../../lib/utils/is-windows.js')
 const isWindowsBash = require('../../../lib/utils/is-windows-bash.js')
diff --git a/deps/npm/test/lib/utils/is-windows.js b/deps/npm/test/lib/utils/is-windows.js
index 9100071699e771..f8f2999c99433d 100644
--- a/deps/npm/test/lib/utils/is-windows.js
+++ b/deps/npm/test/lib/utils/is-windows.js
@@ -2,7 +2,7 @@ const t = require('tap')
 const actuallyWindows = process.platform === 'win32'
 t.equal(actuallyWindows, require('../../../lib/utils/is-windows.js'))
 Object.defineProperty(process, 'platform', {
-  value: actuallyWindows ? 'posix' : 'win32'
+  value: actuallyWindows ? 'posix' : 'win32',
 })
 delete require.cache[require.resolve('../../../lib/utils/is-windows.js')]
 t.equal(!actuallyWindows, require('../../../lib/utils/is-windows.js'))
diff --git a/deps/npm/test/lib/utils/lifecycle-cmd.js b/deps/npm/test/lib/utils/lifecycle-cmd.js
index 7338229546cf52..0eb342cee50124 100644
--- a/deps/npm/test/lib/utils/lifecycle-cmd.js
+++ b/deps/npm/test/lib/utils/lifecycle-cmd.js
@@ -3,9 +3,9 @@ const requireInject = require('require-inject')
 const lifecycleCmd = requireInject('../../../lib/utils/lifecycle-cmd.js', {
   '../../../lib/npm.js': {
     commands: {
-      run: (args, cb) => cb(null, 'called npm.commands.run')
-    }
-  }
+      run: (args, cb) => cb(null, 'called npm.commands.run'),
+    },
+  },
 })
 
 t.test('create a lifecycle command', t => {
diff --git a/deps/npm/test/lib/utils/path.js b/deps/npm/test/lib/utils/path.js
index facee06459d4c0..74fb93462f7553 100644
--- a/deps/npm/test/lib/utils/path.js
+++ b/deps/npm/test/lib/utils/path.js
@@ -3,7 +3,7 @@ const requireInject = require('require-inject')
 const mod = '../../../lib/utils/path.js'
 const delim = require('../../../lib/utils/is-windows.js') ? ';' : ':'
 Object.defineProperty(process, 'env', {
-  value: {}
+  value: {},
 })
 process.env.path = ['foo', 'bar', 'baz'].join(delim)
 t.strictSame(requireInject(mod), ['foo', 'bar', 'baz'])
diff --git a/deps/npm/test/lib/utils/perf.js b/deps/npm/test/lib/utils/perf.js
index 9b38a3da8198c7..840dcb6e32399b 100644
--- a/deps/npm/test/lib/utils/perf.js
+++ b/deps/npm/test/lib/utils/perf.js
@@ -20,15 +20,15 @@ t.test('time some stuff', t => {
       process.emit('timeEnd', 'foo')
       process.emit('timeEnd', 'baz')
       t.match(logs, [
-        [ 'timing', 'foo', /Completed in [0-9]+ms/ ],
-        [ 'timing', 'bar', /Completed in [0-9]+ms/ ],
-        [ 'timing', 'foo', /Completed in [0-9]+ms/ ],
+        ['timing', 'foo', /Completed in [0-9]+ms/],
+        ['timing', 'bar', /Completed in [0-9]+ms/],
+        ['timing', 'foo', /Completed in [0-9]+ms/],
         [
           'silly',
           'timing',
           "Tried to end timer that doesn't exist:",
-          'baz'
-        ]
+          'baz',
+        ],
       ])
       t.match(timings, { foo: Number, bar: Number })
       t.equal(timings.foo > timings.bar, true, 'foo should be > bar')
diff --git a/deps/npm/test/lib/utils/ping.js b/deps/npm/test/lib/utils/ping.js
index d2b269556e6058..6e0451538f9fac 100644
--- a/deps/npm/test/lib/utils/ping.js
+++ b/deps/npm/test/lib/utils/ping.js
@@ -11,7 +11,7 @@ test('pings', async (t) => {
       t.equal(url, '/-/ping?write=true', 'calls the correct url')
       t.equal(opts, options, 'passes through options')
       return { json: () => Promise.resolve(response) }
-    }
+    },
   })
 
   const res = await ping(options)
@@ -28,7 +28,7 @@ test('catches errors and returns empty json', async (t) => {
       t.equal(url, '/-/ping?write=true', 'calls the correct url')
       t.equal(opts, options, 'passes through options')
       return { json: () => Promise.reject(response) }
-    }
+    },
   })
 
   const res = await ping(options)
diff --git a/deps/npm/test/lib/utils/proc-log-listener.js b/deps/npm/test/lib/utils/proc-log-listener.js
index 0a6119d1a1c0ed..2c1009503762d5 100644
--- a/deps/npm/test/lib/utils/proc-log-listener.js
+++ b/deps/npm/test/lib/utils/proc-log-listener.js
@@ -5,11 +5,11 @@ const { inspect } = require('util')
 const logs = []
 const npmlog = {
   warn: (...args) => logs.push(['warn', ...args]),
-  verbose: (...args) => logs.push(['verbose', ...args])
+  verbose: (...args) => logs.push(['verbose', ...args]),
 }
 
 requireInject('../../../lib/utils/proc-log-listener.js', {
-  npmlog
+  npmlog,
 })()
 
 process.emit('log', 'warn', 'hello', 'i am a warning')
@@ -17,22 +17,26 @@ t.strictSame(logs, [['warn', 'hello', 'i am a warning']])
 logs.length = 0
 
 const nopeError = new Error('nope')
-npmlog.warn = () => { throw nopeError }
+npmlog.warn = () => {
+  throw nopeError
+}
 
 process.emit('log', 'warn', 'fail')
 t.strictSame(logs, [[
   'verbose',
   `attempt to log ${inspect(['warn', 'fail'])} crashed`,
-  nopeError
+  nopeError,
 ]])
 logs.length = 0
 
-npmlog.verbose = () => { throw nopeError }
+npmlog.verbose = () => {
+  throw nopeError
+}
 const consoleErrors = []
 console.error = (...args) => consoleErrors.push(args)
 process.emit('log', 'warn', 'fail2')
 t.strictSame(logs, [])
 t.strictSame(consoleErrors, [[
   `attempt to log ${inspect(['warn', 'fail2'])} crashed`,
-  nopeError
+  nopeError,
 ]])
diff --git a/deps/npm/test/lib/utils/read-local-package.js b/deps/npm/test/lib/utils/read-local-package.js
index 8854cf4e5f2179..33a408eb532379 100644
--- a/deps/npm/test/lib/utils/read-local-package.js
+++ b/deps/npm/test/lib/utils/read-local-package.js
@@ -5,21 +5,23 @@ let prefix
 const _flatOptions = {
   json: false,
   global: false,
-  get prefix () { return prefix }
+  get prefix () {
+    return prefix
+  },
 }
 
 const readLocalPackageName = requireInject('../../../lib/utils/read-local-package.js', {
   '../../../lib/npm.js': {
-    flatOptions: _flatOptions
-  }
+    flatOptions: _flatOptions,
+  },
 })
 
 test('read local package.json', async (t) => {
   prefix = t.testdir({
     'package.json': JSON.stringify({
       name: 'my-local-package',
-      version: '1.0.0'
-    })
+      version: '1.0.0',
+    }),
   })
   const packageName = await readLocalPackageName()
   t.equal(
@@ -33,8 +35,8 @@ test('read local scoped-package.json', async (t) => {
   prefix = t.testdir({
     'package.json': JSON.stringify({
       name: '@my-scope/my-local-package',
-      version: '1.0.0'
-    })
+      version: '1.0.0',
+    }),
   })
   const packageName = await readLocalPackageName()
   t.equal(
diff --git a/deps/npm/test/lib/utils/reify-finish.js b/deps/npm/test/lib/utils/reify-finish.js
new file mode 100644
index 00000000000000..d6c7d2e7b2d6d8
--- /dev/null
+++ b/deps/npm/test/lib/utils/reify-finish.js
@@ -0,0 +1,80 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+
+const npm = {
+  config: {
+    data: {
+      get: () => builtinConfMock,
+    },
+  },
+}
+
+const builtinConfMock = {
+  loadError: new Error('no builtin config'),
+  raw: { hasBuiltinConfig: true, x: 'y', nested: { foo: 'bar' }},
+}
+
+const reifyOutput = () => {}
+
+let expectWrite = false
+const realFs = require('fs')
+const fs = {
+  ...realFs,
+  promises: {
+    ...realFs.promises,
+    writeFile: async (path, data) => {
+      if (!expectWrite)
+        throw new Error('did not expect to write builtin config file')
+      return realFs.promises.writeFile(path, data)
+    },
+  },
+}
+
+const reifyFinish = requireInject('../../../lib/utils/reify-finish.js', {
+  fs,
+  '../../../lib/npm.js': npm,
+  '../../../lib/utils/reify-output.js': reifyOutput,
+})
+
+t.test('should not write if not global', async t => {
+  expectWrite = false
+  await reifyFinish({
+    options: { global: false },
+    actualTree: {},
+  })
+})
+
+t.test('should not write if no global npm module', async t => {
+  expectWrite = false
+  await reifyFinish({
+    options: { global: true },
+    actualTree: {
+      inventory: new Map(),
+    },
+  })
+})
+
+t.test('should not write if builtin conf had load error', async t => {
+  expectWrite = false
+  await reifyFinish({
+    options: { global: true },
+    actualTree: {
+      inventory: new Map([['node_modules/npm', {}]]),
+    },
+  })
+})
+
+t.test('should write if everything above passes', async t => {
+  expectWrite = true
+  delete builtinConfMock.loadError
+  const path = t.testdir()
+  await reifyFinish({
+    options: { global: true },
+    actualTree: {
+      inventory: new Map([['node_modules/npm', {path}]]),
+    },
+  })
+  // windowwwwwwssss!!!!!
+  const data = fs.readFileSync(`${path}/npmrc`, 'utf8').replace(/\r\n/g, '\n')
+  t.matchSnapshot(data, 'written config')
+})
diff --git a/deps/npm/test/lib/utils/reify-output.js b/deps/npm/test/lib/utils/reify-output.js
index 55f77f1d9d3a74..f7fd96ee87d984 100644
--- a/deps/npm/test/lib/utils/reify-output.js
+++ b/deps/npm/test/lib/utils/reify-output.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const t = require('tap')
 const requireInject = require('require-inject')
 
@@ -9,18 +7,18 @@ log.level = 'warn'
 t.cleanSnapshot = str => str.replace(/in [0-9]+m?s/g, 'in {TIME}')
 
 const settings = {
-  fund: true
+  fund: true,
 }
 const npmock = {
   started: Date.now(),
-  flatOptions: settings
+  flatOptions: settings,
 }
 const getReifyOutput = tester =>
   requireInject(
     '../../../lib/utils/reify-output.js',
     {
       '../../../lib/npm.js': npmock,
-      '../../../lib/utils/output.js': tester
+      '../../../lib/utils/output.js': tester,
     }
   )
 
@@ -36,11 +34,11 @@ t.test('missing info', (t) => {
 
   reifyOutput({
     actualTree: {
-      children: []
+      children: [],
     },
     diff: {
-      children: []
-    }
+      children: [],
+    },
   })
 })
 
@@ -56,12 +54,11 @@ t.test('even more missing info', t => {
 
   reifyOutput({
     actualTree: {
-      children: []
-    }
+      children: [],
+    },
   })
 })
 
-
 t.test('single package', (t) => {
   t.plan(1)
   const reifyOutput = getReifyOutput(
@@ -81,14 +78,14 @@ t.test('single package', (t) => {
     // the command is not 'audit'
     auditReport: {
       error: {
-        message: 'no audit for youuuuu'
-      }
+        message: 'no audit for youuuuu',
+      },
     },
     actualTree: {
       name: 'foo',
       package: {
         name: 'foo',
-        version: '1.0.0'
+        version: '1.0.0',
       },
       edgesOut: new Map([
         ['bar', {
@@ -97,26 +94,27 @@ t.test('single package', (t) => {
             package: {
               name: 'bar',
               version: '1.0.0',
-              funding: { type: 'foo', url: 'http://example.com' }
-            }
-          }
-        }]
-      ])
+              funding: { type: 'foo', url: 'http://example.com' },
+            },
+          },
+        }],
+      ]),
     },
     diff: {
-      children: []
-    }
+      children: [],
+    },
   })
 })
 
 t.test('no message when funding config is false', (t) => {
-  t.teardown(() => { settings.fund = true })
+  t.teardown(() => {
+    settings.fund = true
+  })
   settings.fund = false
   const reifyOutput = getReifyOutput(
     out => {
-      if (out.endsWith('looking for funding')) {
+      if (out.endsWith('looking for funding'))
         t.fail('should not print funding info', { actual: out })
-      }
     }
   )
 
@@ -125,7 +123,7 @@ t.test('no message when funding config is false', (t) => {
       name: 'foo',
       package: {
         name: 'foo',
-        version: '1.0.0'
+        version: '1.0.0',
       },
       edgesOut: new Map([
         ['bar', {
@@ -134,15 +132,15 @@ t.test('no message when funding config is false', (t) => {
             package: {
               name: 'bar',
               version: '1.0.0',
-              funding: { type: 'foo', url: 'http://example.com' }
-            }
-          }
-        }]
-      ])
+              funding: { type: 'foo', url: 'http://example.com' },
+            },
+          },
+        }],
+      ]),
     },
     diff: {
-      children: []
-    }
+      children: [],
+    },
   })
 
   t.end()
@@ -167,7 +165,7 @@ t.test('print appropriate message for many packages', (t) => {
       name: 'foo',
       package: {
         name: 'foo',
-        version: '1.0.0'
+        version: '1.0.0',
       },
       edgesOut: new Map([
         ['bar', {
@@ -176,9 +174,9 @@ t.test('print appropriate message for many packages', (t) => {
             package: {
               name: 'bar',
               version: '1.0.0',
-              funding: { type: 'foo', url: 'http://example.com' }
-            }
-          }
+              funding: { type: 'foo', url: 'http://example.com' },
+            },
+          },
         }],
         ['lorem', {
           to: {
@@ -186,9 +184,9 @@ t.test('print appropriate message for many packages', (t) => {
             package: {
               name: 'lorem',
               version: '1.0.0',
-              funding: { type: 'foo', url: 'http://example.com' }
-            }
-          }
+              funding: { type: 'foo', url: 'http://example.com' },
+            },
+          },
         }],
         ['ipsum', {
           to: {
@@ -196,15 +194,15 @@ t.test('print appropriate message for many packages', (t) => {
             package: {
               name: 'ipsum',
               version: '1.0.0',
-              funding: { type: 'foo', url: 'http://example.com' }
-            }
-          }
-        }]
-      ])
+              funding: { type: 'foo', url: 'http://example.com' },
+            },
+          },
+        }],
+      ]),
     },
     diff: {
-      children: []
-    }
+      children: [],
+    },
   })
 })
 
@@ -217,19 +215,21 @@ t.test('no output when silent', t => {
   reifyOutput({
     actualTree: { inventory: { size: 999 }, children: [] },
     auditReport: {
-      toJSON: () => mock.auditReport,
+      toJSON: () => {
+        throw new Error('this should not get called')
+      },
       vulnerabilities: {},
       metadata: {
         vulnerabilities: {
-          total: 99
-        }
-      }
+          total: 99,
+        },
+      },
     },
     diff: {
       children: [
-        { action: 'ADD', ideal: { location: 'loc' } }
-      ]
-    }
+        { action: 'ADD', ideal: { location: 'loc' } },
+      ],
+    },
   })
   t.end()
 })
@@ -251,22 +251,22 @@ t.test('packages changed message', t => {
         vulnerabilities: {},
         metadata: {
           vulnerabilities: {
-            total: 0
-          }
-        }
+            total: 0,
+          },
+        },
       } : null,
       diff: {
         children: [
-          { action: 'some random unexpected junk' }
-        ]
-      }
+          { action: 'some random unexpected junk' },
+        ],
+      },
     }
-    for (let i = 0; i < added; i++) {
+    for (let i = 0; i < added; i++)
       mock.diff.children.push({ action: 'ADD', ideal: { location: 'loc' } })
-    }
-    for (let i = 0; i < removed; i++) {
+
+    for (let i = 0; i < removed; i++)
       mock.diff.children.push({ action: 'REMOVE', actual: { location: 'loc' } })
-    }
+
     for (let i = 0; i < changed; i++) {
       const actual = { location: 'loc' }
       const ideal = { location: 'loc' }
@@ -279,7 +279,7 @@ t.test('packages changed message', t => {
       removed,
       changed,
       audited,
-      json
+      json,
     }))
   }
 
@@ -288,9 +288,8 @@ t.test('packages changed message', t => {
     for (const removed of [0, 1, 2]) {
       for (const changed of [0, 1, 2]) {
         for (const audited of [0, 1, 2]) {
-          for (const json of [true, false]) {
+          for (const json of [true, false])
             cases.push([added, removed, changed, audited, json, 'install'])
-          }
         }
       }
     }
@@ -301,9 +300,8 @@ t.test('packages changed message', t => {
   cases.push([0, 0, 0, 2, false, 'audit'])
 
   t.plan(cases.length)
-  for (const [added, removed, changed, audited, json, command] of cases) {
+  for (const [added, removed, changed, audited, json, command] of cases)
     testCase(t, added, removed, changed, audited, json, command)
-  }
 
   t.end()
 })
@@ -319,14 +317,14 @@ t.test('added packages should be looked up within returned tree', t => {
       actualTree: {
         name: 'foo',
         inventory: {
-          has: () => true
-        }
+          has: () => true,
+        },
       },
       diff: {
         children: [
-          { action: 'ADD', ideal: { name: 'baz' } }
-        ]
-      }
+          { action: 'ADD', ideal: { name: 'baz' } },
+        ],
+      },
     })
   })
 
@@ -340,14 +338,14 @@ t.test('added packages should be looked up within returned tree', t => {
       actualTree: {
         name: 'foo',
         inventory: {
-          has: () => false
-        }
+          has: () => false,
+        },
       },
       diff: {
         children: [
-          { action: 'ADD', ideal: { name: 'baz' } }
-        ]
-      }
+          { action: 'ADD', ideal: { name: 'baz' } },
+        ],
+      },
     })
   })
   t.end()
diff --git a/deps/npm/test/lib/utils/setup-log.js b/deps/npm/test/lib/utils/setup-log.js
index 2d5d794f1377a5..4398200abe22c0 100644
--- a/deps/npm/test/lib/utils/setup-log.js
+++ b/deps/npm/test/lib/utils/setup-log.js
@@ -1,15 +1,18 @@
 const t = require('tap')
 const requireInject = require('require-inject')
 
-const settings = {}
+const settings = {
+  level: 'warn',
+}
 t.afterEach(cb => {
-  Object.keys(settings).forEach(k => { delete settings[k] })
+  Object.keys(settings).forEach(k => {
+    delete settings[k]
+  })
   cb()
 })
 
 const WARN_CALLED = []
 const npmlog = {
-  level: 'warn',
   warn: (...args) => {
     WARN_CALLED.push(args)
   },
@@ -22,17 +25,39 @@ const npmlog = {
     notice: 3500,
     warn: 4000,
     error: 5000,
-    silent: Infinity
+    silent: Infinity,
   },
   settings,
-  enableColor: () => { settings.color = true },
-  disableColor: () => { settings.color = false },
-  enableUnicode: () => { settings.unicode = true },
-  disableUnicode: () => { settings.unicode = false },
-  enableProgress: () => { settings.progress = true },
-  disableProgress: () => { settings.progress = false },
-  set heading (h) { settings.heading = h },
-  set level (l) { settings.level = l }
+  enableColor: () => {
+    settings.color = true
+  },
+  disableColor: () => {
+    settings.color = false
+  },
+  enableUnicode: () => {
+    settings.unicode = true
+  },
+  disableUnicode: () => {
+    settings.unicode = false
+  },
+  enableProgress: () => {
+    settings.progress = true
+  },
+  disableProgress: () => {
+    settings.progress = false
+  },
+  get heading () {
+    return settings.heading
+  },
+  set heading (h) {
+    settings.heading = h
+  },
+  get level () {
+    return settings.level
+  },
+  set level (l) {
+    settings.level = l
+  },
 }
 
 const EXPLAIN_CALLED = []
@@ -41,9 +66,9 @@ const setupLog = requireInject('../../../lib/utils/setup-log.js', {
     explain: (...args) => {
       EXPLAIN_CALLED.push(args)
       return 'explanation'
-    }
+    },
   },
-  npmlog
+  npmlog,
 })
 
 const config = obj => ({
@@ -52,7 +77,7 @@ const config = obj => ({
   },
   set (k, v) {
     obj[k] = v
-  }
+  },
 })
 
 t.test('setup with color=always and unicode', t => {
@@ -65,7 +90,7 @@ t.test('setup with color=always and unicode', t => {
     loglevel: 'warn',
     color: 'always',
     unicode: true,
-    progress: false
+    progress: false,
   })), true)
 
   npmlog.warn('ERESOLVE', 'hello', { some: { other: 'object' } })
@@ -73,7 +98,7 @@ t.test('setup with color=always and unicode', t => {
     'log.warn(ERESOLVE) patched to call explainEresolve()')
   t.strictSame(WARN_CALLED, [
     ['ERESOLVE', 'hello'],
-    ['', 'explanation']
+    ['', 'explanation'],
   ], 'warn the explanation')
   EXPLAIN_CALLED.length = 0
   WARN_CALLED.length = 0
@@ -86,7 +111,7 @@ t.test('setup with color=always and unicode', t => {
     color: true,
     unicode: true,
     progress: false,
-    heading: 'npm'
+    heading: 'npm',
   })
 
   t.end()
@@ -106,7 +131,7 @@ t.test('setup with color=true, no unicode, and non-TTY terminal', t => {
     loglevel: 'warn',
     color: false,
     progress: false,
-    heading: 'asdf'
+    heading: 'asdf',
   })), false)
 
   t.strictSame(settings, {
@@ -114,7 +139,7 @@ t.test('setup with color=true, no unicode, and non-TTY terminal', t => {
     color: false,
     unicode: false,
     progress: false,
-    heading: 'asdf'
+    heading: 'asdf',
   })
 
   t.end()
@@ -137,7 +162,7 @@ t.test('setup with color=true, no unicode, and dumb TTY terminal', t => {
     loglevel: 'warn',
     color: true,
     progress: false,
-    heading: 'asdf'
+    heading: 'asdf',
   })), true)
 
   t.strictSame(settings, {
@@ -145,7 +170,7 @@ t.test('setup with color=true, no unicode, and dumb TTY terminal', t => {
     color: true,
     unicode: false,
     progress: false,
-    heading: 'asdf'
+    heading: 'asdf',
   })
 
   t.end()
@@ -168,7 +193,7 @@ t.test('setup with color=true, no unicode, and non-dumb TTY terminal', t => {
     loglevel: 'warn',
     color: true,
     progress: true,
-    heading: 'asdf'
+    heading: 'asdf',
   })), true)
 
   t.strictSame(settings, {
@@ -176,7 +201,7 @@ t.test('setup with color=true, no unicode, and non-dumb TTY terminal', t => {
     color: true,
     unicode: false,
     progress: true,
-    heading: 'asdf'
+    heading: 'asdf',
   })
 
   t.end()
@@ -199,7 +224,7 @@ t.test('setup with non-TTY stdout, TTY stderr', t => {
     loglevel: 'warn',
     color: true,
     progress: true,
-    heading: 'asdf'
+    heading: 'asdf',
   })), false)
 
   t.strictSame(settings, {
@@ -207,7 +232,7 @@ t.test('setup with non-TTY stdout, TTY stderr', t => {
     color: true,
     unicode: false,
     progress: true,
-    heading: 'asdf'
+    heading: 'asdf',
   })
 
   t.end()
@@ -229,7 +254,7 @@ t.test('setup with TTY stdout, non-TTY stderr', t => {
     loglevel: 'warn',
     color: true,
     progress: true,
-    heading: 'asdf'
+    heading: 'asdf',
   })), true)
 
   t.strictSame(settings, {
@@ -237,7 +262,7 @@ t.test('setup with TTY stdout, non-TTY stderr', t => {
     color: false,
     unicode: false,
     progress: false,
-    heading: 'asdf'
+    heading: 'asdf',
   })
 
   t.end()
@@ -246,7 +271,7 @@ t.test('setup with TTY stdout, non-TTY stderr', t => {
 t.test('set loglevel to timing', t => {
   setupLog(config({
     timing: true,
-    loglevel: 'notice'
+    loglevel: 'notice',
   }))
   t.equal(settings.level, 'timing')
   t.end()
@@ -266,7 +291,7 @@ t.test('silent has no logging', t => {
   process.env.TERM = 'totes not dum'
 
   setupLog(config({
-    loglevel: 'silent'
+    loglevel: 'silent',
   }))
   t.equal(settings.progress, false, 'progress disabled when silent')
   t.end()
diff --git a/deps/npm/test/lib/utils/tar.js b/deps/npm/test/lib/utils/tar.js
index 827bc9262db825..b780a73e5ec1c7 100644
--- a/deps/npm/test/lib/utils/tar.js
+++ b/deps/npm/test/lib/utils/tar.js
@@ -11,9 +11,9 @@ const printLogs = (tarball, unicode) => {
     log: {
       notice: (...args) => {
         args.map(el => logs.push(el))
-      }
+      },
     },
-    unicode
+    unicode,
   })
   return logs.join('\n')
 }
@@ -24,19 +24,19 @@ test('should log tarball contents', async (t) => {
       name: 'my-cool-pkg',
       version: '1.0.0',
       bundleDependencies: [
-        'bundle-dep'
-      ]
+        'bundle-dep',
+      ],
     }, null, 2),
-    'node_modules': {
-      'bundle-dep': 'toto'
-    }
+    node_modules: {
+      'bundle-dep': 'toto',
+    },
   })
 
   const tarball = await pack(testDir)
   const tarballContents = await getContents({
     _id: '1',
     name: 'my-cool-pkg',
-    version: '1.0.0'
+    version: '1.0.0',
   }, tarball)
 
   t.matchSnapshot(printLogs(tarballContents, false))
@@ -44,36 +44,36 @@ test('should log tarball contents', async (t) => {
 
 test('should log tarball contents with unicode', async (t) => {
   const { logTar } = requireInject('../../../lib/utils/tar.js', {
-    'npmlog': {
-      'notice': (str) => {
+    npmlog: {
+      notice: (str) => {
         t.ok(true, 'defaults to npmlog')
         return str
-      }
-    }
+      },
+    },
   })
-  
-  logTar({ 
-    files: [], 
+
+  logTar({
+    files: [],
     bundled: [],
-    integrity: '' 
+    integrity: '',
   }, { unicode: true })
   t.end()
 })
 
 test('should default to npmlog', async (t) => {
   const { logTar } = requireInject('../../../lib/utils/tar.js', {
-    'npmlog': {
-      'notice': (str) => {
+    npmlog: {
+      notice: (str) => {
         t.ok(true, 'defaults to npmlog')
         return str
-      }
-    }
+      },
+    },
   })
 
   logTar({
     files: [],
     bundled: [],
-    integrity: ''
+    integrity: '',
   })
   t.end()
 })
@@ -82,19 +82,19 @@ test('should getContents of a tarball', async (t) => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
       name: 'my-cool-pkg',
-      version: '1.0.0'
-    }, null, 2)
+      version: '1.0.0',
+    }, null, 2),
   })
 
   const tarball = await pack(testDir)
 
   const tarballContents = await getContents({
     name: 'my-cool-pkg',
-    version: '1.0.0'
+    version: '1.0.0',
   }, tarball)
 
   const integrity = await ssri.fromData(tarball, {
-    algorithms: ['sha1', 'sha512']
+    algorithms: ['sha1', 'sha512'],
   })
 
   t.strictSame(tarballContents, {
@@ -106,10 +106,9 @@ test('should getContents of a tarball', async (t) => {
     shasum: 'c0bfd67a5142104e429afda09119eedd6a30d2fc',
     integrity: ssri.parse(integrity.sha512[0]),
     filename: 'my-cool-pkg-1.0.0.tgz',
-    files: [ { path: 'package.json', size: 49, mode: 420 } ],
+    files: [{ path: 'package.json', size: 49, mode: 420 }],
     entryCount: 1,
-    bundled: []
+    bundled: [],
   }, 'contents are correct')
   t.end()
-
 })
diff --git a/deps/npm/test/lib/utils/unsupported.js b/deps/npm/test/lib/utils/unsupported.js
index 89ee6af2321d7d..f14cba9b744adb 100644
--- a/deps/npm/test/lib/utils/unsupported.js
+++ b/deps/npm/test/lib/utils/unsupported.js
@@ -30,7 +30,7 @@ const versions = [
   ['v10.0.0-0', false, false],
   ['v11.0.0-0', false, false],
   ['v12.0.0-0', false, false],
-  ['v13.0.0-0', false, false]
+  ['v13.0.0-0', false, false],
 ]
 
 test('versions', function (t) {
@@ -71,7 +71,7 @@ test('checkForBrokenNode', t => {
   const expectLogs = [
     'ERROR: npm is known not to run on Node.js 1.2.3',
     "You'll need to upgrade to a newer Node.js version in order to use this",
-    'version of npm. You can find the latest version at https://nodejs.org/'
+    'version of npm. You can find the latest version at https://nodejs.org/',
   ]
   console.error = msg => logs.push(msg)
   unsupported.checkForBrokenNode()
@@ -92,7 +92,7 @@ test('checkForUnsupportedNode', t => {
     'npm does not support Node.js 8.0.0',
     'You should probably upgrade to a newer version of node as we',
     "can't make any promises that npm will work with this version.",
-    'You can find the latest version at https://nodejs.org/'
+    'You can find the latest version at https://nodejs.org/',
   ]
   npmlog.warn = (section, msg) => logs.push(msg)
 
diff --git a/deps/npm/test/lib/utils/update-notifier.js b/deps/npm/test/lib/utils/update-notifier.js
index 903e888a5e0f7d..99c9dfc26626f1 100644
--- a/deps/npm/test/lib/utils/update-notifier.js
+++ b/deps/npm/test/lib/utils/update-notifier.js
@@ -22,15 +22,15 @@ const pacote = {
       process.exit(1)
     }
     MANIFEST_REQUEST.push(spec)
-    if (PACOTE_ERROR) {
+    if (PACOTE_ERROR)
       throw PACOTE_ERROR
-    }
+
     return {
       version: spec === 'npm@latest' ? CURRENT_VERSION
-        : /-/.test(spec) ? CURRENT_BETA
-        : NEXT_VERSION
+      : /-/.test(spec) ? CURRENT_BETA
+      : NEXT_VERSION,
     }
-  }
+  },
 }
 
 const npm = {
@@ -38,13 +38,12 @@ const npm = {
   log: { useColor: () => true },
   version: CURRENT_VERSION,
   config: { get: (k) => k !== 'global' },
-  flatOptions,
   command: 'view',
-  argv: ['npm']
+  argv: ['npm'],
 }
 const npmNoColor = {
   ...npm,
-  log: { useColor: () => false }
+  log: { useColor: () => false },
 }
 
 const { basename } = require('path')
@@ -70,17 +69,15 @@ const fs = {
       process.exit(1)
     }
     process.nextTick(() => cb(WRITE_ERROR))
-  }
+  },
 }
 
 const updateNotifier = requireInject('../../../lib/utils/update-notifier.js', {
   '@npmcli/ci-detect': () => ciMock,
   pacote,
-  fs
+  fs,
 })
 
-const semver = require('semver')
-
 t.afterEach(cb => {
   MANIFEST_REQUEST.length = 0
   STAT_ERROR = null
@@ -94,7 +91,7 @@ t.test('situations in which we do not notify', t => {
   t.test('nothing to do if notifier disabled', async t => {
     t.equal(await updateNotifier({
       ...npm,
-      config: { get: (k) => k === 'update-notifier' ? false : true }
+      config: { get: (k) => k !== 'update-notifier' },
     }), null)
     t.strictSame(MANIFEST_REQUEST, [], 'no requests for manifests')
   })
@@ -104,7 +101,7 @@ t.test('situations in which we do not notify', t => {
       ...npm,
       flatOptions: { ...flatOptions, global: true },
       command: 'install',
-      argv: ['npm']
+      argv: ['npm'],
     }), null)
     t.strictSame(MANIFEST_REQUEST, [], 'no requests for manifests')
   })
@@ -140,7 +137,9 @@ t.test('situations in which we do not notify', t => {
   })
 
   t.test('do not update in CI', async t => {
-    t.teardown(() => { ciMock = null })
+    t.teardown(() => {
+      ciMock = null
+    })
     ciMock = 'something'
     t.equal(await updateNotifier(npm), null)
     t.strictSame(MANIFEST_REQUEST, [], 'no requests for manifests')
@@ -148,14 +147,14 @@ t.test('situations in which we do not notify', t => {
 
   t.test('only check weekly for GA releases', async t => {
     // the 10 is fuzz factor for test environment
-    STAT_MTIME = Date.now() - (1000*60*60*24*7) + 10
+    STAT_MTIME = Date.now() - (1000 * 60 * 60 * 24 * 7) + 10
     t.equal(await updateNotifier(npm), null)
     t.strictSame(MANIFEST_REQUEST, [], 'no requests for manifests')
   })
 
   t.test('only check daily for betas', async t => {
     // the 10 is fuzz factor for test environment
-    STAT_MTIME = Date.now() - (1000*60*60*24) + 10
+    STAT_MTIME = Date.now() - (1000 * 60 * 60 * 24) + 10
     t.equal(await updateNotifier({ ...npm, version: HAVE_BETA }), null)
     t.strictSame(MANIFEST_REQUEST, [], 'no requests for manifests')
   })
diff --git a/deps/npm/test/lib/version.js b/deps/npm/test/lib/version.js
new file mode 100644
index 00000000000000..f36132253fa321
--- /dev/null
+++ b/deps/npm/test/lib/version.js
@@ -0,0 +1,160 @@
+const t = require('tap')
+const requireInject = require('require-inject')
+
+let result = []
+
+const noop = () => null
+const npm = {
+  flatOptions: {
+    json: false,
+  },
+  prefix: '',
+  version: '1.0.0',
+}
+const mocks = {
+  libnpmversion: noop,
+  '../../lib/npm.js': npm,
+  '../../lib/utils/output.js': (...msg) => {
+    for (const m of msg)
+      result.push(m)
+  },
+  '../../lib/utils/usage.js': () => 'usage instructions',
+}
+
+const version = requireInject('../../lib/version.js', mocks)
+
+const _processVersions = process.versions
+t.afterEach(cb => {
+  npm.flatOptions.json = false
+  npm.prefix = ''
+  process.versions = _processVersions
+  result = []
+  cb()
+})
+
+t.test('no args', t => {
+  const prefix = t.testdir({
+    'package.json': JSON.stringify({
+      name: 'test-version-no-args',
+      version: '3.2.1',
+    }),
+  })
+  npm.prefix = prefix
+  Object.defineProperty(process, 'versions', { value: { node: '1.0.0' } })
+
+  version([], err => {
+    if (err)
+      throw err
+
+    t.deepEqual(
+      result,
+      [{
+        'test-version-no-args': '3.2.1',
+        node: '1.0.0',
+        npm: '1.0.0',
+      }],
+      'should output expected values for various versions in npm'
+    )
+
+    t.end()
+  })
+})
+
+t.test('too many args', t => {
+  version(['foo', 'bar'], err => {
+    t.match(
+      err,
+      'usage instructions',
+      'should throw usage instructions error'
+    )
+
+    t.end()
+  })
+})
+
+t.test('completion', t => {
+  const { completion } = version
+
+  const testComp = (argv, expect) => {
+    completion({ conf: { argv: { remain: argv } } }, (err, res) => {
+      t.ifError(err)
+      t.strictSame(res, expect, argv.join(' '))
+    })
+  }
+
+  testComp(['npm', 'version'], [
+    'major',
+    'minor',
+    'patch',
+    'premajor',
+    'preminor',
+    'prepatch',
+    'prerelease',
+    'from-git',
+  ])
+  testComp(['npm', 'version', 'major'], [])
+
+  t.end()
+})
+
+t.test('failure reading package.json', t => {
+  const prefix = t.testdir({})
+  npm.prefix = prefix
+
+  version([], err => {
+    if (err)
+      throw err
+
+    t.deepEqual(
+      result,
+      [{
+        npm: '1.0.0',
+        node: '1.0.0',
+      }],
+      'should not have package name on returning object'
+    )
+
+    t.end()
+  })
+})
+
+t.test('--json option', t => {
+  const prefix = t.testdir({})
+  npm.flatOptions.json = true
+  npm.prefix = prefix
+  Object.defineProperty(process, 'versions', { value: {} })
+
+  version([], err => {
+    if (err)
+      throw err
+    t.deepEqual(
+      result,
+      ['{\n  "npm": "1.0.0"\n}'],
+      'should return json stringified result'
+    )
+    t.end()
+  })
+})
+
+t.test('with one arg', t => {
+  const version = requireInject('../../lib/version.js', {
+    ...mocks,
+    libnpmversion: (arg, opts) => {
+      t.equal(arg, 'major', 'should forward expected value')
+      t.deepEqual(
+        opts,
+        {
+          json: false,
+          path: '',
+        },
+        'should forward expected options'
+      )
+      t.end()
+    },
+  })
+
+  version(['major'], err => {
+    if (err)
+      throw err
+  })
+})
diff --git a/deps/npm/test/lib/view.js b/deps/npm/test/lib/view.js
index 88b2769a058990..f3e5d97f333605 100644
--- a/deps/npm/test/lib/view.js
+++ b/deps/npm/test/lib/view.js
@@ -13,227 +13,225 @@ const cleanLogs = (done) => {
 }
 
 const packument = (nv, opts) => {
-  if (!opts.fullMetadata) {
+  if (!opts.fullMetadata)
     throw new Error('must fetch fullMetadata')
-  }
 
-  if (!opts.preferOnline) {
+  if (!opts.preferOnline)
     throw new Error('must fetch with preferOnline')
-  }
 
   const mocks = {
-    'red': {
-      'name' : 'red',
+    red: {
+      name: 'red',
       'dist-tags': {
-        '1.0.1': {}
+        '1.0.1': {},
+      },
+      time: {
+        unpublished: new Date(),
       },
-      'time': {
-        'unpublished': new Date()
-      }
     },
-    'blue': {
-      'name': 'blue',
+    blue: {
+      name: 'blue',
       'dist-tags': {},
-      'time': {
-        '1.0.0': '2019-08-06T16:21:09.842Z'
+      time: {
+        '1.0.0': '2019-08-06T16:21:09.842Z',
       },
-      'versions': {
+      versions: {
         '1.0.0': {
-          'name': 'blue',
-          'version': '1.0.0',
-          'dist': {
-            'shasum': '123',
-            'tarball': 'http://hm.blue.com/1.0.0.tgz',
-            'integrity': '---',
-            'fileCount': 1,
-            'unpackedSize': 1              
-          }
+          name: 'blue',
+          version: '1.0.0',
+          dist: {
+            shasum: '123',
+            tarball: 'http://hm.blue.com/1.0.0.tgz',
+            integrity: '---',
+            fileCount: 1,
+            unpackedSize: 1,
+          },
         },
-        '1.0.1': {}
-      }
+        '1.0.1': {},
+      },
     },
-    'cyan': {
-      '_npmUser': {
-        'name': 'claudia',
-        'email': 'claudia@cyan.com'
-      } ,
-      'name': 'cyan',
+    cyan: {
+      _npmUser: {
+        name: 'claudia',
+        email: 'claudia@cyan.com',
+      },
+      name: 'cyan',
       'dist-tags': {},
-      'versions': {
+      versions: {
         '1.0.0': {
-          'version': '1.0.0',
-          'name': 'cyan',
-          'dist': {
-            'shasum': '123',
-            'tarball': 'http://hm.cyan.com/1.0.0.tgz',
-            'integrity': '---',
-            'fileCount': 1,
-            'unpackedSize': 1
-          }
+          version: '1.0.0',
+          name: 'cyan',
+          dist: {
+            shasum: '123',
+            tarball: 'http://hm.cyan.com/1.0.0.tgz',
+            integrity: '---',
+            fileCount: 1,
+            unpackedSize: 1,
+          },
         },
-        '1.0.1': {}
-      }
+        '1.0.1': {},
+      },
     },
-    'brown': {
-      'name': 'brown'
+    brown: {
+      name: 'brown',
     },
-    'yellow': {
-      '_id': 'yellow',
-      'name': 'yellow',
-      'author': {
-        'name': 'foo',
-        'email': 'foo@yellow.com',
-        'twitter': 'foo'
+    yellow: {
+      _id: 'yellow',
+      name: 'yellow',
+      author: {
+        name: 'foo',
+        email: 'foo@yellow.com',
+        twitter: 'foo',
       },
-      'readme': 'a very useful readme',
-      'versions': {
+      readme: 'a very useful readme',
+      versions: {
         '1.0.0': {
-          'version': '1.0.0',
-          'author': 'claudia',
-          'readme': 'a very useful readme',
-          'maintainers': [
-            { 'name': 'claudia', 'email': 'c@yellow.com', 'twitter': 'cyellow' },
-            { 'name': 'isaacs', 'email': 'i@yellow.com', 'twitter': 'iyellow' }
-          ]
+          version: '1.0.0',
+          author: 'claudia',
+          readme: 'a very useful readme',
+          maintainers: [
+            { name: 'claudia', email: 'c@yellow.com', twitter: 'cyellow' },
+            { name: 'isaacs', email: 'i@yellow.com', twitter: 'iyellow' },
+          ],
         },
         '1.0.1': {
-          'version': '1.0.1',
-          'author': 'claudia'
+          version: '1.0.1',
+          author: 'claudia',
         },
         '1.0.2': {
-          'version': '1.0.2',
-          'author': 'claudia'
-        }
-      }
+          version: '1.0.2',
+          author: 'claudia',
+        },
+      },
     },
-    'purple': {
-      'name': 'purple',
-      'versions': {
+    purple: {
+      name: 'purple',
+      versions: {
         '1.0.0': {
-          'foo': 1,
-          'maintainers': [
-            { 'name': 'claudia' }
-          ]
+          foo: 1,
+          maintainers: [
+            { name: 'claudia' },
+          ],
         },
-        '1.0.1': {}
-      }
+        '1.0.1': {},
+      },
     },
-    'green': {
-      '_id': 'green',
-      'name': 'green',
+    green: {
+      _id: 'green',
+      name: 'green',
       'dist-tags': {
-        'latest': '1.0.0'
+        latest: '1.0.0',
       },
-      'maintainers': [
-        { 'name': 'claudia', 'email': 'c@yellow.com', 'twitter': 'cyellow' },
-        { 'name': 'isaacs', 'email': 'i@yellow.com', 'twitter': 'iyellow' }
+      maintainers: [
+        { name: 'claudia', email: 'c@yellow.com', twitter: 'cyellow' },
+        { name: 'isaacs', email: 'i@yellow.com', twitter: 'iyellow' },
       ],
-      'keywords': ['colors', 'green', 'crayola'],
-      'versions': {
+      keywords: ['colors', 'green', 'crayola'],
+      versions: {
         '1.0.0': {
-          '_id': 'green',
-          'version': '1.0.0',
-          'description': 'green is a very important color',
-          'bugs': {
-            'url': 'http://bugs.green.com'
+          _id: 'green',
+          version: '1.0.0',
+          description: 'green is a very important color',
+          bugs: {
+            url: 'http://bugs.green.com',
+          },
+          deprecated: true,
+          repository: {
+            url: 'http://repository.green.com',
           },
-          'deprecated': true,
-          'repository': {
-            'url': 'http://repository.green.com'
+          license: { type: 'ACME' },
+          bin: {
+            green: 'bin/green.js',
           },
-          'license': { type: 'ACME' },
-          'bin': {
-            'green': 'bin/green.js'
+          dependencies: {
+            red: '1.0.0',
+            yellow: '1.0.0',
           },
-          'dependencies': {
-            'red': '1.0.0',
-            'yellow': '1.0.0'
+          dist: {
+            shasum: '123',
+            tarball: 'http://hm.green.com/1.0.0.tgz',
+            integrity: '---',
+            fileCount: 1,
+            unpackedSize: 1,
           },
-          'dist': {
-            'shasum': '123',
-            'tarball': 'http://hm.green.com/1.0.0.tgz',
-            'integrity': '---',
-            'fileCount': 1,
-            'unpackedSize': 1
-          }
         },
-        '1.0.1': {}
-      }
+        '1.0.1': {},
+      },
     },
-    'black': {
-      'name': 'black',
+    black: {
+      name: 'black',
       'dist-tags': {
-        'latest': '1.0.0'
+        latest: '1.0.0',
       },
-      'versions': {
+      versions: {
         '1.0.0': {
-          'version': '1.0.0',
-          'bugs': 'http://bugs.black.com',
-          'license': {},
-          'dependencies': (() => {
+          version: '1.0.0',
+          bugs: 'http://bugs.black.com',
+          license: {},
+          dependencies: (() => {
             const deps = {}
-            for (i = 0; i < 25; i++) {
+            for (let i = 0; i < 25; i++)
               deps[i] = '1.0.0'
-            }
+
             return deps
           })(),
-          'dist': {
-            'shasum': '123',
-            'tarball': 'http://hm.black.com/1.0.0.tgz',
-            'integrity': '---',
-            'fileCount': 1,
-            'unpackedSize': 1
-          }
+          dist: {
+            shasum: '123',
+            tarball: 'http://hm.black.com/1.0.0.tgz',
+            integrity: '---',
+            fileCount: 1,
+            unpackedSize: 1,
+          },
         },
-        '1.0.1': {}
-      }
+        '1.0.1': {},
+      },
     },
-    'pink': {
-      'name': 'pink',
+    pink: {
+      name: 'pink',
       'dist-tags': {
-        'latest': '1.0.0'
+        latest: '1.0.0',
       },
-      'versions': {
+      versions: {
         '1.0.0': {
-          'version': '1.0.0',
-          'maintainers': [
-            { 'name': 'claudia', 'url': 'http://c.pink.com' },
-            { 'name': 'isaacs', 'url': 'http://i.pink.com'  }
+          version: '1.0.0',
+          maintainers: [
+            { name: 'claudia', url: 'http://c.pink.com' },
+            { name: 'isaacs', url: 'http://i.pink.com' },
           ],
-          'repository': 'http://repository.pink.com',
-          'license': {},
-          'dist': {
-            'shasum': '123',
-            'tarball': 'http://hm.pink.com/1.0.0.tgz',
-            'integrity': '---',
-            'fileCount': 1,
-            'unpackedSize': 1
-          }
+          repository: 'http://repository.pink.com',
+          license: {},
+          dist: {
+            shasum: '123',
+            tarball: 'http://hm.pink.com/1.0.0.tgz',
+            integrity: '---',
+            fileCount: 1,
+            unpackedSize: 1,
+          },
         },
-        '1.0.1': {}
-      }
+        '1.0.1': {},
+      },
     },
-    'orange': {
-      'name': 'orange',
+    orange: {
+      name: 'orange',
       'dist-tags': {
-        'latest': '1.0.0'
+        latest: '1.0.0',
       },
-      'versions': {
+      versions: {
         '1.0.0': {
-          'version': '1.0.0',
-          'homepage': 'http://hm.orange.com',
-          'license': {},
-          'dist': {
-            'shasum': '123',
-            'tarball': 'http://hm.orange.com/1.0.0.tgz',
-            'integrity': '---',
-            'fileCount': 1,
-            'unpackedSize': 1
-          }
+          version: '1.0.0',
+          homepage: 'http://hm.orange.com',
+          license: {},
+          dist: {
+            shasum: '123',
+            tarball: 'http://hm.orange.com/1.0.0.tgz',
+            integrity: '---',
+            fileCount: 1,
+            unpackedSize: 1,
+          },
         },
-        '1.0.1': {}
-      }
-    }
+        '1.0.1': {},
+      },
+    },
   }
   return mocks[nv.name]
 }
@@ -244,34 +242,34 @@ t.test('should log package info', t => {
     '../../lib/npm.js': {
       flatOptions: {
         global: false,
-      }
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
 
   const viewJson = requireInject('../../lib/view.js', {
     '../../lib/npm.js': {
       flatOptions: {
-        json: true
-      }
+        json: true,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
 
   const viewUnicode = requireInject('../../lib/view.js', {
     '../../lib/npm.js': {
       flatOptions: {
         global: false,
-        unicode: true
-      }
+        unicode: true,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
 
   t.test('package with license, bugs, repository and other fields', t => {
@@ -344,8 +342,8 @@ t.test('should log info of package in current working dir', t => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
       name: 'blue',
-      version: '1.0.0'
-    }, null, 2)
+      version: '1.0.0',
+    }, null, 2),
   })
 
   const view = requireInject('../../lib/view.js', {
@@ -353,12 +351,12 @@ t.test('should log info of package in current working dir', t => {
       prefix: testDir,
       flatOptions: {
         defaultTag: '1.0.0',
-        global: false
-      }
+        global: false,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
 
   t.test('specific version', t => {
@@ -383,23 +381,23 @@ t.test('should log info by field name', t => {
     '../../lib/npm.js': {
       flatOptions: {
         json: true,
-        global: false
-      }
+        global: false,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
 
   const view = requireInject('../../lib/view.js', {
     '../../lib/npm.js': {
       flatOptions: {
-        global: false
-      }
+        global: false,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
 
   t.test('readme', t => {
@@ -452,14 +450,14 @@ t.test('should log info by field name', t => {
   })
 
   t.test('array field - 1 element', t => {
-    view(['purple@1.0.0',  'maintainers.name'], () => {
+    view(['purple@1.0.0', 'maintainers.name'], () => {
       t.matchSnapshot(logs)
       t.end()
     })
   })
 
   t.test('array field - 2 elements', t => {
-    view(['yellow@1.x.x',  'maintainers.name'], () => {
+    view(['yellow@1.x.x', 'maintainers.name'], () => {
       t.matchSnapshot(logs)
       t.end()
     })
@@ -472,9 +470,9 @@ t.test('throw error if global mode', (t) => {
   const view = requireInject('../../lib/view.js', {
     '../../lib/npm.js': {
       flatOptions: {
-        global: true
-      }
-    }
+        global: true,
+      },
+    },
   })
   view([], (err) => {
     t.equals(err.message, 'Cannot use view command in global mode.')
@@ -489,9 +487,9 @@ t.test('throw ENOENT error if package.json misisng', (t) => {
     '../../lib/npm.js': {
       prefix: testDir,
       flatOptions: {
-        global: false
-      }
-    }
+        global: false,
+      },
+    },
   })
   view([], (err) => {
     t.match(err, { code: 'ENOENT' })
@@ -501,16 +499,16 @@ t.test('throw ENOENT error if package.json misisng', (t) => {
 
 t.test('throw EJSONPARSE error if package.json not json', (t) => {
   const testDir = t.testdir({
-    'package.json': 'not json, nope, not even a little bit!'
+    'package.json': 'not json, nope, not even a little bit!',
   })
 
   const view = requireInject('../../lib/view.js', {
     '../../lib/npm.js': {
       prefix: testDir,
       flatOptions: {
-        global: false
-      }
-    }
+        global: false,
+      },
+    },
   })
   view([], (err) => {
     t.match(err, { code: 'EJSONPARSE' })
@@ -520,16 +518,16 @@ t.test('throw EJSONPARSE error if package.json not json', (t) => {
 
 t.test('throw error if package.json has no name', (t) => {
   const testDir = t.testdir({
-    'package.json': '{}'
+    'package.json': '{}',
   })
 
   const view = requireInject('../../lib/view.js', {
     '../../lib/npm.js': {
       prefix: testDir,
       flatOptions: {
-        global: false
-      }
-    }
+        global: false,
+      },
+    },
   })
   view([], (err) => {
     t.equals(err.message, 'Invalid package.json, no "name" field')
@@ -542,12 +540,12 @@ t.test('throws when unpublished', (t) => {
     '../../lib/npm.js': {
       flatOptions: {
         defaultTag: '1.0.1',
-        global: false
-      }
+        global: false,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
   view(['red'], (err) => {
     t.equals(err.code, 'E404')
@@ -560,16 +558,18 @@ t.test('completion', (t) => {
     '../../lib/npm.js': {
       flatOptions: {
         defaultTag: '1.0.1',
-        global: false
-      }
+        global: false,
+      },
+    },
+    pacote: {
+      packument,
     },
-    'pacote': {
-      packument
-    }
   })
   view.completion({
-    conf: { argv: { remain: ['npm', 'view', 'green@1.0.0'] } }
+    conf: { argv: { remain: ['npm', 'view', 'green@1.0.0'] } },
   }, (err, res) => {
+    if (err)
+      throw err
     t.ok(res, 'returns back fields')
     t.end()
   })
@@ -580,14 +580,13 @@ t.test('no registry completion', (t) => {
     '../../lib/npm.js': {
       flatOptions: {
         defaultTag: '1.0.1',
-      }
-    }
+      },
+    },
   })
   view.completion({
-    conf: { argv: { remain: ['npm', 'view'] } }
+    conf: { argv: { remain: ['npm', 'view'] } },
   }, (err) => {
     t.notOk(err, 'there is no package completion')
     t.end()
   })
 })
-
diff --git a/deps/npm/test/lib/whoami.js b/deps/npm/test/lib/whoami.js
index dc9dbdfd570ff2..d54814db365e7f 100644
--- a/deps/npm/test/lib/whoami.js
+++ b/deps/npm/test/lib/whoami.js
@@ -8,7 +8,7 @@ test('whoami', (t) => {
     '../../lib/npm.js': { flatOptions: {} },
     '../../lib/utils/output.js': (output) => {
       t.equal(output, 'foo', 'should output the username')
-    }
+    },
   })
 
   whoami([], (err) => {
@@ -24,7 +24,7 @@ test('whoami json', (t) => {
     '../../lib/npm.js': { flatOptions: { json: true } },
     '../../lib/utils/output.js': (output) => {
       t.equal(output, '"foo"', 'should output the username as json')
-    }
+    },
   })
 
   whoami([], (err) => {