summaryrefslogtreecommitdiff
path: root/deps/npm/doc/misc
diff options
context:
space:
mode:
authorRebecca Turner <me@re-becca.org>2016-06-24 13:43:51 -0700
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-06-27 11:46:15 +0200
commitd538811fc8b920f3f36d5f21a4c23e270367ceb0 (patch)
tree11cee6c00aa843f16a71819039396f80bf6abe22 /deps/npm/doc/misc
parent1db31a34948eee311abd9881bbf5d906d0cd678b (diff)
downloadnode-new-d538811fc8b920f3f36d5f21a4c23e270367ceb0.tar.gz
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>
Diffstat (limited to 'deps/npm/doc/misc')
-rw-r--r--deps/npm/doc/misc/npm-config.md2
-rw-r--r--deps/npm/doc/misc/npm-scripts.md5
2 files changed, 5 insertions, 2 deletions
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