Revert "deps: upgrade npm to 5.8.0"

This reverts commit 25a816d.

PR-URL: #19837
Reviewed-By: Gus Caplan <me@gus.host>

Author: addaleax

deps/npm/.github/issue_template.md

@@ -3,7 +3,6 @@
   - [ ] npm is crashing.
   - [ ] npm is producing an incorrect install.
   - [ ] npm is doing something I don't understand.
-  - [ ] npm is producing incorrect or undesirable behavior.
   - [ ] Other (_see below for feature requests_):
 
 #### What's going wrong?

deps/npm/AUTHORS

@@ -536,28 +536,3 @@ Jacob Wejendorp <jacob@wejendorp.dk>
 Alejandro López <a.lopez.sanchez@outlook.es>
 Victor Belozyorov <hi@vbelozyorov.com>
 Bradley Farias <bfarias@godaddy.com>
-Kyle E. Mitchell <kyle@kemitchell.com>
-Tuan Anh Tran <me@tuananh.org>
-Nathan Woltman <nwoltman@outlook.com>
-Kyra <kyranet@users.noreply.github.com>
-Leаh Neukirchen <chneukirchen@gmail.com>
-Kyle Spier-Swenson <kyleshome@gmail.com>
-Joe Bowbeer <joe.bowbeer@gmail.com>
-Nalin Bhardwaj <6984346+nalinbhardwaj@users.noreply.github.com>
-Nicolas Garnier <ngarnier@users.noreply.github.com>
-Vladislav Rassokhin <vladrassokhin@gmail.com>
-Josh Goldberg <joshuakgoldberg@outlook.com>
-laggingreflex <laggingreflex@gmail.com>
-Kristofer Selbekk <selbekk@users.noreply.github.com>
-sreenivas alapati <sreenivas9alapati@gmail.com>
-Ben Creasy <ben@bencreasy.com>
-Allan Kimmer Jensen <allankimmerjensen@gmail.com>
-rinfan <rinfan@users.noreply.github.com>
-Matt Hoyle <code@deployable.co>
-Mason Pawsey <mpawsey@csub.edu>
-Johannes Bader <olydis@users.noreply.github.com>
-Michael Zabka <zabka.michael@gmail.com>
-Bruce MacNaughton <bmacnaughton@gmail.com>
-Christopher Patty <christopher.patty@aggiemail.usu.edu>
-Max Stoiber <contact@mxstbr.com>
-Enrico Weigelt <enrico.weigelt@gr13.net>

deps/npm/CHANGELOG.md

@@ -65,7 +65,7 @@ dev: install
 link: uninstall
 	node bin/npm-cli.js link -f
 
-clean: markedclean marked-manclean doc-clean
+clean: markedclean marked-manclean doc-clean uninstall
 	rm -rf npmrc
 	node bin/npm-cli.js cache clean
 

deps/npm/Makefile

@@ -12,19 +12,18 @@ if ! [ -x "$NODE_EXE" ]; then
   NODE_EXE=node
 fi
 
-NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
 NPX_CLI_JS="$basedir/node_modules/npm/bin/npx-cli.js"
 
 case `uname` in
   *MINGW*)
-    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX=`"$NODE_EXE" "$NPX_CLI_JS" prefix -g`
     NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
     if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
       NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
     fi
     ;;
   *CYGWIN*)
-    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX=`"$NODE_EXE" "$NPX_CLI_JS" prefix -g`
     NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
     if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
       NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"

deps/npm/bin/npx

@@ -8,9 +8,8 @@ IF NOT EXIST "%NODE_EXE%" (
   SET "NODE_EXE=node"
 )
 
-SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
 SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
-FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
+FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPX_CLI_JS%" prefix -g') DO (
   SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
 )
 IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (

deps/npm/bin/npx.cmd

@@ -55,9 +55,6 @@ after packing it up into a tarball (b).
     is set to `production`), npm will not install modules listed in
     `devDependencies`.
 
-    > NOTE: The `--production` flag has no particular meaning when adding a
-    dependency to a project.
-
 * `npm install <folder>`:
 
     Install the package in the directory as a symlink in the current project.
@@ -350,8 +347,7 @@ The `--no-shrinkwrap` argument, which will ignore an available
 package lock or shrinkwrap file and use the package.json instead.
 
 The `--no-package-lock` argument will prevent npm from creating a
-`package-lock.json` file.  When running with package-lock's disabled npm
-will not automatically prune your node modules when installing.
+`package-lock.json` file.
 
 The `--nodedir=/path/to/node/source` argument will allow npm to find the
 node source code so that npm can compile native modules.

deps/npm/doc/cli/npm-ci.md

@@ -76,7 +76,7 @@ Max display depth of the dependency tree.
 
 Display only the dependency tree for packages in `dependencies`.
 
-### dev / development
+### dev
 
 * Type: Boolean
 * Default: false

deps/npm/doc/cli/npm-install.md

@@ -3,7 +3,7 @@ npm-prune(1) -- Remove extraneous packages
 
 ## SYNOPSIS
 
-    npm prune [[<@scope>/]<pkg>...] [--production] [--dry-run] [--json]
+    npm prune [[<@scope>/]<pkg>...] [--production]
 
 ## DESCRIPTION
 
@@ -16,21 +16,9 @@ package's dependencies 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
+specified in your `devDependencies`. Setting `--production=false` 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
-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.
-
 ## SEE ALSO
 
 * npm-uninstall(1)