diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml index dbf67611c454d1..95255d8d8072bb 100644 --- a/deps/npm/.travis.yml +++ b/deps/npm/.travis.yml @@ -17,9 +17,11 @@ matrix: # previous LTS is next most important - node_js: "4" env: DEPLOY_VERSION=testing - # then master - node_js: "7" env: DEPLOY_VERSION=testing + # then master + - node_js: "8" + env: DEPLOY_VERSION=testing before_install: # required by test/tap/registry.js - "mkdir -p /var/run/couchdb" diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 64d9c2d0616c46..7357c4a1bd5bdd 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -464,3 +464,14 @@ J F Pavlo Liulia Ján Dzurek Lucas Theisen +Mike Sherov +薛定谔的猫 +Paweł Lula +Jakob Krigovsky +George Rawlinson +Jack Nagel +Andreas Kohn +Jason Wohlgemuth +Ryan Graham +Hirse +Colin Rotherham diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md index e2a8004b8d9b37..03b7e29d91e869 100644 --- a/deps/npm/CHANGELOG.md +++ b/deps/npm/CHANGELOG.md @@ -1,3 +1,238 @@ +## v5.0.3 (2017-06-05) + +Happy Monday, y'all! We've got another npm release for you with the fruits of +our ongoing bugsquashing efforts. You can expect at least one more this week, +but probably more -- and as we announced last week, we'll be merging fixes more +rapidly into the `npmc` canary so you can get everything as soon as possible! + +Hope y'all are enjoying npm5 in the meantime, and don't hesitate to file issues +for anything you find! The goal is to get this release rock-solid as soon as we +can. 💚 + +* [`6e12a5cc0`](https://github.com/npm/npm/commit/6e12a5cc022cb5a157a37df7283b6d7b3d49bdab) + Bump several dependencies to get improvements and bugfixes: + * `cacache`: content files (the tarballs) are now read-only. + * `pacote`: fix failing clones with bad heads, send extra TLS-related opts to proxy, enable global auth configurations and `_auth`-based auth. + * `ssri`: stop crashing with `can't call method find of undefined` when running into a weird `opts.integrity`/`opts.algorithms` conflict during verification. + ([@zkat](https://github.com/zkat)) +* [`89cc8e3e1`](https://github.com/npm/npm/commit/89cc8e3e12dad67fd9844accf4d41deb4c180c5c) + [#16917](https://github.com/npm/npm/pull/16917) + Send `ca`, `cert` and `key` config through to network layer. + ([@colinrotherham](https://github.com/colinrotherham)) +* [`6a9b51c67`](https://github.com/npm/npm/commit/6a9b51c67ba3df0372991631992748329b84f2e7) + [#16929](https://github.com/npm/npm/pull/16929) + Send `npm-session` header value with registry requests again. + ([@zarenner](https://github.com/zarenner)) +* [`662a15ab7`](https://github.com/npm/npm/commit/662a15ab7e790e87f5e5a35252f05d5a4a0724a1) + Fix `npm doctor` so it stop complaining about read-only content files in the + cache. + ([@zkat](https://github.com/zkat)) +* [`191d10a66`](https://github.com/npm/npm/commit/191d10a6616d72e26d89fd00f5a4f6158bfbc526) + [#16918](https://github.com/npm/npm/pull/16918) + Clarify prepublish deprecation message. + ([@Hirse](https://github.com/Hirse)) + +## v5.0.2 (2017-06-02) + +Here's another patch release, soon after the other! + +This particular release includes a slew of fixes to npm's git support, which was +causing some issues for a chunk of people, specially those who were using +self-hosted/Enterprise repos. All of those should be back in working condition +now. + +There's another shiny thing you might wanna know about: npm has a Canary release +now! The `npm5` experiment we did during our beta proved to be incredibly +successful: users were able to have a tight feedback loop between reports and +getting the bugfixes they needed, and the CLI team was able to roll out +experimental patches and have the community try them out right away. So we want +to keep doing that. + +From now on, you'll be able to install the 'npm canary' with `npm i -g npmc`. +This release will be a separate binary (`npmc`. Because canary. Get it?), which +will update independently of the main CLI. Most of the time, this will track +`release-next` or something close to it. We might occasionally toss experimental +branches in there to see if our more adventurous users run into anything +interesting with it. For example, the current canary (`npmc@5.0.1-canary.6`) +includes an [experimental multiproc +branch](https://github.com/npm/npm/pull/16633) that parallelizes tarball +extraction across multiple processes. + +If you find any issues while running the canary version, please report them and +let us know it came from `npmc`! It would be tremendously helpful, and finding +things early is a huge reason to have it there. Happy hacking! + +### A NOTE ABOUT THE ISSUE TRACKER + +Just a heads up: We're preparing to do a massive cleanup of the issue tracker. +It's been a long time since it was something we could really keep up with, and +we didn't have a process for dealing with it that could actually be sustainable. + +We're still sussing the details out, and we'll talk about it more when we're +about to do it, but the plan is essentially to close old, abandoned issues and +start over. We will also [add some automation](https://github.com/probot) around +issue management so that things that we can't keep up with don't just stay +around forever. + +Stay tuned! + +### GIT YOLO + +* [`1f26e9567`](https://github.com/npm/npm/commit/1f26e9567a6d14088704e121ebe787c38b6849a4) + `pacote@2.7.27`: Fixes installing committishes that look like semver, even + though they're not using the required `#semver:` syntax. + ([@zkat](https://github.com/zkat)) +* [`85ea1e0b9`](https://github.com/npm/npm/commit/85ea1e0b9478551265d03d545e7dc750b9edf547) + `npm-package-arg@5.1.1`: This includes the npa git-parsing patch to make it so + non-hosted SCP-style identifiers are correctly handled. Previously, npa would + mangle them (even though hosted-git-info is doing the right thing for them). + ([@zkat](https://github.com/zkat)) + +### COOL NEW OUTPUT + +The new summary output has been really well received! One downside that reared +its head as more people used it, though, is that it doesn't really tell you +anything about the toplevel versions it installed. So, if you did `npm i -g +foo`, it would just say "added 1 package". This patch by +[@rmg](https://github.com/rmg) keeps things concise while still telling you +what you got! So now, you'll see something like this: + +``` +$ npm i -g foo bar ++ foo@1.2.3 ++ bar@3.2.1 +added 234 packages in .005ms +``` + +* [`362f9fd5b`](https://github.com/npm/npm/commit/362f9fd5bec65301082416b4292b8fe3eb7f824a) + [#16899](https://github.com/npm/npm/pull/16899) + For every package that is given as an argument to install, print the name and + version that was actually installed. + ([@rmg](https://github.com/rmg)) + +### OTHER BUGFIXES + +* [`a47593a98`](https://github.com/npm/npm/commit/a47593a98a402143081d7077d2ac677d13083010) + [#16835](https://github.com/npm/npm/pull/16835) + Fix a crash while installing with `--no-shrinkwrap`. + ([@jacknagel](https://github.com/jacknagel)) + +### DOC UPATES + +* [`89e0cb816`](https://github.com/npm/npm/commit/89e0cb8165dd9c3c7ac74d531617f367099608f4) + [#16818](https://github.com/npm/npm/pull/16818) + Fixes a spelling error in the docs. Because the CLI team has trouble spelling + "package", I guess. + ([@ankon](https://github.com/ankon)) +* [`c01fbc46e`](https://github.com/npm/npm/commit/c01fbc46e151bcfb359fd68dd7faa392789b4f55) + [#16895](https://github.com/npm/npm/pull/16895) + Remove `--save` from `npm init` instructions, since it's now the default. + ([@jhwohlgemuth](https://github.com/jhwohlgemuth)) +* [`80c42d218`](https://github.com/npm/npm/commit/80c42d2181dd4d1b79fcee4e9233df268dfb30b7) + Guard against cycles when inflating bundles, as symlinks are bundles now. + ([@iarna](https://github.com/iarna)) +* [`7fe7f8665`](https://github.com/npm/npm/commit/7fe7f86658798db6667df89afc75588c0e43bc94) + [#16674](https://github.com/npm/npm/issues/16674) + Write the builtin config for `npmc`, not just `npm`. This is hardcoded for npm + self-installations and is needed for Canary to work right. + ([@zkat](https://github.com/zkat)) + +### DEP UPDATES + +* [`63df4fcdd`](https://github.com/npm/npm/commit/63df4fcddc7445efb50cc7d8e09cdd45146d3e39) + [#16894](https://github.com/npm/npm/pull/16894) + [`node-gyp@3.6.2`](https://github.com/nodejs/node-gyp/blob/master/CHANGELOG.md#v362-2017-06-01): + Fixes an issue parsing SDK versions on Windows, among other things. + ([@refack](https://github.com/refack)) +* [`5bb15c3c4`](https://github.com/npm/npm/commit/5bb15c3c4f0d7d77c73fd6dafa38ac36549b6e00) + `read-package-tree@5.1.6`: Fixes some racyness while reading the tree. + ([@iarna](https://github.com/iarna)) +* [`a6f7a52e7`](https://github.com/npm/npm/commit/a6f7a52e7) + `aproba@1.1.2`: Remove nested function declaration for speed up + ([@mikesherov](https://github.com/mikesherov)) + +## v5.0.1 (2017-05-31): + +Hey y'all! Hope you're enjoying the new npm! + +As you all know, fresh software that's gone through major overhauls tends to +miss a lot of spots the old one used to handle well enough, and `npm@5` is no +exception. The CLI team will be doing faster release cycles that go directly to +the `latest` tag for a couple of weeks while 5 stabilizes a bit and we're +confident the common low-hanging fruit people are running into are all taken +care of. + +With that said: this is our first patch release! The biggest focus is fixing up +a number of git-related issues that folks ran into right out the door. It also +fixes other things, like some proxy/auth-related issues, and even has a neat +speed boost! (You can expect more speed bumps in the coming releases as pending +work starts landing, too!) + +Thanks everyone who's been reporting issues and submitting patches! + +### BUGFIXES + +* [`e61e68dac`](https://github.com/npm/npm/commit/e61e68dac4fa51c0540a064204a75b19f8052e58) + [#16762](https://github.com/npm/npm/pull/16762) + Make `npm publish` obey the `--tag` flag again. + ([@zkat](https://github.com/zkat)) +* [`923fd58d3`](https://github.com/npm/npm/commit/923fd58d312f40f8c17b232ad1dfc8e2ff622dbd) + [#16749](https://github.com/npm/npm/pull/16749) + Speed up installations by nearly 20% by... removing one line of code. (hah) + ([@mikesherov](https://github.com/mikesherov)) +* [`9aac984cb`](https://github.com/npm/npm/commit/9aac984cbbfef22182ee42b51a193c0b47146ad6) + Guard against a particular failure mode for a bug still being hunted down. + ([@iarna](https://github.com/iarna)) +* [`80ab521f1`](https://github.com/npm/npm/commit/80ab521f18d34df109de0c5dc9eb1cde5ff6d7e8) + Pull in dependency updates for various core deps: + * New `pacote` fixes several git-related bugs. + * `ssri` update fixes crash on early node@4 versions. + * `make-fetch-happen` update fixes proxy authentication issue. + * `npm-user-validate` adds regex for blocking usernames with illegal chars. + ([@zkat](https://github.com/zkat)) +* [`7e5ce87b8`](https://github.com/npm/npm/commit/7e5ce87b84880c7433ee4c07d2dd6ce8806df436) + `pacote@2.7.26`: + Fixes various other git issues related to commit hashes. + ([@zkat](https://github.com/zkat)) +* [`acbe85bfc`](https://github.com/npm/npm/commit/acbe85bfc1a68d19ca339a3fb71da0cffbf58926) + [#16791](https://github.com/npm/npm/pull/16791) + `npm view` was calling `cb` prematurely and giving partial output when called + in a child process. + ([@zkat](https://github.com/zkat)) +* [`ebafe48af`](https://github.com/npm/npm/commit/ebafe48af91f702ccefc8c619d52fed3b8dfd3c7) + [#16750](https://github.com/npm/npm/pull/16750) + Hamilpatch the Musical: Talk less, complete more. + ([@aredridel](https://github.com/aredridel)) + +### DOCUMENTATION + +* [`dc2823a6c`](https://github.com/npm/npm/commit/dc2823a6c5fc098041e61515c643570819d059d2) + [#16799](https://github.com/npm/npm/pull/16799) + Document that `package-lock.json` is never allowed in tarballs. + ([@sonicdoe](https://github.com/sonicdoe)) +* [`f3cb84b44`](https://github.com/npm/npm/commit/f3cb84b446c51d628ee0033cdf13752c15b31a29) + [#16771](https://github.com/npm/npm/pull/16771) + Fix `npm -l` usage information for the `test` command. + ([@grawlinson](https://github.com/grawlinson)) + +### OTHER CHANGES + +* [`661262309`](https://github.com/npm/npm/commit/66126230912ab5ab35287b40a9908e036fa73994) + [#16756](https://github.com/npm/npm/pull/16756) + remove unused argument + ([@Aladdin-ADD](https://github.com/Aladdin-ADD)) +* [`c3e0b4287`](https://github.com/npm/npm/commit/c3e0b4287ea69735cc367aa7bb7e7aa9a6d9804b) + [#16296](https://github.com/npm/npm/pull/16296) + preserve same name convention for command + ([@desfero](https://github.com/desfero)) +* [`9f814831d`](https://github.com/npm/npm/commit/9f814831d330dde7702973186aea06caaa77ff31) + [#16757](https://github.com/npm/npm/pull/16757) + remove unused argument + ([@Aladdin-ADD](https://github.com/Aladdin-ADD)) +* [`3cb843239`](https://github.com/npm/npm/commit/3cb8432397b3666d88c31131dbb4599016a983ff) + minor linter fix + ([@zkat](https://github.com/zkat)) + ## v5.0.0 (2017-05-25) Wowowowowow npm@5! diff --git a/deps/npm/appveyor.yml b/deps/npm/appveyor.yml index d808b2dbcca4eb..7b97e79d626efc 100644 --- a/deps/npm/appveyor.yml +++ b/deps/npm/appveyor.yml @@ -4,8 +4,9 @@ environment: - nodejs_version: "6" # previous LTS is next most important - nodejs_version: "4" - # then master - nodejs_version: "7" + # then master + - nodejs_version: "8" COVERALLS_REPO_TOKEN: secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ platform: diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js index c8c426f4ada83e..e2c013b5df8637 100755 --- a/deps/npm/bin/npm-cli.js +++ b/deps/npm/bin/npm-cli.js @@ -83,7 +83,7 @@ if (er) return errorHandler(er) npm.commands[npm.command](npm.argv, function (err) { // https://www.youtube.com/watch?v=7nfPu8qTiQU - if (!err && npm.config.get('ham-it-up') && !npm.config.get('json') && !npm.config.get('parseable')) { + if (!err && npm.config.get('ham-it-up') && !npm.config.get('json') && !npm.config.get('parseable') && npm.command !== 'completion') { output('\n 🎵 I Have the Honour to Be Your Obedient Servant,🎵 ~ npm 📜🖋\n') } errorHandler.apply(this, arguments) diff --git a/deps/npm/doc/files/package-lock.json.md b/deps/npm/doc/files/package-lock.json.md index dad219b4a14dd9..f6dde3649237b0 100644 --- a/deps/npm/doc/files/package-lock.json.md +++ b/deps/npm/doc/files/package-lock.json.md @@ -50,7 +50,7 @@ whose semantics were used when generating this `package-lock.json`. This is a [subresource integrity](https://w3c.github.io/webappsec/specs/subresourceintegrity/) value -created from the `pacakge.json`. No preprocessing of the `package.json` should +created from the `package.json`. No preprocessing of the `package.json` should be done. Subresource integrity strings can be produced by modules like [`ssri`](https://www.npmjs.com/package/ssri). diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 193caa9240911c..1a06ff794b6784 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -204,6 +204,7 @@ Conversely, some files are always ignored: * `node_modules` * `config.gypi` * `*.orig` +* `package-lock.json` (use shrinkwrap instead) ## main diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index eb4f72947d74b7..6668429083910b 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -126,5 +126,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-access.html b/deps/npm/html/doc/cli/npm-access.html index f015aacdbc89db..4fcfc87ccda4ea 100644 --- a/deps/npm/html/doc/cli/npm-access.html +++ b/deps/npm/html/doc/cli/npm-access.html @@ -84,5 +84,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html index 46385d7295f33d..905c01acb0d24d 100644 --- a/deps/npm/html/doc/cli/npm-adduser.html +++ b/deps/npm/html/doc/cli/npm-adduser.html @@ -81,5 +81,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html index 962a3282d81901..131dff4dd2da70 100644 --- a/deps/npm/html/doc/cli/npm-bin.html +++ b/deps/npm/html/doc/cli/npm-bin.html @@ -35,5 +35,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html index 79e11b018ec61b..e73b582a191f75 100644 --- a/deps/npm/html/doc/cli/npm-bugs.html +++ b/deps/npm/html/doc/cli/npm-bugs.html @@ -55,5 +55,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html index ba59bba643ab0a..99f846f55f2a91 100644 --- a/deps/npm/html/doc/cli/npm-build.html +++ b/deps/npm/html/doc/cli/npm-build.html @@ -40,5 +40,5 @@

DESCRIPTION

       - + diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html index 8f3510f5b8f2a5..3898c9c0a8465f 100644 --- a/deps/npm/html/doc/cli/npm-bundle.html +++ b/deps/npm/html/doc/cli/npm-bundle.html @@ -31,5 +31,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html index fdcf22363880ac..ff6f6cb556f5a5 100644 --- a/deps/npm/html/doc/cli/npm-cache.html +++ b/deps/npm/html/doc/cli/npm-cache.html @@ -89,5 +89,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html index 18d659ea837761..9322d0a096cd77 100644 --- a/deps/npm/html/doc/cli/npm-completion.html +++ b/deps/npm/html/doc/cli/npm-completion.html @@ -43,5 +43,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html index 2ef422bd74f928..6d1f6fcc20809b 100644 --- a/deps/npm/html/doc/cli/npm-config.html +++ b/deps/npm/html/doc/cli/npm-config.html @@ -67,5 +67,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html index d6ff8ce7608475..21c85e73b8def2 100644 --- a/deps/npm/html/doc/cli/npm-dedupe.html +++ b/deps/npm/html/doc/cli/npm-dedupe.html @@ -61,5 +61,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html index 6741f7478b7cda..5b3e33d42288cb 100644 --- a/deps/npm/html/doc/cli/npm-deprecate.html +++ b/deps/npm/html/doc/cli/npm-deprecate.html @@ -38,5 +38,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-dist-tag.html b/deps/npm/html/doc/cli/npm-dist-tag.html index 8fa52c2b33be05..1325853d76517f 100644 --- a/deps/npm/html/doc/cli/npm-dist-tag.html +++ b/deps/npm/html/doc/cli/npm-dist-tag.html @@ -86,5 +86,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html index 530a784ed9c307..7100b563c5faa2 100644 --- a/deps/npm/html/doc/cli/npm-docs.html +++ b/deps/npm/html/doc/cli/npm-docs.html @@ -56,5 +56,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-doctor.html b/deps/npm/html/doc/cli/npm-doctor.html index b75fcc561869f3..41125d789078c4 100644 --- a/deps/npm/html/doc/cli/npm-doctor.html +++ b/deps/npm/html/doc/cli/npm-doctor.html @@ -103,4 +103,4 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html index 8860c492adc420..b4291160b65839 100644 --- a/deps/npm/html/doc/cli/npm-edit.html +++ b/deps/npm/html/doc/cli/npm-edit.html @@ -49,5 +49,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html index 115d43584cb63c..1e5208e496f0bc 100644 --- a/deps/npm/html/doc/cli/npm-explore.html +++ b/deps/npm/html/doc/cli/npm-explore.html @@ -49,5 +49,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html index a9cb77652bbf3d..528e70cbab6e7f 100644 --- a/deps/npm/html/doc/cli/npm-help-search.html +++ b/deps/npm/html/doc/cli/npm-help-search.html @@ -45,5 +45,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html index bd72e9471ef38b..5f2a04a159dc2d 100644 --- a/deps/npm/html/doc/cli/npm-help.html +++ b/deps/npm/html/doc/cli/npm-help.html @@ -50,5 +50,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html index 6f053ddb1b522e..215fdb40a9e70a 100644 --- a/deps/npm/html/doc/cli/npm-init.html +++ b/deps/npm/html/doc/cli/npm-init.html @@ -48,5 +48,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-install-test.html b/deps/npm/html/doc/cli/npm-install-test.html index 02866f73743fb8..83325a82891158 100644 --- a/deps/npm/html/doc/cli/npm-install-test.html +++ b/deps/npm/html/doc/cli/npm-install-test.html @@ -42,5 +42,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html index 55eaabcfd33b20..b41029e7c99afc 100644 --- a/deps/npm/html/doc/cli/npm-install.html +++ b/deps/npm/html/doc/cli/npm-install.html @@ -365,5 +365,5 @@

SEE ALSO

       - + diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html index b279ab4d3a85a4..54b41d91dcbedf 100644 --- a/deps/npm/html/doc/cli/npm-link.html +++ b/deps/npm/html/doc/cli/npm-link.html @@ -74,5 +74,5 @@

SYNOPSIS

       - + diff --git a/deps/npm/html/doc/cli/npm-logout.html b/deps/npm/html/doc/cli/npm-logout.html index 3ecde84cc3e4e4..d3a544534ebaa6 100644 --- a/deps/npm/html/doc/cli/npm-logout.html +++ b/deps/npm/html/doc/cli/npm-logout.html @@ -51,5 +51,5 @@

scope

       - + diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html index af4103febf0d3c..500ca033e576ed 100644 --- a/deps/npm/html/doc/cli/npm-ls.html +++ b/deps/npm/html/doc/cli/npm-ls.html @@ -21,7 +21,7 @@

SYNOPSIS

limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

-
npm@5.0.0 /path/to/npm
+
npm@5.0.3 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 
It will print out extraneous, missing, and invalid packages.

@@ -104,5 +104,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index 7b36dc7f5bc999..1c862a8ba7a7e1 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -116,5 +116,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index aeaa8acb89269a..e4cc4d7de89d11 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -51,5 +51,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index d40a92437a4c63..25982014e3593a 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -41,5 +41,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-ping.html b/deps/npm/html/doc/cli/npm-ping.html
index e9a9f97b200173..666ba97c7cefd6 100644
--- a/deps/npm/html/doc/cli/npm-ping.html
+++ b/deps/npm/html/doc/cli/npm-ping.html
@@ -32,5 +32,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index 99dacb66606c7a..30c3172493f57b 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -38,5 +38,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index 56e8b8ab293350..52b2ba78e4ee4e 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -40,5 +40,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index 9b9cca3cb090b7..3fca992169342d 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -79,5 +79,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index a2a1ad03ab1682..7ec9923cb8bb63 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -35,5 +35,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index 83ec73d5f56083..38990dc8e96f3b 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -41,5 +41,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index c4d3296c251de2..6847b24387ce83 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -53,5 +53,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index 9b115bb0036fde..af03619a5d683c 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -35,5 +35,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index 07e1c514d6270f..2f61d63aece01e 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -66,5 +66,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index 02dc30d68e3675..cc95846328a2e4 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -109,5 +109,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index a1809977c592d2..44388546d8a2c4 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -41,5 +41,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index 8fce9194617a37..aacae893619a59 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -36,5 +36,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index db7f2e06332197..8252aa8f21ae80 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -36,5 +36,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index 756bc34e680068..8c8dd3bb39d16e 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -39,5 +39,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index 31c18f4ba2500e..b55a285de775fa 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -34,5 +34,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-team.html b/deps/npm/html/doc/cli/npm-team.html
index 13fd9474881f4b..8bf5fdea1ed99b 100644
--- a/deps/npm/html/doc/cli/npm-team.html
+++ b/deps/npm/html/doc/cli/npm-team.html
@@ -67,5 +67,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index 798519122a0123..e099df218cb603 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -36,5 +36,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index 147b6e563e3ab4..37bb0bd71f771d 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -60,5 +60,5 @@ 
SYNOPSIS

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index 587dad4259c8f8..36d0d328616187 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -51,5 +51,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index ee1c38dc692c26..197aa41870f128 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -118,5 +118,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index 00361d5174f551..bc29ed75ac1b90 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -114,5 +114,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html
index 9fa968fd636f2f..70bf31e435975a 100644
--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@@ -86,5 +86,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html
index c25ad77e591243..8f84bc8ab62e5b 100644
--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@@ -33,5 +33,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html
index 55495142954b77..4e4d97b2350736 100644
--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@@ -13,7 +13,7 @@ 
npm
 
javascript package manager

 
SYNOPSIS

 
npm <command> [args]
 
VERSION

-
5.0.0

+
5.0.3

 
DESCRIPTION

 
npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency
@@ -126,7 +126,7 @@ 
AUTHOR

 
Isaac Z. Schlueter ::
 isaacs ::
 @izs ::
-i@izs.me

+i@izs.me

 
SEE ALSO

 
    
 
  • npm-help(1)
    • 
@@ -150,5 +150,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html
index 4f9656a922b0a4..300df680e1afb2 100644
--- a/deps/npm/html/doc/files/npm-folders.html
+++ b/deps/npm/html/doc/files/npm-folders.html
@@ -182,5 +182,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html
index 4f9656a922b0a4..300df680e1afb2 100644
--- a/deps/npm/html/doc/files/npm-global.html
+++ b/deps/npm/html/doc/files/npm-global.html
@@ -182,5 +182,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html
index 7d6ed1c78a18e4..e0f2df86f29360 100644
--- a/deps/npm/html/doc/files/npm-json.html
+++ b/deps/npm/html/doc/files/npm-json.html
@@ -162,6 +162,7 @@ 
    files
    
 
  • node_modules
    • 
 
  • config.gypi
    • 
 
  • *.orig
    • 
+
  • package-lock.json (use shrinkwrap instead)
    • 
 

 
main

 
The main field is a module ID that is the primary entry point to your program.
@@ -586,5 +587,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/npm-package-locks.html b/deps/npm/html/doc/files/npm-package-locks.html
index 7f8851781ba030..56bf73fbf86e6a 100644
--- a/deps/npm/html/doc/files/npm-package-locks.html
+++ b/deps/npm/html/doc/files/npm-package-locks.html
@@ -145,4 +145,4 @@ 
SEE ALSO

   
    
 
-
+
diff --git a/deps/npm/html/doc/files/npm-shrinkwrap.json.html b/deps/npm/html/doc/files/npm-shrinkwrap.json.html
index 3498af79217053..1437a6807ee6f6 100644
--- a/deps/npm/html/doc/files/npm-shrinkwrap.json.html
+++ b/deps/npm/html/doc/files/npm-shrinkwrap.json.html
@@ -42,4 +42,4 @@ 
SEE ALSO

   
    
 
-
+
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index ef6d01b6119952..9dd6e18b10c0e6 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -85,5 +85,5 @@ 
SEE ALSO

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/package-lock.json.html b/deps/npm/html/doc/files/package-lock.json.html
index 57423161bd84b2..ea9439e8418ee2 100644
--- a/deps/npm/html/doc/files/package-lock.json.html
+++ b/deps/npm/html/doc/files/package-lock.json.html
@@ -47,7 +47,7 @@ 
lockfileVersion

 
packageIntegrity

 
This is a subresource
 integrity value
-created from the pacakge.json. No preprocessing of the package.json should
+created from the package.json. No preprocessing of the package.json should
 be done. Subresource integrity strings can be produced by modules like
 ssri.

 
@@ -124,4 +124,4 @@ 
SEE ALSO

   
    
 
-
+
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index 7d6ed1c78a18e4..e0f2df86f29360 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -162,6 +162,7 @@ 
files

 
  • node_modules
    • 
 
  • config.gypi
    • 
 
  • *.orig
    • 
+
  • package-lock.json (use shrinkwrap instead)
    • 
 
 
    main
    
 
    The main field is a module ID that is the primary entry point to your program.
@@ -586,5 +587,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index 75891616b89116..9e300e85bf23b6 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -168,5 +168,5 @@ 
    semver(7)
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index 0048979e908ad1..081d89f4945cff 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -153,5 +153,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index bed7aa07367ea7..c6fc5cad3cb289 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -981,5 +981,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html
index d87e8c05fcd4be..7d27bd2bc19724 100644
--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@@ -194,5 +194,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html
index e5d95529e6be02..351539c60b87a7 100644
--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@@ -20,7 +20,7 @@ 
    npm-disputes
     
    Handling Module
 
    TL;DR
    
 
      
 
    1. Get the author email with npm owner ls <pkgname>
      2. 
-
    2. Email the author, CC support@npmjs.com
      3. 
+
    3. Email the author, CC support@npmjs.com
      4. 
 
    4. After a few weeks, if there's no resolution, we'll sort it out.
      5. 
 
    
 
    Don't squat on package names.  Publish code or move out of the way.
    
@@ -55,12 +55,12 @@ 
    DESCRIPTION
    
 
 
  • Alice emails Yusuf, explaining the situation as respectfully as possible,
 and what she would like to do with the module name. She adds the npm support
-staff support@npmjs.com to the CC list of the email. Mention in the email
+staff support@npmjs.com to the CC list of the email. Mention in the email
 that Yusuf can run npm owner add alice foo to add Alice as an owner of the
 foo package.
    • 
 
  • After a reasonable amount of time, if Yusuf has not responded, or if Yusuf
 and Alice can't come to any sort of resolution, email support
-support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least
+support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least
 4 weeks.)
    • 
 
 
    REASONING
    
@@ -96,12 +96,12 @@ 
    EXCEPTIONS
    
 Code of Conduct such as hateful
 language, pornographic content, or harassment.
 
-
    If you see bad behavior like this, please report it to abuse@npmjs.com right
+
    If you see bad behavior like this, please report it to abuse@npmjs.com right
 away. You are never expected to resolve abusive behavior on your own. We are
 here to help.
    
 
    TRADEMARKS
    
 
    If you think another npm publisher is infringing your trademark, such as by
-using a confusingly similar package name, email abuse@npmjs.com with a link to
+using a confusingly similar package name, email abuse@npmjs.com with a link to
 the package or user account on https://npmjs.com. Attach a
 copy of your trademark registration certificate.
    
 
    If we see that the package's publisher is intentionally misleading others by
@@ -134,5 +134,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html
index 75956cc368a495..4888d872841e05 100644
--- a/deps/npm/html/doc/misc/npm-index.html
+++ b/deps/npm/html/doc/misc/npm-index.html
@@ -168,5 +168,5 @@ 
    semver(7)
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-orgs.html b/deps/npm/html/doc/misc/npm-orgs.html
index 1c769d1495d728..f3aab6e8517a29 100644
--- a/deps/npm/html/doc/misc/npm-orgs.html
+++ b/deps/npm/html/doc/misc/npm-orgs.html
@@ -86,5 +86,5 @@ 
    Team Admins create teams
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html
index aca3dc550c74af..7c6445b4cf4a18 100644
--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@@ -90,5 +90,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html
index f15285ba784eae..98595501fad131 100644
--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@@ -99,5 +99,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html
index 976695a05cc878..ea3ecc321d8145 100644
--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@@ -243,5 +243,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html
index 8a7a51e4b0629d..98404d073c88ad 100644
--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@@ -57,5 +57,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html
index 5a8b556bcabcd4..44c208b217d82c 100644
--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@@ -325,5 +325,5 @@ 
    Ranges
    
   
    
 
-
+
 
diff --git a/deps/npm/lib/build.js b/deps/npm/lib/build.js
index 5dd243a7953aac..c2acc0066235e2 100644
--- a/deps/npm/lib/build.js
+++ b/deps/npm/lib/build.js
@@ -79,7 +79,8 @@ var writeBuiltinConf = build.writeBuiltinConf = function (pkg, folder, cb) {
   var parent = path.dirname(folder)
   var dir = npm.globalDir
 
-  if (pkg.name !== 'npm' ||
+  // Make this count for canary, too
+  if ((pkg.name !== 'npm' && pkg.name !== 'npmc') ||
       !npm.config.get('global') ||
       !npm.config.usingBuiltin ||
       dir !== parent) {
diff --git a/deps/npm/lib/config/pacote.js b/deps/npm/lib/config/pacote.js
index 705544fe3cbad2..2d2dda59fa3ee2 100644
--- a/deps/npm/lib/config/pacote.js
+++ b/deps/npm/lib/config/pacote.js
@@ -2,6 +2,7 @@
 
 const Buffer = require('safe-buffer').Buffer
 
+const crypto = require('crypto')
 const npm = require('../npm')
 const log = require('npmlog')
 let pack
@@ -9,6 +10,9 @@ const path = require('path')
 
 let effectiveOwner
 
+const npmSession = crypto.randomBytes(8).toString('hex')
+log.verbose('npm-session', npmSession)
+
 module.exports = pacoteOpts
 function pacoteOpts (moreOpts) {
   if (!pack) {
@@ -17,13 +21,17 @@ function pacoteOpts (moreOpts) {
   const ownerStats = calculateOwner()
   const opts = {
     cache: path.join(npm.config.get('cache'), '_cacache'),
+    ca: npm.config.get('ca'),
+    cert: npm.config.get('cert'),
     defaultTag: npm.config.get('tag'),
     dirPacker: pack.packGitDep,
     hashAlgorithm: 'sha1',
+    key: npm.config.get('key'),
     localAddress: npm.config.get('local-address'),
     log: log,
     maxAge: npm.config.get('cache-min'),
     maxSockets: npm.config.get('maxsockets'),
+    npmSession: npmSession,
     offline: npm.config.get('offline'),
     preferOffline: npm.config.get('prefer-offline') || npm.config.get('cache-min') > 9999,
     preferOnline: npm.config.get('prefer-online') || npm.config.get('cache-max') <= 0,
diff --git a/deps/npm/lib/config/reg-client.js b/deps/npm/lib/config/reg-client.js
new file mode 100644
index 00000000000000..d4e2417097fa09
--- /dev/null
+++ b/deps/npm/lib/config/reg-client.js
@@ -0,0 +1,29 @@
+'use strict'
+
+module.exports = regClientConfig
+function regClientConfig (npm, log, config) {
+  return {
+    proxy: {
+      http: config.get('proxy'),
+      https: config.get('https-proxy'),
+      localAddress: config.get('local-address')
+    },
+    ssl: {
+      certificate: config.get('cert'),
+      key: config.get('key'),
+      ca: config.get('ca'),
+      strict: config.get('strict-ssl')
+    },
+    retry: {
+      retries: config.get('fetch-retries'),
+      factor: config.get('fetch-retry-factor'),
+      minTimeout: config.get('fetch-retry-mintimeout'),
+      maxTimeout: config.get('fetch-retry-maxtimeout')
+    },
+    userAgent: config.get('user-agent'),
+    log: log,
+    defaultTag: config.get('tag'),
+    maxSockets: config.get('maxsockets'),
+    scope: npm.projectScope
+  }
+}
diff --git a/deps/npm/lib/doctor.js b/deps/npm/lib/doctor.js
index 357ba91a5ac7de..95ede1bc872429 100644
--- a/deps/npm/lib/doctor.js
+++ b/deps/npm/lib/doctor.js
@@ -39,9 +39,9 @@ function doctor (args, silent, cb) {
     [getLatestNpmVersion],
     [getLatestNodejsVersion, args['node-url']],
     [getGitPath],
-    [checkFilesPermission, npm.cache, 6],
-    [checkFilesPermission, globalNodeModules, 4],
-    [checkFilesPermission, localNodeModules, 6],
+    [checkFilesPermission, npm.cache, 4, 6],
+    [checkFilesPermission, globalNodeModules, 4, 4],
+    [checkFilesPermission, localNodeModules, 6, 6],
     [verifyCachedFiles, path.join(npm.cache, '_cacache')]
   ]
 
diff --git a/deps/npm/lib/doctor/check-files-permission.js b/deps/npm/lib/doctor/check-files-permission.js
index 50014fd232eb72..1cefb6e64cea51 100644
--- a/deps/npm/lib/doctor/check-files-permission.js
+++ b/deps/npm/lib/doctor/check-files-permission.js
@@ -6,7 +6,7 @@ var log = require('npmlog')
 var npm = require('../npm.js')
 var fileCompletion = require('../utils/completion/file-completion.js')
 
-function checkFilesPermission (root, mask, cb) {
+function checkFilesPermission (root, fmask, dmask, cb) {
   if (process.platform === 'win32') return cb(null, true)
   getUid(npm.config.get('user'), npm.config.get('group'), function (e, uid, gid) {
     var tracker = log.newItem('checkFilePermissions', 1)
@@ -37,10 +37,10 @@ function checkFilesPermission (root, mask, cb) {
         fs.lstat(file, function (e, stat) {
           tracker.completeWork(1)
           if (e) return next(e)
-          if (!stat.isFile()) return next()
+          if (!stat.isDirectory() && !stat.isFile()) return next()
           // 6 = fs.constants.R_OK | fs.constants.W_OK
           // constants aren't available on v4
-          fs.access(file, 6, (err) => {
+          fs.access(file, stat.isFile() ? fmask : dmask, (err) => {
             if (err) {
               tracker.error('checkFilePermissions', `Missing permissions on ${file}`)
               return next(new Error('Missing permissions for ' + file))
diff --git a/deps/npm/lib/init.js b/deps/npm/lib/init.js
index df5615e47632fd..000fa1a5b689e9 100644
--- a/deps/npm/lib/init.js
+++ b/deps/npm/lib/init.js
@@ -22,7 +22,7 @@ function init (args, cb) {
       'See `npm help json` for definitive documentation on these fields',
       'and exactly what they do.',
       '',
-      'Use `npm install  --save` afterwards to install a package and',
+      'Use `npm install ` afterwards to install a package and',
       'save it as a dependency in the package.json file.',
       '',
       'Press ^C at any time to quit.'
diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js
index 5d111b32c8b699..67dcf98b70d797 100644
--- a/deps/npm/lib/install.js
+++ b/deps/npm/lib/install.js
@@ -741,6 +741,11 @@ Installer.prototype.printInstalledForHuman = function (diffs, cb) {
     }
   })
   var report = ''
+  if (this.args.length && (added || updated)) {
+    report += this.args.map((p) => {
+      return `+ ${p.name}@${p.version}`
+    }).join('\n') + '\n'
+  }
   var actions = []
   if (added) actions.push('added ' + packages(added))
   if (removed) actions.push('removed ' + packages(removed))
diff --git a/deps/npm/lib/install/action/finalize.js b/deps/npm/lib/install/action/finalize.js
index ba38e602f82d8d..ded2350dff7155 100644
--- a/deps/npm/lib/install/action/finalize.js
+++ b/deps/npm/lib/install/action/finalize.js
@@ -90,6 +90,6 @@ module.exports = function (staging, pkg, log) {
 
 module.exports.rollback = function (top, staging, pkg, next) {
   const requested = pkg.package._requested || getRequested(pkg)
-  if (requested.type === 'directory') return next()
+  if (requested && requested.type === 'directory') return next()
   gentlyRm(pkg.realpath, false, top, next)
 }
diff --git a/deps/npm/lib/install/action/prepare.js b/deps/npm/lib/install/action/prepare.js
index 771a2a9399533a..5e4333a5b51c6f 100644
--- a/deps/npm/lib/install/action/prepare.js
+++ b/deps/npm/lib/install/action/prepare.js
@@ -11,8 +11,8 @@ module.exports = function (staging, pkg, log, next) {
   // see https://github.com/npm/npm/issues/10074 for details
   if (pkg.package && pkg.package.scripts && pkg.package.scripts.prepublish) {
     prepublishWarning([
-      'As of npm@5, `prepublish` scripts will run only for `npm publish`.',
-      '(In npm@4 and previous versions, it also runs for `npm install`.)',
+      'As of npm@5, `prepublish` scripts are deprecated.',
+      'Use `prepare` for build steps and `prepublishOnly` for upload-only.',
       'See the deprecation note in `npm help scripts` for more information.'
     ])
   }
diff --git a/deps/npm/lib/install/inflate-bundled.js b/deps/npm/lib/install/inflate-bundled.js
index 70da583df4e4f2..66bbb44a33de37 100644
--- a/deps/npm/lib/install/inflate-bundled.js
+++ b/deps/npm/lib/install/inflate-bundled.js
@@ -1,11 +1,11 @@
 'use strict'
-var validate = require('aproba')
+
 var childPath = require('../utils/child-path.js')
 var reset = require('./node.js').reset
 
 module.exports = function inflateBundled (bundler, parent, children) {
-  validate('OOA', arguments)
   children.forEach(function (child) {
+    if (child.fromBundle === bundler) return
     reset(child)
     child.fromBundle = bundler
     child.isInLink = bundler.isLink
diff --git a/deps/npm/lib/install/inflate-shrinkwrap.js b/deps/npm/lib/install/inflate-shrinkwrap.js
index 8cb75626bb5d77..7ad966ea0a90e8 100644
--- a/deps/npm/lib/install/inflate-shrinkwrap.js
+++ b/deps/npm/lib/install/inflate-shrinkwrap.js
@@ -19,13 +19,13 @@ module.exports = function (tree, swdeps, opts, finishInflating) {
     fetchPackageMetadata = BB.promisify(require('../fetch-package-metadata.js'))
     addBundled = BB.promisify(fetchPackageMetadata.addBundled)
   }
-  if (!npm.config.get('shrinkwrap') || !npm.config.get('package-lock')) {
-    return finishInflating()
-  }
   if (arguments.length === 3) {
     finishInflating = opts
     opts = {}
   }
+  if (!npm.config.get('shrinkwrap') || !npm.config.get('package-lock')) {
+    return finishInflating()
+  }
   tree.loaded = true
   return inflateShrinkwrap(tree.path, tree, swdeps, opts).then(
     () => finishInflating(),
diff --git a/deps/npm/lib/ls.js b/deps/npm/lib/ls.js
index b993dd6235ebc6..3e2f2ce8fadef8 100644
--- a/deps/npm/lib/ls.js
+++ b/deps/npm/lib/ls.js
@@ -429,7 +429,7 @@ function makeArchy_ (data, long, dir, depth, parent, d) {
 
   if (long) {
     if (dir === data.path) out.label += '\n' + dir
-    out.label += '\n' + getExtras(data, dir)
+    out.label += '\n' + getExtras(data)
   } else if (dir === data.path) {
     if (out.label) out.label += ' '
     out.label += dir
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index dbd8e97150a763..990d8c51098593 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -33,6 +33,7 @@
   var rimraf = require('rimraf')
   var lazyProperty = require('lazy-property')
   var parseJSON = require('./utils/parse-json.js')
+  var clientConfig = require('./config/reg-client.js')
   var aliases = require('./config/cmd-list').aliases
   var cmdList = require('./config/cmd-list').cmdList
   var plumbing = require('./config/cmd-list').plumbing
@@ -344,7 +345,7 @@
         lazyProperty(npm, 'registry', function () {
           registryLoaded = true
           var RegClient = require('npm-registry-client')
-          var registry = new RegClient(adaptClientConfig(npm.config))
+          var registry = new RegClient(clientConfig(npm, log, npm.config))
           registry.version = npm.version
           registry.refer = registryRefer
           return registry
@@ -467,31 +468,4 @@
       return ''
     }
   }
-
-  function adaptClientConfig (config) {
-    return {
-      proxy: {
-        http: config.get('proxy'),
-        https: config.get('https-proxy'),
-        localAddress: config.get('local-address')
-      },
-      ssl: {
-        certificate: config.get('cert'),
-        key: config.get('key'),
-        ca: config.get('ca'),
-        strict: config.get('strict-ssl')
-      },
-      retry: {
-        retries: config.get('fetch-retries'),
-        factor: config.get('fetch-retry-factor'),
-        minTimeout: config.get('fetch-retry-mintimeout'),
-        maxTimeout: config.get('fetch-retry-maxtimeout')
-      },
-      userAgent: config.get('user-agent'),
-      log: log,
-      defaultTag: config.get('tag'),
-      maxSockets: config.get('maxsockets'),
-      scope: npm.projectScope
-    }
-  }
 })()
diff --git a/deps/npm/lib/pack.js b/deps/npm/lib/pack.js
index 075a672d66f212..4552bbc498986b 100644
--- a/deps/npm/lib/pack.js
+++ b/deps/npm/lib/pack.js
@@ -92,8 +92,8 @@ function prepareDirectory (dir) {
       if (pkg.scripts && pkg.scripts.prepublish) {
         prepublishWarning([
           'As of npm@5, `prepublish` scripts are deprecated.',
-          'Use `prepare` for build steps and `prepublishOnly` for upload-only',
-          'See the deprecation note in `npm help scripts` for more information'
+          'Use `prepare` for build steps and `prepublishOnly` for upload-only.',
+          'See the deprecation note in `npm help scripts` for more information.'
         ])
       }
       if (npm.config.get('ignore-prepublish')) {
diff --git a/deps/npm/lib/test.js b/deps/npm/lib/test.js
index cbc75821708b12..4ef025c4bac50c 100644
--- a/deps/npm/lib/test.js
+++ b/deps/npm/lib/test.js
@@ -1,6 +1,12 @@
 module.exports = test
 
-var testCmd = require('./utils/lifecycle.js').cmd('test')
+const testCmd = require('./utils/lifecycle.js').cmd('test')
+const usage = require('./utils/usage')
+
+test.usage = usage(
+  'test',
+  'npm test [-- ]'
+)
 
 function test (args, cb) {
   testCmd(args, function (er) {
diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js
index 5374d1feeca078..b13d42e1df451f 100644
--- a/deps/npm/lib/utils/error-handler.js
+++ b/deps/npm/lib/utils/error-handler.js
@@ -120,7 +120,7 @@ function exit (code, noLog) {
     })
     rollbacks.length = 0
   } else if (code && !noLog) {
-    writeLogFile(reallyExit)
+    writeLogFile()
   } else {
     reallyExit()
   }
diff --git a/deps/npm/lib/utils/get-publish-config.js b/deps/npm/lib/utils/get-publish-config.js
index fa475434ff61bc..ac0ef0934201ad 100644
--- a/deps/npm/lib/utils/get-publish-config.js
+++ b/deps/npm/lib/utils/get-publish-config.js
@@ -1,12 +1,16 @@
-var Conf = require('../config/core.js').Conf
-var RegClient = require('npm-registry-client')
-var log = require('npmlog')
+'use strict'
+
+const clientConfig = require('../config/reg-client.js')
+const Conf = require('../config/core.js').Conf
+const log = require('npmlog')
+const npm = require('../npm.js')
+const RegClient = require('npm-registry-client')
 
 module.exports = getPublishConfig
 
 function getPublishConfig (publishConfig, defaultConfig, defaultClient) {
-  var config = defaultConfig
-  var client = defaultClient
+  let config = defaultConfig
+  let client = defaultClient
   log.verbose('getPublishConfig', publishConfig)
   if (publishConfig) {
     config = new Conf(defaultConfig)
@@ -18,7 +22,7 @@ function getPublishConfig (publishConfig, defaultConfig, defaultClient) {
       s[k] = publishConfig[k]
       return s
     }, {}))
-    client = new RegClient(config)
+    client = new RegClient(clientConfig(npm, log, config))
   }
 
   return { config: config, client: client }
diff --git a/deps/npm/lib/utils/module-name.js b/deps/npm/lib/utils/module-name.js
index 649dfac01bd51b..43e0f5fb128e53 100644
--- a/deps/npm/lib/utils/module-name.js
+++ b/deps/npm/lib/utils/module-name.js
@@ -1,6 +1,5 @@
 'use strict'
 var path = require('path')
-var validate = require('aproba')
 
 module.exports = moduleName
 module.exports.test = {}
@@ -22,7 +21,6 @@ function isNotEmpty (str) {
 
 var unknown = 0
 function moduleName (tree) {
-  validate('O', arguments)
   var pkg = tree.package || tree
   if (isNotEmpty(pkg.name)) return pkg.name
   var pkgName = pathToPackageName(tree.path)
diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1
index ac6cb0f4cca5b7..0c2fbb6faa2483 100644
--- a/deps/npm/man/man1/npm-README.1
+++ b/deps/npm/man/man1/npm-README.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "May 2017" "" ""
+.TH "NPM" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm\fR \- a JavaScript package manager
 .P
diff --git a/deps/npm/man/man1/npm-access.1 b/deps/npm/man/man1/npm-access.1
index a0004f7ed35db5..d2a7a9fa00d160 100644
--- a/deps/npm/man/man1/npm-access.1
+++ b/deps/npm/man/man1/npm-access.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ACCESS" "1" "May 2017" "" ""
+.TH "NPM\-ACCESS" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-access\fR \- Set access level on published packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-adduser.1 b/deps/npm/man/man1/npm-adduser.1
index 0d2426de56df71..64b037402f0d22 100644
--- a/deps/npm/man/man1/npm-adduser.1
+++ b/deps/npm/man/man1/npm-adduser.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ADDUSER" "1" "May 2017" "" ""
+.TH "NPM\-ADDUSER" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-adduser\fR \- Add a registry user account
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1
index 6dd28b8615f4ed..e6a15a467c3311 100644
--- a/deps/npm/man/man1/npm-bin.1
+++ b/deps/npm/man/man1/npm-bin.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BIN" "1" "May 2017" "" ""
+.TH "NPM\-BIN" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-bin\fR \- Display npm bin folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1
index 949412ae0c64e3..860d5299ca0891 100644
--- a/deps/npm/man/man1/npm-bugs.1
+++ b/deps/npm/man/man1/npm-bugs.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUGS" "1" "May 2017" "" ""
+.TH "NPM\-BUGS" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1
index f0f629d3343c30..322d8c069e7e7f 100644
--- a/deps/npm/man/man1/npm-build.1
+++ b/deps/npm/man/man1/npm-build.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUILD" "1" "May 2017" "" ""
+.TH "NPM\-BUILD" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-build\fR \- Build a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-bundle.1 b/deps/npm/man/man1/npm-bundle.1
index ca564836cc1759..c8d8f8686b3e2f 100644
--- a/deps/npm/man/man1/npm-bundle.1
+++ b/deps/npm/man/man1/npm-bundle.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUNDLE" "1" "May 2017" "" ""
+.TH "NPM\-BUNDLE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-bundle\fR \- REMOVED
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-cache.1 b/deps/npm/man/man1/npm-cache.1
index cc8b1e2fae490a..41d84cba055dd3 100644
--- a/deps/npm/man/man1/npm-cache.1
+++ b/deps/npm/man/man1/npm-cache.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CACHE" "1" "May 2017" "" ""
+.TH "NPM\-CACHE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-cache\fR \- Manipulates packages cache
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1
index e2f0217b77841f..11b4d11b1f1df2 100644
--- a/deps/npm/man/man1/npm-completion.1
+++ b/deps/npm/man/man1/npm-completion.1
@@ -1,4 +1,4 @@
-.TH "NPM\-COMPLETION" "1" "May 2017" "" ""
+.TH "NPM\-COMPLETION" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-completion\fR \- Tab Completion for npm
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1
index 491401e0b1b266..265aff01c6cd01 100644
--- a/deps/npm/man/man1/npm-config.1
+++ b/deps/npm/man/man1/npm-config.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "1" "May 2017" "" ""
+.TH "NPM\-CONFIG" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- Manage the npm configuration files
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1
index 19d20cb3ceb048..d0962471d801b9 100644
--- a/deps/npm/man/man1/npm-dedupe.1
+++ b/deps/npm/man/man1/npm-dedupe.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DEDUPE" "1" "May 2017" "" ""
+.TH "NPM\-DEDUPE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-dedupe\fR \- Reduce duplication
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1
index d8c806dd18fd31..2b26e9fc56fe18 100644
--- a/deps/npm/man/man1/npm-deprecate.1
+++ b/deps/npm/man/man1/npm-deprecate.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DEPRECATE" "1" "May 2017" "" ""
+.TH "NPM\-DEPRECATE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-deprecate\fR \- Deprecate a version of a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-dist-tag.1 b/deps/npm/man/man1/npm-dist-tag.1
index 049ad0d868b546..3142da944ff0e5 100644
--- a/deps/npm/man/man1/npm-dist-tag.1
+++ b/deps/npm/man/man1/npm-dist-tag.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DIST\-TAG" "1" "May 2017" "" ""
+.TH "NPM\-DIST\-TAG" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-dist-tag\fR \- Modify package distribution tags
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1
index 9ae6826c22d20c..c97b912e184337 100644
--- a/deps/npm/man/man1/npm-docs.1
+++ b/deps/npm/man/man1/npm-docs.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCS" "1" "May 2017" "" ""
+.TH "NPM\-DOCS" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-docs\fR \- Docs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-doctor.1 b/deps/npm/man/man1/npm-doctor.1
index 7ef3c91d09e251..787b9d42198cd9 100644
--- a/deps/npm/man/man1/npm-doctor.1
+++ b/deps/npm/man/man1/npm-doctor.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCTOR" "1" "May 2017" "" ""
+.TH "NPM\-DOCTOR" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-doctor\fR \- Check your environments
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1
index c495f292c48349..978a4e54f3e680 100644
--- a/deps/npm/man/man1/npm-edit.1
+++ b/deps/npm/man/man1/npm-edit.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EDIT" "1" "May 2017" "" ""
+.TH "NPM\-EDIT" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-edit\fR \- Edit an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1
index 03986814eecc54..d5cf964ecb2a71 100644
--- a/deps/npm/man/man1/npm-explore.1
+++ b/deps/npm/man/man1/npm-explore.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EXPLORE" "1" "May 2017" "" ""
+.TH "NPM\-EXPLORE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-explore\fR \- Browse an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1
index f4512cb7d0456d..d54f316542229a 100644
--- a/deps/npm/man/man1/npm-help-search.1
+++ b/deps/npm/man/man1/npm-help-search.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP\-SEARCH" "1" "May 2017" "" ""
+.TH "NPM\-HELP\-SEARCH" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-help-search\fR \- Search npm help documentation
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1
index 3028ac419596cf..a102985b9f240a 100644
--- a/deps/npm/man/man1/npm-help.1
+++ b/deps/npm/man/man1/npm-help.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP" "1" "May 2017" "" ""
+.TH "NPM\-HELP" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-help\fR \- Get help on npm
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1
index 99d1bad04ea55f..c8ccd94b7b866d 100644
--- a/deps/npm/man/man1/npm-init.1
+++ b/deps/npm/man/man1/npm-init.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INIT" "1" "May 2017" "" ""
+.TH "NPM\-INIT" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-init\fR \- Interactively create a package\.json file
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-install-test.1 b/deps/npm/man/man1/npm-install-test.1
index 9b7094591c36ff..3bdd4c632b95f0 100644
--- a/deps/npm/man/man1/npm-install-test.1
+++ b/deps/npm/man/man1/npm-install-test.1
@@ -1,4 +1,4 @@
-.TH "NPM" "" "May 2017" "" ""
+.TH "NPM" "" "June 2017" "" ""
 .SH "NAME"
 \fBnpm\fR
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index 2dca6a4b8fe56a..e90cc4f8f40c68 100644
--- a/deps/npm/man/man1/npm-install.1
+++ b/deps/npm/man/man1/npm-install.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL" "1" "May 2017" "" ""
+.TH "NPM\-INSTALL" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-install\fR \- Install a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1
index ae6e6b3b1e9884..b5b1d25098f32a 100644
--- a/deps/npm/man/man1/npm-link.1
+++ b/deps/npm/man/man1/npm-link.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LINK" "1" "May 2017" "" ""
+.TH "NPM\-LINK" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-link\fR \- Symlink a package folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-logout.1 b/deps/npm/man/man1/npm-logout.1
index c594d22fa082c9..1bb0d25ce53c70 100644
--- a/deps/npm/man/man1/npm-logout.1
+++ b/deps/npm/man/man1/npm-logout.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LOGOUT" "1" "May 2017" "" ""
+.TH "NPM\-LOGOUT" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-logout\fR \- Log out of the registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index 31cbd387aa695f..bf339ee70ca67b 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LS" "1" "May 2017" "" ""
+.TH "NPM\-LS" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-ls\fR \- List installed packages
 .SH SYNOPSIS
@@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-npm@5.0.0 /path/to/npm
+npm@5.0.3 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi
diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1
index c43306fcb8615b..992c359dcbabb9 100644
--- a/deps/npm/man/man1/npm-outdated.1
+++ b/deps/npm/man/man1/npm-outdated.1
@@ -1,4 +1,4 @@
-.TH "NPM\-OUTDATED" "1" "May 2017" "" ""
+.TH "NPM\-OUTDATED" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-outdated\fR \- Check for outdated packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1
index 29a9d54bfc40e7..9eb713bd666d00 100644
--- a/deps/npm/man/man1/npm-owner.1
+++ b/deps/npm/man/man1/npm-owner.1
@@ -1,4 +1,4 @@
-.TH "NPM\-OWNER" "1" "May 2017" "" ""
+.TH "NPM\-OWNER" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-owner\fR \- Manage package owners
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1
index 9e80b63ea9c899..634d3e84094c59 100644
--- a/deps/npm/man/man1/npm-pack.1
+++ b/deps/npm/man/man1/npm-pack.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PACK" "1" "May 2017" "" ""
+.TH "NPM\-PACK" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-pack\fR \- Create a tarball from a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-ping.1 b/deps/npm/man/man1/npm-ping.1
index 1df2ee8a520aaa..e14fa450d97268 100644
--- a/deps/npm/man/man1/npm-ping.1
+++ b/deps/npm/man/man1/npm-ping.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PING" "1" "May 2017" "" ""
+.TH "NPM\-PING" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-ping\fR \- Ping npm registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-prefix.1 b/deps/npm/man/man1/npm-prefix.1
index 539cce1e6e8da3..46d06910454ac2 100644
--- a/deps/npm/man/man1/npm-prefix.1
+++ b/deps/npm/man/man1/npm-prefix.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PREFIX" "1" "May 2017" "" ""
+.TH "NPM\-PREFIX" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-prefix\fR \- Display prefix
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1
index 21695ac1350b0c..c8051b36e8ed9d 100644
--- a/deps/npm/man/man1/npm-prune.1
+++ b/deps/npm/man/man1/npm-prune.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PRUNE" "1" "May 2017" "" ""
+.TH "NPM\-PRUNE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-prune\fR \- Remove extraneous packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1
index 603c79da7f499f..5095939be6ad8d 100644
--- a/deps/npm/man/man1/npm-publish.1
+++ b/deps/npm/man/man1/npm-publish.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PUBLISH" "1" "May 2017" "" ""
+.TH "NPM\-PUBLISH" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-publish\fR \- Publish a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1
index 3eac6d27a9913e..7cb888b260d7c0 100644
--- a/deps/npm/man/man1/npm-rebuild.1
+++ b/deps/npm/man/man1/npm-rebuild.1
@@ -1,4 +1,4 @@
-.TH "NPM\-REBUILD" "1" "May 2017" "" ""
+.TH "NPM\-REBUILD" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-rebuild\fR \- Rebuild a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1
index 18f2a3f69f2cfe..cf2c9f7f5797a9 100644
--- a/deps/npm/man/man1/npm-repo.1
+++ b/deps/npm/man/man1/npm-repo.1
@@ -1,4 +1,4 @@
-.TH "NPM\-REPO" "1" "May 2017" "" ""
+.TH "NPM\-REPO" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-repo\fR \- Open package repository page in the browser
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-restart.1 b/deps/npm/man/man1/npm-restart.1
index 95f402d09d4d3a..7a0c40d0502ddb 100644
--- a/deps/npm/man/man1/npm-restart.1
+++ b/deps/npm/man/man1/npm-restart.1
@@ -1,4 +1,4 @@
-.TH "NPM\-RESTART" "1" "May 2017" "" ""
+.TH "NPM\-RESTART" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-restart\fR \- Restart a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1
index 8a158479e4e923..fd30fb7cac442a 100644
--- a/deps/npm/man/man1/npm-root.1
+++ b/deps/npm/man/man1/npm-root.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ROOT" "1" "May 2017" "" ""
+.TH "NPM\-ROOT" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-root\fR \- Display npm root
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1
index 7c75d8680d74fa..eaffbefc0ff5fa 100644
--- a/deps/npm/man/man1/npm-run-script.1
+++ b/deps/npm/man/man1/npm-run-script.1
@@ -1,4 +1,4 @@
-.TH "NPM\-RUN\-SCRIPT" "1" "May 2017" "" ""
+.TH "NPM\-RUN\-SCRIPT" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-run-script\fR \- Run arbitrary package scripts
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index caeab7142f5748..89cb716d847a1a 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -1,4 +1,4 @@
-.TH "NPM\-SEARCH" "1" "May 2017" "" ""
+.TH "NPM\-SEARCH" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-search\fR \- Search for packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1
index 08ce497d2066d5..d6d12bf1676774 100644
--- a/deps/npm/man/man1/npm-shrinkwrap.1
+++ b/deps/npm/man/man1/npm-shrinkwrap.1
@@ -1,4 +1,4 @@
-.TH "NPM\-SHRINKWRAP" "1" "May 2017" "" ""
+.TH "NPM\-SHRINKWRAP" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-shrinkwrap\fR \- Lock down dependency versions for publication
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1
index ed9afb395f1c0c..a04ce7363e2d7f 100644
--- a/deps/npm/man/man1/npm-star.1
+++ b/deps/npm/man/man1/npm-star.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STAR" "1" "May 2017" "" ""
+.TH "NPM\-STAR" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-star\fR \- Mark your favorite packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1
index ca709693776bff..face66764b542e 100644
--- a/deps/npm/man/man1/npm-stars.1
+++ b/deps/npm/man/man1/npm-stars.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STARS" "1" "May 2017" "" ""
+.TH "NPM\-STARS" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-stars\fR \- View packages marked as favorites
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-start.1 b/deps/npm/man/man1/npm-start.1
index 9886f0d9a99e2c..0916970e0d247d 100644
--- a/deps/npm/man/man1/npm-start.1
+++ b/deps/npm/man/man1/npm-start.1
@@ -1,4 +1,4 @@
-.TH "NPM\-START" "1" "May 2017" "" ""
+.TH "NPM\-START" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-start\fR \- Start a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-stop.1 b/deps/npm/man/man1/npm-stop.1
index 10fb4a4d0b9744..430f3c117f5c66 100644
--- a/deps/npm/man/man1/npm-stop.1
+++ b/deps/npm/man/man1/npm-stop.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STOP" "1" "May 2017" "" ""
+.TH "NPM\-STOP" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-stop\fR \- Stop a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-team.1 b/deps/npm/man/man1/npm-team.1
index 2a73f126df6c95..b38561f7114732 100644
--- a/deps/npm/man/man1/npm-team.1
+++ b/deps/npm/man/man1/npm-team.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TEAM" "1" "May 2017" "" ""
+.TH "NPM\-TEAM" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-team\fR \- Manage organization teams and team memberships
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-test.1 b/deps/npm/man/man1/npm-test.1
index e32f30670ae6a1..ad9fc14d558fab 100644
--- a/deps/npm/man/man1/npm-test.1
+++ b/deps/npm/man/man1/npm-test.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TEST" "1" "May 2017" "" ""
+.TH "NPM\-TEST" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-test\fR \- Test a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1
index aa86ac30ba74bb..29df8f50f4f242 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UNINSTALL" "1" "May 2017" "" ""
+.TH "NPM\-UNINSTALL" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-uninstall\fR \- Remove a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1
index ab85d670a914e1..c3883a59498f0a 100644
--- a/deps/npm/man/man1/npm-unpublish.1
+++ b/deps/npm/man/man1/npm-unpublish.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UNPUBLISH" "1" "May 2017" "" ""
+.TH "NPM\-UNPUBLISH" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-unpublish\fR \- Remove a package from the registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1
index 0ebcd400eb6ea7..14bad07f5fedd4 100644
--- a/deps/npm/man/man1/npm-update.1
+++ b/deps/npm/man/man1/npm-update.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UPDATE" "1" "May 2017" "" ""
+.TH "NPM\-UPDATE" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-update\fR \- Update a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1
index 069e9e45ea2404..ae2678a8db610a 100644
--- a/deps/npm/man/man1/npm-version.1
+++ b/deps/npm/man/man1/npm-version.1
@@ -1,4 +1,4 @@
-.TH "NPM\-VERSION" "1" "May 2017" "" ""
+.TH "NPM\-VERSION" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-version\fR \- Bump a package version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1
index 0341f9001d26c7..0bfedd6b8b9c36 100644
--- a/deps/npm/man/man1/npm-view.1
+++ b/deps/npm/man/man1/npm-view.1
@@ -1,4 +1,4 @@
-.TH "NPM\-VIEW" "1" "May 2017" "" ""
+.TH "NPM\-VIEW" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-view\fR \- View registry info
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1
index 66d53afa33d461..8fdf66c2fc5b93 100644
--- a/deps/npm/man/man1/npm-whoami.1
+++ b/deps/npm/man/man1/npm-whoami.1
@@ -1,4 +1,4 @@
-.TH "NPM\-WHOAMI" "1" "May 2017" "" ""
+.TH "NPM\-WHOAMI" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-whoami\fR \- Display npm username
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 8ce03075f12ace..e3771ad9facb2f 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "May 2017" "" ""
+.TH "NPM" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm\fR \- javascript package manager
 .SH SYNOPSIS
@@ -10,7 +10,7 @@ npm  [args]
 .RE
 .SH VERSION
 .P
-5.0.0
+5.0.3
 .SH DESCRIPTION
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man5/npm-folders.5 b/deps/npm/man/man5/npm-folders.5
index d3757535db3f4d..194e6bcc02d474 100644
--- a/deps/npm/man/man5/npm-folders.5
+++ b/deps/npm/man/man5/npm-folders.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "May 2017" "" ""
+.TH "NPM\-FOLDERS" "5" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-folders\fR \- Folder Structures Used by npm
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-global.5 b/deps/npm/man/man5/npm-global.5
index d3757535db3f4d..194e6bcc02d474 100644
--- a/deps/npm/man/man5/npm-global.5
+++ b/deps/npm/man/man5/npm-global.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "May 2017" "" ""
+.TH "NPM\-FOLDERS" "5" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-folders\fR \- Folder Structures Used by npm
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index a8c4be85a0b5a2..89eefefcf68123 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "May 2017" "" ""
+.TH "PACKAGE\.JSON" "5" "June 2017" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
@@ -265,6 +265,8 @@ Conversely, some files are always ignored:
 \fBconfig\.gypi\fP
 .IP \(bu 2
 \fB*\.orig\fP
+.IP \(bu 2
+\fBpackage\-lock\.json\fP (use shrinkwrap instead)
 
 .RE
 .SH main
diff --git a/deps/npm/man/man5/npm-package-locks.5 b/deps/npm/man/man5/npm-package-locks.5
index d751dc55661570..4d6a28519294af 100644
--- a/deps/npm/man/man5/npm-package-locks.5
+++ b/deps/npm/man/man5/npm-package-locks.5
@@ -1,4 +1,4 @@
-.TH "NPM\-PACKAGE\-LOCKS" "5" "May 2017" "" ""
+.TH "NPM\-PACKAGE\-LOCKS" "5" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-package-locks\fR \- An explanation of npm lockfiles
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-shrinkwrap.json.5 b/deps/npm/man/man5/npm-shrinkwrap.json.5
index deb06a7244cd31..400e23b20adb5e 100644
--- a/deps/npm/man/man5/npm-shrinkwrap.json.5
+++ b/deps/npm/man/man5/npm-shrinkwrap.json.5
@@ -1,4 +1,4 @@
-.TH "NPM\-SHRINKWRAP\.JSON" "5" "May 2017" "" ""
+.TH "NPM\-SHRINKWRAP\.JSON" "5" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-shrinkwrap.json\fR \- A publishable lockfile
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5
index 70b824a7d9cc47..a80fdca666fe9b 100644
--- a/deps/npm/man/man5/npmrc.5
+++ b/deps/npm/man/man5/npmrc.5
@@ -1,4 +1,4 @@
-.TH "NPMRC" "5" "May 2017" "" ""
+.TH "NPMRC" "5" "June 2017" "" ""
 .SH "NAME"
 \fBnpmrc\fR \- The npm config files
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/package-lock.json.5 b/deps/npm/man/man5/package-lock.json.5
index fb86d4d0c56e62..09dc0d760040ed 100644
--- a/deps/npm/man/man5/package-lock.json.5
+++ b/deps/npm/man/man5/package-lock.json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\-LOCK\.JSON" "5" "May 2017" "" ""
+.TH "PACKAGE\-LOCK\.JSON" "5" "June 2017" "" ""
 .SH "NAME"
 \fBpackage-lock.json\fR \- A manifestation of the manifest
 .SH DESCRIPTION
@@ -47,7 +47,7 @@ whose semantics were used when generating this \fBpackage\-lock\.json\fP\|\.
 .P
 This is a subresource
 integrity \fIhttps://w3c\.github\.io/webappsec/specs/subresourceintegrity/\fR value
-created from the \fBpacakge\.json\fP\|\. No preprocessing of the \fBpackage\.json\fP should
+created from the \fBpackage\.json\fP\|\. No preprocessing of the \fBpackage\.json\fP should
 be done\. Subresource integrity strings can be produced by modules like
 \fBssri\fP \fIhttps://www\.npmjs\.com/package/ssri\fR\|\.
 .SS preserveSymlinks
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index a8c4be85a0b5a2..89eefefcf68123 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "May 2017" "" ""
+.TH "PACKAGE\.JSON" "5" "June 2017" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
@@ -265,6 +265,8 @@ Conversely, some files are always ignored:
 \fBconfig\.gypi\fP
 .IP \(bu 2
 \fB*\.orig\fP
+.IP \(bu 2
+\fBpackage\-lock\.json\fP (use shrinkwrap instead)
 
 .RE
 .SH main
diff --git a/deps/npm/man/man7/npm-coding-style.7 b/deps/npm/man/man7/npm-coding-style.7
index 3ab6f30cbec6b1..6a788d870c223f 100644
--- a/deps/npm/man/man7/npm-coding-style.7
+++ b/deps/npm/man/man7/npm-coding-style.7
@@ -1,4 +1,4 @@
-.TH "NPM\-CODING\-STYLE" "7" "May 2017" "" ""
+.TH "NPM\-CODING\-STYLE" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-coding-style\fR \- npm's "funny" coding style
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index 67e8880659a055..7af1f90f7cb86a 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "7" "May 2017" "" ""
+.TH "NPM\-CONFIG" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- More than you probably want to know about npm configuration
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-developers.7 b/deps/npm/man/man7/npm-developers.7
index 52bf3c9144b7a1..da88a0df013cd7 100644
--- a/deps/npm/man/man7/npm-developers.7
+++ b/deps/npm/man/man7/npm-developers.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DEVELOPERS" "7" "May 2017" "" ""
+.TH "NPM\-DEVELOPERS" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-developers\fR \- Developer Guide
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-disputes.7 b/deps/npm/man/man7/npm-disputes.7
index 7c4f2462f9b677..8de6d02da89ac3 100644
--- a/deps/npm/man/man7/npm-disputes.7
+++ b/deps/npm/man/man7/npm-disputes.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DISPUTES" "7" "May 2017" "" ""
+.TH "NPM\-DISPUTES" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-disputes\fR \- Handling Module Name Disputes
 .P
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index 8ec9c159769861..689e6b91ad96c0 100644
--- a/deps/npm/man/man7/npm-index.7
+++ b/deps/npm/man/man7/npm-index.7
@@ -1,4 +1,4 @@
-.TH "NPM\-INDEX" "7" "May 2017" "" ""
+.TH "NPM\-INDEX" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-index\fR \- Index of all npm documentation
 .SS npm help README
diff --git a/deps/npm/man/man7/npm-orgs.7 b/deps/npm/man/man7/npm-orgs.7
index c8873a0122fcef..4c37567e15793a 100644
--- a/deps/npm/man/man7/npm-orgs.7
+++ b/deps/npm/man/man7/npm-orgs.7
@@ -1,4 +1,4 @@
-.TH "NPM\-ORGS" "7" "May 2017" "" ""
+.TH "NPM\-ORGS" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-orgs\fR \- Working with Teams & Orgs
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-registry.7 b/deps/npm/man/man7/npm-registry.7
index 26806666babf10..483f36010c03ad 100644
--- a/deps/npm/man/man7/npm-registry.7
+++ b/deps/npm/man/man7/npm-registry.7
@@ -1,4 +1,4 @@
-.TH "NPM\-REGISTRY" "7" "May 2017" "" ""
+.TH "NPM\-REGISTRY" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-registry\fR \- The JavaScript Package Registry
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-scope.7 b/deps/npm/man/man7/npm-scope.7
index 14243684d99999..5331efae492130 100644
--- a/deps/npm/man/man7/npm-scope.7
+++ b/deps/npm/man/man7/npm-scope.7
@@ -1,4 +1,4 @@
-.TH "NPM\-SCOPE" "7" "May 2017" "" ""
+.TH "NPM\-SCOPE" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-scope\fR \- Scoped packages
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-scripts.7 b/deps/npm/man/man7/npm-scripts.7
index f57a4c221fef30..c58a1ef9544989 100644
--- a/deps/npm/man/man7/npm-scripts.7
+++ b/deps/npm/man/man7/npm-scripts.7
@@ -1,4 +1,4 @@
-.TH "NPM\-SCRIPTS" "7" "May 2017" "" ""
+.TH "NPM\-SCRIPTS" "7" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-scripts\fR \- How npm handles the "scripts" field
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/removing-npm.7 b/deps/npm/man/man7/removing-npm.7
index 789a9e3516a49f..f2bd986225fa09 100644
--- a/deps/npm/man/man7/removing-npm.7
+++ b/deps/npm/man/man7/removing-npm.7
@@ -1,4 +1,4 @@
-.TH "NPM\-REMOVAL" "1" "May 2017" "" ""
+.TH "NPM\-REMOVAL" "1" "June 2017" "" ""
 .SH "NAME"
 \fBnpm-removal\fR \- Cleaning the Slate
 .SH SYNOPSIS
diff --git a/deps/npm/man/man7/semver.7 b/deps/npm/man/man7/semver.7
index d534638e02a793..88ed4a079912de 100644
--- a/deps/npm/man/man7/semver.7
+++ b/deps/npm/man/man7/semver.7
@@ -1,4 +1,4 @@
-.TH "SEMVER" "7" "May 2017" "" ""
+.TH "SEMVER" "7" "June 2017" "" ""
 .SH "NAME"
 \fBsemver\fR \- The semantic versioner for npm
 .SH Usage
diff --git a/deps/npm/node_modules/aproba/README.md b/deps/npm/node_modules/aproba/README.md
index a9d38222a7debc..79e865924d78cf 100644
--- a/deps/npm/node_modules/aproba/README.md
+++ b/deps/npm/node_modules/aproba/README.md
@@ -20,17 +20,17 @@ myfunc('test', 23, function () {}, true) // too many args error
 
 Valid types are:
 
-type | description
----- | -----------
-*    | matches any type
-A    | Array.isArray OR an arguments object
-S    | typeof == string
-N    | typeof == number
-F    | typeof == function
-O    | typeof == object and not type A and not type E
-B    | typeof == boolean
-E    | instanceof Error OR null **(special: see below)**
-Z    | == null
+| type | description
+| :--: | :----------
+| *    | matches any type
+| A    | `Array.isArray` OR an `arguments` object
+| S    | typeof == string
+| N    | typeof == number
+| F    | typeof == function
+| O    | typeof == object and not type A and not type E
+| B    | typeof == boolean
+| E    | `instanceof Error` OR `null` **(special: see below)**
+| Z    | == `null`
 
 Validation failures throw one of three exception types, distinguished by a
 `code` property of `EMISSINGARG`, `EINVALIDTYPE` or `ETOOMANYARGS`.
diff --git a/deps/npm/node_modules/aproba/index.js b/deps/npm/node_modules/aproba/index.js
index bc6ed1f17bfe41..4f8c1fc7d8534b 100644
--- a/deps/npm/node_modules/aproba/index.js
+++ b/deps/npm/node_modules/aproba/index.js
@@ -16,6 +16,11 @@ var types = {
   Z: {label: 'null', check: function (thingy) { return thingy == null }}
 }
 
+function addSchema (schema, arity) {
+  var group = arity[schema.length] = arity[schema.length] || []
+  if (group.indexOf(schema) === -1) group.push(schema)
+}
+
 var validate = module.exports = function (rawSchemas, args) {
   if (arguments.length !== 2) throw wrongNumberOfArgs(['SA'], arguments.length)
   if (!rawSchemas) throw missingRequiredArg(0, 'rawSchemas')
@@ -24,21 +29,18 @@ var validate = module.exports = function (rawSchemas, args) {
   if (!types.A.check(args)) throw invalidType(1, ['array'], args)
   var schemas = rawSchemas.split('|')
   var arity = {}
-  function addSchema (schema) {
-    var group = arity[schema.length] = arity[schema.length] || []
-    if (group.indexOf(schema) === -1) group.push(schema)
-  }
+
   schemas.forEach(function (schema) {
     for (var ii = 0; ii < schema.length; ++ii) {
       var type = schema[ii]
       if (!types[type]) throw unknownType(ii, type)
     }
     if (/E.*E/.test(schema)) throw moreThanOneError(schema)
-    addSchema(schema)
+    addSchema(schema, arity)
     if (/E/.test(schema)) {
-      addSchema(schema.replace(/E.*$/, 'E'))
-      addSchema(schema.replace(/E/, 'Z'))
-      if (schema.length === 1) addSchema('')
+      addSchema(schema.replace(/E.*$/, 'E'), arity)
+      addSchema(schema.replace(/E/, 'Z'), arity)
+      if (schema.length === 1) addSchema('', arity)
     }
   })
   var matching = arity[args.length]
diff --git a/deps/npm/node_modules/aproba/package.json b/deps/npm/node_modules/aproba/package.json
index ba6cb1385de0a0..e3a85f406627f3 100644
--- a/deps/npm/node_modules/aproba/package.json
+++ b/deps/npm/node_modules/aproba/package.json
@@ -1,36 +1,36 @@
 {
-  "_from": "aproba@~1.1.1",
-  "_id": "aproba@1.1.1",
-  "_integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
+  "_from": "aproba@1.1.2",
+  "_id": "aproba@1.1.2",
+  "_inBundle": false,
+  "_integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==",
   "_location": "/aproba",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "version",
     "registry": true,
-    "raw": "aproba@~1.1.1",
+    "raw": "aproba@1.1.2",
     "name": "aproba",
     "escapedName": "aproba",
-    "rawSpec": "~1.1.1",
+    "rawSpec": "1.1.2",
     "saveSpec": null,
-    "fetchSpec": "~1.1.1"
+    "fetchSpec": "1.1.2"
   },
   "_requiredBy": [
+    "#USER",
     "/",
     "/move-concurrently",
     "/move-concurrently/copy-concurrently",
     "/move-concurrently/run-queue",
     "/npmlog/gauge"
   ],
-  "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
-  "_shasum": "95d3600f07710aa0e9298c726ad5ecf2eacbabab",
-  "_shrinkwrap": null,
-  "_spec": "aproba@~1.1.1",
-  "_where": "/Users/zkat/Documents/code/npm",
+  "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+  "_shasum": "45c6629094de4e96f693ef7eab74ae079c240fc1",
+  "_spec": "aproba@1.1.2",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Rebecca Turner",
     "email": "me@re-becca.org"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/iarna/aproba/issues"
   },
@@ -56,8 +56,6 @@
   "license": "ISC",
   "main": "index.js",
   "name": "aproba",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/iarna/aproba.git"
@@ -65,5 +63,5 @@
   "scripts": {
     "test": "standard && tap -j3 test/*.js"
   },
-  "version": "1.1.1"
+  "version": "1.1.2"
 }
diff --git a/deps/npm/node_modules/cacache/CHANGELOG.md b/deps/npm/node_modules/cacache/CHANGELOG.md
index 8235212ade495f..802257622eab58 100644
--- a/deps/npm/node_modules/cacache/CHANGELOG.md
+++ b/deps/npm/node_modules/cacache/CHANGELOG.md
@@ -2,6 +2,36 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+
+## [9.2.8](https://github.com/zkat/cacache/compare/v9.2.7...v9.2.8) (2017-06-05)
+
+
+### Bug Fixes
+
+* **ssri:** bump ssri for bugfix ([c3232ea](https://github.com/zkat/cacache/commit/c3232ea))
+
+
+
+
+## [9.2.7](https://github.com/zkat/cacache/compare/v9.2.6...v9.2.7) (2017-06-05)
+
+
+### Bug Fixes
+
+* **content:** make verified content completely read-only (#96) ([4131196](https://github.com/zkat/cacache/commit/4131196))
+
+
+
+
+## [9.2.6](https://github.com/zkat/cacache/compare/v9.2.5...v9.2.6) (2017-05-31)
+
+
+### Bug Fixes
+
+* **node:** update ssri to prevent old node 4 crash ([5209ffe](https://github.com/zkat/cacache/commit/5209ffe))
+
+
+
 
 ## [9.2.5](https://github.com/zkat/cacache/compare/v9.2.4...v9.2.5) (2017-05-25)
 
diff --git a/deps/npm/node_modules/cacache/lib/util/move-file.js b/deps/npm/node_modules/cacache/lib/util/move-file.js
index 422c8294e3405a..e12e98188c42c0 100644
--- a/deps/npm/node_modules/cacache/lib/util/move-file.js
+++ b/deps/npm/node_modules/cacache/lib/util/move-file.js
@@ -2,6 +2,8 @@
 
 const fs = require('graceful-fs')
 const BB = require('bluebird')
+const chmod = BB.promisify(fs.chmod)
+const unlink = BB.promisify(fs.unlink)
 let move
 let pinflight
 
@@ -27,8 +29,11 @@ function moveFile (src, dest) {
           return cb(err)
         }
       }
-      return fs.unlink(src, cb)
+      return cb()
     })
+  }).then(() => {
+    // content should never change for any reason, so make it read-only
+    return BB.join(unlink(src), process.platform !== 'win32' && chmod(dest, '0444'))
   }).catch(err => {
     if (process.platform !== 'win32') {
       throw err
diff --git a/deps/npm/node_modules/cacache/package.json b/deps/npm/node_modules/cacache/package.json
index 26b8e826f216ba..b55c3ba6897b82 100644
--- a/deps/npm/node_modules/cacache/package.json
+++ b/deps/npm/node_modules/cacache/package.json
@@ -1,19 +1,19 @@
 {
-  "_from": "cacache@9.2.5",
-  "_id": "cacache@9.2.5",
+  "_from": "cacache@9.2.8",
+  "_id": "cacache@9.2.8",
   "_inBundle": false,
-  "_integrity": "sha512-mURsTvkjbCSFRTdkuPhHUp9sbEHn3AVrvM4mveg/bhlKKYolfRm23TsFUVAssC9p622lwmh7pgpb+H5mSVpYcA==",
+  "_integrity": "sha512-nA3gmaDPEsFWqI5eYAe35IfvW54yGJ3ns2wDopWf4iDA3fkhBNsdvnYp4NrL+L7ysMt0/isM84Mwi+b4l8/pMQ==",
   "_location": "/cacache",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "cacache@9.2.5",
+    "raw": "cacache@9.2.8",
     "name": "cacache",
     "escapedName": "cacache",
-    "rawSpec": "9.2.5",
+    "rawSpec": "9.2.8",
     "saveSpec": null,
-    "fetchSpec": "9.2.5"
+    "fetchSpec": "9.2.8"
   },
   "_requiredBy": [
     "#USER",
@@ -21,10 +21,10 @@
     "/pacote",
     "/pacote/make-fetch-happen"
   ],
-  "_resolved": "https://registry.npmjs.org/cacache/-/cacache-9.2.5.tgz",
-  "_shasum": "cb401d0e59858532062de1f104097cb40c71c3bf",
-  "_spec": "cacache@9.2.5",
-  "_where": "/Users/rebecca/code/npm",
+  "_resolved": "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz",
+  "_shasum": "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4",
+  "_spec": "cacache@9.2.8",
+  "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Kat Marchán",
     "email": "kzm@sykosomatic.org"
@@ -66,7 +66,7 @@
     "move-concurrently": "^1.0.1",
     "promise-inflight": "^1.0.1",
     "rimraf": "^2.6.1",
-    "ssri": "^4.1.3",
+    "ssri": "^4.1.5",
     "unique-filename": "^1.1.0",
     "y18n": "^3.2.1"
   },
@@ -76,13 +76,13 @@
     "benchmark": "^2.1.4",
     "chalk": "^1.1.3",
     "cross-env": "^5.0.0",
-    "nyc": "^10.3.2",
+    "nyc": "^11.0.2",
     "require-inject": "^1.4.0",
-    "safe-buffer": "^5.0.1",
+    "safe-buffer": "^5.1.0",
     "standard": "^10.0.2",
     "standard-version": "^4.0.0",
     "tacks": "^1.2.2",
-    "tap": "^10.3.2",
+    "tap": "^10.3.3",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.8"
   },
@@ -125,5 +125,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "9.2.5"
+  "version": "9.2.8"
 }
diff --git a/deps/npm/node_modules/node-gyp/CHANGELOG.md b/deps/npm/node_modules/node-gyp/CHANGELOG.md
index e727128350b481..70aca6bc9e2ce5 100644
--- a/deps/npm/node_modules/node-gyp/CHANGELOG.md
+++ b/deps/npm/node_modules/node-gyp/CHANGELOG.md
@@ -1,3 +1,13 @@
+v3.6.2 2017-06-01
+=================
+
+* [[`72afdd62cd`](https://github.com/nodejs/node-gyp/commit/72afdd62cd)] - **build**: rename copyNodeLib() to doBuild() (Liu Chao) [#1206](https://github.com/nodejs/node-gyp/pull/1206)
+* [[`bad903ac70`](https://github.com/nodejs/node-gyp/commit/bad903ac70)] - **win**: more robust parsing of SDK version (Refael Ackermann) [#1198](https://github.com/nodejs/node-gyp/pull/1198)
+* [[`241752f381`](https://github.com/nodejs/node-gyp/commit/241752f381)] - Log dist-url. (Ben Noordhuis) [#1170](https://github.com/nodejs/node-gyp/pull/1170)
+* [[`386746c7d1`](https://github.com/nodejs/node-gyp/commit/386746c7d1)] - **configure**: use full path in node_lib_file GYP var (Pavel Medvedev) [#964](https://github.com/nodejs/node-gyp/pull/964)
+* [[`0913b2dd99`](https://github.com/nodejs/node-gyp/commit/0913b2dd99)] - **build, win**: use target_arch to link with node.lib (Pavel Medvedev) [#964](https://github.com/nodejs/node-gyp/pull/964)
+* [[`c307b302f7`](https://github.com/nodejs/node-gyp/commit/c307b302f7)] - **doc**: blorb about setting `npm_config_OPTION_NAME` (Refael Ackermann) [#1185](https://github.com/nodejs/node-gyp/pull/1185)
+
 v3.6.1 2017-04-30
 =================
 
diff --git a/deps/npm/node_modules/node-gyp/README.md b/deps/npm/node_modules/node-gyp/README.md
index d5443080dd0c34..a5c1325c712242 100644
--- a/deps/npm/node_modules/node-gyp/README.md
+++ b/deps/npm/node_modules/node-gyp/README.md
@@ -192,6 +192,23 @@ Command Options
 | `--solution=$solution`            | Set Visual Studio Solution version (win)
 
 
+Configuration
+--------
+
+__`node-gyp` responds to environment variables or `npm` configuration__
+1. Environment variables take the form `npm_config_OPTION_NAME` for any of the
+ options listed above (dashes in option names should be replaced by underscores).
+ These work also when `node-gyp` is invoked directly:
+ `$ export npm_config_devdir=/tmp/.gyp`
+ or on Windows
+ `> set npm_config_devdir=c:\temp\.gyp`
+2. As `npm` configuration, variables take the form `OPTION_NAME`.
+ This way only works when `node-gyp` is executed by `npm`:
+ `$ npm config set [--global] devdir /tmp/.gyp`
+ `$ npm i buffertools`
+
+
+
 License
 -------
 
diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi
index 1422900390221f..f2f6a7925e4ed0 100644
--- a/deps/npm/node_modules/node-gyp/addon.gypi
+++ b/deps/npm/node_modules/node-gyp/addon.gypi
@@ -109,7 +109,7 @@
           '-luuid.lib',
           '-lodbc32.lib',
           '-lDelayImp.lib',
-          '-l"<(node_root_dir)/$(ConfigurationName)/<(node_lib_file)"'
+          '-l"<(node_lib_file)"'
         ],
         'msvs_disabled_warnings': [
           # warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent'
diff --git a/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs b/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs
index a41a354f61c454..87e0a9c9bbab80 100644
--- a/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs
+++ b/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs
@@ -228,9 +228,12 @@ private static bool CheckInstance(ISetupInstance2 setupInstance2, ref StringBuil
                     hasMSBuild = true;
                 else if (id == "Microsoft.VisualStudio.Component.VC.Tools.x86.x64")
                     hasVCTools = true;
-                else if (id.StartsWith(Win10SDKPrefix))
-                    Win10SDKVer = Math.Max(Win10SDKVer, UInt32.Parse(id.Substring(Win10SDKPrefix.Length)));
-                else if (id == "Microsoft.VisualStudio.Component.Windows81SDK")
+                else if (id.StartsWith(Win10SDKPrefix)) {
+                    string[] parts = id.Substring(Win10SDKPrefix.Length).Split('.');
+                    if (parts.Length > 1 && parts[1] != "Desktop")
+                        continue;
+                    Win10SDKVer = Math.Max(Win10SDKVer, UInt32.Parse(parts[0]));
+                } else if (id == "Microsoft.VisualStudio.Component.Windows81SDK")
                     hasWin8SDK = true;
                 else
                     continue;
diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js
index 5253109857bda7..0445fb6452ca44 100644
--- a/deps/npm/node_modules/node-gyp/lib/build.js
+++ b/deps/npm/node_modules/node-gyp/lib/build.js
@@ -11,7 +11,6 @@ var fs = require('graceful-fs')
   , glob = require('glob')
   , log = require('npmlog')
   , which = require('which')
-  , mkdirp = require('mkdirp')
   , exec = require('child_process').exec
   , processRelease = require('./process-release')
   , win = process.platform === 'win32'
@@ -36,7 +35,6 @@ function build (gyp, argv, callback) {
     , config
     , arch
     , nodeDir
-    , copyDevLib
 
   loadConfigGypi()
 
@@ -60,7 +58,6 @@ function build (gyp, argv, callback) {
       buildType = config.target_defaults.default_configuration
       arch = config.variables.target_arch
       nodeDir = config.variables.nodedir
-      copyDevLib = config.variables.copy_dev_lib == 'true'
 
       if ('debug' in gyp.opts) {
         buildType = gyp.opts.debug ? 'Debug' : 'Release'
@@ -115,7 +112,7 @@ function build (gyp, argv, callback) {
         return
       }
       log.verbose('`which` succeeded for `' + command + '`', execPath)
-      copyNodeLib()
+      doBuild()
     })
   }
 
@@ -127,7 +124,7 @@ function build (gyp, argv, callback) {
     if (config.variables.msbuild_path) {
       command = config.variables.msbuild_path
       log.verbose('using MSBuild:', command)
-      copyNodeLib()
+      doBuild()
       return
     }
 
@@ -180,36 +177,12 @@ function build (gyp, argv, callback) {
             return
           }
           command = msbuildPath
-          copyNodeLib()
+          doBuild()
         })
       })()
     })
   }
 
-  /**
-   * Copies the node.lib file for the current target architecture into the
-   * current proper dev dir location.
-   */
-
-  function copyNodeLib () {
-    if (!win || !copyDevLib) return doBuild()
-
-    var buildDir = path.resolve(nodeDir, buildType)
-      , archNodeLibPath = path.resolve(nodeDir, arch, release.name + '.lib')
-      , buildNodeLibPath = path.resolve(buildDir, release.name + '.lib')
-
-    mkdirp(buildDir, function (err, isNew) {
-      if (err) return callback(err)
-      log.verbose('"' + buildType + '" dir needed to be created?', isNew)
-      var rs = fs.createReadStream(archNodeLibPath)
-        , ws = fs.createWriteStream(buildNodeLibPath)
-      log.verbose('copying "' + release.name + '.lib" for ' + arch, buildNodeLibPath)
-      rs.pipe(ws)
-      rs.on('error', callback)
-      ws.on('error', callback)
-      rs.on('end', doBuild)
-    })
-  }
 
   /**
    * Actually spawn the process and compile the module.
diff --git a/deps/npm/node_modules/node-gyp/lib/configure.js b/deps/npm/node_modules/node-gyp/lib/configure.js
index 4bad1bffd11cc6..1351576d12e8c8 100644
--- a/deps/npm/node_modules/node-gyp/lib/configure.js
+++ b/deps/npm/node_modules/node-gyp/lib/configure.js
@@ -144,9 +144,6 @@ function configure (gyp, argv, callback) {
     // set the node development directory
     variables.nodedir = nodeDir
 
-    // don't copy dev libraries with nodedir option
-    variables.copy_dev_lib = !gyp.opts.nodedir
-
     // disable -T "thin" static archives by default
     variables.standalone_static_library = gyp.opts.thin ? 0 : 1
 
@@ -286,6 +283,9 @@ function configure (gyp, argv, callback) {
         output_dir = buildDir
       }
       var nodeGypDir = path.resolve(__dirname, '..')
+      var nodeLibFile = path.join(nodeDir,
+        !gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
+        release.name + '.lib')
 
       argv.push('-I', addon_gypi)
       argv.push('-I', common_gypi)
@@ -296,7 +296,7 @@ function configure (gyp, argv, callback) {
         argv.push('-Dnode_exp_file=' + node_exp_file)
       }
       argv.push('-Dnode_gyp_dir=' + nodeGypDir)
-      argv.push('-Dnode_lib_file=' + release.name + '.lib')
+      argv.push('-Dnode_lib_file=' + nodeLibFile)
       argv.push('-Dmodule_root_dir=' + process.cwd())
       argv.push('-Dnode_engine=' +
         (gyp.opts.node_engine || process.jsEngine || 'v8'))
diff --git a/deps/npm/node_modules/node-gyp/lib/process-release.js b/deps/npm/node_modules/node-gyp/lib/process-release.js
index 89eaf9be361290..0d177f1c93e4d3 100644
--- a/deps/npm/node_modules/node-gyp/lib/process-release.js
+++ b/deps/npm/node_modules/node-gyp/lib/process-release.js
@@ -74,6 +74,8 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
     }
   }
 
+  if (overrideDistUrl)
+    log.verbose('download', 'using dist-url', overrideDistUrl)
 
   if (overrideDistUrl)
     distBaseUrl = overrideDistUrl.replace(/\/+$/, '')
diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json
index 9a3664d910c4ea..ce58e31b95ffbf 100644
--- a/deps/npm/node_modules/node-gyp/package.json
+++ b/deps/npm/node_modules/node-gyp/package.json
@@ -1,29 +1,29 @@
 {
-  "_from": "node-gyp@latest",
-  "_id": "node-gyp@3.6.1",
+  "_from": "node-gyp@3.6.2",
+  "_id": "node-gyp@3.6.2",
   "_inBundle": false,
-  "_integrity": "sha1-GVYQZ/8YVGSt7UeCEmgfR/1XjLw=",
+  "_integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
   "_location": "/node-gyp",
   "_phantomChildren": {
     "abbrev": "1.1.0"
   },
   "_requested": {
-    "type": "tag",
+    "type": "version",
     "registry": true,
-    "raw": "node-gyp@latest",
+    "raw": "node-gyp@3.6.2",
     "name": "node-gyp",
     "escapedName": "node-gyp",
-    "rawSpec": "latest",
+    "rawSpec": "3.6.2",
     "saveSpec": null,
-    "fetchSpec": "latest"
+    "fetchSpec": "3.6.2"
   },
   "_requiredBy": [
     "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz",
-  "_shasum": "19561067ff185464aded478212681f47fd578cbc",
-  "_spec": "node-gyp@latest",
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+  "_shasum": "9bfbe54562286284838e750eac05295853fa1c60",
+  "_spec": "node-gyp@3.6.2",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Nathan Rajlich",
@@ -85,5 +85,5 @@
   "scripts": {
     "test": "tape test/test-*"
   },
-  "version": "3.6.1"
+  "version": "3.6.2"
 }
diff --git a/deps/npm/node_modules/npm-package-arg/CHANGELOG.md b/deps/npm/node_modules/npm-package-arg/CHANGELOG.md
deleted file mode 100644
index 339ef8793a93e5..00000000000000
--- a/deps/npm/node_modules/npm-package-arg/CHANGELOG.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## new
-
-* New properties:
-  * `from` indicates how we parsed this specifier, values are:
-    localArgument, local, hosted, url and registry.
-
-    _localArgument_ differs from _local_ in that it means the argument
-    parsing rules were used instead of the dependency parsing rules. That is, the
-    rules for `npm install /foo` instead of those for `"dependencies":
-    {"foo": "file:/foo"}`.
-
-* Changed properties:
-  * `type` indicates what sort of specifier this is, values are: file, directory, git, remote, version, range, tag.
-
-* Local specifiers:
-  * Trailing spaces on local specifiers are no longer trimmed.
-  * The `spec` field for local specifiers is now a fully resolved path.
-  * The type is now _file_ or _directory, never _local_.
-* Git specifiers:
-  * The leading `git+` is no longer stripped. This makes the behavior match
-    `hosted-git-info`.
-* Hosted git specifiers:
-  * The `type` is now _git_. You can check if something is hosted by looking at the `hosted` property or checking to see if `from` is _hosted_.
diff --git a/deps/npm/node_modules/npm-package-arg/npa.js b/deps/npm/node_modules/npm-package-arg/npa.js
index a94c54abbd7ff2..e359958a38187d 100644
--- a/deps/npm/node_modules/npm-package-arg/npa.js
+++ b/deps/npm/node_modules/npm-package-arg/npa.js
@@ -192,6 +192,22 @@ function unsupportedURLType (protocol, spec) {
   return err
 }
 
+function matchGitScp (spec) {
+  // git ssh specifiers are overloaded to also use scp-style git
+  // specifiers, so we have to parse those out and treat them special.
+  // They are NOT true URIs, so we can't hand them to `url.parse`.
+  //
+  // This regex looks for things that look like:
+  // git+ssh://git@my.custom.git.com:username/project.git#deadbeef
+  //
+  // ...and various combinations. The username in the beginning is *required*.
+  const matched = spec.match(/^git\+ssh:\/\/([^:]+:[^#]+(?:\.git)?)(?:#(.*))$/i)
+  return matched && !matched[1].match(/:[0-9]+\/?.*$/i) && {
+    fetchSpec: matched[1],
+    gitCommittish: matched[2]
+  }
+}
+
 function fromURL (res) {
   if (!url) url = require('url')
   const urlparse = url.parse(res.rawSpec)
@@ -203,15 +219,20 @@ function fromURL (res) {
     case 'git+https:':
     case 'git+rsync:':
     case 'git+ftp:':
-    case 'git+ssh:':
     case 'git+file:':
+    case 'git+ssh:':
       res.type = 'git'
-      setGitCommittish(res, urlparse.hash != null ? urlparse.hash.slice(1) : '')
-      urlparse.protocol = urlparse.protocol.replace(/^git[+]/, '')
-      delete urlparse.hash
-      res.fetchSpec = url.format(urlparse)
+      const match = urlparse.protocol === 'git+ssh:' && matchGitScp(res.rawSpec)
+      if (match) {
+        res.fetchSpec = match.fetchSpec
+        res.gitCommittish = match.gitCommittish
+      } else {
+        setGitCommittish(res, urlparse.hash != null ? urlparse.hash.slice(1) : '')
+        urlparse.protocol = urlparse.protocol.replace(/^git[+]/, '')
+        delete urlparse.hash
+        res.fetchSpec = url.format(urlparse)
+      }
       break
-
     case 'http:':
     case 'https:':
       res.type = 'remote'
diff --git a/deps/npm/node_modules/npm-package-arg/package.json b/deps/npm/node_modules/npm-package-arg/package.json
index d8ef6979cbd501..b8afefc5772057 100644
--- a/deps/npm/node_modules/npm-package-arg/package.json
+++ b/deps/npm/node_modules/npm-package-arg/package.json
@@ -1,37 +1,37 @@
 {
-  "_from": "npm-package-arg@~5.0.1",
-  "_id": "npm-package-arg@5.0.1",
-  "_integrity": "sha1-CagW4/RaVJ492vM+m65eezEHeHI=",
+  "_from": "npm-package-arg@latest",
+  "_id": "npm-package-arg@5.1.1",
+  "_inBundle": false,
+  "_integrity": "sha512-67wPa1moaLvn9YAVLLECpGe+v3jL82pBDTE2jMxLOQHd0kWBLnmtCqbxrFagp5pVNFukqmtYRruK3wfoeVTZ2g==",
   "_location": "/npm-package-arg",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "tag",
     "registry": true,
-    "raw": "npm-package-arg@~5.0.1",
+    "raw": "npm-package-arg@latest",
     "name": "npm-package-arg",
     "escapedName": "npm-package-arg",
-    "rawSpec": "~5.0.1",
+    "rawSpec": "latest",
     "saveSpec": null,
-    "fetchSpec": "~5.0.1"
+    "fetchSpec": "latest"
   },
   "_requiredBy": [
+    "#USER",
     "/",
     "/init-package-json",
     "/npm-registry-client",
     "/pacote",
     "/pacote/npm-pick-manifest"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz",
-  "_shasum": "09a816e3f45a549e3ddaf33e9bae5e7b31077872",
-  "_shrinkwrap": null,
-  "_spec": "npm-package-arg@~5.0.1",
+  "_resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz",
+  "_shasum": "a3d09053f2d8a0bfa562624507baa597737fc3bf",
+  "_spec": "npm-package-arg@latest",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/npm/npm-package-arg/issues"
   },
@@ -58,8 +58,6 @@
   "license": "ISC",
   "main": "npa.js",
   "name": "npm-package-arg",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/npm-package-arg.git"
@@ -67,5 +65,5 @@
   "scripts": {
     "test": "standard && tap -J --coverage test/*.js"
   },
-  "version": "5.0.1"
+  "version": "5.1.1"
 }
diff --git a/deps/npm/node_modules/npm-user-validate/.npmignore b/deps/npm/node_modules/npm-user-validate/.npmignore
deleted file mode 100644
index 39747c08b4dc95..00000000000000
--- a/deps/npm/node_modules/npm-user-validate/.npmignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.swp
-.*.swp
-
-.DS_Store
-*~
-.project
-.settings
-npm-debug.log
-coverage.html
-.idea
-lib-cov
-
-node_modules
\ No newline at end of file
diff --git a/deps/npm/node_modules/npm-user-validate/.travis.yml b/deps/npm/node_modules/npm-user-validate/.travis.yml
deleted file mode 100644
index 6ff074b74880dd..00000000000000
--- a/deps/npm/node_modules/npm-user-validate/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: node_js
-before_install:
-- npm install -g npm@latest
-sudo: false
-node_js:
-  - "0.8"
-  - "0.10"
diff --git a/deps/npm/node_modules/npm-user-validate/npm-user-validate.js b/deps/npm/node_modules/npm-user-validate/npm-user-validate.js
index 3a645ec9329acd..9250ce33a4abe0 100644
--- a/deps/npm/node_modules/npm-user-validate/npm-user-validate.js
+++ b/deps/npm/node_modules/npm-user-validate/npm-user-validate.js
@@ -1,19 +1,23 @@
 exports.email = email
 exports.pw = pw
 exports.username = username
-
 var requirements = exports.requirements = {
   username: {
     length: 'Name length must be less than or equal to 214 characters long',
     lowerCase: 'Name must be lowercase',
     urlSafe: 'Name may not contain non-url-safe chars',
-    dot: 'Name may not start with "."'
+    dot: 'Name may not start with "."',
+    illegal: 'Name may not contain illegal character'
   },
   password: {},
   email: {
     valid: 'Email must be an email address'
   }
-};
+}
+
+var illegalCharacterRe = new RegExp('([' + [
+  "'"
+].join() + '])')
 
 function username (un) {
   if (un !== un.toLowerCase()) {
@@ -32,6 +36,11 @@ function username (un) {
     return new Error(requirements.username.length)
   }
 
+  var illegal = un.match(illegalCharacterRe)
+  if (illegal) {
+    return new Error(requirements.username.illegal + ' "' + illegal[0] + '"')
+  }
+
   return null
 }
 
diff --git a/deps/npm/node_modules/npm-user-validate/package.json b/deps/npm/node_modules/npm-user-validate/package.json
index d6e30bd54551c8..df646cd0559acf 100644
--- a/deps/npm/node_modules/npm-user-validate/package.json
+++ b/deps/npm/node_modules/npm-user-validate/package.json
@@ -1,42 +1,46 @@
 {
-  "_from": "npm-user-validate@~0.1.5",
-  "_id": "npm-user-validate@0.1.5",
-  "_integrity": "sha1-UkZdUMLSApSlcSW5lrrtv1bFAEs=",
+  "_from": "npm-user-validate@latest",
+  "_id": "npm-user-validate@1.0.0",
+  "_inBundle": false,
+  "_integrity": "sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=",
   "_location": "/npm-user-validate",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "tag",
     "registry": true,
-    "raw": "npm-user-validate@~0.1.5",
+    "raw": "npm-user-validate@latest",
     "name": "npm-user-validate",
     "escapedName": "npm-user-validate",
-    "rawSpec": "~0.1.5",
+    "rawSpec": "latest",
     "saveSpec": null,
-    "fetchSpec": "~0.1.5"
+    "fetchSpec": "latest"
   },
   "_requiredBy": [
+    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.5.tgz",
-  "_shasum": "52465d50c2d20294a57125b996baedbf56c5004b",
-  "_shrinkwrap": null,
-  "_spec": "npm-user-validate@~0.1.5",
+  "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz",
+  "_shasum": "8ceca0f5cea04d4e93519ef72d0557a75122e951",
+  "_spec": "npm-user-validate@latest",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Robert Kowalski",
     "email": "rok@kowalski.gd"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/npm/npm-user-validate/issues"
   },
   "bundleDependencies": false,
-  "dependencies": {},
   "deprecated": false,
   "description": "User validations for npm",
   "devDependencies": {
-    "tap": "^1.2.0"
+    "standard": "^8.4.0",
+    "standard-version": "^3.0.0",
+    "tap": "^7.1.2"
   },
+  "files": [
+    "npm-user-validate.js"
+  ],
   "homepage": "https://github.com/npm/npm-user-validate#readme",
   "keywords": [
     "npm",
@@ -46,14 +50,13 @@
   "license": "BSD-2-Clause",
   "main": "npm-user-validate.js",
   "name": "npm-user-validate",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/npm/npm-user-validate.git"
   },
   "scripts": {
-    "test": "tap test/*.js"
+    "pretest": "standard",
+    "test": "tap --100 test/*.js"
   },
-  "version": "0.1.5"
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/npm-user-validate/test/email.test.js b/deps/npm/node_modules/npm-user-validate/test/email.test.js
deleted file mode 100644
index 1060a9354d6ccd..00000000000000
--- a/deps/npm/node_modules/npm-user-validate/test/email.test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var test = require('tap').test
-var v = require('../npm-user-validate.js').email
-
-test('email misses an @', function (t) {
-  err = v('namedomain')
-  t.type(err, 'object')
-  t.end()
-})
-
-test('email misses a dot', function (t) {
-  err = v('name@domain')
-  t.type(err, 'object')
-  t.end()
-})
-
-test('email misses a string before the @', function (t) {
-  err = v('@domain')
-  t.type(err, 'object')
-  t.end()
-})
-
-test('email is ok', function (t) {
-  err = v('name@domain.com')
-  t.type(err, 'null')
-  t.end()
-})
\ No newline at end of file
diff --git a/deps/npm/node_modules/npm-user-validate/test/pw.test.js b/deps/npm/node_modules/npm-user-validate/test/pw.test.js
deleted file mode 100644
index d57401da0b5d2f..00000000000000
--- a/deps/npm/node_modules/npm-user-validate/test/pw.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var test = require('tap').test
-var v = require('../npm-user-validate.js').pw
-
-test('pw contains a \'', function (t) {
-  err = v('\'')
-  t.type(err, 'null')
-  t.end()
-})
-
-test('pw contains a :', function (t) {
-  err = v(':')
-  t.type(err, 'null')
-  t.end()
-})
-
-test('pw contains a @', function (t) {
-  err = v('@')
-  t.notOk(err, 'null')
-  t.end()
-})
-
-test('pw contains a "', function (t) {
-  err = v('"')
-  t.type(err, 'null')
-  t.end()
-})
-
-test('pw is ok', function (t) {
-  err = v('duck')
-  t.type(err, 'null')
-  t.end()
-})
diff --git a/deps/npm/node_modules/npm-user-validate/test/username.test.js b/deps/npm/node_modules/npm-user-validate/test/username.test.js
deleted file mode 100644
index aa0e6b33def686..00000000000000
--- a/deps/npm/node_modules/npm-user-validate/test/username.test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-var test = require('tap').test
-var v = require('../npm-user-validate.js').username
-
-test('username must be lowercase', function (t) {
-  var err = v('ERRR')
-  t.type(err, 'object')
-  t.match(err.message, /lowercase/)
-  t.end()
-})
-
-test('username may not contain non-url-safe chars', function (t) {
-  var err = v('f  ')
-  t.type(err, 'object')
-  t.match(err.message, /url-safe/)
-  t.end()
-})
-
-test('username may not start with "."', function (t) {
-  var err = v('.username')
-  t.type(err, 'object')
-  t.match(err.message, /start with.*\./)
-  t.end()
-})
-
-test('username may not be longer than 214 characters', function (t) {
-  var err = v('bacon-ipsum-dolor-amet-tongue-short-loin-landjaeger-tenderloin-ball-tip-pork-loin-porchetta-pig-pork-chop-beef-ribs-pork-belly--shankle-t-bone-turducken-tongue-landjaeger-pork-loin-beef-chicken-short-loin-and-pickle')
-  t.type(err, 'object')
-  t.match(err.message, /less than or equal to 214/)
-  t.end()
-});
-
-test('username may be as long as 214 characters', function (t) {
-  var err = v('bacon-ipsum-dolor-amet-tongue-short-loin-landjaeger-tenderloin-ball-tip-pork-loin-porchetta-pig-pork-chop-beef-ribs-pork-belly--shankle-t-bone-turducken-tongue-landjaeger-pork-loin-beef-chicken-short-loin-porchetta')
-  t.type(err, 'null')
-  t.end()
-});
-
-test('username is ok', function (t) {
-  var err = v('ente')
-  t.type(err, 'null')
-  t.end()
-})
diff --git a/deps/npm/node_modules/pacote/CHANGELOG.md b/deps/npm/node_modules/pacote/CHANGELOG.md
index 55c0cda6861a5c..7f7eac282da100 100644
--- a/deps/npm/node_modules/pacote/CHANGELOG.md
+++ b/deps/npm/node_modules/pacote/CHANGELOG.md
@@ -2,6 +2,100 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+
+## [2.7.30](https://github.com/zkat/pacote/compare/v2.7.29...v2.7.30) (2017-06-05)
+
+
+### Bug Fixes
+
+* **ssri:** bump ssri for bugfix ([70a859c](https://github.com/zkat/pacote/commit/70a859c))
+
+
+
+
+## [2.7.29](https://github.com/zkat/pacote/compare/v2.7.28...v2.7.29) (2017-06-05)
+
+
+### Bug Fixes
+
+* **registry:** use cert instead of certfile opt ([a45880d](https://github.com/zkat/pacote/commit/a45880d))
+
+
+
+
+## [2.7.28](https://github.com/zkat/pacote/compare/v2.7.27...v2.7.28) (2017-06-05)
+
+
+### Bug Fixes
+
+* **git:** limit ls-remote output to heads/tags (#97) ([c1e3dcd](https://github.com/zkat/pacote/commit/c1e3dcd))
+* **proxy:** send certificate authority, key and other options (#95) ([c4b6128](https://github.com/zkat/pacote/commit/c4b6128))
+* **registry:** add support for global auth and _auth token (#96) ([7919fb7](https://github.com/zkat/pacote/commit/7919fb7))
+* **registry:** emit npm-session header (#98) ([9816b18](https://github.com/zkat/pacote/commit/9816b18))
+
+
+
+
+## [2.7.27](https://github.com/zkat/pacote/compare/v2.7.26...v2.7.27) (2017-06-01)
+
+
+### Bug Fixes
+
+* **git:** fix semver range detection. oops ([76d9233](https://github.com/zkat/pacote/commit/76d9233))
+
+
+
+
+## [2.7.26](https://github.com/zkat/pacote/compare/v2.7.25...v2.7.26) (2017-06-01)
+
+
+### Bug Fixes
+
+* **git:** hash was not being replaced/appended correctly ([6fcbed5](https://github.com/zkat/pacote/commit/6fcbed5))
+
+
+
+
+## [2.7.25](https://github.com/zkat/pacote/compare/v2.7.24...v2.7.25) (2017-05-31)
+
+
+### Bug Fixes
+
+* **git:** git deps were getting _resolved without shasums ([96f0675](https://github.com/zkat/pacote/commit/96f0675))
+
+
+
+
+## [2.7.24](https://github.com/zkat/pacote/compare/v2.7.23...v2.7.24) (2017-05-31)
+
+
+### Bug Fixes
+
+* **deps:** update dep versions with new patches ([dc2e4ff](https://github.com/zkat/pacote/commit/dc2e4ff))
+
+
+
+
+## [2.7.23](https://github.com/zkat/pacote/compare/v2.7.22...v2.7.23) (2017-05-31)
+
+
+### Bug Fixes
+
+* **git:** fix ls-remote command and throw away ^{} junk ([62ba84d](https://github.com/zkat/pacote/commit/62ba84d))
+* **git:** use the parsed git committish from npa ([77a676a](https://github.com/zkat/pacote/commit/77a676a))
+
+
+
+
+## [2.7.22](https://github.com/zkat/pacote/compare/v2.7.21...v2.7.22) (2017-05-31)
+
+
+### Bug Fixes
+
+* **git:** accept shortened git hashes (#91) ([4466388](https://github.com/zkat/pacote/commit/4466388))
+
+
+
 
 ## [2.7.21](https://github.com/zkat/pacote/compare/v2.7.20...v2.7.21) (2017-05-25)
 
diff --git a/deps/npm/node_modules/pacote/lib/fetchers/git.js b/deps/npm/node_modules/pacote/lib/fetchers/git.js
index d8af7693642c30..9da6a6438a4256 100644
--- a/deps/npm/node_modules/pacote/lib/fetchers/git.js
+++ b/deps/npm/node_modules/pacote/lib/fetchers/git.js
@@ -15,7 +15,6 @@ const PassThrough = require('stream').PassThrough
 const path = require('path')
 const pipe = BB.promisify(require('mississippi').pipe)
 const rimraf = BB.promisify(require('rimraf'))
-const semver = require('semver')
 const uniqueFilename = require('unique-filename')
 
 // `git` dependencies are fetched from git repositories and packed up.
@@ -50,7 +49,7 @@ Fetcher.impl(fetchGit, {
     opts = optCheck(opts)
     let streamError
     const stream = new PassThrough().on('error', e => { streamError = e })
-    const cacheName = manifest._resolved || spec.saveSpec || spec.fetchSpec
+    const cacheName = manifest._uniqueResolved || manifest._resolved || ''
     const cacheStream = (
       opts.cache &&
       cacache.get.stream(
@@ -69,11 +68,9 @@ Fetcher.impl(fetchGit, {
             manifest._repo, manifest._ref, manifest._rawRef, tmp, opts
           ).then(HEAD => {
             if (streamError) { throw streamError }
-            if (!manifest._resolved) {
-              manifest._resolved = spec.saveSpec.replace(/#.*/, `#${HEAD}`)
-              manifest._uniqueResolved = manifest._resolved
-            }
-            return packDir(manifest, cacheName, tmp, stream, opts)
+            manifest._resolved = spec.saveSpec.replace(/(:?#.*)?$/, `#${HEAD}`)
+            manifest._uniqueResolved = manifest._resolved
+            return packDir(manifest, manifest._uniqueResolved, tmp, stream, opts)
           })
         }).catch(err => stream.emit('error', err))
       }
@@ -102,9 +99,9 @@ function hostedManifest (spec, opts) {
 }
 
 function plainManifest (repo, spec, opts) {
-  const rawRef = spec.gitCommittish
+  const rawRef = spec.gitCommittish || spec.gitRange
   return resolve(
-    repo, rawRef, spec.name, opts
+    repo, spec, spec.name, opts
   ).then(ref => {
     if (ref) {
       const resolved = spec.saveSpec.replace(/(?:#.*)?$/, `#${ref.sha}`)
@@ -113,7 +110,7 @@ function plainManifest (repo, spec, opts) {
         _resolved: resolved,
         _spec: spec,
         _ref: ref,
-        _rawRef: rawRef,
+        _rawRef: spec.gitCommittish || spec.gitRange,
         _uniqueResolved: resolved
       }
     } else {
@@ -132,19 +129,18 @@ function plainManifest (repo, spec, opts) {
   })
 }
 
-function resolve (url, rawRef, name, opts) {
-  const semverMatch = rawRef.match(/^semver:v?(.*)/)
-  const isSemver = semverMatch && semver.validRange(semverMatch[1])
+function resolve (url, spec, name, opts) {
+  const isSemver = !!spec.gitRange
   return git.revs(url, opts).then(remoteRefs => {
     return isSemver
     ? pickManifest({
       versions: remoteRefs.versions,
       'dist-tags': remoteRefs['dist-tags'],
       name: name
-    }, semverMatch[1], opts)
+    }, spec.gitRange, opts)
     : remoteRefs
     ? BB.resolve(
-      remoteRefs.refs[rawRef] || remoteRefs.refs[remoteRefs.shas[rawRef]]
+      remoteRefs.refs[spec.gitCommittish] || remoteRefs.refs[remoteRefs.shas[spec.gitCommittish]]
     )
     : null
   })
diff --git a/deps/npm/node_modules/pacote/lib/fetchers/registry/fetch.js b/deps/npm/node_modules/pacote/lib/fetchers/registry/fetch.js
index 46a926a1a15b93..1c6c8e8d6e2ca9 100644
--- a/deps/npm/node_modules/pacote/lib/fetchers/registry/fetch.js
+++ b/deps/npm/node_modules/pacote/lib/fetchers/registry/fetch.js
@@ -16,14 +16,19 @@ function regFetch (uri, registry, opts) {
     algorithms: opts.algorithms,
     cache: getCacheMode(opts),
     cacheManager: opts.cache,
+    ca: opts.ca,
+    cert: opts.cert,
     headers: getHeaders(uri, registry, opts),
     integrity: opts.integrity,
+    key: opts.key,
+    localAddress: opts.localAddress,
     memoize: opts.memoize,
     noProxy: opts.noProxy,
     Promise: BB,
     proxy: opts.proxy,
     referer: opts.refer,
     retry: opts.retry,
+    strictSSL: !!opts.strictSSL,
     timeout: opts.timeout,
     uid: opts.uid,
     gid: opts.gid
@@ -74,13 +79,15 @@ function getHeaders (uri, registry, opts) {
   const headers = Object.assign({
     'npm-in-ci': opts.isFromCI,
     'npm-scope': opts.projectScope,
+    'npm-session': opts.npmSession,
     'user-agent': opts.userAgent,
     'referer': opts.refer
   }, opts.headers)
-  const auth = (
+  // check for auth settings specific to this registry
+  let auth = (
     opts.auth &&
     opts.auth[registryKey(registry)]
-  )
+  ) || opts.auth
   // If a tarball is hosted on a different place than the manifest, only send
   // credentials on `alwaysAuth`
   const shouldAuth = auth && (
@@ -94,6 +101,8 @@ function getHeaders (uri, registry, opts) {
       `${auth.username}:${auth.password}`, 'utf8'
     ).toString('base64')
     headers.authorization = `Basic ${encoded}`
+  } else if (shouldAuth && auth._auth) {
+    headers.authorization = `Basic ${auth._auth}`
   }
   return headers
 }
diff --git a/deps/npm/node_modules/pacote/lib/util/git.js b/deps/npm/node_modules/pacote/lib/util/git.js
index dc189b54189a5d..fc3d158fa7c737 100644
--- a/deps/npm/node_modules/pacote/lib/util/git.js
+++ b/deps/npm/node_modules/pacote/lib/util/git.js
@@ -105,7 +105,7 @@ function revs (repo, opts) {
     return BB.resolve(cached)
   }
   return pinflight(`ls-remote:${repo}`, () => {
-    return spawnGit(['ls-remote', repo, '-t', '-h', '*'], {
+    return spawnGit(['ls-remote', '-h', '-t', repo], {
       env: gitEnv()
     }, opts).then(child => {
       let stdout = ''
@@ -117,6 +117,7 @@ function revs (repo, opts) {
           const sha = split[0].trim()
           const ref = split[1].trim().match(/(?:refs\/[^/]+\/)?(.*)/)[1]
           if (!ref) { return revs } // ???
+          if (ref.match(/\^\{\}$/)) { return revs } // refs/tags/x^{} crap
           const type = refType(line)
           const doc = {sha, ref, type}
 
diff --git a/deps/npm/node_modules/pacote/lib/util/opt-check.js b/deps/npm/node_modules/pacote/lib/util/opt-check.js
index dd8aa518dc5258..a2692836a3ad7c 100644
--- a/deps/npm/node_modules/pacote/lib/util/opt-check.js
+++ b/deps/npm/node_modules/pacote/lib/util/opt-check.js
@@ -12,7 +12,11 @@ function PacoteOptions (opts) {
   this.scopeTargets = opts.scopeTargets || {}
   this.defaultTag = opts.defaultTag || 'latest'
   this.cache = opts.cache
+  this.ca = opts.ca
+  this.cert = opts.cert
   this.integrity = opts.integrity
+  this.key = opts.key
+  this.localAddress = opts.localAddress
   this.log = opts.log || silentlog
   this.memoize = opts.memoize
   this.maxSockets = opts.maxSockets || 10
@@ -26,6 +30,7 @@ function PacoteOptions (opts) {
   this.userAgent = opts.userAgent || `${pkg.name}@${pkg.version}/node@${process.version}+${process.arch} (${process.platform})`
   this.where = opts.where
   this.preferOnline = opts.preferOnline
+  this.strictSSL = !!opts.strictSSL
   this.isFromCI = !!(
     opts.isFromCI ||
     process.env['CI'] === 'true' ||
@@ -33,6 +38,7 @@ function PacoteOptions (opts) {
     process.env['JENKINS_URL'] ||
     process.env['bamboo.buildKey']
   )
+  this.npmSession = opts.npmSession
   this.refer = opts.referer || opts.refer
   this.projectScope = opts.projectScope
   this.fullMetadata = opts.fullMetadata
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md
index 854388027b0634..54d88f339186a6 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+
+## [2.4.11](https://github.com/zkat/make-fetch-happen/compare/v2.4.10...v2.4.11) (2017-06-05)
+
+
+### Bug Fixes
+
+* **deps:** bump deps with ssri fix ([bef1994](https://github.com/zkat/make-fetch-happen/commit/bef1994))
+
+
+
+
+## [2.4.10](https://github.com/zkat/make-fetch-happen/compare/v2.4.9...v2.4.10) (2017-05-31)
+
+
+### Bug Fixes
+
+* **deps:** bump dep versions with bugfixes ([0af4003](https://github.com/zkat/make-fetch-happen/commit/0af4003))
+* **proxy:** use auth parameter for proxy authentication (#30) ([c687306](https://github.com/zkat/make-fetch-happen/commit/c687306))
+
+
+
 
 ## [2.4.9](https://github.com/zkat/make-fetch-happen/compare/v2.4.8...v2.4.9) (2017-05-25)
 
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/agent.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/agent.js
index 0100498947e21f..a3c910eb9340cc 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/agent.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/agent.js
@@ -126,6 +126,7 @@ function getProxy (proxyUrl, opts, isHttps) {
     port: proxyUrl.port,
     protocol: proxyUrl.protocol,
     path: proxyUrl.path,
+    auth: proxyUrl.auth,
     ca: opts.ca,
     cert: opts.cert,
     key: opts.key,
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/.travis.yml b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/.travis.yml
index 85a50123c63edb..20b794051c9aaa 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/.travis.yml
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/.travis.yml
@@ -1,8 +1,29 @@
+sudo: false
+
 language: node_js
+
 node_js:
   - "0.8"
   - "0.10"
   - "0.12"
-before_install:
-  - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
-  - npm install -g npm@latest
+  - "1"
+  - "2"
+  - "3"
+  - "4"
+  - "5"
+  - "6"
+  - "7"
+
+install:
+  - PATH="`npm bin`:`npm bin -g`:$PATH"
+  # Node 0.8 comes with a too obsolete npm
+  - if [[ "`node --version`" =~ ^v0\.8\. ]]; then npm install -g npm@1.4.28 ; fi
+  # Install dependencies and build
+  - npm install
+
+script:
+  # Output useful info for debugging
+  - node --version
+  - npm --version
+  # Run tests
+  - npm test
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/History.md b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/History.md
index 0ceef6c13f70bf..2191a9e8014753 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/History.md
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/History.md
@@ -1,4 +1,22 @@
 
+2.1.1 / 2017-05-30
+==================
+
+  * Revert [fe2162e0ba18123f5b301cba4de1e9dd74e437cd](https://github.com/TooTallNate/node-agent-base/commit/fe2162e0ba18123f5b301cba4de1e9dd74e437cd) and [270bdc92eb8e3bd0444d1e5266e8e9390aeb3095](https://github.com/TooTallNate/node-agent-base/commit/270bdc92eb8e3bd0444d1e5266e8e9390aeb3095) (fixes #7)
+
+2.1.0 / 2017-05-26
+==================
+
+  * unref is not supported for node < 0.9.1 (@pi0)
+  * add tests to dangling socket (@pi0)
+  * check unref() is supported (@pi0)
+  * fix dangling sockets problem (@pi0)
+  * add basic "ws" module tests
+  * make `Agent` be subclassable
+  * turn `addRequest()` into a named function
+  * test: Node.js v4 likes to call `cork` on the stream (#3, @tomhughes)
+  * travis: test node v4, v5, v6 and v7
+
 2.0.1 / 2015-09-10
 ==================
 
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/agent.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/agent.js
index 4005ebc0efb98e..7ea91f886cba24 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/agent.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/agent.js
@@ -24,12 +24,17 @@ module.exports = Agent;
 
 function Agent (callback) {
   if (!(this instanceof Agent)) return new Agent(callback);
-  if ('function' != typeof callback) throw new Error('Must pass a "callback function"');
   EventEmitter.call(this);
-  this.callback = callback;
+  if ('function' === typeof callback) {
+    this.callback = callback;
+  }
 }
 inherits(Agent, EventEmitter);
 
+Agent.prototype.callback = function callback (req, opts, fn) {
+  fn(new Error('"agent-base" has no default implementation, you must subclass and override `callback()`'));
+};
+
 /**
  * Called by node-core's "_http_client.js" module when creating
  * a new HTTP request with this Agent instance.
@@ -37,7 +42,7 @@ inherits(Agent, EventEmitter);
  * @api public
  */
 
-Agent.prototype.addRequest = function (req, host, port, localAddress) {
+Agent.prototype.addRequest = function addRequest (req, host, port, localAddress) {
   var opts;
   if ('object' == typeof host) {
     // >= v0.11.x API
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/package.json b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/package.json
index 0e296ced06eb1c..f74df4fcb787a4 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/package.json
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/package.json
@@ -1,7 +1,8 @@
 {
   "_from": "agent-base@2",
-  "_id": "agent-base@2.0.1",
-  "_integrity": "sha1-vY+ehqjrIh//oHvRS+/VXfFCgV4=",
+  "_id": "agent-base@2.1.1",
+  "_inBundle": false,
+  "_integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
   "_location": "/pacote/make-fetch-happen/http-proxy-agent/agent-base",
   "_phantomChildren": {},
   "_requested": {
@@ -17,9 +18,8 @@
   "_requiredBy": [
     "/pacote/make-fetch-happen/http-proxy-agent"
   ],
-  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
-  "_shasum": "bd8f9e86a8eb221fffa07bd14befd55df142815e",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+  "_shasum": "d6de10d5af6132d5bd692427d46fc538539094c7",
   "_spec": "agent-base@2",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent",
   "author": {
@@ -27,7 +27,6 @@
     "email": "nathan@tootallnate.net",
     "url": "http://n8.io/"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/TooTallNate/node-agent-base/issues"
   },
@@ -39,7 +38,8 @@
   "deprecated": false,
   "description": "Turn a function into an `http.Agent` instance",
   "devDependencies": {
-    "mocha": "2"
+    "mocha": "2",
+    "ws": "0.8.0"
   },
   "homepage": "https://github.com/TooTallNate/node-agent-base#readme",
   "keywords": [
@@ -52,8 +52,6 @@
   "license": "MIT",
   "main": "agent.js",
   "name": "agent-base",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/TooTallNate/node-agent-base.git"
@@ -61,5 +59,5 @@
   "scripts": {
     "test": "mocha --reporter spec"
   },
-  "version": "2.0.1"
+  "version": "2.1.1"
 }
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/test/test.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/test/test.js
index f87d308f8e65a2..7d8dee66ce902b 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/test/test.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/agent-base/test/test.js
@@ -9,13 +9,45 @@ var net = require('net');
 var tls = require('tls');
 var http = require('http');
 var https = require('https');
+var WebSocket = require('ws');
 var assert = require('assert');
 var events = require('events');
+var inherits = require('util').inherits;
+var semver = require('semver');
 var Agent = require('../');
 
 describe('Agent', function () {
+  describe('subclass', function () {
+    it('should be subclassable', function (done) {
+      function MyAgent () {
+        Agent.call(this);
+      }
+      inherits(MyAgent, Agent);
+
+      MyAgent.prototype.callback = function (req, opts, fn) {
+        assert.equal(req.path, '/foo');
+        assert.equal(req.getHeader('host'), '127.0.0.1:1234');
+        assert.equal(opts.secureEndpoint, true);
+        done();
+      };
+
+      var info = url.parse('https://127.0.0.1:1234/foo');
+      info.agent = new MyAgent;
+      https.get(info);
+    });
+  });
   describe('"error" event', function () {
-    it('should be invoked on `http.ClientRequest` instance if passed to callback function on the first tick', function (done) {
+    it('should be invoked on `http.ClientRequest` instance if `callback()` has not been defined', function (done) {
+      var agent = new Agent();
+      var info = url.parse('http://127.0.0.1/foo');
+      info.agent = agent;
+      var req = http.get(info);
+      req.on('error', function (err) {
+        assert.equal('"agent-base" has no default implementation, you must subclass and override `callback()`', err.message);
+        done();
+      });
+    });
+    it('should be invoked on `http.ClientRequest` instance if Error passed to callback function on the first tick', function (done) {
       var agent = new Agent(function (req, opts, fn) {
         fn(new Error('is this caught?'));
       });
@@ -27,7 +59,7 @@ describe('Agent', function () {
         done();
       });
     });
-    it('should be invoked on `http.ClientRequest` instance if passed to callback function after the first tick', function (done) {
+    it('should be invoked on `http.ClientRequest` instance if Error passed to callback function after the first tick', function (done) {
       var agent = new Agent(function (req, opts, fn) {
         setTimeout(function () {
           fn(new Error('is this caught?'));
@@ -54,6 +86,10 @@ describe('Agent', function () {
         done();
       };
 
+      // needed for `http` module in Node.js 4
+      stream.cork = function () {
+      };
+
       var opts = {
         method: 'GET',
         host: '127.0.0.1',
@@ -298,3 +334,118 @@ describe('"https" module', function () {
     });
   });
 });
+
+describe('"ws" server', function () {
+  var wss;
+  var server;
+  var port;
+
+  // setup test HTTP server
+  before(function (done) {
+    server = http.createServer()
+    wss = new WebSocket.Server({ server: server });
+    server.listen(0, function () {
+      port = server.address().port;
+      done();
+    });
+  });
+
+  // shut down test HTTP server
+  after(function (done) {
+    server.once('close', function () {
+      done();
+    });
+    server.close();
+  });
+
+  it('should work for basic WebSocket connections', function (done) {
+    function onconnection(ws) {
+      ws.on('message', function (data) {
+        assert.equal('ping', data);
+        ws.send('pong');
+      });
+    }
+    wss.on('connection', onconnection);
+
+    var agent = new Agent(function (req, opts, fn) {
+      var socket = net.connect(opts);
+      fn(null, socket);
+    });
+
+    var client = new WebSocket('ws://127.0.0.1:' + port + '/', {
+      agent: agent
+    });
+
+    client.on('open', function () {
+      client.send('ping');
+    });
+
+    client.on('message', function (data) {
+      assert.equal('pong', data);
+      client.close();
+      wss.removeListener('connection', onconnection);
+      done();
+    });
+  });
+
+});
+
+describe('"wss" server', function () {
+  var wss;
+  var server;
+  var port;
+
+  // setup test HTTP server
+  before(function (done) {
+    var options = {
+      key: fs.readFileSync(__dirname + '/ssl-cert-snakeoil.key'),
+      cert: fs.readFileSync(__dirname + '/ssl-cert-snakeoil.pem')
+    };
+    server = https.createServer(options);
+    wss = new WebSocket.Server({ server: server });
+    server.listen(0, function () {
+      port = server.address().port;
+      done();
+    });
+  });
+
+  // shut down test HTTP server
+  after(function (done) {
+    server.once('close', function () {
+      done();
+    });
+    server.close();
+  });
+
+  it('should work for secure WebSocket connections', function (done) {
+    function onconnection(ws) {
+      ws.on('message', function (data) {
+        assert.equal('ping', data);
+        ws.send('pong');
+      });
+    }
+    wss.on('connection', onconnection);
+
+    var agent = new Agent(function (req, opts, fn) {
+      var socket = tls.connect(opts);
+      fn(null, socket);
+    });
+
+    var client = new WebSocket('wss://127.0.0.1:' + port + '/', {
+      agent: agent,
+      rejectUnauthorized: false
+    });
+
+    client.on('open', function () {
+      client.send('ping');
+    });
+
+    client.on('message', function (data) {
+      assert.equal('pong', data);
+      client.close();
+      wss.removeListener('connection', onconnection);
+      done();
+    });
+  });
+
+});
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/.travis.yml b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/.travis.yml
index 85a50123c63edb..20b794051c9aaa 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/.travis.yml
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/.travis.yml
@@ -1,8 +1,29 @@
+sudo: false
+
 language: node_js
+
 node_js:
   - "0.8"
   - "0.10"
   - "0.12"
-before_install:
-  - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
-  - npm install -g npm@latest
+  - "1"
+  - "2"
+  - "3"
+  - "4"
+  - "5"
+  - "6"
+  - "7"
+
+install:
+  - PATH="`npm bin`:`npm bin -g`:$PATH"
+  # Node 0.8 comes with a too obsolete npm
+  - if [[ "`node --version`" =~ ^v0\.8\. ]]; then npm install -g npm@1.4.28 ; fi
+  # Install dependencies and build
+  - npm install
+
+script:
+  # Output useful info for debugging
+  - node --version
+  - npm --version
+  # Run tests
+  - npm test
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/History.md b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/History.md
index 0ceef6c13f70bf..2191a9e8014753 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/History.md
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/History.md
@@ -1,4 +1,22 @@
 
+2.1.1 / 2017-05-30
+==================
+
+  * Revert [fe2162e0ba18123f5b301cba4de1e9dd74e437cd](https://github.com/TooTallNate/node-agent-base/commit/fe2162e0ba18123f5b301cba4de1e9dd74e437cd) and [270bdc92eb8e3bd0444d1e5266e8e9390aeb3095](https://github.com/TooTallNate/node-agent-base/commit/270bdc92eb8e3bd0444d1e5266e8e9390aeb3095) (fixes #7)
+
+2.1.0 / 2017-05-26
+==================
+
+  * unref is not supported for node < 0.9.1 (@pi0)
+  * add tests to dangling socket (@pi0)
+  * check unref() is supported (@pi0)
+  * fix dangling sockets problem (@pi0)
+  * add basic "ws" module tests
+  * make `Agent` be subclassable
+  * turn `addRequest()` into a named function
+  * test: Node.js v4 likes to call `cork` on the stream (#3, @tomhughes)
+  * travis: test node v4, v5, v6 and v7
+
 2.0.1 / 2015-09-10
 ==================
 
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/agent.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/agent.js
index 4005ebc0efb98e..7ea91f886cba24 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/agent.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/agent.js
@@ -24,12 +24,17 @@ module.exports = Agent;
 
 function Agent (callback) {
   if (!(this instanceof Agent)) return new Agent(callback);
-  if ('function' != typeof callback) throw new Error('Must pass a "callback function"');
   EventEmitter.call(this);
-  this.callback = callback;
+  if ('function' === typeof callback) {
+    this.callback = callback;
+  }
 }
 inherits(Agent, EventEmitter);
 
+Agent.prototype.callback = function callback (req, opts, fn) {
+  fn(new Error('"agent-base" has no default implementation, you must subclass and override `callback()`'));
+};
+
 /**
  * Called by node-core's "_http_client.js" module when creating
  * a new HTTP request with this Agent instance.
@@ -37,7 +42,7 @@ inherits(Agent, EventEmitter);
  * @api public
  */
 
-Agent.prototype.addRequest = function (req, host, port, localAddress) {
+Agent.prototype.addRequest = function addRequest (req, host, port, localAddress) {
   var opts;
   if ('object' == typeof host) {
     // >= v0.11.x API
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/package.json b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/package.json
index b57e81b1b464f6..9dedd7231d81e8 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/package.json
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/package.json
@@ -1,7 +1,8 @@
 {
   "_from": "agent-base@2",
-  "_id": "agent-base@2.0.1",
-  "_integrity": "sha1-vY+ehqjrIh//oHvRS+/VXfFCgV4=",
+  "_id": "agent-base@2.1.1",
+  "_inBundle": false,
+  "_integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
   "_location": "/pacote/make-fetch-happen/https-proxy-agent/agent-base",
   "_phantomChildren": {},
   "_requested": {
@@ -17,9 +18,8 @@
   "_requiredBy": [
     "/pacote/make-fetch-happen/https-proxy-agent"
   ],
-  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
-  "_shasum": "bd8f9e86a8eb221fffa07bd14befd55df142815e",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+  "_shasum": "d6de10d5af6132d5bd692427d46fc538539094c7",
   "_spec": "agent-base@2",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent",
   "author": {
@@ -27,7 +27,6 @@
     "email": "nathan@tootallnate.net",
     "url": "http://n8.io/"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/TooTallNate/node-agent-base/issues"
   },
@@ -39,7 +38,8 @@
   "deprecated": false,
   "description": "Turn a function into an `http.Agent` instance",
   "devDependencies": {
-    "mocha": "2"
+    "mocha": "2",
+    "ws": "0.8.0"
   },
   "homepage": "https://github.com/TooTallNate/node-agent-base#readme",
   "keywords": [
@@ -52,8 +52,6 @@
   "license": "MIT",
   "main": "agent.js",
   "name": "agent-base",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/TooTallNate/node-agent-base.git"
@@ -61,5 +59,5 @@
   "scripts": {
     "test": "mocha --reporter spec"
   },
-  "version": "2.0.1"
+  "version": "2.1.1"
 }
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/test/test.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/test/test.js
index f87d308f8e65a2..7d8dee66ce902b 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/test/test.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/https-proxy-agent/node_modules/agent-base/test/test.js
@@ -9,13 +9,45 @@ var net = require('net');
 var tls = require('tls');
 var http = require('http');
 var https = require('https');
+var WebSocket = require('ws');
 var assert = require('assert');
 var events = require('events');
+var inherits = require('util').inherits;
+var semver = require('semver');
 var Agent = require('../');
 
 describe('Agent', function () {
+  describe('subclass', function () {
+    it('should be subclassable', function (done) {
+      function MyAgent () {
+        Agent.call(this);
+      }
+      inherits(MyAgent, Agent);
+
+      MyAgent.prototype.callback = function (req, opts, fn) {
+        assert.equal(req.path, '/foo');
+        assert.equal(req.getHeader('host'), '127.0.0.1:1234');
+        assert.equal(opts.secureEndpoint, true);
+        done();
+      };
+
+      var info = url.parse('https://127.0.0.1:1234/foo');
+      info.agent = new MyAgent;
+      https.get(info);
+    });
+  });
   describe('"error" event', function () {
-    it('should be invoked on `http.ClientRequest` instance if passed to callback function on the first tick', function (done) {
+    it('should be invoked on `http.ClientRequest` instance if `callback()` has not been defined', function (done) {
+      var agent = new Agent();
+      var info = url.parse('http://127.0.0.1/foo');
+      info.agent = agent;
+      var req = http.get(info);
+      req.on('error', function (err) {
+        assert.equal('"agent-base" has no default implementation, you must subclass and override `callback()`', err.message);
+        done();
+      });
+    });
+    it('should be invoked on `http.ClientRequest` instance if Error passed to callback function on the first tick', function (done) {
       var agent = new Agent(function (req, opts, fn) {
         fn(new Error('is this caught?'));
       });
@@ -27,7 +59,7 @@ describe('Agent', function () {
         done();
       });
     });
-    it('should be invoked on `http.ClientRequest` instance if passed to callback function after the first tick', function (done) {
+    it('should be invoked on `http.ClientRequest` instance if Error passed to callback function after the first tick', function (done) {
       var agent = new Agent(function (req, opts, fn) {
         setTimeout(function () {
           fn(new Error('is this caught?'));
@@ -54,6 +86,10 @@ describe('Agent', function () {
         done();
       };
 
+      // needed for `http` module in Node.js 4
+      stream.cork = function () {
+      };
+
       var opts = {
         method: 'GET',
         host: '127.0.0.1',
@@ -298,3 +334,118 @@ describe('"https" module', function () {
     });
   });
 });
+
+describe('"ws" server', function () {
+  var wss;
+  var server;
+  var port;
+
+  // setup test HTTP server
+  before(function (done) {
+    server = http.createServer()
+    wss = new WebSocket.Server({ server: server });
+    server.listen(0, function () {
+      port = server.address().port;
+      done();
+    });
+  });
+
+  // shut down test HTTP server
+  after(function (done) {
+    server.once('close', function () {
+      done();
+    });
+    server.close();
+  });
+
+  it('should work for basic WebSocket connections', function (done) {
+    function onconnection(ws) {
+      ws.on('message', function (data) {
+        assert.equal('ping', data);
+        ws.send('pong');
+      });
+    }
+    wss.on('connection', onconnection);
+
+    var agent = new Agent(function (req, opts, fn) {
+      var socket = net.connect(opts);
+      fn(null, socket);
+    });
+
+    var client = new WebSocket('ws://127.0.0.1:' + port + '/', {
+      agent: agent
+    });
+
+    client.on('open', function () {
+      client.send('ping');
+    });
+
+    client.on('message', function (data) {
+      assert.equal('pong', data);
+      client.close();
+      wss.removeListener('connection', onconnection);
+      done();
+    });
+  });
+
+});
+
+describe('"wss" server', function () {
+  var wss;
+  var server;
+  var port;
+
+  // setup test HTTP server
+  before(function (done) {
+    var options = {
+      key: fs.readFileSync(__dirname + '/ssl-cert-snakeoil.key'),
+      cert: fs.readFileSync(__dirname + '/ssl-cert-snakeoil.pem')
+    };
+    server = https.createServer(options);
+    wss = new WebSocket.Server({ server: server });
+    server.listen(0, function () {
+      port = server.address().port;
+      done();
+    });
+  });
+
+  // shut down test HTTP server
+  after(function (done) {
+    server.once('close', function () {
+      done();
+    });
+    server.close();
+  });
+
+  it('should work for secure WebSocket connections', function (done) {
+    function onconnection(ws) {
+      ws.on('message', function (data) {
+        assert.equal('ping', data);
+        ws.send('pong');
+      });
+    }
+    wss.on('connection', onconnection);
+
+    var agent = new Agent(function (req, opts, fn) {
+      var socket = tls.connect(opts);
+      fn(null, socket);
+    });
+
+    var client = new WebSocket('wss://127.0.0.1:' + port + '/', {
+      agent: agent,
+      rejectUnauthorized: false
+    });
+
+    client.on('open', function () {
+      client.send('ping');
+    });
+
+    client.on('message', function (data) {
+      assert.equal('pong', data);
+      client.close();
+      wss.removeListener('connection', onconnection);
+      done();
+    });
+  });
+
+});
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/.travis.yml b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/.travis.yml
index 85a50123c63edb..20b794051c9aaa 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/.travis.yml
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/.travis.yml
@@ -1,8 +1,29 @@
+sudo: false
+
 language: node_js
+
 node_js:
   - "0.8"
   - "0.10"
   - "0.12"
-before_install:
-  - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
-  - npm install -g npm@latest
+  - "1"
+  - "2"
+  - "3"
+  - "4"
+  - "5"
+  - "6"
+  - "7"
+
+install:
+  - PATH="`npm bin`:`npm bin -g`:$PATH"
+  # Node 0.8 comes with a too obsolete npm
+  - if [[ "`node --version`" =~ ^v0\.8\. ]]; then npm install -g npm@1.4.28 ; fi
+  # Install dependencies and build
+  - npm install
+
+script:
+  # Output useful info for debugging
+  - node --version
+  - npm --version
+  # Run tests
+  - npm test
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/History.md b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/History.md
index 0ceef6c13f70bf..2191a9e8014753 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/History.md
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/History.md
@@ -1,4 +1,22 @@
 
+2.1.1 / 2017-05-30
+==================
+
+  * Revert [fe2162e0ba18123f5b301cba4de1e9dd74e437cd](https://github.com/TooTallNate/node-agent-base/commit/fe2162e0ba18123f5b301cba4de1e9dd74e437cd) and [270bdc92eb8e3bd0444d1e5266e8e9390aeb3095](https://github.com/TooTallNate/node-agent-base/commit/270bdc92eb8e3bd0444d1e5266e8e9390aeb3095) (fixes #7)
+
+2.1.0 / 2017-05-26
+==================
+
+  * unref is not supported for node < 0.9.1 (@pi0)
+  * add tests to dangling socket (@pi0)
+  * check unref() is supported (@pi0)
+  * fix dangling sockets problem (@pi0)
+  * add basic "ws" module tests
+  * make `Agent` be subclassable
+  * turn `addRequest()` into a named function
+  * test: Node.js v4 likes to call `cork` on the stream (#3, @tomhughes)
+  * travis: test node v4, v5, v6 and v7
+
 2.0.1 / 2015-09-10
 ==================
 
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/agent.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/agent.js
index 4005ebc0efb98e..7ea91f886cba24 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/agent.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/agent.js
@@ -24,12 +24,17 @@ module.exports = Agent;
 
 function Agent (callback) {
   if (!(this instanceof Agent)) return new Agent(callback);
-  if ('function' != typeof callback) throw new Error('Must pass a "callback function"');
   EventEmitter.call(this);
-  this.callback = callback;
+  if ('function' === typeof callback) {
+    this.callback = callback;
+  }
 }
 inherits(Agent, EventEmitter);
 
+Agent.prototype.callback = function callback (req, opts, fn) {
+  fn(new Error('"agent-base" has no default implementation, you must subclass and override `callback()`'));
+};
+
 /**
  * Called by node-core's "_http_client.js" module when creating
  * a new HTTP request with this Agent instance.
@@ -37,7 +42,7 @@ inherits(Agent, EventEmitter);
  * @api public
  */
 
-Agent.prototype.addRequest = function (req, host, port, localAddress) {
+Agent.prototype.addRequest = function addRequest (req, host, port, localAddress) {
   var opts;
   if ('object' == typeof host) {
     // >= v0.11.x API
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/package.json b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/package.json
index 81950940bbdd6a..e2041315371230 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/package.json
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/package.json
@@ -1,7 +1,8 @@
 {
   "_from": "agent-base@2",
-  "_id": "agent-base@2.0.1",
-  "_integrity": "sha1-vY+ehqjrIh//oHvRS+/VXfFCgV4=",
+  "_id": "agent-base@2.1.1",
+  "_inBundle": false,
+  "_integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
   "_location": "/pacote/make-fetch-happen/socks-proxy-agent/agent-base",
   "_phantomChildren": {},
   "_requested": {
@@ -17,9 +18,8 @@
   "_requiredBy": [
     "/pacote/make-fetch-happen/socks-proxy-agent"
   ],
-  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
-  "_shasum": "bd8f9e86a8eb221fffa07bd14befd55df142815e",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+  "_shasum": "d6de10d5af6132d5bd692427d46fc538539094c7",
   "_spec": "agent-base@2",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent",
   "author": {
@@ -27,7 +27,6 @@
     "email": "nathan@tootallnate.net",
     "url": "http://n8.io/"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/TooTallNate/node-agent-base/issues"
   },
@@ -39,7 +38,8 @@
   "deprecated": false,
   "description": "Turn a function into an `http.Agent` instance",
   "devDependencies": {
-    "mocha": "2"
+    "mocha": "2",
+    "ws": "0.8.0"
   },
   "homepage": "https://github.com/TooTallNate/node-agent-base#readme",
   "keywords": [
@@ -52,8 +52,6 @@
   "license": "MIT",
   "main": "agent.js",
   "name": "agent-base",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/TooTallNate/node-agent-base.git"
@@ -61,5 +59,5 @@
   "scripts": {
     "test": "mocha --reporter spec"
   },
-  "version": "2.0.1"
+  "version": "2.1.1"
 }
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/test/test.js b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/test/test.js
index f87d308f8e65a2..7d8dee66ce902b 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/test/test.js
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/node_modules/agent-base/test/test.js
@@ -9,13 +9,45 @@ var net = require('net');
 var tls = require('tls');
 var http = require('http');
 var https = require('https');
+var WebSocket = require('ws');
 var assert = require('assert');
 var events = require('events');
+var inherits = require('util').inherits;
+var semver = require('semver');
 var Agent = require('../');
 
 describe('Agent', function () {
+  describe('subclass', function () {
+    it('should be subclassable', function (done) {
+      function MyAgent () {
+        Agent.call(this);
+      }
+      inherits(MyAgent, Agent);
+
+      MyAgent.prototype.callback = function (req, opts, fn) {
+        assert.equal(req.path, '/foo');
+        assert.equal(req.getHeader('host'), '127.0.0.1:1234');
+        assert.equal(opts.secureEndpoint, true);
+        done();
+      };
+
+      var info = url.parse('https://127.0.0.1:1234/foo');
+      info.agent = new MyAgent;
+      https.get(info);
+    });
+  });
   describe('"error" event', function () {
-    it('should be invoked on `http.ClientRequest` instance if passed to callback function on the first tick', function (done) {
+    it('should be invoked on `http.ClientRequest` instance if `callback()` has not been defined', function (done) {
+      var agent = new Agent();
+      var info = url.parse('http://127.0.0.1/foo');
+      info.agent = agent;
+      var req = http.get(info);
+      req.on('error', function (err) {
+        assert.equal('"agent-base" has no default implementation, you must subclass and override `callback()`', err.message);
+        done();
+      });
+    });
+    it('should be invoked on `http.ClientRequest` instance if Error passed to callback function on the first tick', function (done) {
       var agent = new Agent(function (req, opts, fn) {
         fn(new Error('is this caught?'));
       });
@@ -27,7 +59,7 @@ describe('Agent', function () {
         done();
       });
     });
-    it('should be invoked on `http.ClientRequest` instance if passed to callback function after the first tick', function (done) {
+    it('should be invoked on `http.ClientRequest` instance if Error passed to callback function after the first tick', function (done) {
       var agent = new Agent(function (req, opts, fn) {
         setTimeout(function () {
           fn(new Error('is this caught?'));
@@ -54,6 +86,10 @@ describe('Agent', function () {
         done();
       };
 
+      // needed for `http` module in Node.js 4
+      stream.cork = function () {
+      };
+
       var opts = {
         method: 'GET',
         host: '127.0.0.1',
@@ -298,3 +334,118 @@ describe('"https" module', function () {
     });
   });
 });
+
+describe('"ws" server', function () {
+  var wss;
+  var server;
+  var port;
+
+  // setup test HTTP server
+  before(function (done) {
+    server = http.createServer()
+    wss = new WebSocket.Server({ server: server });
+    server.listen(0, function () {
+      port = server.address().port;
+      done();
+    });
+  });
+
+  // shut down test HTTP server
+  after(function (done) {
+    server.once('close', function () {
+      done();
+    });
+    server.close();
+  });
+
+  it('should work for basic WebSocket connections', function (done) {
+    function onconnection(ws) {
+      ws.on('message', function (data) {
+        assert.equal('ping', data);
+        ws.send('pong');
+      });
+    }
+    wss.on('connection', onconnection);
+
+    var agent = new Agent(function (req, opts, fn) {
+      var socket = net.connect(opts);
+      fn(null, socket);
+    });
+
+    var client = new WebSocket('ws://127.0.0.1:' + port + '/', {
+      agent: agent
+    });
+
+    client.on('open', function () {
+      client.send('ping');
+    });
+
+    client.on('message', function (data) {
+      assert.equal('pong', data);
+      client.close();
+      wss.removeListener('connection', onconnection);
+      done();
+    });
+  });
+
+});
+
+describe('"wss" server', function () {
+  var wss;
+  var server;
+  var port;
+
+  // setup test HTTP server
+  before(function (done) {
+    var options = {
+      key: fs.readFileSync(__dirname + '/ssl-cert-snakeoil.key'),
+      cert: fs.readFileSync(__dirname + '/ssl-cert-snakeoil.pem')
+    };
+    server = https.createServer(options);
+    wss = new WebSocket.Server({ server: server });
+    server.listen(0, function () {
+      port = server.address().port;
+      done();
+    });
+  });
+
+  // shut down test HTTP server
+  after(function (done) {
+    server.once('close', function () {
+      done();
+    });
+    server.close();
+  });
+
+  it('should work for secure WebSocket connections', function (done) {
+    function onconnection(ws) {
+      ws.on('message', function (data) {
+        assert.equal('ping', data);
+        ws.send('pong');
+      });
+    }
+    wss.on('connection', onconnection);
+
+    var agent = new Agent(function (req, opts, fn) {
+      var socket = tls.connect(opts);
+      fn(null, socket);
+    });
+
+    var client = new WebSocket('wss://127.0.0.1:' + port + '/', {
+      agent: agent,
+      rejectUnauthorized: false
+    });
+
+    client.on('open', function () {
+      client.send('ping');
+    });
+
+    client.on('message', function (data) {
+      assert.equal('pong', data);
+      client.close();
+      wss.removeListener('connection', onconnection);
+      done();
+    });
+  });
+
+});
diff --git a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/package.json b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/package.json
index 8b8e2cd878d5ec..37607223547a3a 100644
--- a/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/package.json
+++ b/deps/npm/node_modules/pacote/node_modules/make-fetch-happen/package.json
@@ -1,28 +1,28 @@
 {
-  "_from": "make-fetch-happen@^2.4.9",
-  "_id": "make-fetch-happen@2.4.9",
+  "_from": "make-fetch-happen@^2.4.11",
+  "_id": "make-fetch-happen@2.4.11",
   "_inBundle": false,
-  "_integrity": "sha512-/qh6T1E2gBD31bhutxeFehcHDwbBJJ7F+7w8bNAzPbacqfTwEpeo7W5SVQqciCSfNex51SjnEyw1XuK4zDn+Fw==",
+  "_integrity": "sha512-3dbl9CVS9Y0hqVzcD5HBYnaNUGw3XWpmeTqGT6ACRrmKS7WKwSDfv5+Gd1K0X/Mt52hsvZwtOH8hrNIulYkhag==",
   "_location": "/pacote/make-fetch-happen",
   "_phantomChildren": {
-    "safe-buffer": "5.0.1"
+    "safe-buffer": "5.1.0"
   },
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "make-fetch-happen@^2.4.9",
+    "raw": "make-fetch-happen@^2.4.11",
     "name": "make-fetch-happen",
     "escapedName": "make-fetch-happen",
-    "rawSpec": "^2.4.9",
+    "rawSpec": "^2.4.11",
     "saveSpec": null,
-    "fetchSpec": "^2.4.9"
+    "fetchSpec": "^2.4.11"
   },
   "_requiredBy": [
     "/pacote"
   ],
-  "_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.9.tgz",
-  "_shasum": "245b799e35da3ec05a45e6ef31f9c34df7d1e0c1",
-  "_spec": "make-fetch-happen@^2.4.9",
+  "_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.11.tgz",
+  "_shasum": "0b29967da2dc995e88f778dd0c673855ec7613e3",
+  "_spec": "make-fetch-happen@^2.4.11",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote",
   "author": {
     "name": "Kat Marchán",
@@ -34,7 +34,7 @@
   "bundleDependencies": false,
   "dependencies": {
     "agentkeepalive": "^3.1.0",
-    "cacache": "^9.2.4",
+    "cacache": "^9.2.7",
     "http-cache-semantics": "^3.7.3",
     "http-proxy-agent": "^1.0.0",
     "https-proxy-agent": "^1.0.0",
@@ -42,8 +42,8 @@
     "mississippi": "^1.2.0",
     "node-fetch-npm": "^2.0.1",
     "promise-retry": "^1.1.1",
-    "socks-proxy-agent": "^2.0.0",
-    "ssri": "^4.1.3"
+    "socks-proxy-agent": "^2.1.0",
+    "ssri": "^4.1.5"
   },
   "deprecated": false,
   "description": "Opinionated, caching, retrying fetch client",
@@ -52,13 +52,13 @@
     "mkdirp": "^0.5.1",
     "nock": "^9.0.6",
     "npmlog": "^4.1.0",
-    "nyc": "^10.3.2",
+    "nyc": "^11.0.2",
     "rimraf": "^2.5.4",
-    "safe-buffer": "^5.0.1",
+    "safe-buffer": "^5.1.0",
     "standard": "^10.0.1",
     "standard-version": "^4.0.0",
     "tacks": "^1.2.6",
-    "tap": "^10.2.0",
+    "tap": "^10.3.3",
     "weallbehave": "^1.0.0",
     "weallcontribute": "^1.0.7"
   },
@@ -92,5 +92,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "2.4.9"
+  "version": "2.4.11"
 }
diff --git a/deps/npm/node_modules/pacote/package.json b/deps/npm/node_modules/pacote/package.json
index c27683d0d20778..44e5b7eca0ab1e 100644
--- a/deps/npm/node_modules/pacote/package.json
+++ b/deps/npm/node_modules/pacote/package.json
@@ -1,40 +1,40 @@
 {
-  "_from": "pacote@2.7.21",
-  "_id": "pacote@2.7.21",
+  "_from": "pacote@2.7.30",
+  "_id": "pacote@2.7.30",
   "_inBundle": false,
-  "_integrity": "sha512-ksTHJiAkJxLmcOGxO6iGMk1cVMTTtIC051ZUqvWbckICIhzScOSBgGRBc4CHRhd62NuqAL082RuOOmb1Mi6o6Q==",
+  "_integrity": "sha512-xFxozbxytemyfNPZmkL2seTD15mozK8ghov9npjBO4YTs3SnA8I55aiN94eZJ+XhLKzbN8yXqQMr9ti4c3WIDw==",
   "_location": "/pacote",
   "_phantomChildren": {
-    "cacache": "9.2.5",
+    "cacache": "9.2.8",
     "chownr": "1.0.1",
     "lru-cache": "4.0.2",
     "mississippi": "1.3.0",
     "mkdirp": "0.5.1",
-    "npm-package-arg": "5.0.1",
+    "npm-package-arg": "5.1.1",
     "once": "1.4.0",
-    "readable-stream": "2.2.9",
+    "readable-stream": "2.2.10",
     "retry": "0.10.1",
-    "safe-buffer": "5.0.1",
+    "safe-buffer": "5.1.0",
     "semver": "5.3.0",
-    "ssri": "4.1.3"
+    "ssri": "4.1.5"
   },
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "pacote@2.7.21",
+    "raw": "pacote@2.7.30",
     "name": "pacote",
     "escapedName": "pacote",
-    "rawSpec": "2.7.21",
+    "rawSpec": "2.7.30",
     "saveSpec": null,
-    "fetchSpec": "2.7.21"
+    "fetchSpec": "2.7.30"
   },
   "_requiredBy": [
     "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.21.tgz",
-  "_shasum": "e909e8a0559940053300e1127297e92a1302d244",
-  "_spec": "pacote@2.7.21",
+  "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.30.tgz",
+  "_shasum": "f31678e0a40161b592498688c1e2c8d7918eac7e",
+  "_spec": "pacote@2.7.30",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Kat Marchán",
@@ -56,22 +56,22 @@
   ],
   "dependencies": {
     "bluebird": "^3.5.0",
-    "cacache": "^9.2.5",
+    "cacache": "^9.2.8",
     "glob": "^7.1.2",
     "lru-cache": "^4.0.2",
-    "make-fetch-happen": "^2.4.9",
+    "make-fetch-happen": "^2.4.11",
     "minimatch": "^3.0.4",
     "mississippi": "^1.2.0",
     "normalize-package-data": "^2.3.6",
-    "npm-package-arg": "^5.0.0",
+    "npm-package-arg": "^5.1.1",
     "npm-pick-manifest": "^1.0.3",
     "osenv": "^0.1.4",
     "promise-inflight": "^1.0.1",
     "promise-retry": "^1.1.1",
     "protoduck": "^4.0.0",
-    "safe-buffer": "^5.0.1",
+    "safe-buffer": "^5.1.0",
     "semver": "^5.3.0",
-    "ssri": "^4.1.3",
+    "ssri": "^4.1.5",
     "tar-fs": "^1.15.1",
     "tar-stream": "^1.5.4",
     "unique-filename": "^1.1.0",
@@ -83,13 +83,13 @@
     "mkdirp": "^0.5.1",
     "nock": "^9.0.13",
     "npmlog": "^4.1.0",
-    "nyc": "^10.3.2",
+    "nyc": "^11.0.2",
     "require-inject": "^1.4.0",
     "rimraf": "^2.5.4",
     "standard": "^10.0.1",
     "standard-version": "^4.0.0",
     "tacks": "^1.2.6",
-    "tap": "^10.2.0",
+    "tap": "^10.3.3",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.7"
   },
@@ -120,5 +120,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "2.7.21"
+  "version": "2.7.30"
 }
diff --git a/deps/npm/node_modules/read-package-tree/README.md b/deps/npm/node_modules/read-package-tree/README.md
index b3cda81f7fdcf4..d2248f82b55a9e 100644
--- a/deps/npm/node_modules/read-package-tree/README.md
+++ b/deps/npm/node_modules/read-package-tree/README.md
@@ -35,7 +35,7 @@ mutate package.json data objects (beyond what
 doesn't limit its search to include/exclude `devDependencies`, or
 anything else.
 
-Just follows the links in the `node_modules` heirarchy and reads the
+Just follows the links in the `node_modules` hierarchy and reads the
 package.json files it finds therein.
 
 ## Symbolic Links
diff --git a/deps/npm/node_modules/read-package-tree/package.json b/deps/npm/node_modules/read-package-tree/package.json
index f9fa36224131bf..55513a93947088 100644
--- a/deps/npm/node_modules/read-package-tree/package.json
+++ b/deps/npm/node_modules/read-package-tree/package.json
@@ -1,33 +1,33 @@
 {
-  "_from": "read-package-tree@~5.1.5",
-  "_id": "read-package-tree@5.1.5",
-  "_integrity": "sha1-rOfmOBx2hPlwqqmPx8XStmat2rY=",
+  "_from": "read-package-tree@5.1.6",
+  "_id": "read-package-tree@5.1.6",
+  "_inBundle": false,
+  "_integrity": "sha512-FCX1aT3GWyY658wzDICef4p+n0dB+ENRct8E/Qyvppj6xVpOYerBHfUu7OP5Rt1/393Tdglguf5ju5DEX4wZNg==",
   "_location": "/read-package-tree",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "version",
     "registry": true,
-    "raw": "read-package-tree@~5.1.5",
+    "raw": "read-package-tree@5.1.6",
     "name": "read-package-tree",
     "escapedName": "read-package-tree",
-    "rawSpec": "~5.1.5",
+    "rawSpec": "5.1.6",
     "saveSpec": null,
-    "fetchSpec": "~5.1.5"
+    "fetchSpec": "5.1.6"
   },
   "_requiredBy": [
+    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz",
-  "_shasum": "ace7e6381c7684f970aaa98fc7c5d2b666addab6",
-  "_shrinkwrap": null,
-  "_spec": "read-package-tree@~5.1.5",
-  "_where": "/Users/zkat/Documents/code/npm",
+  "_resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz",
+  "_shasum": "4f03e83d0486856fb60d97c94882841c2a7b1b7a",
+  "_spec": "read-package-tree@5.1.6",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/npm/read-package-tree/issues"
   },
@@ -42,9 +42,10 @@
   "deprecated": false,
   "description": "Read the contents of node_modules.",
   "devDependencies": {
-    "archy": "0",
+    "archy": "^1.0.0",
+    "mkdirp": "^0.5.1",
     "tacks": "^1.2.1",
-    "tap": "^1.2.0"
+    "tap": "^6.3.0"
   },
   "directories": {
     "test": "test"
@@ -56,8 +57,6 @@
   "license": "ISC",
   "main": "rpt.js",
   "name": "read-package-tree",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/read-package-tree.git"
@@ -65,5 +64,5 @@
   "scripts": {
     "test": "tap test/*.js"
   },
-  "version": "5.1.5"
+  "version": "5.1.6"
 }
diff --git a/deps/npm/node_modules/read-package-tree/rpt.js b/deps/npm/node_modules/read-package-tree/rpt.js
index 8a6a89b085a9ba..96f152012090e5 100644
--- a/deps/npm/node_modules/read-package-tree/rpt.js
+++ b/deps/npm/node_modules/read-package-tree/rpt.js
@@ -37,25 +37,27 @@ rpt.Node = Node
 rpt.Link = Link
 
 var ID = 0
-function Node (pkg, logical, physical, er, cache) {
-  if (cache[physical]) return cache[physical]
-
+function Node (pkg, logical, physical, er, cache, fromLink) {
   if (!(this instanceof Node)) {
     return new Node(pkg, logical, physical, er, cache)
   }
 
-  cache[physical] = this
+  var node = cache[physical] || this
+  if (fromLink && cache[physical]) return cache[physical]
 
-  debug(this.constructor.name, dpath(physical), pkg && pkg._id)
+  debug(node.constructor.name, dpath(physical), pkg && pkg._id)
 
-  this.id = ID++
-  this.package = pkg || {}
-  this.path = logical
-  this.realpath = physical
-  this.parent = null
-  this.isLink = false
-  this.children = []
-  this.error = er
+  node.path = logical
+  node.realpath = physical
+  node.error = er
+  if (!cache[physical]) {
+    node.id = ID++
+    node.package = pkg || {}
+    node.parent = null
+    node.isLink = false
+    node.children = []
+  }
+  return cache[physical] = node
 }
 
 Node.prototype.package = null
@@ -80,7 +82,7 @@ function Link (pkg, logical, physical, realpath, er, cache) {
   this.realpath = realpath
   this.package = pkg || {}
   this.parent = null
-  this.target = new Node(this.package, logical, realpath, er, cache)
+  this.target = new Node(this.package, logical, realpath, er, cache, true)
   this.isLink = true
   this.children = this.target.children
   this.error = er
diff --git a/deps/npm/node_modules/readable-stream/.travis.yml b/deps/npm/node_modules/readable-stream/.travis.yml
index 76b4b0cfcb0765..0c5d2bc262d399 100644
--- a/deps/npm/node_modules/readable-stream/.travis.yml
+++ b/deps/npm/node_modules/readable-stream/.travis.yml
@@ -2,26 +2,40 @@ sudo: false
 language: node_js
 before_install:
   - npm install -g npm@2
-  - npm install -g npm
+  - test $NPM_LEGACY && npm install -g npm@latest-3 || npm install npm -g
 notifications:
   email: false
 matrix:
   fast_finish: true
   include:
   - node_js: '0.8'
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: '0.10'
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: '0.11'
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: '0.12'
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: 1
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: 2
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: 3
-    env: TASK=test
+    env:
+      - TASK=test
+      - NPM_LEGACY=true
   - node_js: 4
     env: TASK=test
   - node_js: 5
@@ -30,17 +44,19 @@ matrix:
     env: TASK=test
   - node_js: 7
     env: TASK=test
-  - node_js: 5
+  - node_js: 8
+    env: TASK=test
+  - node_js: 6
     env: TASK=browser BROWSER_NAME=ie BROWSER_VERSION="9..latest"
-  - node_js: 5
+  - node_js: 6
     env: TASK=browser BROWSER_NAME=opera BROWSER_VERSION="11..latest"
-  - node_js: 5
+  - node_js: 6
     env: TASK=browser BROWSER_NAME=chrome BROWSER_VERSION="-3..latest"
-  - node_js: 5
+  - node_js: 6
     env: TASK=browser BROWSER_NAME=firefox BROWSER_VERSION="-3..latest"
-  - node_js: 5
+  - node_js: 6
     env: TASK=browser BROWSER_NAME=safari BROWSER_VERSION="5..latest"
-  - node_js: 5
+  - node_js: 6
     env: TASK=browser BROWSER_NAME=microsoftedge BROWSER_VERSION=latest
 script: "npm run $TASK"
 env:
diff --git a/deps/npm/node_modules/readable-stream/README.md b/deps/npm/node_modules/readable-stream/README.md
index 8b6e5d39bd3944..3024d77c69567a 100644
--- a/deps/npm/node_modules/readable-stream/README.md
+++ b/deps/npm/node_modules/readable-stream/README.md
@@ -18,7 +18,7 @@ npm install --save readable-stream
 This package is a mirror of the Streams2 and Streams3 implementations in
 Node-core.
 
-Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v7.8.0/docs/api/).
+Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v7.10.0/docs/api/stream.html).
 
 If you want to guarantee a stable streams base, regardless of what version of
 Node you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *"stream"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/readable-stream/lib/_stream_readable.js
index b19b2088b95776..a01012e3cfbb70 100644
--- a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js
+++ b/deps/npm/node_modules/readable-stream/lib/_stream_readable.js
@@ -28,9 +28,8 @@ var EElistenerCount = function (emitter, type) {
 var Stream = require('./internal/streams/stream');
 /**/
 
-var Buffer = require('buffer').Buffer;
 /**/
-var bufferShim = require('buffer-shims');
+var Buffer = require('safe-buffer').Buffer;
 /**/
 
 /**/
@@ -163,7 +162,7 @@ Readable.prototype.push = function (chunk, encoding) {
   if (!state.objectMode && typeof chunk === 'string') {
     encoding = encoding || state.defaultEncoding;
     if (encoding !== state.encoding) {
-      chunk = bufferShim.from(chunk, encoding);
+      chunk = Buffer.from(chunk, encoding);
       encoding = '';
     }
   }
@@ -483,7 +482,7 @@ Readable.prototype.pipe = function (dest, pipeOpts) {
 
   var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr;
 
-  var endFn = doEnd ? onend : cleanup;
+  var endFn = doEnd ? onend : unpipe;
   if (state.endEmitted) processNextTick(endFn);else src.once('end', endFn);
 
   dest.on('unpipe', onunpipe);
@@ -516,7 +515,7 @@ Readable.prototype.pipe = function (dest, pipeOpts) {
     dest.removeListener('error', onerror);
     dest.removeListener('unpipe', onunpipe);
     src.removeListener('end', onend);
-    src.removeListener('end', cleanup);
+    src.removeListener('end', unpipe);
     src.removeListener('data', ondata);
 
     cleanedUp = true;
@@ -873,7 +872,7 @@ function copyFromBufferString(n, list) {
 // This function is designed to be inlinable, so please take care when making
 // changes to the function body.
 function copyFromBuffer(n, list) {
-  var ret = bufferShim.allocUnsafe(n);
+  var ret = Buffer.allocUnsafe(n);
   var p = list.head;
   var c = 1;
   p.data.copy(ret);
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/readable-stream/lib/_stream_writable.js
index 15db0386836c84..e9701f500727cf 100644
--- a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js
+++ b/deps/npm/node_modules/readable-stream/lib/_stream_writable.js
@@ -35,9 +35,8 @@ var internalUtil = {
 var Stream = require('./internal/streams/stream');
 /**/
 
-var Buffer = require('buffer').Buffer;
 /**/
-var bufferShim = require('buffer-shims');
+var Buffer = require('safe-buffer').Buffer;
 /**/
 
 util.inherits(Writable, Stream);
@@ -293,7 +292,7 @@ Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
 
 function decodeChunk(state, chunk, encoding) {
   if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') {
-    chunk = bufferShim.from(chunk, encoding);
+    chunk = Buffer.from(chunk, encoding);
   }
   return chunk;
 }
diff --git a/deps/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js b/deps/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js
index e4bfcf02dc8bbf..82598c852179cb 100644
--- a/deps/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js
+++ b/deps/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var Buffer = require('buffer').Buffer;
 /**/
-var bufferShim = require('buffer-shims');
+
+var Buffer = require('safe-buffer').Buffer;
 /**/
 
 module.exports = BufferList;
@@ -50,9 +50,9 @@ BufferList.prototype.join = function (s) {
 };
 
 BufferList.prototype.concat = function (n) {
-  if (this.length === 0) return bufferShim.alloc(0);
+  if (this.length === 0) return Buffer.alloc(0);
   if (this.length === 1) return this.head.data;
-  var ret = bufferShim.allocUnsafe(n >>> 0);
+  var ret = Buffer.allocUnsafe(n >>> 0);
   var p = this.head;
   var i = 0;
   while (p) {
diff --git a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/index.js b/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/index.js
deleted file mode 100644
index 1cab4c05e1ac2a..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-'use strict';
-
-var buffer = require('buffer');
-var Buffer = buffer.Buffer;
-var SlowBuffer = buffer.SlowBuffer;
-var MAX_LEN = buffer.kMaxLength || 2147483647;
-exports.alloc = function alloc(size, fill, encoding) {
-  if (typeof Buffer.alloc === 'function') {
-    return Buffer.alloc(size, fill, encoding);
-  }
-  if (typeof encoding === 'number') {
-    throw new TypeError('encoding must not be number');
-  }
-  if (typeof size !== 'number') {
-    throw new TypeError('size must be a number');
-  }
-  if (size > MAX_LEN) {
-    throw new RangeError('size is too large');
-  }
-  var enc = encoding;
-  var _fill = fill;
-  if (_fill === undefined) {
-    enc = undefined;
-    _fill = 0;
-  }
-  var buf = new Buffer(size);
-  if (typeof _fill === 'string') {
-    var fillBuf = new Buffer(_fill, enc);
-    var flen = fillBuf.length;
-    var i = -1;
-    while (++i < size) {
-      buf[i] = fillBuf[i % flen];
-    }
-  } else {
-    buf.fill(_fill);
-  }
-  return buf;
-}
-exports.allocUnsafe = function allocUnsafe(size) {
-  if (typeof Buffer.allocUnsafe === 'function') {
-    return Buffer.allocUnsafe(size);
-  }
-  if (typeof size !== 'number') {
-    throw new TypeError('size must be a number');
-  }
-  if (size > MAX_LEN) {
-    throw new RangeError('size is too large');
-  }
-  return new Buffer(size);
-}
-exports.from = function from(value, encodingOrOffset, length) {
-  if (typeof Buffer.from === 'function' && (!global.Uint8Array || Uint8Array.from !== Buffer.from)) {
-    return Buffer.from(value, encodingOrOffset, length);
-  }
-  if (typeof value === 'number') {
-    throw new TypeError('"value" argument must not be a number');
-  }
-  if (typeof value === 'string') {
-    return new Buffer(value, encodingOrOffset);
-  }
-  if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) {
-    var offset = encodingOrOffset;
-    if (arguments.length === 1) {
-      return new Buffer(value);
-    }
-    if (typeof offset === 'undefined') {
-      offset = 0;
-    }
-    var len = length;
-    if (typeof len === 'undefined') {
-      len = value.byteLength - offset;
-    }
-    if (offset >= value.byteLength) {
-      throw new RangeError('\'offset\' is out of bounds');
-    }
-    if (len > value.byteLength - offset) {
-      throw new RangeError('\'length\' is out of bounds');
-    }
-    return new Buffer(value.slice(offset, offset + len));
-  }
-  if (Buffer.isBuffer(value)) {
-    var out = new Buffer(value.length);
-    value.copy(out, 0, 0, value.length);
-    return out;
-  }
-  if (value) {
-    if (Array.isArray(value) || (typeof ArrayBuffer !== 'undefined' && value.buffer instanceof ArrayBuffer) || 'length' in value) {
-      return new Buffer(value);
-    }
-    if (value.type === 'Buffer' && Array.isArray(value.data)) {
-      return new Buffer(value.data);
-    }
-  }
-
-  throw new TypeError('First argument must be a string, Buffer, ' + 'ArrayBuffer, Array, or array-like object.');
-}
-exports.allocUnsafeSlow = function allocUnsafeSlow(size) {
-  if (typeof Buffer.allocUnsafeSlow === 'function') {
-    return Buffer.allocUnsafeSlow(size);
-  }
-  if (typeof size !== 'number') {
-    throw new TypeError('size must be a number');
-  }
-  if (size >= MAX_LEN) {
-    throw new RangeError('size is too large');
-  }
-  return new SlowBuffer(size);
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/license.md b/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/license.md
deleted file mode 100644
index 01cfaefe2fcaff..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/license.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2016 Calvin Metcalf
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.**
diff --git a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/package.json b/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/package.json
deleted file mode 100644
index 8e4af6603bb26b..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "_from": "buffer-shims@~1.0.0",
-  "_id": "buffer-shims@1.0.0",
-  "_integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-  "_location": "/readable-stream/buffer-shims",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "buffer-shims@~1.0.0",
-    "name": "buffer-shims",
-    "escapedName": "buffer-shims",
-    "rawSpec": "~1.0.0",
-    "saveSpec": null,
-    "fetchSpec": "~1.0.0"
-  },
-  "_requiredBy": [
-    "/readable-stream",
-    "/readable-stream/string_decoder"
-  ],
-  "_resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-  "_shasum": "9978ce317388c649ad8793028c3477ef044a8b51",
-  "_shrinkwrap": null,
-  "_spec": "buffer-shims@~1.0.0",
-  "_where": "/Users/zkat/Documents/code/npm/node_modules/readable-stream",
-  "bin": null,
-  "bugs": {
-    "url": "https://github.com/calvinmetcalf/buffer-shims/issues"
-  },
-  "bundleDependencies": false,
-  "dependencies": {},
-  "deprecated": false,
-  "description": "some shims for node buffers",
-  "devDependencies": {
-    "tape": "^4.5.1"
-  },
-  "files": [
-    "index.js"
-  ],
-  "homepage": "https://github.com/calvinmetcalf/buffer-shims#readme",
-  "license": "MIT",
-  "main": "index.js",
-  "name": "buffer-shims",
-  "optionalDependencies": {},
-  "peerDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/calvinmetcalf/buffer-shims.git"
-  },
-  "scripts": {
-    "test": "tape test/*.js"
-  },
-  "version": "1.0.0"
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/readme.md b/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/readme.md
deleted file mode 100644
index 7ea6475e284e8e..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/buffer-shims/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-buffer-shims
-===
-
-functions to make sure the new buffer methods work in older browsers.
-
-```js
-var bufferShim = require('buffer-shims');
-bufferShim.from('foo');
-bufferShim.alloc(9, 'cafeface', 'hex');
-bufferShim.allocUnsafe(15);
-bufferShim.allocUnsafeSlow(21);
-```
-
-should just use the original  in newer nodes and on older nodes uses fallbacks.
-
-Known Issues
-===
-- this does not patch the buffer object, only the constructor stuff
-- it's actually a polyfill
-
-![](https://i.imgur.com/zxII3jJ.gif)
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
index 13d827d8947e43..dc3a2d2160b900 100644
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
+++ b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
@@ -7,8 +7,6 @@
 [![NPM](https://nodei.co/npm-dl/string_decoder.png?&months=6&height=3)](https://nodei.co/npm/string_decoder/)
 
 
-[![Sauce Test Status](https://saucelabs.com/browser-matrix/string_decoder.svg)](https://saucelabs.com/u/string_decoder)
-
 ```bash
 npm install --save string_decoder
 ```
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js
index 696d7ab6136a60..26fb94c349ac4f 100644
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js
+++ b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var Buffer = require('buffer').Buffer;
-var bufferShim = require('buffer-shims');
+var Buffer = require('safe-buffer').Buffer;
 
 var isEncoding = Buffer.isEncoding || function (encoding) {
   encoding = '' + encoding;
@@ -78,7 +77,7 @@ function StringDecoder(encoding) {
   }
   this.lastNeed = 0;
   this.lastTotal = 0;
-  this.lastChar = bufferShim.allocUnsafe(nb);
+  this.lastChar = Buffer.allocUnsafe(nb);
 }
 
 StringDecoder.prototype.write = function (buf) {
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
index fb2958ba2cfcfa..cb5868ecedc40a 100644
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
+++ b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
@@ -1,7 +1,8 @@
 {
   "_from": "string_decoder@~1.0.0",
-  "_id": "string_decoder@1.0.0",
-  "_integrity": "sha1-8G9BFXtmTYYGn4S9vcmw2KsoFmc=",
+  "_id": "string_decoder@1.0.1",
+  "_inBundle": false,
+  "_integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
   "_location": "/readable-stream/string_decoder",
   "_phantomChildren": {},
   "_requested": {
@@ -17,18 +18,16 @@
   "_requiredBy": [
     "/readable-stream"
   ],
-  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz",
-  "_shasum": "f06f41157b664d86069f84bdbdc9b0d8ab281667",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+  "_shasum": "62e200f039955a6810d8df0a33ffc0f013662d98",
   "_spec": "string_decoder@~1.0.0",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/readable-stream",
-  "bin": null,
   "bugs": {
     "url": "https://github.com/rvagg/string_decoder/issues"
   },
   "bundleDependencies": false,
   "dependencies": {
-    "buffer-shims": "~1.0.0"
+    "safe-buffer": "^5.0.1"
   },
   "deprecated": false,
   "description": "The string_decoder module from Node core",
@@ -46,8 +45,6 @@
   "license": "MIT",
   "main": "lib/string_decoder.js",
   "name": "string_decoder",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/rvagg/string_decoder.git"
@@ -55,5 +52,5 @@
   "scripts": {
     "test": "tap test/parallel/*.js"
   },
-  "version": "1.0.0"
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/readable-stream/package.json b/deps/npm/node_modules/readable-stream/package.json
index d1bf299d055bb2..5308555f496301 100644
--- a/deps/npm/node_modules/readable-stream/package.json
+++ b/deps/npm/node_modules/readable-stream/package.json
@@ -1,20 +1,24 @@
 {
-  "_from": "readable-stream@~2.2.9",
-  "_id": "readable-stream@2.2.9",
-  "_integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+  "_from": "readable-stream@2.2.10",
+  "_id": "readable-stream@2.2.10",
+  "_inBundle": false,
+  "_integrity": "sha512-HQEnnoV404e0EtwB9yNiuk2tJ+egeVC8Y9QBAxzDg8DBJt4BzRp+yQuIb/t3FIWkSTmIi+sgx7yVv/ZM0GNoqw==",
   "_location": "/readable-stream",
-  "_phantomChildren": {},
+  "_phantomChildren": {
+    "safe-buffer": "5.0.1"
+  },
   "_requested": {
-    "type": "range",
+    "type": "version",
     "registry": true,
-    "raw": "readable-stream@~2.2.9",
+    "raw": "readable-stream@2.2.10",
     "name": "readable-stream",
     "escapedName": "readable-stream",
-    "rawSpec": "~2.2.9",
+    "rawSpec": "2.2.10",
     "saveSpec": null,
-    "fetchSpec": "~2.2.9"
+    "fetchSpec": "2.2.10"
   },
   "_requiredBy": [
+    "#USER",
     "/",
     "/fs-write-stream-atomic",
     "/mississippi/concat-stream",
@@ -34,12 +38,10 @@
     "/tap/tap-mocha-reporter",
     "/tap/tap-parser"
   ],
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-  "_shasum": "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8",
-  "_shrinkwrap": null,
-  "_spec": "readable-stream@~2.2.9",
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
+  "_shasum": "effe72bb7c884c0dd335e2379d526196d9d011ee",
+  "_spec": "readable-stream@2.2.10",
   "_where": "/Users/zkat/Documents/code/npm",
-  "bin": null,
   "browser": {
     "util": false,
     "./readable.js": "./readable-browser.js",
@@ -52,11 +54,11 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "buffer-shims": "~1.0.0",
     "core-util-is": "~1.0.0",
     "inherits": "~2.0.1",
     "isarray": "~1.0.0",
     "process-nextick-args": "~1.0.6",
+    "safe-buffer": "^5.0.1",
     "string_decoder": "~1.0.0",
     "util-deprecate": "~1.0.1"
   },
@@ -85,8 +87,6 @@
       "lib/**.js"
     ]
   },
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/nodejs/readable-stream.git"
@@ -99,5 +99,5 @@
     "test": "tap test/parallel/*.js test/ours/*.js",
     "write-zuul": "printf \"ui: tape\nbrowsers:\n  - name: $BROWSER_NAME\n    version: $BROWSER_VERSION\n\">.zuul.yml"
   },
-  "version": "2.2.9"
+  "version": "2.2.10"
 }
diff --git a/deps/npm/node_modules/safe-buffer/README.md b/deps/npm/node_modules/safe-buffer/README.md
index 96eb387aa08586..e9a81afd0406f0 100644
--- a/deps/npm/node_modules/safe-buffer/README.md
+++ b/deps/npm/node_modules/safe-buffer/README.md
@@ -1,17 +1,20 @@
-# safe-buffer [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][npm-url]
+# safe-buffer [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
 
-#### Safer Node.js Buffer API
-
-**Use the new Node.js v6 Buffer APIs (`Buffer.from`, `Buffer.alloc`,
-`Buffer.allocUnsafe`, `Buffer.allocUnsafeSlow`) in Node.js v0.10, v0.12, v4.x, and v5.x.**
-
-**Uses the built-in implementations when available.**
-
-[travis-image]: https://img.shields.io/travis/feross/safe-buffer.svg
+[travis-image]: https://img.shields.io/travis/feross/safe-buffer/master.svg
 [travis-url]: https://travis-ci.org/feross/safe-buffer
 [npm-image]: https://img.shields.io/npm/v/safe-buffer.svg
 [npm-url]: https://npmjs.org/package/safe-buffer
 [downloads-image]: https://img.shields.io/npm/dm/safe-buffer.svg
+[downloads-url]: https://npmjs.org/package/safe-buffer
+[standard-image]: https://img.shields.io/badge/code_style-standard-brightgreen.svg
+[standard-url]: https://standardjs.com
+
+#### Safer Node.js Buffer API
+
+**Use the new Node.js Buffer APIs (`Buffer.from`, `Buffer.alloc`,
+`Buffer.allocUnsafe`, `Buffer.allocUnsafeSlow`) in all versions of Node.js.**
+
+**Uses the built-in implementation when available.**
 
 ## install
 
diff --git a/deps/npm/node_modules/safe-buffer/browser.js b/deps/npm/node_modules/safe-buffer/browser.js
deleted file mode 100644
index 0bd12027d30ff7..00000000000000
--- a/deps/npm/node_modules/safe-buffer/browser.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('buffer')
diff --git a/deps/npm/node_modules/safe-buffer/index.js b/deps/npm/node_modules/safe-buffer/index.js
index 74a7358ee82ac5..ea87b099d83dec 100644
--- a/deps/npm/node_modules/safe-buffer/index.js
+++ b/deps/npm/node_modules/safe-buffer/index.js
@@ -1,4 +1,6 @@
+/* eslint-disable node/no-deprecated-api */
 var buffer = require('buffer')
+var Buffer = buffer.Buffer
 
 if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
   module.exports = buffer
diff --git a/deps/npm/node_modules/safe-buffer/package.json b/deps/npm/node_modules/safe-buffer/package.json
index d866dd9580b6dc..8bce3da12596e7 100644
--- a/deps/npm/node_modules/safe-buffer/package.json
+++ b/deps/npm/node_modules/safe-buffer/package.json
@@ -1,34 +1,36 @@
 {
-  "_from": "safe-buffer@~5.0.1",
-  "_id": "safe-buffer@5.0.1",
+  "_from": "safe-buffer@latest",
+  "_id": "safe-buffer@5.1.0",
   "_inBundle": false,
-  "_integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+  "_integrity": "sha512-aSLEDudu6OoRr/2rU609gRmnYboRLxgDG1z9o2Q0os7236FwvcqIOO8r8U5JUEwivZOhDaKlFO4SbPTJYyBEyQ==",
   "_location": "/safe-buffer",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "tag",
     "registry": true,
-    "raw": "safe-buffer@~5.0.1",
+    "raw": "safe-buffer@latest",
     "name": "safe-buffer",
     "escapedName": "safe-buffer",
-    "rawSpec": "~5.0.1",
+    "rawSpec": "latest",
     "saveSpec": null,
-    "fetchSpec": "~5.0.1"
+    "fetchSpec": "latest"
   },
   "_requiredBy": [
     "#USER",
-    "/"
+    "/",
+    "/readable-stream",
+    "/readable-stream/string_decoder",
+    "/ssri"
   ],
-  "_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-  "_shasum": "d263ca54696cd8a306b5ca6551e92de57918fbe7",
-  "_spec": "safe-buffer@~5.0.1",
+  "_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
+  "_shasum": "fe4c8460397f9eaaaa58e73be46273408a45e223",
+  "_spec": "safe-buffer@latest",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
     "url": "http://feross.org"
   },
-  "browser": "./browser.js",
   "bugs": {
     "url": "https://github.com/feross/safe-buffer/issues"
   },
@@ -36,7 +38,7 @@
   "deprecated": false,
   "description": "Safer Node.js Buffer API",
   "devDependencies": {
-    "standard": "^7.0.0",
+    "standard": "*",
     "tape": "^4.0.0",
     "zuul": "^3.0.0"
   },
@@ -60,5 +62,5 @@
   "scripts": {
     "test": "standard && tape test.js"
   },
-  "version": "5.0.1"
+  "version": "5.1.0"
 }
diff --git a/deps/npm/node_modules/safe-buffer/test.js b/deps/npm/node_modules/safe-buffer/test.js
index 7da8ad761ee720..4925059c5c592d 100644
--- a/deps/npm/node_modules/safe-buffer/test.js
+++ b/deps/npm/node_modules/safe-buffer/test.js
@@ -1,3 +1,5 @@
+/* eslint-disable node/no-deprecated-api */
+
 var test = require('tape')
 var SafeBuffer = require('./').Buffer
 
diff --git a/deps/npm/node_modules/ssri/CHANGELOG.md b/deps/npm/node_modules/ssri/CHANGELOG.md
index 46a0093e00c366..c03bb4174eff96 100644
--- a/deps/npm/node_modules/ssri/CHANGELOG.md
+++ b/deps/npm/node_modules/ssri/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+
+## [4.1.5](https://github.com/zkat/ssri/compare/v4.1.4...v4.1.5) (2017-06-05)
+
+
+### Bug Fixes
+
+* **integrityStream:** stop crashing if opts.algorithms and opts.integrity have an algo mismatch ([fb1293e](https://github.com/zkat/ssri/commit/fb1293e))
+
+
+
+
+## [4.1.4](https://github.com/zkat/ssri/compare/v4.1.3...v4.1.4) (2017-05-31)
+
+
+### Bug Fixes
+
+* **node:** older versions of node[@4](https://github.com/4) do not support base64buffer string parsing ([513df4e](https://github.com/zkat/ssri/commit/513df4e))
+
+
+
 
 ## [4.1.3](https://github.com/zkat/ssri/compare/v4.1.2...v4.1.3) (2017-05-24)
 
diff --git a/deps/npm/node_modules/ssri/index.js b/deps/npm/node_modules/ssri/index.js
index f01986fa51b1bb..6ec0d73df6bab8 100644
--- a/deps/npm/node_modules/ssri/index.js
+++ b/deps/npm/node_modules/ssri/index.js
@@ -1,5 +1,7 @@
 'use strict'
 
+const Buffer = require('safe-buffer').Buffer
+
 const crypto = require('crypto')
 const Transform = require('stream').Transform
 
@@ -31,7 +33,7 @@ class Hash {
     this.options = rawOpts ? rawOpts.slice(1).split('?') : []
   }
   hexDigest () {
-    return this.digest && bufFrom(this.digest, 'base64').toString('hex')
+    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
   }
   toJSON () {
     return this.toString()
@@ -154,7 +156,7 @@ function fromHex (hexDigest, algorithm, opts) {
   : ''
   return parse(
     `${algorithm}-${
-      bufFrom(hexDigest, 'hex').toString('base64')
+      Buffer.from(hexDigest, 'hex').toString('base64')
     }${optString}`, opts
   )
 }
@@ -257,6 +259,7 @@ function integrityStream (opts) {
     const match = (
       // Integrity verification mode
       opts.integrity &&
+      newSri[algorithm] &&
       digests &&
       digests.find(hash => {
         return newSri[algorithm].find(newhash => {
@@ -332,7 +335,3 @@ function getPrioritizedHash (algo1, algo2) {
   ? algo1
   : algo2
 }
-
-function bufFrom (data, enc) {
-  return Buffer.from ? Buffer.from(data, enc) : new Buffer(data, enc)
-}
diff --git a/deps/npm/node_modules/ssri/package.json b/deps/npm/node_modules/ssri/package.json
index fae62d7c52961c..b004400f3801be 100644
--- a/deps/npm/node_modules/ssri/package.json
+++ b/deps/npm/node_modules/ssri/package.json
@@ -1,19 +1,19 @@
 {
-  "_from": "ssri@4.1.3",
-  "_id": "ssri@4.1.3",
+  "_from": "ssri@4.1.5",
+  "_id": "ssri@4.1.5",
   "_inBundle": false,
-  "_integrity": "sha512-vDXK4C5lxEMlMXyUvsaNAqyYkoMaScW8r6jUTg3uwUOMnvbMmNRSw3Cal0iiWHtMsQxga7NG4GShS0CKt3Pt1w==",
+  "_integrity": "sha512-TaLitc/pZH1UF8LCgZWdbssPiOUcPjBmIJsYJa+YltP77mY2qQ0Y2b+VS4C9RbZRH1GPMt4zckqqBd7GE/61ew==",
   "_location": "/ssri",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "ssri@4.1.3",
+    "raw": "ssri@4.1.5",
     "name": "ssri",
     "escapedName": "ssri",
-    "rawSpec": "4.1.3",
+    "rawSpec": "4.1.5",
     "saveSpec": null,
-    "fetchSpec": "4.1.3"
+    "fetchSpec": "4.1.5"
   },
   "_requiredBy": [
     "#USER",
@@ -23,9 +23,9 @@
     "/pacote",
     "/pacote/make-fetch-happen"
   ],
-  "_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.3.tgz",
-  "_shasum": "ec8b5585cbfc726a5f9aad829efce238de831935",
-  "_spec": "ssri@4.1.3",
+  "_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.5.tgz",
+  "_shasum": "e3844770b5379ced69b512e70a28d86d86abd43a",
+  "_spec": "ssri@4.1.5",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Kat Marchán",
@@ -43,7 +43,9 @@
       ]
     }
   },
-  "dependencies": {},
+  "dependencies": {
+    "safe-buffer": "^5.0.1"
+  },
   "deprecated": false,
   "description": "Standard Subresource Integrity library --  parses, serializes, generates, and verifies integrity metadata according to the SRI spec.",
   "devDependencies": {
@@ -88,5 +90,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "4.1.3"
+  "version": "4.1.5"
 }
diff --git a/deps/npm/package.json b/deps/npm/package.json
index 3bb9001de010d1..ba61cdda81ef13 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.0",
+  "version": "5.0.3",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -35,10 +35,10 @@
     "ansi-regex": "~2.1.1",
     "ansicolors": "~0.3.2",
     "ansistyles": "~0.1.3",
-    "aproba": "~1.1.1",
+    "aproba": "~1.1.2",
     "archy": "~1.0.0",
     "bluebird": "~3.5.0",
-    "cacache": "~9.2.5",
+    "cacache": "~9.2.8",
     "call-limit": "~1.1.0",
     "chownr": "~1.0.1",
     "cmd-shim": "~2.0.2",
@@ -71,37 +71,37 @@
     "mississippi": "~1.3.0",
     "mkdirp": "~0.5.1",
     "move-concurrently": "~1.0.1",
-    "node-gyp": "~3.6.1",
+    "node-gyp": "~3.6.2",
     "nopt": "~4.0.1",
     "normalize-package-data": "~2.3.8",
     "npm-cache-filename": "~1.0.2",
     "npm-install-checks": "~3.0.0",
-    "npm-package-arg": "~5.0.1",
+    "npm-package-arg": "~5.1.1",
     "npm-registry-client": "~8.3.0",
-    "npm-user-validate": "~0.1.5",
+    "npm-user-validate": "~1.0.0",
     "npmlog": "~4.1.0",
     "once": "~1.4.0",
     "opener": "~1.4.3",
     "osenv": "~0.1.4",
-    "pacote": "~2.7.21",
+    "pacote": "~2.7.30",
     "path-is-inside": "~1.0.2",
     "promise-inflight": "~1.0.1",
     "read": "~1.0.7",
     "read-cmd-shim": "~1.0.1",
     "read-installed": "~4.0.3",
     "read-package-json": "~2.0.5",
-    "read-package-tree": "~5.1.5",
-    "readable-stream": "~2.2.9",
+    "read-package-tree": "~5.1.6",
+    "readable-stream": "~2.2.10",
     "request": "~2.81.0",
     "retry": "~0.10.1",
     "rimraf": "~2.6.1",
-    "safe-buffer": "~5.0.1",
+    "safe-buffer": "~5.1.0",
     "semver": "~5.3.0",
     "sha": "~2.0.1",
     "slide": "~1.1.6",
     "sorted-object": "~2.0.1",
     "sorted-union-stream": "~2.1.3",
-    "ssri": "~4.1.3",
+    "ssri": "~4.1.5",
     "strip-ansi": "~3.0.1",
     "tar": "~2.2.1",
     "text-table": "~0.2.0",
diff --git a/deps/npm/test/tap/prepublish.js b/deps/npm/test/tap/prepublish.js
index 18bfe5f22aa0ba..c71455a2480cca 100644
--- a/deps/npm/test/tap/prepublish.js
+++ b/deps/npm/test/tap/prepublish.js
@@ -94,7 +94,7 @@ test('prepublish deprecation warning on `npm install`', function (t) {
     t.equal(code, 0, 'pack finished successfully')
     t.ifErr(err, 'pack finished successfully')
 
-    t.match(stderr, /`prepublish` scripts will run only for `npm publish`/)
+    t.match(stderr, /`prepublish` scripts are deprecated/)
     var c = stdout.trim()
     var regex = new RegExp('' +
       '> npm-test-prepublish@1.2.5 prepublish [^\\r\\n]+\\r?\\n' +
diff --git a/deps/npm/test/tap/publish-config.js b/deps/npm/test/tap/publish-config.js
index 399fd0f93b42b0..fb430af2101820 100644
--- a/deps/npm/test/tap/publish-config.js
+++ b/deps/npm/test/tap/publish-config.js
@@ -1,36 +1,43 @@
-var common = require('../common-tap.js')
-var test = require('tap').test
-var fs = require('fs')
-var osenv = require('osenv')
-var pkg = process.env.npm_config_tmp || '/tmp'
-pkg += '/npm-test-publish-config'
+'use strict'
+
+const common = require('../common-tap.js')
+const test = require('tap').test
+const fs = require('fs')
+const osenv = require('osenv')
+const pkg = `${process.env.npm_config_tmp || '/tmp'}/npm-test-publish-config`
 
 require('mkdirp').sync(pkg)
 
 fs.writeFileSync(pkg + '/package.json', JSON.stringify({
   name: 'npm-test-publish-config',
   version: '1.2.3',
-  publishConfig: { registry: common.registry }
+  publishConfig: {
+    registry: common.registry
+  }
 }), 'utf8')
 
 fs.writeFileSync(pkg + '/fixture_npmrc',
   '//localhost:1337/:email = fancy@feast.net\n' +
   '//localhost:1337/:username = fancy\n' +
-  '//localhost:1337/:_password = ' + new Buffer('feast').toString('base64') + '\n' +
-  'registry = http://localhost:1337/')
+  '//localhost:1337/:_password = ' + new Buffer('feast').toString('base64'))
 
 test(function (t) {
-  var child
-  t.plan(4)
+  let child
+  t.plan(5)
   require('http').createServer(function (req, res) {
     t.pass('got request on the fakey fake registry')
-    this.close()
-    res.statusCode = 500
-    res.end(JSON.stringify({
-      error: 'sshhh. naptime nao. \\^O^/ <(YAWWWWN!)'
-    }))
-    child.kill('SIGINT')
-  }).listen(common.port, function () {
+    let body = ''
+    req.on('data', (d) => { body += d })
+    req.on('end', () => {
+      this.close()
+      res.statusCode = 500
+      res.end(JSON.stringify({
+        error: 'sshhh. naptime nao. \\^O^/ <(YAWWWWN!)'
+      }))
+      t.match(body, /"beta"/, 'got expected tag')
+      child.kill('SIGINT')
+    })
+  }).listen(common.port, () => {
     t.pass('server is listening')
 
     // don't much care about listening to the child's results
@@ -40,7 +47,7 @@ test(function (t) {
     // itself functions normally.
     //
     // Make sure that we don't sit around waiting for lock files
-    child = common.npm(['publish', '--userconfig=' + pkg + '/fixture_npmrc'], {
+    child = common.npm(['publish', '--userconfig=' + pkg + '/fixture_npmrc', '--tag=beta'], {
       cwd: pkg,
       stdio: 'inherit',
       env: {