diff --git a/deps/npm/.gitmodules b/deps/npm/.gitmodules
index c705633663..169c87505c 100644
--- a/deps/npm/.gitmodules
+++ b/deps/npm/.gitmodules
@@ -36,19 +36,25 @@
url = https://github.com/mikeal/request.git
[submodule "node_modules/tar"]
path = node_modules/tar
- url = git://github.com/isaacs/node-tar.git
+ url = https://github.com/isaacs/node-tar.git
[submodule "node_modules/fstream"]
path = node_modules/fstream
- url = git://github.com/isaacs/fstream.git
+ url = https://github.com/isaacs/fstream.git
[submodule "node_modules/inherits"]
path = node_modules/inherits
- url = git://github.com/isaacs/inherits.git
+ url = https://github.com/isaacs/inherits.git
[submodule "node_modules/block-stream"]
path = node_modules/block-stream
- url = git://github.com/isaacs/block-stream.git
+ url = https://github.com/isaacs/block-stream.git
[submodule "node_modules/mkdirp"]
path = node_modules/mkdirp
- url = git://github.com/isaacs/node-mkdirp.git
+ url = https://github.com/isaacs/node-mkdirp.git
[submodule "node_modules/fast-list"]
path = node_modules/fast-list
- url = git://github.com/isaacs/fast-list.git
+ url = https://github.com/isaacs/fast-list.git
+[submodule "node_modules/read"]
+ path = node_modules/read
+ url = https://github.com/isaacs/read.git
+[submodule "node_modules/lru-cache"]
+ path = node_modules/lru-cache
+ url = https://github.com/isaacs/node-lru-cache.git
diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
new file mode 100644
index 0000000000..698bc9abdf
--- /dev/null
+++ b/deps/npm/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+before_install: "make &>out || cat out; rm out"
+node_js:
+ - 0.6
diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
index db6db2fbd2..e0b9f20bb8 100755
--- a/deps/npm/bin/npm-cli.js
+++ b/deps/npm/bin/npm-cli.js
@@ -12,6 +12,9 @@ if (typeof WScript !== "undefined") {
return
}
+
+process.title = "npm"
+
var log = require("../lib/utils/log.js")
log.waitForConfig()
log.info("ok", "it worked if it ends with")
diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md
index e380e65eff..e70acc258a 100644
--- a/deps/npm/doc/cli/config.md
+++ b/deps/npm/doc/cli/config.md
@@ -225,6 +225,14 @@ The location of npm's cache directory. See `npm-cache(1)`
If false, never shows colors. If `"always"` then always shows colors.
If true, then only prints color codes for tty file descriptors.
+### coverage
+
+* Default: false
+* Type: Boolean
+
+A flag to tell test-harness to run with their coverage options enabled,
+if they respond to the `npm_config_coverage` environment variable.
+
### depth
* Default: Infinity
@@ -379,13 +387,16 @@ The location to write log output.
### loglevel
-* Default: "warn"
+* Default: "http"
* Type: String
-* Values: "silent", "win", "error", "warn", "info", "verbose", "silly"
+* Values: "silent", "win", "error", "warn", "http", "info", "verbose", "silly"
What level of logs to report. On failure, *all* logs are written to
`npm-debug.log` in the current working directory.
+Any logs of a higher level than the setting are shown.
+The default is "http", which shows http, warn, and error output.
+
### logprefix
* Default: true on Posix, false on Windows
@@ -537,6 +548,16 @@ Space-separated options that are always passed to search.
Space-separated options that limit the results from search.
+### searchsort
+
+* Default: "name"
+* Type: String
+* Values: "name", "-name", "date", "-date", "description",
+ "-description", "keywords", "-keywords"
+
+Indication of which field to sort search results by. Prefix with a `-`
+character to indicate reverse sort.
+
### shell
* Default: SHELL environment variable, or "bash" on Posix, or "cmd" on
diff --git a/deps/npm/doc/cli/developers.md b/deps/npm/doc/cli/developers.md
index 0f0f94c588..9123f35a33 100644
--- a/deps/npm/doc/cli/developers.md
+++ b/deps/npm/doc/cli/developers.md
@@ -150,8 +150,8 @@ You can give publish a url to a tarball, or a filename of a tarball,
or a path to a folder.
Note that pretty much **everything in that folder will be exposed**
-by default. So, if you have secret stuff in there, use a `.npminclude`
-or `.npmignore` file to list out the globs to include/ignore, or publish
+by default. So, if you have secret stuff in there, use a
+`.npmignore` file to list out the globs to ignore, or publish
from a fresh checkout.
## Brag about it
diff --git a/deps/npm/doc/cli/search.md b/deps/npm/doc/cli/search.md
index 3b15e9b073..e9e408c677 100644
--- a/deps/npm/doc/cli/search.md
+++ b/deps/npm/doc/cli/search.md
@@ -9,28 +9,9 @@ npm-search(1) -- Search for packages
Search the registry for packages matching the search terms.
-## CONFIGURATION
-
-### description
-
-* Default: true
-* Type: Boolean
-
-Show the description in `npm search`
-
-### searchopts
-
-* Default: ""
-* Type: String
-
-Space-separated options that are always passed to search.
-
-### searchexclude
-
-* Default: ""
-* Type: String
-
-Space-separated options that limit the results from search.
+If a term starts with `/`, then it's interpreted as a regular expression.
+A trailing `/` will be ignored in this case. (Note that many regular
+expression characters must be escaped or quoted in most shells.)
## SEE ALSO
diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html
index accd17cc85..6fc11563da 100644
--- a/deps/npm/html/api/bin.html
+++ b/deps/npm/html/api/bin.html
@@ -19,7 +19,7 @@
This function should not be used programmatically. Instead, just refer
to the npm.bin member.
-
+