deps: upgrade npm to 3.10.2

Contains the following npm releases:
- https://github.com/npm/npm/releases/tag/v3.9.6
- https://github.com/npm/npm/releases/tag/v3.10.0
- https://github.com/npm/npm/releases/tag/v3.10.1
- https://github.com/npm/npm/releases/tag/v3.10.2

PR-URL: https://github.com/nodejs/node/pull/7410
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

4 files changed, 16 insertions, 2 deletions

diff --git a/deps/npm/doc/cli/npm-shrinkwrap.md b/deps/npm/doc/cli/npm-shrinkwrap.md
index c79418a248..6fc7d96f7c 100644
--- a/deps/npm/doc/cli/npm-shrinkwrap.md
+++ b/deps/npm/doc/cli/npm-shrinkwrap.md
@@ -109,6 +109,14 @@ resolution using "version" if one isn't.
 
 2. The tree is walked and any missing dependencies are installed in the usual fashion.
 
+If `preshrinkwrap`, `shrinkwrap` or `postshrinkwrap` are in the `scripts` property of the
+`package.json`, they will be executed by running `npm shrinkwrap`.
+`preshrinkwrap` and `shrinkwrap` are executed before the shrinkwrap, `postshrinkwrap` is
+executed afterwards. For example to run some postprocessing on the generated file:
+
+    "scripts": { "postshrinkwrap": "node fix-shrinkwrap.js" }
+
+
 ### Using shrinkwrapped packages
 
 Using a shrinkwrapped package is no different than using any other
@@ -174,5 +182,7 @@ contents rather than versions.
 ## SEE ALSO
 
 * npm-install(1)
+* npm-run-script(1)
+* npm-scripts(7)
 * package.json(5)
 * npm-ls(1)
diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md
index a52f9f011d..98b77af3e5 100644
--- a/deps/npm/doc/files/package.json.md
+++ b/deps/npm/doc/files/package.json.md
@@ -202,6 +202,7 @@ Conversely, some files are always ignored:
 * `npm-debug.log`
 * `.npmrc`
 * `node_modules`
+* `config.gypi`
 
 ## main
 
diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md
index ac372bd7a1..764555ea4a 100644
--- a/deps/npm/doc/misc/npm-config.md
+++ b/deps/npm/doc/misc/npm-config.md
@@ -676,7 +676,7 @@ Set to true to run in "production" mode.
 
 ### progress
 
-* Default: true
+* Default: true, unless TRAVIS or CI env vars set.
 * Type: Boolean
 
 When set to `true`, npm will display a progress bar during time intensive
diff --git a/deps/npm/doc/misc/npm-scripts.md b/deps/npm/doc/misc/npm-scripts.md
index 972ba90bc5..9ec75cc5dd 100644
--- a/deps/npm/doc/misc/npm-scripts.md
+++ b/deps/npm/doc/misc/npm-scripts.md
@@ -32,11 +32,14 @@ following scripts:
 * 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 <stage>`. *Pre* and *post* commands with matching
 names will be run for those as well (e.g. `premyscript`, `myscript`,
-`postmyscript`).
+`postmyscript`). Scripts from dependencies can be run with `npm explore
+<pkg> -- npm run <stage>`.
 
 ## COMMON USES