diff --git a/.gitignore b/.gitignore
index e1703844e5d320..9864e6780b3bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@
/doc/api.xml
/node
/node_g
+/gon-config.json
/*.exe
/*.swp
/out
diff --git a/BUILDING.md b/BUILDING.md
index 3cc173d1f533f3..cb1960db7445cf 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -165,7 +165,7 @@ Binaries at are produced on:
| Binary package | Platform and Toolchain |
| --------------------- | ------------------------------------------------------------------------ |
| aix-ppc64 | AIX 7.1 TL05 on PPC64BE with GCC 6 |
-| darwin-x64 (and .pkg) | macOS 10.11, Xcode Command Line Tools 8 with -mmacosx-version-min=10.10 |
+| darwin-x64 (and .pkg) | macOS 10.15, Xcode Command Line Tools 11 with -mmacosx-version-min=10.10 |
| linux-arm64 | CentOS 7 with devtoolset-6 / GCC 6 |
| linux-armv7l | Cross-compiled on Ubuntu 16.04 x64 with [custom GCC toolchain](https://github.com/rvagg/rpi-newer-crosstools) |
| linux-ppc64le | CentOS 7 with devtoolset-6 / GCC 6 [7](#fn7) |
diff --git a/Makefile b/Makefile
index 9347b7d84b928a..88166da2a84cd8 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,6 +1010,7 @@ $(PKG): release-only
--resources $(MACOSOUTDIR)/installer/productbuild/Resources \
--package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
+ bash tools/osx-notarize.sh $(FULLVERSION)
.PHONY: pkg
# Builds the macOS installer for releases.
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index 3e75785db4763a..c2a38c02d53f97 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -682,3 +682,12 @@ Zhenya Vinogradov
Rafael Hengles
Jan-Philip Gehrcke
Caleb Sacks <16855387+clabe45@users.noreply.github.com>
+Kyle Getz
+Sean Healy
+Netanel Gilad
+Dave Nicolson
+Ajay Narain Mathur
+Vitaliy Markitanov <9357021+vit100@users.noreply.github.com>
+simon_s
+John Kennedy
+Bernard Kitchens
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index 3abd37703a4d02..5cd9c8d8f88615 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,3 +1,89 @@
+## 6.14.4 (2020-03-24)
+
+### DEPENDENCIES
+
+* Bump `minimist@1.2.5` transitive dep to resolve security issue
+ * [`9c554fd8c`](https://github.com/npm/cli/commit/9c554fd8cd1e9aeb8eb122ccfa3c78d12af4097a) `update-notifier@2.5.0`
+ * bump `deep-extend@1.2.5`
+ * bump `deep-extend@0.6.0`
+ * bump `is-ci@1.2.1`
+ * bump `is-retry-allowed@1.2.0`
+ * bump `rc@1.2.8`
+ * bump `registry-auth-token@3.4.0`
+ * bump `widest-line@2.0.1`
+* [`136832dca`](https://github.com/npm/cli/commit/136832dcae13cb5518b1fe17bd63ea9b2a195f92) `mkdirp@0.5.4`
+* [`8bf99b2b5`](https://github.com/npm/cli/commit/8bf99b2b58c14d45dc6739fce77de051ebc8ffb7) [#1053](https://github.com/npm/cli/pull/1053) deps: updates term-size to use signed binary
+ * [`d2f08a1bdb`](https://github.com/nodejs/node/commit/d2f08a1bdb78655c4a3fc49825986c148d14117e) ([@rvagg](https://github.com/rvagg))
+
+## 6.14.3 (2020-03-19)
+
+### DOCUMENTATION
+
+* [`4ad221487`](https://github.com/npm/cli/commit4ad2214873cddfd4a0eff1bd188516b08fae9f9e) [#1020](https://github.com/npm/cli/pull/1020) docs(teams): updated team docs to reflect MFA workflow ([@blkdm0n](https://github.com/blkdm0n))
+* [`4a31a4ba2`](https://github.com/npm/cli/commit/4a31a4ba2db0a5db2d1d0890ee934ba1babb73a6) [#1034](https://github.com/npm/cli/pull/1034) docs: cleanup ([@ruyadorno](https://github.com/ruyadorno))
+* [`0eac801cd`](https://github.com/npm/cli/commit/0eac801cdef344e9fbda6270145e062211255b0e) [#1013](https://github.com/npm/cli/pull/1013) docs: fix links to cli commands ([@alenros](https://github.com/alenros))
+* [`7d8e5b99c`](https://github.com/npm/cli/commit/7d8e5b99c4ef8c394cffa7fc845f54a25ff37e3a) [#755](https://github.com/npm/cli/pull/755) docs: correction to `npm update -g` behaviour ([@johnkennedy9147](https://github.com/johnkennedy9147))
+
+### DEPENDENCIES
+
+* [`e11167646`](https://github.com/npm/cli/commit/e111676467f090f73802b97e8da7ece481b18f99) `mkdirp@0.5.3`
+ * [`c5b97d17d`](https://github.com/isaacs/node-mkdirp/commit/c5b97d17d45a22bcf4c815645cbb989dab57ddd8) fix: bump `minimist` dep to resolve security issue ([@isaacs](https://github.com/isaacs))
+* [`c50d679c6`](https://github.com/npm/cli/commit/c50d679c68b39dd03ad127d34f540ddcb1b1e804) `rimraf@2.7.1`
+* [`a2de99ff9`](https://github.com/npm/cli/commit/a2de99ff9e02425a3ccc25280f390178be755a36) `npm-registry-mock@1.3.1`
+* [`217debeb9`](https://github.com/npm/cli/commit/217debeb9812e037a6686cbf6ec67a0cd47fa68a) `npm-registry-couchapp@2.7.4`
+
+## 6.14.2 (2020-03-03)
+
+### DOCUMENTATION
+* [`f9248c0be`](https://github.com/npm/cli/commit/f9248c0be63fba37a30098dc9215c752474380e3) [#730](https://github.com/npm/cli/pull/730) chore(docs): update unpublish docs & policy reference ([@nomadtechie](https://github.com/nomadtechie), [@mikemimik](https://github.com/mikemimik))
+
+### DEPENDENCIES
+
+* [`909cc3918`](https://github.com/npm/cli/commit/909cc39180a352f206898481add5772206c8b65f) `hosted-git-info@2.8.8` ([@darcyclarke](https://github.com/darcyclarke))
+ * [`5038b1891`](https://github.com/npm/hosted-git-info/commit/5038b1891a61ca3cd7453acbf85d7011fe0086bb) fix: regression in old node versions w/ respect to url.URL implmentation
+* [`9204ffa58`](https://github.com/npm/cli/commit/9204ffa584c140c5e22b1ee37f6df2c98f5dc70b) `npm-profile@4.0.4` ([@isaacs](https://github.com/isaacs))
+ * [`6bcf0860a`](https://github.com/npm/npm-profile/commit/6bcf0860a3841865099d0115dbcbde8b78109bd9) fix: treat non-http/https login urls as invalid
+* [`0365d39bd`](https://github.com/npm/cli/commit/0365d39bdc74960a18caac674f51d0e2a98b31e6) `glob@7.1.6` ([@isaacs](https://github.com/isaacs))
+* [`dab030536`](https://github.com/nodejs/node-gyp/commit/dab030536b6a70ecae37debc74c581db9e5280fd) `node-gyp@5.1.0` ([@rvagg](https://github.com/rvagg))
+
+## 6.14.1 (2020-02-26)
+
+* [`303e5c11e`](https://github.com/npm/cli/commit/303e5c11e7db34cf014107aecd2e81c821bfde8d)
+ `hosted-git-info@2.8.7`
+ Fixes a regression where scp-style git urls are passed to the WhatWG URL
+ parser, which does not handle them properly.
+ ([@isaacs](https://github.com/isaacs))
+
+## 6.14.0 (2020-02-25)
+
+### FEATURES
+* [`30f170877`](https://github.com/npm/cli/commit/30f170877954acd036cb234a581e4eb155049b82) [#731](https://github.com/npm/cli/pull/731) add support for multiple funding sources ([@ljharb](https://github.com/ljharb) & [@ruyadorno](hhttps://github.com/ruyadorno/))
+
+### BUG FIXES
+* [`55916b130`](https://github.com/npm/cli/commit/55916b130ef52984584678f2cc17c15c1f031cb5) [#508](https://github.com/npm/cli/pull/508) fix: check `npm.config` before accessing its members ([@kaiyoma](https://github.com/kaiyoma))
+* [`7d0cd65b2`](https://github.com/npm/cli/commit/7d0cd65b23c0986b631b9b54d87bbe74902cc023) [#733](https://github.com/npm/cli/pull/733) fix: access grant with unscoped packages ([@netanelgilad](https://github.com/netanelgilad))
+* [`28c3d40d6`](https://github.com/npm/cli/commit/28c3d40d65eef63f9d6ccb60b99ac57f5057a46e), [`0769c5b20`](https://github.com/npm/cli/commit/30f170877954acd036cb234a581e4eb155049b82) [#945](https://github.com/npm/cli/pull/945), [#697](https://github.com/npm/cli/pull/697) fix: allow new major versions of node to be automatically considered "supported" ([@isaacs](https://github.com/isaacs), [@ljharb](https://github.com/ljharb))
+
+### DEPENDENCIES
+* [`6f39e93`](https://github.com/npm/hosted-git-info/commit/6f39e93bae9162663af6f15a9d10bce675dd5de3) `hosted-git-info@2.8.6` ([@darcyclarke](https://github.com/darcyclarke))
+ * fix: passwords & usernames are escaped properly in git deps ([@stevenhilder](https://github.com/stevenhilder))
+* [`f14b594ee`](https://github.com/npm/cli/commit/f14b594ee9dbfc98ed0b65c65d904782db4f31ad) `chownr@1.1.4` ([@isaacs](https://github.com/isaacs))
+* [`77044150b`](https://github.com/npm/cli/commit/77044150b763d67d997f9ff108219132ea922678) `npm-packlist@1.4.8` ([@isaacs](https://github.com/isaacs))
+* [`1d112461a`](https://github.com/npm/cli/commit/1d112461ad8dc99e5ff7fabb5177e8c2f89a9755) `npm-registry-fetch@4.0.3` ([@isaacs](https://github.com/isaacs))
+ * [`ba8b4fe`](https://github.com/npm/npm-registry-fetch/commit/ba8b4fe60eb6cdf9b39012560aec596eda8ce924) fix: always bypass cache when ?write=true
+* [`a47fed760`](https://github.com/npm/cli/commit/a47fed7603a6ed31dcc314c0c573805f05a96830) `readable-stream@3.6.0`
+ * [`3bbf2d6`](https://github.com/nodejs/readable-stream/commit/3bbf2d6feb45b03f4e46a2ae8251601ad2262121) fix: babel's "loose mode" class transform enbrittles BufferList ([@ljharb](https://github.com/ljharb))
+
+### DOCUMENTATION
+* [`284c1c055`](https://github.com/npm/cli/commit/284c1c055a28c4b334496101799acefe3c54ceb3), [`fbb5f0e50`](https://github.com/npm/cli/commit/fbb5f0e50e54425119fa3f03c5de93e4cb6bfda7) [#729](https://github.com/npm/cli/pull/729) update lifecycle hooks docs
+ ([@seanhealy](https://github.com/seanhealy), [@mikemimik](https://github.com/mikemimik))
+* [`1c272832d`](https://github.com/npm/cli/commit/1c272832d048300e409882313305c416dc6f21a2) [#787](https://github.com/npm/cli/pull/787) fix: trademarks typo ([@dnicolson](https://github.com/dnicolson))
+* [`f6ff41776`](https://github.com/npm/cli/commit/f6ff417767d52418cc8c9e7b9731ede2c3916d2e) [#936](https://github.com/npm/cli/pull/936) fix: postinstall example ([@ajaymathur](https://github.com/ajaymathur))
+* [`373224b16`](https://github.com/npm/cli/commit/373224b16e019b7b63d8f0b4c5d4adb7e5cb80dd) [#939](https://github.com/npm/cli/pull/939) fix: bad links in publish docs ([@vit100](https://github.com/vit100))
+
+### MISCELLANEOUS
+* [`85c79636d`](https://github.com/npm/cli/commit/85c79636df31bac586c0e380c4852ee155a7723c) [#736](https://github.com/npm/cli/pull/736) add script to update dist-tags ([@mikemimik](https://github.com/mikemimik))
+
## 6.13.7 (2020-01-28)
### BUG FIXES
diff --git a/deps/npm/docs/content/cli-commands/npm-access.md b/deps/npm/docs/content/cli-commands/npm-access.md
index 0fbce9c0759d12..f4088fe8855139 100644
--- a/deps/npm/docs/content/cli-commands/npm-access.md
+++ b/deps/npm/docs/content/cli-commands/npm-access.md
@@ -87,7 +87,7 @@ Management of teams and team memberships is done with the `npm team` command.
### See Also
* [`libnpmaccess`](https://npm.im/libnpmaccess)
-* [npm team](/cli-commands/npm-team)
-* [npm publish](/cli-commands/npm-publish)
-* [npm config](/cli-commands/npm-config)
+* [npm team](/cli-commands/team)
+* [npm publish](/cli-commands/publish)
+* [npm config](/cli-commands/config)
* [npm registry](/using-npm/registry)
diff --git a/deps/npm/docs/content/cli-commands/npm-adduser.md b/deps/npm/docs/content/cli-commands/npm-adduser.md
index 2df35e45fc550e..ec61cdd39acbad 100644
--- a/deps/npm/docs/content/cli-commands/npm-adduser.md
+++ b/deps/npm/docs/content/cli-commands/npm-adduser.md
@@ -89,7 +89,7 @@ username/password entry in legacy npm.
### See Also
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
-* [npm owner](/cli-commands/npm-owner)
-* [npm whoami](/cli-commands/npm-whoami)
+* [npm owner](/cli-commands/owner)
+* [npm whoami](/cli-commands/whoami)
diff --git a/deps/npm/docs/content/cli-commands/npm-audit.md b/deps/npm/docs/content/cli-commands/npm-audit.md
index 0aba874f96df8d..8b944e94cc12e2 100644
--- a/deps/npm/docs/content/cli-commands/npm-audit.md
+++ b/deps/npm/docs/content/cli-commands/npm-audit.md
@@ -131,6 +131,6 @@ configuration setting.
### See Also
-* [npm install](/cli-commands/npm-install)
+* [npm install](/cli-commands/install)
* [package-locks](/configuring-npm/package-locks)
* [config](/using-npm/config)
diff --git a/deps/npm/docs/content/cli-commands/npm-bin.md b/deps/npm/docs/content/cli-commands/npm-bin.md
index 6c7ce0eee54e21..eb0912ae48a92a 100644
--- a/deps/npm/docs/content/cli-commands/npm-bin.md
+++ b/deps/npm/docs/content/cli-commands/npm-bin.md
@@ -19,8 +19,8 @@ Print the folder where npm will install executables.
### See Also
-* [npm prefix](/cli-commands/npm-prefix)
-* [npm root](/cli-commands/npm-root)
+* [npm prefix](/cli-commands/prefix)
+* [npm root](/cli-commands/root)
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-bugs.md b/deps/npm/docs/content/cli-commands/npm-bugs.md
index dcc9c358df14d8..6e59f2bd1a05e0 100644
--- a/deps/npm/docs/content/cli-commands/npm-bugs.md
+++ b/deps/npm/docs/content/cli-commands/npm-bugs.md
@@ -41,10 +41,10 @@ The base URL of the npm package registry.
### See Also
-* [npm docs](/cli-commands/npm-docs)
-* [npm view](/cli-commands/npm-view)
-* [npm publish](/cli-commands/npm-publish)
+* [npm docs](/cli-commands/docs)
+* [npm view](/cli-commands/view)
+* [npm publish](/cli-commands/publish)
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/docs/content/cli-commands/npm-build.md b/deps/npm/docs/content/cli-commands/npm-build.md
index b657129787663d..eca5397d9c77d5 100644
--- a/deps/npm/docs/content/cli-commands/npm-build.md
+++ b/deps/npm/docs/content/cli-commands/npm-build.md
@@ -28,7 +28,7 @@ directly, run:
### See Also
-* [npm install](/cli-commands/npm-install)
-* [npm link](/cli-commands/npm-link)
+* [npm install](/cli-commands/install)
+* [npm link](/cli-commands/link)
* [npm scripts](/using-npm/scripts)
* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/docs/content/cli-commands/npm-bundle.md b/deps/npm/docs/content/cli-commands/npm-bundle.md
index 76417ac8b0b0c7..c4fdc5e6bb0e64 100644
--- a/deps/npm/docs/content/cli-commands/npm-bundle.md
+++ b/deps/npm/docs/content/cli-commands/npm-bundle.md
@@ -18,4 +18,4 @@ Just use `npm install` now to do what `npm bundle` used to do.
### See Also
-* [npm install](/cli-commands/npm-install)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/content/cli-commands/npm-cache.md b/deps/npm/docs/content/cli-commands/npm-cache.md
index ed31a320421b0c..4d19749b80f2d9 100644
--- a/deps/npm/docs/content/cli-commands/npm-cache.md
+++ b/deps/npm/docs/content/cli-commands/npm-cache.md
@@ -82,10 +82,10 @@ The root cache folder.
### See Also
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
-* [npm install](/cli-commands/npm-install)
-* [npm publish](/cli-commands/npm-publish)
-* [npm pack](/cli-commands/npm-pack)
+* [npm install](/cli-commands/install)
+* [npm publish](/cli-commands/publish)
+* [npm pack](/cli-commands/pack)
* https://npm.im/cacache
* https://npm.im/pacote
diff --git a/deps/npm/docs/content/cli-commands/npm-ci.md b/deps/npm/docs/content/cli-commands/npm-ci.md
index 357ba16cf6ade1..b5b6447a485f8f 100644
--- a/deps/npm/docs/content/cli-commands/npm-ci.md
+++ b/deps/npm/docs/content/cli-commands/npm-ci.md
@@ -45,7 +45,7 @@ cache:
### Description
-This command is similar to [`npm install`](/cli-commands/npm-install), except it's meant to be used in
+This command is similar to [`npm install`](/cli-commands/install), except it's meant to be used in
automated environments such as test platforms, continuous integration, and
deployment -- or any situation where you want to make sure you're doing a clean
install of your dependencies. It can be significantly faster than a regular npm
@@ -63,5 +63,5 @@ In short, the main differences between using `npm install` and `npm ci` are:
### See Also
-* [npm install](/cli-commands/npm-install)
+* [npm install](/cli-commands/install)
* [package-locks](/configuring-npm/package-locks)
diff --git a/deps/npm/docs/content/cli-commands/npm-config.md b/deps/npm/docs/content/cli-commands/npm-config.md
index c2f2033b066d29..68d403746fc103 100644
--- a/deps/npm/docs/content/cli-commands/npm-config.md
+++ b/deps/npm/docs/content/cli-commands/npm-config.md
@@ -79,7 +79,7 @@ global config.
### See Also
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [package.json](/configuring-npm/package-json)
* [npmrc](/configuring-npm/npmrc)
* [npm](/cli-commands/npm)
diff --git a/deps/npm/docs/content/cli-commands/npm-dedupe.md b/deps/npm/docs/content/cli-commands/npm-dedupe.md
index e15a12ba7c18a3..a146885a044086 100644
--- a/deps/npm/docs/content/cli-commands/npm-dedupe.md
+++ b/deps/npm/docs/content/cli-commands/npm-dedupe.md
@@ -62,6 +62,6 @@ result in new modules being installed.
### See Also
-* [npm ls](/cli-commands/npm-ls)
-* [npm update](/cli-commands/npm-update)
-* [npm install](/cli-commands/npm-install)
+* [npm ls](/cli-commands/ls)
+* [npm update](/cli-commands/update)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/content/cli-commands/npm-deprecate.md b/deps/npm/docs/content/cli-commands/npm-deprecate.md
index d2d9613f653c6c..252c0e70370791 100644
--- a/deps/npm/docs/content/cli-commands/npm-deprecate.md
+++ b/deps/npm/docs/content/cli-commands/npm-deprecate.md
@@ -32,5 +32,5 @@ format an empty string.
### See Also
-* [npm publish](/cli-commands/npm-publish)
+* [npm publish](/cli-commands/publish)
* [npm registry](/using-npm/registry)
diff --git a/deps/npm/docs/content/cli-commands/npm-dist-tag.md b/deps/npm/docs/content/cli-commands/npm-dist-tag.md
index c7921c7f739d72..4f7fcb9f58f1ba 100644
--- a/deps/npm/docs/content/cli-commands/npm-dist-tag.md
+++ b/deps/npm/docs/content/cli-commands/npm-dist-tag.md
@@ -92,9 +92,9 @@ begin with a number or the letter `v`.
### See Also
-* [npm publish](/cli-commands/npm-publish)
-* [npm install](/cli-commands/npm-install)
-* [npm dedupe](/cli-commands/npm-dedupe)
+* [npm publish](/cli-commands/publish)
+* [npm install](/cli-commands/install)
+* [npm dedupe](/cli-commands/dedupe)
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-docs.md b/deps/npm/docs/content/cli-commands/npm-docs.md
index 46f5cd0d900a47..f157e200dc514f 100644
--- a/deps/npm/docs/content/cli-commands/npm-docs.md
+++ b/deps/npm/docs/content/cli-commands/npm-docs.md
@@ -44,9 +44,9 @@ The base URL of the npm package registry.
### See Also
-* [npm view](/cli-commands/npm-view)
-* [npm publish](/cli-commands/npm-publish)
+* [npm view](/cli-commands/view)
+* [npm publish](/cli-commands/publish)
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/docs/content/cli-commands/npm-doctor.md b/deps/npm/docs/content/cli-commands/npm-doctor.md
index 7cec349e5a8145..60a57ea4765a26 100644
--- a/deps/npm/docs/content/cli-commands/npm-doctor.md
+++ b/deps/npm/docs/content/cli-commands/npm-doctor.md
@@ -106,6 +106,6 @@ cache, you should probably run `npm cache clean` and reset the cache.
### See Also
-* [npm bugs](/cli-commands/npm-bugs)
-* [npm help](/cli-commands/npm-help)
-* [npm ping](/cli-commands/npm-ping)
+* [npm bugs](/cli-commands/bugs)
+* [npm help](/cli-commands/help)
+* [npm ping](/cli-commands/ping)
diff --git a/deps/npm/docs/content/cli-commands/npm-edit.md b/deps/npm/docs/content/cli-commands/npm-edit.md
index 94b6a087fa102f..d4b9bbb819b94f 100644
--- a/deps/npm/docs/content/cli-commands/npm-edit.md
+++ b/deps/npm/docs/content/cli-commands/npm-edit.md
@@ -41,7 +41,7 @@ The command to run for `npm edit` or `npm config edit`.
### See Also
* [npm folders](/configuring-npm/folders)
-* [npm explore](/cli-commands/npm-explore)
-* [npm install](/cli-commands/npm-install)
-* [npm config](/cli-commands/npm-config)
+* [npm explore](/cli-commands/explore)
+* [npm install](/cli-commands/install)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-explore.md b/deps/npm/docs/content/cli-commands/npm-explore.md
index 8ded96d40984fe..dfa4d9c0737412 100644
--- a/deps/npm/docs/content/cli-commands/npm-explore.md
+++ b/deps/npm/docs/content/cli-commands/npm-explore.md
@@ -44,7 +44,7 @@ The shell to run for the `npm explore` command.
### See Also
* [npm folders](/configuring-npm/folders)
-* [npm edit](/cli-commands/npm-edit)
-* [npm rebuild](/cli-commands/npm-rebuild)
-* [npm build](/cli-commands/npm-build)
-* [npm install](/cli-commands/npm-install)
+* [npm edit](/cli-commands/edit)
+* [npm rebuild](/cli-commands/rebuild)
+* [npm build](/cli-commands/build)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/content/cli-commands/npm-fund.md b/deps/npm/docs/content/cli-commands/npm-fund.md
index 64894e291fc4f6..73910ff7c07bde 100644
--- a/deps/npm/docs/content/cli-commands/npm-fund.md
+++ b/deps/npm/docs/content/cli-commands/npm-fund.md
@@ -21,7 +21,8 @@ a given project. If no package name is provided, it will list all
dependencies that are looking for funding in a tree-structure in which
are listed the type of funding and the url to visit. If a package name
is provided then it tries to open its funding url using the `--browser`
-config param.
+config param; if there are multiple funding sources for the package, the
+user will be instructed to pass the `--which` command to disambiguate.
The list will avoid duplicated entries and will stack all packages
that share the same type/url as a single entry. Given this nature the
@@ -38,8 +39,8 @@ The browser that is called by the `npm fund` command to open websites.
#### json
-* Default: false
* Type: Boolean
+* Default: false
Show information in JSON format.
@@ -51,10 +52,17 @@ Show information in JSON format.
Whether to represent the tree structure using unicode characters.
Set it to `false` in order to use all-ansi output.
+#### which
+
+* Type: Number
+* Default: undefined
+
+If there are multiple funding sources, which 1-indexed source URL to open.
+
## See Also
-* [npm docs](/cli-commands/npm-docs)
-* [npm config](/cli-commands/npm-config)
-* [npm install](/cli-commands/npm-install)
-* [npm ls](/cli-commands/npm-ls)
+* [npm docs](/cli-commands/docs)
+* [npm config](/cli-commands/config)
+* [npm install](/cli-commands/install)
+* [npm ls](/cli-commands/ls)
diff --git a/deps/npm/docs/content/cli-commands/npm-help-search.md b/deps/npm/docs/content/cli-commands/npm-help-search.md
index 69d005cb160ed7..96781856551383 100644
--- a/deps/npm/docs/content/cli-commands/npm-help-search.md
+++ b/deps/npm/docs/content/cli-commands/npm-help-search.md
@@ -40,4 +40,4 @@ If false, then help-search will just list out the help topics found.
### See Also
* [npm](/cli-commands/npm)
-* [npm help](/cli-commands/npm-help)
+* [npm help](/cli-commands/help)
diff --git a/deps/npm/docs/content/cli-commands/npm-help.md b/deps/npm/docs/content/cli-commands/npm-help.md
index c47676ffcac1d3..358010c05ece33 100644
--- a/deps/npm/docs/content/cli-commands/npm-help.md
+++ b/deps/npm/docs/content/cli-commands/npm-help.md
@@ -38,7 +38,7 @@ Set to `"browser"` to view html help content in the default web browser.
* [npm](/cli-commands/npm)
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [package.json](/configuring-npm/package-json)
-* [npm help-search](/cli-commands/npm-help-search)
+* [npm help-search](/cli-commands/help-search)
diff --git a/deps/npm/docs/content/cli-commands/npm-init.md b/deps/npm/docs/content/cli-commands/npm-init.md
index 73ad74b23ea998..32b7f823019910 100644
--- a/deps/npm/docs/content/cli-commands/npm-init.md
+++ b/deps/npm/docs/content/cli-commands/npm-init.md
@@ -70,5 +70,5 @@ will create a scoped package.
*
* [package.json](/configuring-npm/package-json)
-* [npm version](/cli-commands/npm-version)
+* [npm version](/cli-commands/version)
* [npm scope](/using-npm/scope)
diff --git a/deps/npm/docs/content/cli-commands/npm-install-ci-test.md b/deps/npm/docs/content/cli-commands/npm-install-ci-test.md
index 98e40f4b27a77d..09d738c79fbed5 100644
--- a/deps/npm/docs/content/cli-commands/npm-install-ci-test.md
+++ b/deps/npm/docs/content/cli-commands/npm-install-ci-test.md
@@ -22,5 +22,5 @@ This command runs an `npm ci` followed immediately by an `npm test`.
### See Also
-* [npm ci](/cli-commands/npm-ci)
-* [npm test](/cli-commands/npm-test)
+* [npm ci](/cli-commands/ci)
+* [npm test](/cli-commands/test)
diff --git a/deps/npm/docs/content/cli-commands/npm-install-test.md b/deps/npm/docs/content/cli-commands/npm-install-test.md
index b86a5199117c4a..58b8844b4fcfff 100644
--- a/deps/npm/docs/content/cli-commands/npm-install-test.md
+++ b/deps/npm/docs/content/cli-commands/npm-install-test.md
@@ -31,5 +31,5 @@ takes exactly the same arguments as `npm install`.
### See Also
-* [npm install](/cli-commands/npm-install)
-* [npm test](/cli-commands/npm-test)
+* [npm install](/cli-commands/install)
+* [npm test](/cli-commands/test)
diff --git a/deps/npm/docs/content/cli-commands/npm-install.md b/deps/npm/docs/content/cli-commands/npm-install.md
index 8e661bf643f394..be196fa825546b 100644
--- a/deps/npm/docs/content/cli-commands/npm-install.md
+++ b/deps/npm/docs/content/cli-commands/npm-install.md
@@ -32,7 +32,7 @@ common options: [-P|--save-prod|-D|--save-dev|-O|--save-optional] [-E|--save-exa
This command installs a package, and any packages that it depends on. If the
package has a package-lock or shrinkwrap file, the installation of dependencies
will be driven by that, with an `npm-shrinkwrap.json` taking precedence if both
-files exist. See [package-lock.json](/configuring-npm/package-lock-json) and [`npm shrinkwrap`](/cli-commands/npm-shrinkwrap).
+files exist. See [package-lock.json](/configuring-npm/package-lock-json) and [`npm shrinkwrap`](/cli-commands/shrinkwrap).
A `package` is:
@@ -40,7 +40,7 @@ A `package` is:
* b) a gzipped tarball containing (a)
* c) a url that resolves to (b)
* d) a `@` that is published on the registry (see [`registry`](/using-npm/registry)) with (c)
-* e) a `@` (see [`npm dist-tag`](/cli-commands/npm-dist-tag)) that points to (d)
+* e) a `@` (see [`npm dist-tag`](/cli-commands/dist-tag)) that points to (d)
* f) a `` that has a "latest" tag satisfying (e)
* g) a `` that resolves to (a)
@@ -503,17 +503,17 @@ affects a real use-case, it will be investigated.
### See Also
* [npm folders](/configuring-npm/folders)
-* [npm update](/cli-commands/npm-update)
-* [npm audit](/cli-commands/npm-audit)
-* [npm fund](/cli-commands/npm-fund)
-* [npm link](/cli-commands/npm-link)
-* [npm rebuild](/cli-commands/npm-rebuild)
+* [npm update](/cli-commands/update)
+* [npm audit](/cli-commands/audit)
+* [npm fund](/cli-commands/fund)
+* [npm link](/cli-commands/link)
+* [npm rebuild](/cli-commands/rebuild)
* [npm scripts](/using-npm/scripts)
-* [npm build](/cli-commands/npm-build)
-* [npm config](/cli-commands/npm-config)
+* [npm build](/cli-commands/build)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [npm registry](/using-npm/registry)
-* [npm dist-tag](/cli-commands/npm-dist-tag)
-* [npm uninstall](/cli-commands/npm-uninstall)
-* [npm shrinkwrap](/cli-commands/npm-shrinkwrap)
+* [npm dist-tag](/cli-commands/dist-tag)
+* [npm uninstall](/cli-commands/uninstall)
+* [npm shrinkwrap](/cli-commands/shrinkwrap)
* [package.json](/configuring-npm/package-json)
diff --git a/deps/npm/docs/content/cli-commands/npm-link.md b/deps/npm/docs/content/cli-commands/npm-link.md
index a6d2908c4a32ab..3f513868dfebd6 100644
--- a/deps/npm/docs/content/cli-commands/npm-link.md
+++ b/deps/npm/docs/content/cli-commands/npm-link.md
@@ -86,7 +86,7 @@ npm link @myorg/privatepackage
* [npm developers](/using-npm/developers)
* [package.json](/configuring-npm/package-json)
-* [npm- nstall](/cli-commands/npm-install)
+* [npm- nstall](/cli-commands/install)
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-logout.md b/deps/npm/docs/content/cli-commands/npm-logout.md
index ca7d86f2d1960e..5fb7100e8ef7d0 100644
--- a/deps/npm/docs/content/cli-commands/npm-logout.md
+++ b/deps/npm/docs/content/cli-commands/npm-logout.md
@@ -48,7 +48,7 @@ npm logout --scope=@myco
### See Also
-* [npm adduser](/cli-commands/npm-adduser)
+* [npm adduser](/cli-commands/adduser)
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
-* [npm whoami](/cli-commands/npm-whoami)
+* [npm config](/cli-commands/config)
+* [npm whoami](/cli-commands/whoami)
diff --git a/deps/npm/docs/content/cli-commands/npm-ls.md b/deps/npm/docs/content/cli-commands/npm-ls.md
index 64a399155ff601..797f15a50d8494 100644
--- a/deps/npm/docs/content/cli-commands/npm-ls.md
+++ b/deps/npm/docs/content/cli-commands/npm-ls.md
@@ -119,11 +119,11 @@ Set it to false in order to use all-ansi output.
### See Also
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [npm folders](/configuring-npm/folders)
-* [npm install](/cli-commands/npm-install)
-* [npm link](/cli-commands/npm-link)
-* [npm prune](/cli-commands/npm-prune)
-* [npm outdated](/cli-commands/npm-outdated)
-* [npm update](/cli-commands/npm-update)
+* [npm install](/cli-commands/install)
+* [npm link](/cli-commands/link)
+* [npm prune](/cli-commands/prune)
+* [npm outdated](/cli-commands/outdated)
+* [npm update](/cli-commands/update)
diff --git a/deps/npm/docs/content/cli-commands/npm-outdated.md b/deps/npm/docs/content/cli-commands/npm-outdated.md
index c7934109dca370..3dae28c465f4e6 100644
--- a/deps/npm/docs/content/cli-commands/npm-outdated.md
+++ b/deps/npm/docs/content/cli-commands/npm-outdated.md
@@ -118,7 +118,7 @@ Max depth for checking dependency tree.
### See Also
-* [npm update](/cli-commands/npm-update)
-* [npm dist-tag](/cli-commands/npm-dist-tag)
+* [npm update](/cli-commands/update)
+* [npm dist-tag](/cli-commands/dist-tag)
* [npm registry](/using-npm/registry)
* [npm folders](/configuring-npm/folders)
diff --git a/deps/npm/docs/content/cli-commands/npm-owner.md b/deps/npm/docs/content/cli-commands/npm-owner.md
index bc2fbc82fb280e..7088cdaf5cb396 100644
--- a/deps/npm/docs/content/cli-commands/npm-owner.md
+++ b/deps/npm/docs/content/cli-commands/npm-owner.md
@@ -41,7 +41,7 @@ with `--otp`.
### See Also
-* [npm publish](/cli-commands/npm-publish)
+* [npm publish](/cli-commands/publish)
* [npm registry](/using-npm/registry)
-* [npm adduser](/cli-commands/npm-adduser)
+* [npm adduser](/cli-commands/adduser)
* [npm disputes](/using-npm/disputes)
diff --git a/deps/npm/docs/content/cli-commands/npm-pack.md b/deps/npm/docs/content/cli-commands/npm-pack.md
index acf18559c14e00..d4774ff3716710 100644
--- a/deps/npm/docs/content/cli-commands/npm-pack.md
+++ b/deps/npm/docs/content/cli-commands/npm-pack.md
@@ -32,7 +32,7 @@ actually packing anything. Reports on what would have gone into the tarball.
### See Also
-* [npm cache](/cli-commands/npm-cache)
-* [npm publish](/cli-commands/npm-publish)
-* [npm config](/cli-commands/npm-config)
+* [npm cache](/cli-commands/cache)
+* [npm publish](/cli-commands/publish)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-ping.md b/deps/npm/docs/content/cli-commands/npm-ping.md
index 93d18b57f840b0..8f765501ac9f33 100644
--- a/deps/npm/docs/content/cli-commands/npm-ping.md
+++ b/deps/npm/docs/content/cli-commands/npm-ping.md
@@ -29,5 +29,5 @@ Ping error: {*Detail about error}
### See Also
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-prefix.md b/deps/npm/docs/content/cli-commands/npm-prefix.md
index b82fec663a147d..c6b1f7441bcd65 100644
--- a/deps/npm/docs/content/cli-commands/npm-prefix.md
+++ b/deps/npm/docs/content/cli-commands/npm-prefix.md
@@ -21,12 +21,12 @@ to contain a `package.json` file or `node_modules` directory, unless `-g` is
also specified.
If `-g` is specified, this will be the value of the global prefix. See
-[`npm config`](/cli-commands/npm-config) for more detail.
+[`npm config`](/cli-commands/config) for more detail.
### See Also
-* [npm root](/cli-commands/npm-root)
-* [npm bin](/cli-commands/npm-bin)
+* [npm root](/cli-commands/root)
+* [npm bin](/cli-commands/bin)
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-profile.md b/deps/npm/docs/content/cli-commands/npm-profile.md
index 9fe82cd2d3a952..7cc38e2c9c3fe3 100644
--- a/deps/npm/docs/content/cli-commands/npm-profile.md
+++ b/deps/npm/docs/content/cli-commands/npm-profile.md
@@ -79,4 +79,4 @@ available on non npmjs.com registries.
### See Also
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
diff --git a/deps/npm/docs/content/cli-commands/npm-prune.md b/deps/npm/docs/content/cli-commands/npm-prune.md
index c6b61e62f828a2..586c2e7024642b 100644
--- a/deps/npm/docs/content/cli-commands/npm-prune.md
+++ b/deps/npm/docs/content/cli-commands/npm-prune.md
@@ -41,6 +41,6 @@ and it's up to you to run `npm prune` from time-to-time to remove them.
### See Also
-* [npm uninstall](/cli-commands/npm-uninstall)
+* [npm uninstall](/cli-commands/uninstall)
* [npm folders](/configuring-npm/folders)
-* [npm ls](/cli-commands/npm-ls)
+* [npm ls](/cli-commands/ls)
diff --git a/deps/npm/docs/content/cli-commands/npm-publish.md b/deps/npm/docs/content/cli-commands/npm-publish.md
index b9d0cf1449e760..199377fa0df32d 100644
--- a/deps/npm/docs/content/cli-commands/npm-publish.md
+++ b/deps/npm/docs/content/cli-commands/npm-publish.md
@@ -60,22 +60,22 @@ 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`](/cli-commands/npm-unpublish).
+it is removed with [`npm unpublish`](/cli-commands/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`](/cli-commands/npm-pack), which figures out the files to be
+Similar to `--dry-run` see [`npm pack`](/cli-commands/pack), which figures out the files to be
included and packs them into a tarball to be uploaded to the registry.
### See Also
* [npm registry](/using-npm/registry)
* [npm scope](/using-npm/scope)
-* [npm adduser](/cli-commands/npm-adduser)
-* [npm owner](/cli-commands/npm-owner)
-* [npm deprecate](/cli-commands/npm-deprecate)
-* [npm dist-tag](/cli-commands/npm-dist-tag)
-* [npm pack](/cli-commands/npm-pack)
-* [npm profile](/cli-commands/npm-profile)
+* [npm adduser](/cli-commands/adduser)
+* [npm owner](/cli-commands/owner)
+* [npm deprecate](/cli-commands/deprecate)
+* [npm dist-tag](/cli-commands/dist-tag)
+* [npm pack](/cli-commands/pack)
+* [npm profile](/cli-commands/profile)
diff --git a/deps/npm/docs/content/cli-commands/npm-rebuild.md b/deps/npm/docs/content/cli-commands/npm-rebuild.md
index 414b9ca55a1932..9503d6aae84263 100644
--- a/deps/npm/docs/content/cli-commands/npm-rebuild.md
+++ b/deps/npm/docs/content/cli-commands/npm-rebuild.md
@@ -22,5 +22,5 @@ This command runs the `npm build` command on the matched folders. This is usefu
### See Also
-* [npm build](/cli-commands/npm-build)
-* [npm install](/cli-commands/npm-install)
+* [npm build](/cli-commands/build)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/content/cli-commands/npm-repo.md b/deps/npm/docs/content/cli-commands/npm-repo.md
index ad41ea571253fd..48021d9af5d912 100644
--- a/deps/npm/docs/content/cli-commands/npm-repo.md
+++ b/deps/npm/docs/content/cli-commands/npm-repo.md
@@ -32,5 +32,5 @@ The browser that is called by the `npm repo` command to open websites.
### See Also
-* [npm docs](/cli-commands/npm-docs)
-* [npm config](/cli-commands/npm-config)
+* [npm docs](/cli-commands/docs)
+* [npm config](/cli-commands/config)
diff --git a/deps/npm/docs/content/cli-commands/npm-restart.md b/deps/npm/docs/content/cli-commands/npm-restart.md
index d6d388b224ab1f..663b8f45066084 100644
--- a/deps/npm/docs/content/cli-commands/npm-restart.md
+++ b/deps/npm/docs/content/cli-commands/npm-restart.md
@@ -41,9 +41,9 @@ behavior will be accompanied by an increase in major version number
### See Also
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm run-script](/cli-commands/run-script)
* [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/npm-test)
-* [npm start](/cli-commands/npm-start)
-* [npm stop](/cli-commands/npm-stop)
-* [npm restart](/cli-commands/npm-restart)
\ No newline at end of file
+* [npm test](/cli-commands/test)
+* [npm start](/cli-commands/start)
+* [npm stop](/cli-commands/stop)
+* [npm restart](/cli-commands/restart)
\ No newline at end of file
diff --git a/deps/npm/docs/content/cli-commands/npm-root.md b/deps/npm/docs/content/cli-commands/npm-root.md
index 2b27878af4c6dc..fce4490de78eac 100644
--- a/deps/npm/docs/content/cli-commands/npm-root.md
+++ b/deps/npm/docs/content/cli-commands/npm-root.md
@@ -19,8 +19,8 @@ Print the effective `node_modules` folder to standard out.
### See Also
-* [npm prefix](/cli-commands/npm-prefix)
-* [npm bin](/cli-commands/npm-bin)
+* [npm prefix](/cli-commands/prefix)
+* [npm bin](/cli-commands/bin)
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-run-script.md b/deps/npm/docs/content/cli-commands/npm-run-script.md
index 51def74c3c4c33..1ee381e00f2f1e 100644
--- a/deps/npm/docs/content/cli-commands/npm-run-script.md
+++ b/deps/npm/docs/content/cli-commands/npm-run-script.md
@@ -90,8 +90,8 @@ without breaking the execution chain.
### See Also
* [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/npm-test)
-* [npm start](/cli-commands/npm-start)
-* [npm restart](/cli-commands/npm-restart)
-* [npm stop](/cli-commands/npm-stop)
-* [npm config](/cli-commands/npm-config)
+* [npm test](/cli-commands/test)
+* [npm start](/cli-commands/start)
+* [npm restart](/cli-commands/restart)
+* [npm stop](/cli-commands/stop)
+* [npm config](/cli-commands/config)
diff --git a/deps/npm/docs/content/cli-commands/npm-search.md b/deps/npm/docs/content/cli-commands/npm-search.md
index e066106faf71f4..c65e489cba27c8 100644
--- a/deps/npm/docs/content/cli-commands/npm-search.md
+++ b/deps/npm/docs/content/cli-commands/npm-search.md
@@ -109,6 +109,6 @@ setting.
### See Also
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
-* [npm view](/cli-commands/npm-view)
+* [npm view](/cli-commands/view)
diff --git a/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md b/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md
index 342fb001675ab3..a22aed88e125fe 100644
--- a/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md
+++ b/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md
@@ -24,11 +24,11 @@ of package locks in npm, see [package-locks](/configuring-npm/package-locks).
### See Also
-* [npm install](/cli-commands/npm-install)
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm install](/cli-commands/install)
+* [npm run-script](/cli-commands/run-script)
* [npm scripts](/using-npm/scripts)
* [package.js](/configuring-npm/package-json)
* [package-locks](/configuring-npm/package-locks)
* [package-lock.json](/configuring-npm/package-lock-json)
* [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
-* [npm ls](/cli-commands/npm-ls)
+* [npm ls](/cli-commands/ls)
diff --git a/deps/npm/docs/content/cli-commands/npm-star.md b/deps/npm/docs/content/cli-commands/npm-star.md
index 1912e9c654bc28..440d15d05c652e 100644
--- a/deps/npm/docs/content/cli-commands/npm-star.md
+++ b/deps/npm/docs/content/cli-commands/npm-star.md
@@ -26,6 +26,6 @@ It's a boolean thing. Starring repeatedly has no additional effect.
### See Also
-* [npm view](/cli-commands/npm-view)
-* [npm whoami](/cli-commands/npm-whoami)
-* [npm adduser](/cli-commands/npm-adduser)
+* [npm view](/cli-commands/view)
+* [npm whoami](/cli-commands/whoami)
+* [npm adduser](/cli-commands/adduser)
diff --git a/deps/npm/docs/content/cli-commands/npm-stars.md b/deps/npm/docs/content/cli-commands/npm-stars.md
index 475547bb4b7f2f..87b1664ef8595d 100644
--- a/deps/npm/docs/content/cli-commands/npm-stars.md
+++ b/deps/npm/docs/content/cli-commands/npm-stars.md
@@ -23,7 +23,7 @@ you will most certainly enjoy this command.
### See Also
-* [npm star](/cli-commands/npm-star)
-* [npm view](/cli-commands/npm-view)
-* [npm whoami](/cli-commands/npm-whoami)
-* [npm adduser](/cli-commands/npm-adduser)
+* [npm star](/cli-commands/star)
+* [npm view](/cli-commands/view)
+* [npm whoami](/cli-commands/whoami)
+* [npm adduser](/cli-commands/adduser)
diff --git a/deps/npm/docs/content/cli-commands/npm-start.md b/deps/npm/docs/content/cli-commands/npm-start.md
index 839528257b6d95..70221c9926a5d8 100644
--- a/deps/npm/docs/content/cli-commands/npm-start.md
+++ b/deps/npm/docs/content/cli-commands/npm-start.md
@@ -21,12 +21,12 @@ its `"scripts"` object. If no `"start"` property is specified on the
`"scripts"` object, it will run `node server.js`.
As of [`npm@2.0.0`](https://blog.npmjs.org/post/98131109725/npm-2-0-0), you can
-use custom arguments when executing scripts. Refer to [`npm run-script`](/cli-commands/npm-run-script) for more details.
+use custom arguments when executing scripts. Refer to [`npm run-script`](/cli-commands/run-script) for more details.
### See Also
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm run-script](/cli-commands/run-script)
* [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/npm-test)
-* [npm restart](/cli-commands/npm-restart)
-* [npm stop](/cli-commands/npm-stop)
+* [npm test](/cli-commands/test)
+* [npm restart](/cli-commands/restart)
+* [npm stop](/cli-commands/stop)
diff --git a/deps/npm/docs/content/cli-commands/npm-stop.md b/deps/npm/docs/content/cli-commands/npm-stop.md
index da759047cb19a5..889f04ec41e3e2 100644
--- a/deps/npm/docs/content/cli-commands/npm-stop.md
+++ b/deps/npm/docs/content/cli-commands/npm-stop.md
@@ -20,8 +20,8 @@ This runs a package's "stop" script, if one was provided.
### See Also
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm run-script](/cli-commands/run-script)
* [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/npm-test)
-* [npm start](/cli-commands/npm-start)
-* [npm restart](/cli-commands/npm-restart)
+* [npm test](/cli-commands/test)
+* [npm start](/cli-commands/start)
+* [npm restart](/cli-commands/restart)
diff --git a/deps/npm/docs/content/cli-commands/npm-team.md b/deps/npm/docs/content/cli-commands/npm-team.md
index 9a63b10c26f325..53e084d47d14a3 100644
--- a/deps/npm/docs/content/cli-commands/npm-team.md
+++ b/deps/npm/docs/content/cli-commands/npm-team.md
@@ -30,6 +30,8 @@ handle permissions for packages.
Teams must always be fully qualified with the organization/scope they belong to
when operating on them, separated by a colon (`:`). That is, if you have a `wombats` team in a `wisdom` organization, you must always refer to that team as `wisdom:wombats` in these commands.
+If you have two-factor authentication enabled in `auth-and-writes` mode, then you can provide a code from your authenticator with `[--otp ]`. If you don't include this then you will be prompted.
+
* create / destroy:
Create a new team, or destroy an existing one. Note: You cannot remove the `developers` team, learn more.
* add / rm:
@@ -60,5 +62,5 @@ use the `npm access` command to grant or revoke the appropriate permissions.
### See Also
-* [npm access](/cli-commands/npm-access)
+* [npm access](/cli-commands/access)
* [npm registry](/using-npm/registry)
diff --git a/deps/npm/docs/content/cli-commands/npm-test.md b/deps/npm/docs/content/cli-commands/npm-test.md
index 99c027e3e057af..11900fd2fbf5e1 100644
--- a/deps/npm/docs/content/cli-commands/npm-test.md
+++ b/deps/npm/docs/content/cli-commands/npm-test.md
@@ -22,8 +22,8 @@ This runs a package's "test" script, if one was provided.
### See Also
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm run-script](/cli-commands/run-script)
* [npm scripts](/using-npm/scripts)
-* [npm start](/cli-commands/npm-start)
-* [npm restart](/cli-commands/npm-restart)
-* [npm stop](/cli-commands/npm-stop)
+* [npm start](/cli-commands/start)
+* [npm restart](/cli-commands/restart)
+* [npm stop](/cli-commands/stop)
diff --git a/deps/npm/docs/content/cli-commands/npm-uninstall.md b/deps/npm/docs/content/cli-commands/npm-uninstall.md
index 96fdc4ebe05ba9..2b994ba6180b65 100644
--- a/deps/npm/docs/content/cli-commands/npm-uninstall.md
+++ b/deps/npm/docs/content/cli-commands/npm-uninstall.md
@@ -57,8 +57,8 @@ npm uninstall lodash --no-save
### See Also
-* [npm prune](/cli-commands/npm-prune)
-* [npm install](/cli-commands/npm-install)
+* [npm prune](/cli-commands/prune)
+* [npm install](/cli-commands/install)
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
diff --git a/deps/npm/docs/content/cli-commands/npm-unpublish.md b/deps/npm/docs/content/cli-commands/npm-unpublish.md
index 5348023d9a8400..9b918ed432c306 100644
--- a/deps/npm/docs/content/cli-commands/npm-unpublish.md
+++ b/deps/npm/docs/content/cli-commands/npm-unpublish.md
@@ -10,19 +10,21 @@ description: Remove a package from the registry
### Synopsis
+#### Unpublishing a single version of a package
+
```bash
-npm unpublish [<@scope>/][@]
+npm unpublish [<@scope>/]@
```
-### Warning
+#### Unpublishing an entire package
-**It is generally considered bad behavior to remove versions of a library
-that others are depending on!**
+```bash
+npm unpublish [<@scope>/] --force
+```
-Consider using the `deprecate` command
-instead, if your intent is to encourage users to upgrade.
+### Warning
-There is plenty of room on the registry.
+Consider using the `deprecate` command instead, if your intent is to encourage users to upgrade, or if you no longer want to maintain a package.
### Description
@@ -34,21 +36,15 @@ the root package entry is removed from the registry entirely.
Even if a package version is unpublished, that specific name and
version combination can never be reused. In order to publish the
-package again, a new version number must be used. Additionally,
-new versions of packages with every version unpublished may not
-be republished until 24 hours have passed.
+package again, a new version number must be used. If you unpublish the entire package, you may not publish any new versions of that package until 24 hours have passed.
-With the default registry (`registry.npmjs.org`), unpublish is
-only allowed with versions published in the last 72 hours. If you
-are trying to unpublish a version published longer ago than that,
-contact support@npmjs.com.
+To learn more about how unpublish is treated on the npm registry, see our unpublish policies.
-The scope is optional and follows the usual rules for [`scope`](/using-npm/scope).
### See Also
-* [npm deprecate](/cli-commands/npm-deprecate)
-* [npm publish](/cli-commands/npm-publish)
+* [npm deprecate](/cli-commands/deprecate)
+* [npm publish](/cli-commands/publish)
* [npm registry](/using-npm/registry)
-* [npm adduser](/cli-commands/npm-adduser)
-* [npm owner](/cli-commands/npm-owner)
+* [npm adduser](/cli-commands/adduser)
+* [npm owner](/cli-commands/owner)
diff --git a/deps/npm/docs/content/cli-commands/npm-update.md b/deps/npm/docs/content/cli-commands/npm-update.md
index f2e93b6dc33df1..706d8acf208f91 100644
--- a/deps/npm/docs/content/cli-commands/npm-update.md
+++ b/deps/npm/docs/content/cli-commands/npm-update.md
@@ -122,7 +122,9 @@ version that satisfies `^0.4.0` (`>= 0.4.0 <0.5.0`)
`npm update -g` will apply the `update` action to each globally installed
package that is `outdated` -- that is, has a version that is different from
-`latest`.
+`wanted`.
+
+Note: Globally installed packages are treated as if they are installed with a caret semver range specified. So if you require to update to `latest` you may need to run `npm install -g [...]`
NOTE: If a package has been upgraded to a version newer than `latest`, it will
be _downgraded_.
@@ -130,9 +132,9 @@ be _downgraded_.
### See Also
-* [npm install](/cli-commands/npm-install)
-* [npm outdated](/cli-commands/npm-outdated)
-* [npm shrinkwrap](/cli-commands/npm-shrinkwrap)
+* [npm install](/cli-commands/install)
+* [npm outdated](/cli-commands/outdated)
+* [npm shrinkwrap](/cli-commands/shrinkwrap)
* [npm registry](/using-npm/registry)
* [npm folders](/configuring-npm/folders)
-* [npm ls](/cli-commands/npm-ls)
+* [npm ls](/cli-commands/ls)
diff --git a/deps/npm/docs/content/cli-commands/npm-version.md b/deps/npm/docs/content/cli-commands/npm-version.md
index a47e9e33326acf..05a2ea4c8d8097 100644
--- a/deps/npm/docs/content/cli-commands/npm-version.md
+++ b/deps/npm/docs/content/cli-commands/npm-version.md
@@ -126,8 +126,8 @@ Note that you must have a default GPG key set up in your git config for this to
### See Also
-* [npm init](/cli-commands/npm-init)
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm init](/cli-commands/init)
+* [npm run-script](/cli-commands/run-script)
* [npm scripts](/using-npm/scripts)
* [package.json](/configuring-npm/package-json)
* [semver](/using-npm/semver)
diff --git a/deps/npm/docs/content/cli-commands/npm-view.md b/deps/npm/docs/content/cli-commands/npm-view.md
index 0c108e6f566154..b4c68471f5a7dc 100644
--- a/deps/npm/docs/content/cli-commands/npm-view.md
+++ b/deps/npm/docs/content/cli-commands/npm-view.md
@@ -117,8 +117,8 @@ the field name.
### See Also
-* [npm search](/cli-commands/npm-search)
+* [npm search](/cli-commands/search)
* [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
-* [npm docs](/cli-commands/npm-docs)
+* [npm docs](/cli-commands/docs)
diff --git a/deps/npm/docs/content/cli-commands/npm-whoami.md b/deps/npm/docs/content/cli-commands/npm-whoami.md
index b0eda4e46aa61b..d82f1f89732def 100644
--- a/deps/npm/docs/content/cli-commands/npm-whoami.md
+++ b/deps/npm/docs/content/cli-commands/npm-whoami.md
@@ -19,6 +19,6 @@ Print the `username` config to standard output.
### See Also
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
-* [npm adduser](/cli-commands/npm-adduser)
+* [npm adduser](/cli-commands/adduser)
diff --git a/deps/npm/docs/content/configuring-npm/folders.md b/deps/npm/docs/content/configuring-npm/folders.md
index 96a8f4783d719b..abb6133fd1702f 100644
--- a/deps/npm/docs/content/configuring-npm/folders.md
+++ b/deps/npm/docs/content/configuring-npm/folders.md
@@ -73,7 +73,7 @@ Man pages are not installed on Windows systems.
#### Cache
-See [`npm cache`](/cli-commands/npm-cache). Cache files are stored in `~/.npm` on Posix, or
+See [`npm cache`](/cli-commands/cache). Cache files are stored in `~/.npm` on Posix, or
`%AppData%/npm-cache` on Windows.
This is controlled by the `cache` configuration param.
@@ -214,10 +214,10 @@ cannot be found elsewhere. See [`package.json`](/configuring-npm/package.json)
### See also
* [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/npm-install)
-* [npm pack](/cli-commands/npm-pack)
-* [npm cache](/cli-commands/npm-cache)
-* [npm config](/cli-commands/npm-config)
+* [npm install](/cli-commands/install)
+* [npm pack](/cli-commands/pack)
+* [npm cache](/cli-commands/cache)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [config](/using-npm/config)
-* [npm publish](/cli-commands/npm-publish)
+* [npm publish](/cli-commands/publish)
diff --git a/deps/npm/docs/content/configuring-npm/npmrc.md b/deps/npm/docs/content/configuring-npm/npmrc.md
index 090ed5944fcce5..3439c0a8bfcf8b 100644
--- a/deps/npm/docs/content/configuring-npm/npmrc.md
+++ b/deps/npm/docs/content/configuring-npm/npmrc.md
@@ -97,7 +97,7 @@ manner.
### See also
* [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [config](/using-npm/config)
* [package.json](/configuring-npm/package-json)
* [npm](/cli-commands/npm)
diff --git a/deps/npm/docs/content/configuring-npm/package-json.md b/deps/npm/docs/content/configuring-npm/package-json.md
index ccdbe041fb063f..6d9cae346b1944 100644
--- a/deps/npm/docs/content/configuring-npm/package-json.md
+++ b/deps/npm/docs/content/configuring-npm/package-json.md
@@ -197,7 +197,8 @@ npm also sets a top-level "maintainers" field with your npm user info.
### funding
You can specify an object containing an URL that provides up-to-date
-information about ways to help fund development of your package:
+information about ways to help fund development of your package, or
+a string URL, or an array of these:
"funding": {
"type" : "individual",
@@ -209,10 +210,26 @@ information about ways to help fund development of your package:
"url" : "https://www.patreon.com/my-account"
}
+ "funding": "http://example.com/donate"
+
+ "funding": [
+ {
+ "type" : "individual",
+ "url" : "http://example.com/donate"
+ },
+ "http://example.com/donateAlso",
+ {
+ "type" : "patreon",
+ "url" : "https://www.patreon.com/my-account"
+ }
+ ]
+
+
Users can use the `npm fund` subcommand to list the `funding` URLs of all
dependencies of their project, direct and indirect. A shortcut to visit each
funding url is also available when providing the project name such as:
-`npm fund `.
+`npm fund ` (when there are multiple URLs, the first one will be
+visited)
### files
@@ -516,7 +533,7 @@ See [semver](/using-npm/semver) for more details about specifying version ranges
* `range1 || range2` Passes if either range1 or range2 are satisfied.
* `git...` See 'Git URLs as Dependencies' below
* `user/repo` See 'GitHub URLs' below
-* `tag` A specific version tagged and published as `tag` See [`npm dist-tag`](/cli-commands/npm-dist-tag)
+* `tag` A specific version tagged and published as `tag` See [`npm dist-tag`](/cli-commands/dist-tag)
* `path/path/path` See [Local Paths](#local-paths) below
For example, these are all valid:
@@ -893,10 +910,10 @@ npm will default some values based on package contents.
### SEE ALSO
* [semver](/using-npm/semver)
-* [npm init](/cli-commands/npm-init)
-* [npm version](/cli-commands/npm-version)
-* [npm config](/cli-commands/npm-config)
-* [npm help](/cli-commands/npm-help)
-* [npm install](/cli-commands/npm-install)
-* [npm publish](/cli-commands/npm-publish)
-* [npm uninstall](/cli-commands/npm-uninstall)
+* [npm init](/cli-commands/init)
+* [npm version](/cli-commands/version)
+* [npm config](/cli-commands/config)
+* [npm help](/cli-commands/help)
+* [npm install](/cli-commands/install)
+* [npm publish](/cli-commands/publish)
+* [npm uninstall](/cli-commands/uninstall)
diff --git a/deps/npm/docs/content/configuring-npm/package-lock-json.md b/deps/npm/docs/content/configuring-npm/package-lock-json.md
index 9f3ca4683defe7..0ab0aaa4ce247e 100644
--- a/deps/npm/docs/content/configuring-npm/package-lock-json.md
+++ b/deps/npm/docs/content/configuring-npm/package-lock-json.md
@@ -142,8 +142,8 @@ The dependencies of this dependency, exactly as at the top level.
### See also
-* [npm shrinkwrap](/cli-commands/npm-shrinkwrap)
+* [npm shrinkwrap](/cli-commands/shrinkwrap)
* [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
* [package-locks](/configuring-npm/package-locks)
* [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/npm-install)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/content/configuring-npm/package-locks.md b/deps/npm/docs/content/configuring-npm/package-locks.md
index de65e3c634f077..81d21298ae84dd 100644
--- a/deps/npm/docs/content/configuring-npm/package-locks.md
+++ b/deps/npm/docs/content/configuring-npm/package-locks.md
@@ -10,7 +10,7 @@ description: An explanation of npm lockfiles
### Description
-Conceptually, the "input" to [`npm install`](/cli-commands/npm-install) is a [package.json](/configuring-npm/package-json), while its
+Conceptually, the "input" to [`npm install`](/cli-commands/install) is a [package.json](/configuring-npm/package-json), while its
"output" is a fully-formed `node_modules` tree: a representation of the
dependencies you declared. In an ideal world, npm would work like a pure
function: the same `package.json` should produce the exact same `node_modules`
@@ -179,4 +179,4 @@ pre-`npm@5.7.0` versions of npm 5, albeit a bit more noisily. Note that if
* [package.json](/configuring-npm/package-json)
* [package-lock.json](/configuring-npm/package-lock-json)
* [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
-* [npm shrinkwrap](/cli-commands/npm-shrinkwrap)
+* [npm shrinkwrap](/cli-commands/shrinkwrap)
diff --git a/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md b/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md
index bc5e061d55b095..fcb32952f93776 100644
--- a/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md
+++ b/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md
@@ -10,7 +10,7 @@ description: A publishable lockfile
### Description
-`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/cli-commands/npm-shrinkwrap). It is identical to
+`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/cli-commands/shrinkwrap). It is identical to
`package-lock.json`, with one major caveat: Unlike `package-lock.json`,
`npm-shrinkwrap.json` may be included when publishing a package.
@@ -28,7 +28,7 @@ to the manual page for [package-lock.json](/configuring-npm/package-lock-json).
### See also
-* [npm shrinkwrap](/cli-commands/npm-shrinkwrap)
+* [npm shrinkwrap](/cli-commands/shrinkwrap)
* [package-lock.json](/configuring-npm/package-lock-json)
* [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/npm-install)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/content/using-npm/config.md b/deps/npm/docs/content/using-npm/config.md
index a6947b17d58d15..fcf116d7f1ff66 100644
--- a/deps/npm/docs/content/using-npm/config.md
+++ b/deps/npm/docs/content/using-npm/config.md
@@ -179,7 +179,7 @@ When "dev" or "development" and running local `npm shrinkwrap`,
When "true" submit audit reports alongside `npm install` runs to the default
registry and all registries configured for scopes. See the documentation
-for [`npm audit`](/cli-commands/npm-audit) for details on what is submitted.
+for [`npm audit`](/cli-commands/audit) for details on what is submitted.
#### audit-level
@@ -270,7 +270,7 @@ well as for the CA information to be stored in a file on disk.
* Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm`
* Type: path
-The location of npm's cache directory. See [`npm cache`](/cli-commands/npm-cache)
+The location of npm's cache directory. See [`npm cache`](/cli-commands/cache)
#### cache-lock-stale
@@ -456,7 +456,7 @@ packages.
When "true" displays the message at the end of each `npm install`
aknowledging the number of dependencies looking for funding.
-See [`npm fund`](/cli-commands/npm-fund) for details.
+See [`npm fund`](/cli-commands/fund) for details.
#### git
@@ -571,7 +571,7 @@ If true, npm does not run scripts specified in package.json files.
A module that will be loaded by the `npm init` command. See the
documentation for the
[init-package-json](https://github.com/isaacs/init-package-json) module
-for more information, or [npm init](/cli-commands/npm-init).
+for more information, or [npm init](/cli-commands/init).
#### init-author-name
@@ -1228,7 +1228,7 @@ version of npm than the latest.
* Type: Boolean
Set to show short usage output (like the -H output)
-instead of complete help when doing [`npm help`](/cli-commands/npm-help).
+instead of complete help when doing [`npm help`](/cli-commands/help).
#### user
@@ -1293,7 +1293,7 @@ Set to `"browser"` to view html help content in the default web browser.
### See also
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [npmrc](/configuring-npm/npmrc)
* [npm scripts](/using-npm/scripts)
* [npm folders](/configuring-npm/folders)
diff --git a/deps/npm/docs/content/using-npm/disputes.md b/deps/npm/docs/content/using-npm/disputes.md
index 65751618cab8ae..37a724e6b0f1c2 100644
--- a/deps/npm/docs/content/using-npm/disputes.md
+++ b/deps/npm/docs/content/using-npm/disputes.md
@@ -105,7 +105,7 @@ If you see bad behavior like this, please report it to right
away. **You are never expected to resolve abusive behavior on your own. We are
here to help.**
-### Trademarkss
+### Trademarks
If you think another npm publisher is infringing your trademark, such as by
using a confusingly similar package name, email with a link to
@@ -134,4 +134,4 @@ License.
### See also
* [npm registry](/using-npm/registry)
-* [npm owner](/cli-commands/npm-owner)
+* [npm owner](/cli-commands/owner)
diff --git a/deps/npm/docs/content/using-npm/orgs.md b/deps/npm/docs/content/using-npm/orgs.md
index 9709a12d726752..107bac7a9454bd 100644
--- a/deps/npm/docs/content/using-npm/orgs.md
+++ b/deps/npm/docs/content/using-npm/orgs.md
@@ -24,8 +24,8 @@ The developer will be able to access packages based on the teams they are on. Ac
There are two main commands:
-1. `npm team` see [npm team](/cli-commands/npm-team) for more details
-2. `npm access` see [npm access](/cli-commands/npm-access) for more details
+1. `npm team` see [npm team](/cli-commands/team) for more details
+2. `npm access` see [npm access](/cli-commands/access) for more details
### Team Admins create teams
@@ -92,6 +92,6 @@ npm access ls-collaborators
### See also
-* [npm team](/cli-commands/npm-team)
-* [npm access](/cli-commands/npm-access)
+* [npm team](/cli-commands/team)
+* [npm access](/cli-commands/access)
* [npm scope](/using-npm/scope)
diff --git a/deps/npm/docs/content/using-npm/registry.md b/deps/npm/docs/content/using-npm/registry.md
index cd6a2e4d71eebc..44d0594132929f 100644
--- a/deps/npm/docs/content/using-npm/registry.md
+++ b/deps/npm/docs/content/using-npm/registry.md
@@ -33,7 +33,7 @@ available at .
The registry URL used is determined by the scope of the package (see
[`scope`](/using-npm/scope). If no scope is specified, the default registry is used, which is
-supplied by the `registry` config parameter. See [`npm config`](/cli-commands/npm-config),
+supplied by the `registry` config parameter. See [`npm config`](/cli-commands/config),
[`npmrc`](/configuring-npm/npmrc), and [`config`](/using-npm/config) for more on managing npm's configuration.
### Does npm send any information about me back to the registry?
@@ -100,7 +100,7 @@ Yes, head over to
### See also
-* [npm config](/cli-commands/npm-config)
+* [npm config](/cli-commands/config)
* [config](/using-npm/config)
* [npmrc](/configuring-npm/npmrc)
* [npm developers](/using-npm/developers)
diff --git a/deps/npm/docs/content/using-npm/removal.md b/deps/npm/docs/content/using-npm/removal.md
index 7c836846732403..20f353dc3475d8 100644
--- a/deps/npm/docs/content/using-npm/removal.md
+++ b/deps/npm/docs/content/using-npm/removal.md
@@ -66,5 +66,5 @@ find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ;
### See also
-* [npm uninstall](/cli-commands/npm-uninstall)
-* [npm prune](/cli-commands/npm-prune)
+* [npm uninstall](/cli-commands/uninstall)
+* [npm prune](/cli-commands/prune)
diff --git a/deps/npm/docs/content/using-npm/scope.md b/deps/npm/docs/content/using-npm/scope.md
index 2cbc108f0db92c..81c55060ff601e 100644
--- a/deps/npm/docs/content/using-npm/scope.md
+++ b/deps/npm/docs/content/using-npm/scope.md
@@ -55,7 +55,7 @@ Or in `package.json`:
```
Note that if the `@` symbol is omitted, in either case, npm will instead attempt to
-install from GitHub; see [`npm install`](/cli-commands/npm-install).
+install from GitHub; see [`npm install`](/cli-commands/install).
### Requiring scoped packages
@@ -125,7 +125,7 @@ that registry instead.
### See also
-* [npm install](/cli-commands/npm-install)
-* [npm publish](/cli-commands/npm-publish)
-* [npm access](/cli-commands/npm-access)
+* [npm install](/cli-commands/install)
+* [npm publish](/cli-commands/publish)
+* [npm access](/cli-commands/access)
* [npm registry](/using-npm/registry)
diff --git a/deps/npm/docs/content/using-npm/scripts.md b/deps/npm/docs/content/using-npm/scripts.md
index 6a2522fba43a77..a9ca433fdea08c 100644
--- a/deps/npm/docs/content/using-npm/scripts.md
+++ b/deps/npm/docs/content/using-npm/scripts.md
@@ -10,90 +10,64 @@ description: How npm handles the "scripts" field
### Description
-npm supports the "scripts" property of the package.json file, for the
-following scripts:
-
-* **prepublish** (_as of npm@5, `prepublish` is deprecated. Use `prepare` for build steps and `prepublishOnly` for upload-only._):
- Run BEFORE the package is packed and published, as well as on local `npm
- install` without any arguments. (See below)
-* **prepare**:
- Run both BEFORE the package is packed and published, on local `npm
- install` without any arguments, and when installing git dependencies (See
- below). This is run AFTER `prepublish`, but BEFORE `prepublishOnly`.
-* **prepublishOnly**:
- Run BEFORE the package is prepared and packed, ONLY on `npm publish`. (See
- below.)
-* **prepack**:
- run BEFORE a tarball is packed (on `npm pack`, `npm publish`, and when
- installing git dependencies)
-* **postpack**:
- Run AFTER the tarball has been generated and moved to its final destination.
-* **publish**, **postpublish**:
- Run AFTER the package is published.
-* **preinstall**:
- Run BEFORE the package is installed
-* **install**, **postinstall**:
- Run AFTER the package is installed.
-* **preuninstall**, **uninstall**:
- Run BEFORE the package is uninstalled.
-* **postuninstall**:
- Run AFTER the package is uninstalled.
-* **preversion**:
- Run BEFORE bumping the package version.
-* **version**:
- Run AFTER bumping the package version, but BEFORE commit.
-* **postversion**:
- Run AFTER bumping the package version, and AFTER commit.
-* **pretest**, **test**, **posttest**:
- Run by the `npm test` command.
-* **prestop**, **stop**, **poststop**:
- Run by the `npm stop` command.
-* **prestart**, **start**, **poststart**:
- Run by the `npm start` command.
-* **prerestart**, **restart**, **postrestart**:
- Run by the `npm restart` command. Note: `npm restart` will run the
- stop and start scripts if no `restart` script is provided.
-* **preshrinkwrap**, **shrinkwrap**, **postshrinkwrap**:
- Run by the `npm shrinkwrap` command.
-
-Additionally, arbitrary scripts can be executed by running `npm
-run-script `. *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 -- npm run `.
-
-#### Prepublish and Prepare
-
-#### Deprecation Note
-
-Since `npm@1.1.71`, the npm CLI has run the `prepublish` script for both `npm
-publish` and `npm install`, because it's a convenient way to prepare a package
-for use (some common use cases are described in the section below). It has
-also turned out to be, in practice, [very
-confusing](https://github.com/npm/npm/issues/10074). As of `npm@4.0.0`, a new
-event has been introduced, `prepare`, that preserves this existing behavior. A
-_new_ event, `prepublishOnly` has been added as a transitional strategy to
-allow users to avoid the confusing behavior of existing npm versions and only
-run on `npm publish` (for instance, running the tests one last time to ensure
-they're in good shape).
-
-See for a much lengthier
-justification, with further reading, for this change.
-
-#### Use Cases
-
-If you need to perform operations on your package before it is used, in a way
-that is not dependent on the operating system or architecture of the
-target system, use a `prepublish` script. This includes
-tasks such as:
+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 ` or `npm run ` 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 -- npm run `.
+
+### Pre & Post Scripts
+
+To create "pre" or "post" scripts for any scripts defined in the `"scripts"` section of the `package.json`, simply create another script *with a matching name* and add "pre" or "post" to the beginning of them.
+
+```json
+{
+ "scripts": {
+ "precompress": "{{ executes BEFORE the `compress` script }}",
+ "compress": "{{ run command to compress files }}",
+ "postcompress": "{{ executes AFTER `compress` script }}"
+ }
+}
+```
+
+### Life Cycle Scripts
+
+There are some special life cycle scripts that happen only in certain situations. These scripts happen in addtion to the "pre" and "post" script.
+* `prepare`, `prepublish`, `prepublishOnly`, `prepack`, `postpack`
+
+**prepare** (since `npm@4.0.0`)
+* Runs BEFORE the package is packed
+* Runs BEFORE the package is published
+* Runs on local `npm install` without any arguments
+* Run AFTER `prepublish`, but BEFORE `prepublishOnly`
+* NOTE: If a package being installed through git contains a `prepare` script, its `dependencies` and `devDependencies` will be installed, and the prepare script will be run, before the package is packaged and installed.
+
+**prepublish** (DEPRECATED)
+* Same as `prepare`
+
+**prepublishOnly**
+* Runs BEFORE the package is prepared and packed, ONLY on `npm publish`.
+
+**prepack**
+* Runs BEFORE a tarball is packed (on "`npm pack`", "`npm publish`", and when installing a git dependencies).
+* NOTE: "`npm run pack`" is NOT the same as "`npm pack`". "`npm run pack`" is an arbitrary user defined script name, where as, "`npm pack`" is a CLI defined command.
+
+**postpack**
+* Runs AFTER the tarball has been generated and moved to its final destination.
+
+#### Prepare and Prepublish
+
+**Deprecation Note: prepublish**
+
+Since `npm@1.1.71`, the npm CLI has run the `prepublish` script for both `npm publish` and `npm install`, because it's a convenient way to prepare a package for use (some common use cases are described in the section below). It has also turned out to be, in practice, [very confusing](https://github.com/npm/npm/issues/10074). As of `npm@4.0.0`, a new event has been introduced, `prepare`, that preserves this existing behavior. A _new_ event, `prepublishOnly` has been added as a transitional strategy to allow users to avoid the confusing behavior of existing npm versions and only run on `npm publish` (for instance, running the tests one last time to ensure they're in good shape).
+
+See for a much lengthier justification, with further reading, for this change.
+
+**Use Cases**
+
+If you need to perform operations on your package before it is used, in a way that is not dependent on the operating system or architecture of the target system, use a `prepublish` script. This includes tasks such as:
* Compiling CoffeeScript source code into JavaScript.
* Creating minified versions of JavaScript source code.
* Fetching remote resources that your package will use.
-The advantage of doing these things at `prepublish` time is that they can be done once, in a
-single place, thus reducing complexity and variability.
-Additionally, this means that:
+The advantage of doing these things at `prepublish` time is that they can be done once, in a single place, thus reducing complexity and variability. Additionally, this means that:
* You can depend on `coffee-script` as a `devDependency`, and thus
your users don't need to have it installed.
@@ -102,8 +76,41 @@ Additionally, this means that:
* You don't need to rely on your users having `curl` or `wget` or
other system tools on the target machines.
-### Default Values
+### Life Cycle Operation Order
+
+#### [`npm publish`](/cli-commands/publish)
+
+* `prepublishOnly`
+* `prepare`
+* `prepublish`
+* `publish`
+* `postpublish`
+
+#### [`npm pack`](/cli-commands/pack)
+
+* `prepack`
+* `postpack`
+#### [`npm install`](/cli-commands/install)
+
+* `preinstall`
+* `install`
+* `postinstall`
+
+Also triggers
+
+* `prepublish` (when on local)
+* `prepare` (when on local)
+
+#### [`npm start`](/cli-commands/start)
+
+`npm run start` has an `npm start` shorthand.
+
+* `prestart`
+* `start`
+* `poststart`
+
+### Default Values
npm will default some script values based on package contents.
* `"start": "node server.js"`:
@@ -208,7 +215,7 @@ For example, if your package.json contains this:
```json
{ "scripts" :
{ "install" : "scripts/install.js"
- , "postinstall" : "scripts/install.js"
+ , "postinstall" : "scripts/postinstall.js"
, "uninstall" : "scripts/uninstall.js"
}
}
@@ -283,7 +290,7 @@ above.
### See Also
-* [npm run-script](/cli-commands/npm-run-script)
+* [npm run-script](/cli-commands/run-script)
* [package.json](/configuring-npm/package-json)
* [npm developers](/using-npm/developers)
-* [npm install](/cli-commands/npm-install)
+* [npm install](/cli-commands/install)
diff --git a/deps/npm/docs/public/cli-commands/npm-access/index.html b/deps/npm/docs/public/cli-commands/npm-access/index.html
index 33febc80177727..f3853e530b6b3a 100644
--- a/deps/npm/docs/public/cli-commands/npm-access/index.html
+++ b/deps/npm/docs/public/cli-commands/npm-access/index.html
@@ -74,7 +74,7 @@
}
}
})
-