deps: upgrade npm to 4.0.5

PR-URL: https://github.com/nodejs/node/pull/10330 Reviewed-By: Myles Borins <myles.borins@gmail.com>
2016-12-18 20:22:09 -08:00 · 2016-12-18 20:22:09 -08:00 · 9946519fba
commit 9946519fba
parent 4d3b487b79
719 changed files with 38704 additions and 13917 deletions
--- a/deps/npm/.travis.yml
+++ b/deps/npm/.travis.yml
@ -13,13 +13,17 @@ matrix:
      env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
      script:
        - "node . run tap-cover -- \"test/tap/*.js\""
-        - "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/slow/*.js\" \"test/broken-under-*/*.js\""
+        - "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/broken-under-*/*.js\""
    # previous LTS is next most important
    - node_js: "4"
      env: DEPLOY_VERSION=testing
    # then master
    - node_js: "7"
      env: DEPLOY_VERSION=testing
+    # then 0.12, which is still in maintenance mode until the end of 2016 I guess?
+    # https://github.com/nodejs/LTS#lts-schedule
+    - node_js: "0.12"
+      env: DEPLOY_VERSION=testing
 before_install:
  # required by test/tap/registry.js
  - "mkdir -p /var/run/couchdb"
@ -29,6 +33,7 @@ cache:
  directories:
  - $HOME/.npm
  - node_modules/.bin
+  - node_modules/.cache
  - node_modules/deep-equal
  - node_modules/marked
  - node_modules/marked-man
@ -45,4 +50,4 @@ install:
  - "node . install --ignore-scripts"
  - "make -j4 doc"
 script:
-  - "node . run tap -- \"test/tap/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc/*.js\""
+  - "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@ -435,3 +435,13 @@ Ionică Bizău <bizauionica@gmail.com>
 Alex Chesters <AlexChesters@users.noreply.github.com>
 Robert Gay <robert.gay@redfin.com>
 Steven <stevokk@hotmail.com>
+Tim Caswell <tim@creationix.com>
+Anna Henningsen <github@addaleax.net>
+Kim Røen <kim@kimroen.com>
+Douglas Wilson <dougwilson@live.com>
+Mike Engel <mike@mike-engel.com>
+baderbuddy <baderbuddy@gmail.com>
+Alex Jordan <alex@strugee.net>
+Ville Lahdenvuo <tuhoojabotti@gmail.com>
+Natalie Wolfe <nwolfe@newrelic.com>
+Andrew Schmadel <aschmadel@learningobjects.com>
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
--- a/deps/npm/README.md
+++ b/deps/npm/README.md
@ -1,6 +1,6 @@
 npm(1) -- a JavaScript package manager
 ==============================
-[![Build Status](https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm)
+[![Build Status](https://img.shields.io/travis/npm/npm/latest.svg)](https://travis-ci.org/npm/npm)
 ## SYNOPSIS

 This is just enough info to get you up and running.
@ -27,15 +27,15 @@ terms of use for the default public registry are available at

 ## Super Easy Install

-npm is bundled with [node](http://nodejs.org/download/).
+npm is bundled with [node](https://nodejs.org/en/download/).

 ### Windows Computers

-[Get the MSI](http://nodejs.org/download/).  npm is in it.
+[Get the MSI](https://nodejs.org/en/download/).  npm is in it.

 ### Apple Macintosh Computers

-[Get the pkg](http://nodejs.org/download/).  npm is in it.
+[Get the pkg](https://nodejs.org/en/download/).  npm is in it.

 ### Other Sorts of Unices

@ -156,7 +156,7 @@ When you find issues, please report them:
 Be sure to include *all* of the output from the npm command that didn't work
 as expected.  The `npm-debug.log` file is also helpful to provide.

-You can also look for isaacs in #node.js on irc://irc.freenode.net.  He
+You can also look for isaacs in #node.js on irc://irc.freenode.net.  She
 will no doubt tell you to put the output in a gist or email.

 ## SEE ALSO
--- a/deps/npm/bin/npm-cli.js
+++ b/deps/npm/bin/npm-cli.js
@ -16,11 +16,15 @@

  process.title = 'npm'

+  var unsupported = require('../lib/utils/unsupported.js')
+  unsupported.checkForBrokenNode()
+
  var log = require('npmlog')
  log.pause() // will be unpaused when config is loaded.
-
  log.info('it worked if it ends with', 'ok')

+  unsupported.checkForUnsupportedNode()
+
  var path = require('path')
  var npm = require('../lib/npm.js')
  var npmconf = require('../lib/config/core.js')
--- a/deps/npm/changelogs/CHANGELOG-3.md
+++ b/deps/npm/changelogs/CHANGELOG-3.md
--- a/deps/npm/doc/cli/npm-adduser.md
+++ b/deps/npm/doc/cli/npm-adduser.md
@ -33,7 +33,8 @@ your existing record.
 Default: https://registry.npmjs.org/

 The base URL of the npm package registry. If `scope` is also specified,
-this registry will only be used for packages with that scope. See `npm-scope(7)`.
+this registry will only be used for packages with that scope. `scope` defaults
+to the scope of the project directory you're currently in, if any. See `npm-scope(7)`.

 ### scope

--- a/deps/npm/doc/cli/npm-dist-tag.md
+++ b/deps/npm/doc/cli/npm-dist-tag.md
@ -77,7 +77,6 @@ begin with a number or the letter `v`.

 ## SEE ALSO

-* npm-tag(1)
 * npm-publish(1)
 * npm-install(1)
 * npm-dedupe(1)
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/doc/cli/npm-install.md
@ -343,6 +343,10 @@ folder structures that npm creates.

 ### Limitations of npm's Install Algorithm

+npm will refuse to install any package with an identical name to the
+current package. This can be overridden with the `--force` flag, but in
+most cases can simply be addressed by changing the local package name.
+
 There are some very rare and pathological edge-cases where a cycle can
 cause npm to try to install a never-ending tree of packages.  Here is
 the simplest case:
@ -374,7 +378,7 @@ affects a real use-case, it will be investigated.
 * npm-config(7)
 * npmrc(5)
 * npm-registry(7)
-* npm-tag(1)
+* npm-dist-tag(1)
 * npm-uninstall(1)
 * npm-shrinkwrap(1)
 * package.json(5)
--- a/deps/npm/doc/cli/npm-logout.md
+++ b/deps/npm/doc/cli/npm-logout.md
@ -29,7 +29,7 @@ it takes precedence.

 ### scope

-Default: none
+Default: The scope of your current project, if any, otherwise none.

 If specified, you will be logged out of the specified scope. See `npm-scope(7)`.

--- a/deps/npm/doc/cli/npm-publish.md
+++ b/deps/npm/doc/cli/npm-publish.md
@ -59,5 +59,5 @@ packs them into a tarball to be uploaded to the registry.
 * npm-adduser(1)
 * npm-owner(1)
 * npm-deprecate(1)
-* npm-tag(1)
+* npm-dist-tag(1)
 * npm-pack(1)
--- a/deps/npm/doc/cli/npm-run-script.md
+++ b/deps/npm/doc/cli/npm-run-script.md
@ -41,8 +41,11 @@ you should write:
 instead of `"scripts": {"test": "node_modules/.bin/tap test/\*.js"}` to run your tests.

 `npm run` sets the `NODE` environment variable to the `node` executable with
-which `npm` is executed. Also, the directory within which it resides is added to the
-`PATH`, if the `node` executable is not in the `PATH`.
+which `npm` is executed. Also, if the `--scripts-prepend-node-path` is passed,
+the directory within which `node` resides is added to the
+`PATH`. If `--scripts-prepend-node-path=auto` is passed (which has been the
+default in `npm` v3), this is only performed when that `node` executable is
+not found in the `PATH`.

 If you try to run a script without having a `node_modules` directory and it fails,
 you will be given a warning to run `npm install`, just in case you've forgotten.
--- a/deps/npm/doc/cli/npm-search.md
+++ b/deps/npm/doc/cli/npm-search.md
@ -3,20 +3,58 @@ npm-search(1) -- Search for packages

 ## SYNOPSIS

-    npm search [-l|--long] [search terms ...]
+    npm search [-l|--long] [--json] [--parseable] [--no-description] [search terms ...]

    aliases: s, se, find

 ## DESCRIPTION

-Search the registry for packages matching the search terms.
+Search the registry for packages matching the search terms. `npm search`
+performs a linear, incremental, lexically-ordered search through package
+metadata for all files in the registry. If color is enabled, it will further
+highlight the matches in the results.

-If a term starts with `/`, then it's interpreted as a regular expression.
-A trailing `/` will be ignored in this case.  (Note that many regular
-expression characters must be escaped or quoted in most shells.)
+Additionally, using the `--searchopts` and `--searchexclude` options paired with
+more search terms will respectively include and exclude further patterns. The
+main difference between `--searchopts` and the standard search terms is that the
+former does not highlight results in the output and can be used for more
+fine-grained filtering. Additionally, both of these can be added to `.npmrc` for
+default search filtering behavior.
+
+Search also allows targeting of maintainers in search results, by prefixing
+their npm username with `=`.
+
+If a term starts with `/`, then it's interpreted as a regular expression and
+supports standard JavaScript RegExp syntax. A trailing `/` will be ignored in
+this case. (Note that many regular expression characters must be escaped or
+quoted in most shells.)
+
+### A Note on caching

 ## CONFIGURATION

+### description
+
+* Default: true
+* Type: Boolean
+
+Used as `--no-description`, disables search matching in package descriptions and
+suppresses display of that field in results.
+
+### json
+
+* Default: false
+* Type: Boolean
+
+Output search results as a JSON array.
+
+### parseable
+
+* Default: false
+* Type: Boolean
+
+Output search results as lines with tab-separated columns.
+
 ### long

 * Default: false
@ -27,14 +65,37 @@ lines. When disabled (default) search results are truncated to fit
 neatly on a single line. Modules with extremely long names will
 fall on multiple lines.

+### searchopts
+
+* Default: ""
+* Type: String
+
+Space-separated options that are always passed to search.
+
+### searchexclude
+
+* Default: ""
+* Type: String
+
+Space-separated options that limit the results from search.
+
+### searchstaleness
+
+* Default: 900 (15 minutes)
+* Type: Number
+
+The age of the cache, in seconds, before another registry request is made.
+
 ### registry

 * Default: https://registry.npmjs.org/
- * Type   : url
+ * Type: url

-Search the specified registry for modules. If you have configured npm to point to a different default registry,
-such as your internal private module repository, `npm search` will default to that registry when searching.
-Pass a different registry url such as the default above in order to override this setting.
+Search the specified registry for modules. If you have configured npm to point
+to a different default registry, such as your internal private module
+repository, `npm search` will default to that registry when searching. Pass a
+different registry url such as the default above in order to override this
+setting.

 ## SEE ALSO

--- a/deps/npm/doc/cli/npm-shrinkwrap.md
+++ b/deps/npm/doc/cli/npm-shrinkwrap.md
@ -158,12 +158,16 @@ wouldn't actually work. Similarly, the command will fail if there are
 extraneous packages (not referenced by `package.json`), since that would
 indicate that `package.json` is not correct.

-Since `npm shrinkwrap` is intended to lock down your dependencies for
-production use, `devDependencies` will not be included unless you
-explicitly set the `--dev` flag when you run `npm shrinkwrap`.  If
-installed `devDependencies` are excluded, then npm will print a
-warning.  If you want them to be installed with your module by
-default, please consider adding them to `dependencies` instead.
+Starting with npm v4.0.1, `devDependencies` are included when you run
+`npm shrinkwrap` and follow the usual rules as to when they're installed.
+As of npm v3.10.8, if you run `npm install --only=production` or
+`npm install --production` with a shrinkwrap including your development
+dependencies they won't be installed. Similarly, if the environment
+variable `NODE_ENV` is `production` then they won't be installed. If you
+need compatibility with versions of npm prior to v3.10.8 or otherwise
+don't want them in your shrinkwrap you can exclude development
+dependencies with:
+`npm shrinkwrap --only=prod` or `npm shrinkwrap --production`.

 If shrinkwrapped package A depends on shrinkwrapped package B, B's
 shrinkwrap will not be used as part of the installation of A. However,
--- a/deps/npm/doc/cli/npm-tag.md
+++ b/deps/npm/doc/cli/npm-tag.md
@ -1,61 +0,0 @@
-npm-tag(1) -- Tag a published version
-=====================================
-
-## SYNOPSIS
-
-    [DEPRECATED] npm tag <name>@<version> [<tag>]
-    See `dist-tag`
-
-## DESCRIPTION
-
-THIS COMMAND IS DEPRECATED. See npm-dist-tag(1) for details.
-
-Tags the specified version of the package with the specified tag, or the
-`--tag` config if not specified.
-
-A tag can be used when installing packages as a reference to a version instead
-of using a specific version number:
-
-    npm install <name>@<tag>
-
-When installing dependencies, a preferred tagged version may be specified:
-
-    npm install --tag <tag>
-
-This also applies to `npm dedupe`.
-
-Publishing a package always sets the "latest" tag to the published version.
-
-## PURPOSE
-
-Tags can be used to provide an alias instead of version numbers.  For
-example, `npm` currently uses the tag "next" to identify the upcoming
-version, and the tag "latest" to identify the current version.
-
-A project might choose to have multiple streams of development, e.g.,
-"stable", "canary".
-
-## CAVEATS
-
-Tags must share a namespace with version numbers, because they are
-specified in the same slot: `npm install <pkg>@<version>` vs `npm
-install <pkg>@<tag>`.
-
-Tags that can be interpreted as valid semver ranges will be
-rejected. For example, `v1.4` cannot be used as a tag, because it is
-interpreted by semver as `>=1.4.0 <1.5.0`.  See
-<https://github.com/npm/npm/issues/6082>.
-
-The simplest way to avoid semver problems with tags is to use tags
-that do not begin with a number or the letter `v`.
-
-## SEE ALSO
-
-* npm-publish(1)
-* npm-install(1)
-* npm-dedupe(1)
-* npm-registry(7)
-* npm-config(1)
-* npm-config(7)
-* npm-dist-tag(1)
-* npmrc(5)
--- a/deps/npm/doc/cli/npm-test.md
+++ b/deps/npm/doc/cli/npm-test.md
@ -11,9 +11,6 @@ npm-test(1) -- Test a package

 This runs a package's "test" script, if one was provided.

-To run tests as a condition of installation, set the `npat` config to
-true.
-
 ## SEE ALSO

 * npm-run-script(1)
--- a/deps/npm/doc/cli/npm-version.md
+++ b/deps/npm/doc/cli/npm-version.md
@ -85,6 +85,15 @@ and tag up to the server, and deletes the `build/temp` directory.

 Commit and tag the version change.

+### sign-git-tag
+
+* Default: false
+* Type: Boolean
+
+Pass the `-s` flag to git to sign the tag.
+
+Note that you must have a default GPG key set up in your git config for this to work properly.
+
 ## SEE ALSO

 * npm-init(1)
--- a/deps/npm/doc/files/npmrc.md
+++ b/deps/npm/doc/files/npmrc.md
@ -36,11 +36,6 @@ example:
    key[] = "first value"
    key[] = "second value"

-**NOTE:** Because local (per-project or per-user) `.npmrc` files can contain
-sensitive credentials, they must be readable and writable _only_ by your user
-account (i.e. must have a mode of `0600`), otherwise they _will be ignored by
-npm!_
-
 #### Comments

 Lines in `.npmrc` files are interpreted as comments when they begin with a `;` or `#` character. `.npmrc` files are parsed by [npm/ini](https://github.com/npm/ini), which specifies this comment syntax.
--- a/deps/npm/doc/files/package.json.md
+++ b/deps/npm/doc/files/package.json.md
@ -420,7 +420,7 @@ See semver(7) for more details about specifying version ranges.
 * `range1 || range2` Passes if either range1 or range2 are satisfied.
 * `git...` See 'Git URLs as Dependencies' below
 * `user/repo` See 'GitHub URLs' below
-* `tag` A specific version tagged and published as `tag`  See `npm-tag(1)`
+* `tag` A specific version tagged and published as `tag`  See `npm-dist-tag(1)`
 * `path/path/path` See [Local Paths](#local-paths) below

 For example, these are all valid:
@ -471,8 +471,8 @@ included.  For example:
      "name": "foo",
      "version": "0.0.0",
      "dependencies": {
-        "express": "visionmedia/express",
-        "mocha": "visionmedia/mocha#4727d357ea",
+        "express": "expressjs/express",
+        "mocha": "mochajs/mocha#4727d357ea",
        "module": "user/repo#feature\/branch"
      }
    }
@ -517,7 +517,7 @@ from the root of a package, and can be managed like any other npm
 configuration param.  See `npm-config(7)` for more on the topic.

 For build steps that are not platform-specific, such as compiling
-CoffeeScript or other languages to JavaScript, use the `prepublish`
+CoffeeScript or other languages to JavaScript, use the `prepare`
 script to do this, and make the required package a devDependency.

 For example:
@ -529,12 +529,12 @@ For example:
        "coffee-script": "~1.6.3"
      },
      "scripts": {
-        "prepublish": "coffee -o lib/ -c src/waza.coffee"
+        "prepare": "coffee -o lib/ -c src/waza.coffee"
      },
      "main": "lib/waza.js"
    }

-The `prepublish` script will be run before publishing, so that users
+The `prepare` script will be run before publishing, so that users
 can consume the functionality without requiring them to compile it
 themselves.  In dev mode (ie, locally running `npm install`), it'll
 run this script as well, so that you can test it easily.
--- a/deps/npm/doc/misc/npm-config.md
+++ b/deps/npm/doc/misc/npm-config.md
@ -20,7 +20,10 @@ interpreted as a configuration parameter.  For example, putting
 configuration parameter to `bar`.  Any environment configurations that
 are not given a value will be given the value of `true`.  Config
 values are case-insensitive, so `NPM_CONFIG_FOO=bar` will work the
-same.
+same. However, please note that inside [npm-scripts](/misc/scripts)
+npm will set it's own environment variables and Node will prefer
+those lowercase versions over any uppercase ones that you might set.
+For details see [this issue](https://github.com/npm/npm/issues/14528).

 ### npmrc Files

@ -280,9 +283,6 @@ Show the description in `npm search`

 Install `dev-dependencies` along with packages.

-Note that `dev-dependencies` are also installed if the `npat` flag is
-set.
-
 ### dry-run

 * Default: false
@ -499,9 +499,9 @@ version number, if not already set in package.json.

 Whether or not to output JSON data, rather than the normal output.

-This feature is currently experimental, and the output data structures
-for many commands is either not implemented in JSON yet, or subject to
-change.  Only the output from `npm ls --json` is currently valid.
+This feature is currently experimental, and the output data structures for many
+commands is either not implemented in JSON yet, or subject to change.  Only the
+output from `npm ls --json` and `npm search --json` are currently valid.

 ### key

@ -607,13 +607,6 @@ Any "%s" in the message will be replaced with the version number.

 The node version to use when checking a package's `engines` map.

-### npat
-
-* Default: false
-* Type: Boolean
-
-Run tests on installation.
-
 ### onload-script

 * Default: false
@ -655,7 +648,7 @@ process is not aborted.
 * Type: Boolean

 Output parseable results from commands that write to
-standard output.
+standard output. For `npm search`, this will be tab-separated table format.

 ### prefix

@ -801,7 +794,7 @@ patch upgrades.

 ### scope

-* Default: ""
+* Default: the scope of the current project, if any, or ""
 * Type: String

 Associate an operation with a scope for a scoped registry. Useful when logging
@ -810,12 +803,25 @@ in to a private registry for the first time:
 will cause `@organization` to be mapped to the registry for future installation
 of packages specified according to the pattern `@organization/package`.

-### searchopts
+### scripts-prepend-node-path

-* Default: ""
-* Type: String
+* Default: "warn-only"
+* Type: Boolean, `"auto"` or `"warn-only"`

-Space-separated options that are always passed to search.
+If set to `true`, add the directory in which the current `node` executable
+resides to the `PATH` environment variable when running scripts,
+even if that means that `npm` will invoke a different `node` executable than
+the one which it is running.
+
+If set to `false`, never modify `PATH` with that.
+
+If set to `"warn-only"`, never modify `PATH` but print a warning if `npm` thinks
+that you may want to run it with `true`, e.g. because the `node` executable
+in the `PATH` is not the one `npm` was invoked with.
+
+If set to `auto`, only add that directory to the `PATH` environment variable
+if the `node` executable with which `npm` was invoked and the one that is found
+first on the `PATH` are different.

 ### searchexclude

@ -824,15 +830,19 @@ Space-separated options that are always passed to search.

 Space-separated options that limit the results from search.

-### searchsort
+### searchopts

-* Default: "name"
+* Default: ""
 * Type: String
-* Values: "name", "-name", "date", "-date", "description",
-  "-description", "keywords", "-keywords"

-Indication of which field to sort search results by.  Prefix with a `-`
-character to indicate reverse sort.
+Space-separated options that are always passed to search.
+
+### searchstaleness
+
+* Default: 900 (15 minutes)
+* Type: Number
+
+The age of the cache, in seconds, before another registry request is made.

 ### shell

--- a/deps/npm/doc/misc/npm-disputes.md
+++ b/deps/npm/doc/misc/npm-disputes.md
@ -1,7 +1,16 @@
 npm-disputes(7) -- Handling Module Name Disputes
 ================================================

-## SYNOPSIS
+This document describes the steps that you should take to resolve module name
+disputes with other npm publishers. It also describes special steps you should
+take about names you think infringe your trademarks.
+
+This document is a clarification of the acceptable behavior outlined in the
+[npm Code of Conduct](https://www.npmjs.com/policies/conduct), and nothing in
+this document should be interpreted to contradict any aspect of the npm Code of
+Conduct.
+
+## TL;DR

 1. Get the author email with `npm owner ls <pkgname>`
 2. Email the author, CC <support@npmjs.com>
@ -11,87 +20,109 @@ Don't squat on package names.  Publish code or move out of the way.

 ## DESCRIPTION

-There sometimes arise cases where a user publishes a module, and then
-later, some other user wants to use that name.  Here are some common
-ways that happens (each of these is based on actual events.)
+There sometimes arise cases where a user publishes a module, and then later,
+some other user wants to use that name. Here are some common ways that happens
+(each of these is based on actual events.)

-1. Joe writes a JavaScript module `foo`, which is not node-specific.
-   Joe doesn't use node at all.  Bob   wants to use `foo` in node, so he
-   wraps it in an npm module.  Some time later, Joe starts using node,
-   and wants to take over management of his program.
-2. Bob writes an npm module `foo`, and publishes it.  Perhaps much
-   later, Joe finds a bug in `foo`, and fixes it.  He sends a pull
-   request to Bob, but Bob doesn't have the time to deal with it,
-   because he has a new job and a new baby and is focused on his new
-   erlang project, and kind of not involved with node any more.  Joe
-   would like to publish a new `foo`, but can't, because the name is
-   taken.
-3. Bob writes a 10-line flow-control library, and calls it `foo`, and
-   publishes it to the npm registry.  Being a simple little thing, it
-   never really has to be updated.  Joe works for Foo Inc, the makers
-   of the critically acclaimed and widely-marketed `foo` JavaScript
-   toolkit framework.  They publish it to npm as `foojs`, but people are
-   routinely confused when `npm install foo` is some different thing.
-4. Bob writes a parser for the widely-known `foo` file format, because
-   he needs it for work.  Then, he gets a new job, and never updates the
-   prototype.  Later on, Joe writes a much more complete `foo` parser,
-   but can't publish, because Bob's `foo` is in the way.
+1. Alice writes a JavaScript module `foo`, which is not node-specific. Alice
+   doesn't use node at all. Yusuf wants to use `foo` in node, so he wraps it in
+   an npm module. Some time later, Alice starts using node, and wants to take
+   over management of her program.
+2. Yusuf writes an npm module `foo`, and publishes it. Perhaps much later, Alice
+   finds a bug in `foo`, and fixes it. She sends a pull request to Yusuf, but
+   Yusuf doesn't have the time to deal with it, because he has a new job and a
+   new baby and is focused on his new Erlang project, and kind of not involved
+   with node any more. Alice would like to publish a new `foo`, but can't,
+   because the name is taken.
+3. Yusuf writes a 10-line flow-control library, and calls it `foo`, and
+   publishes it to the npm registry. Being a simple little thing, it never
+   really has to be updated. Alice works for Foo Inc, the makers of the
+   critically acclaimed and widely-marketed `foo` JavaScript toolkit framework.
+   They publish it to npm as `foojs`, but people are routinely confused when
+   `npm install `foo`` is some different thing.
+4. Yusuf writes a parser for the widely-known `foo` file format, because he
+   needs it for work. Then, he gets a new job, and never updates the prototype.
+   Later on, Alice writes a much more complete `foo` parser, but can't publish,
+   because Yusuf's `foo` is in the way.

-The validity of Joe's claim in each situation can be debated.  However,
-Joe's appropriate course of action in each case is the same.
-
-1. `npm owner ls foo`.  This will tell Joe the email address of the
-   owner (Bob).
-2. Joe emails Bob, explaining the situation **as respectfully as
-   possible**, and what he would like to do with the module name.  He
-   adds the npm support staff <support@npmjs.com> to the CC list of
-   the email.  Mention in the email that Bob can run `npm owner add
-   joe foo` to add Joe as an owner of the `foo` package.
-3. After a reasonable amount of time, if Bob has not responded, or if
-   Bob and Joe can't come to any sort of resolution, email support
-   <support@npmjs.com> and we'll sort it out.  ("Reasonable" is
-   usually at least 4 weeks, but extra time is allowed around common
-   holidays.)
+1. `npm owner ls foo`. This will tell Alice the email address of the owner
+   (Yusuf).
+2. 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
+   that Yusuf can run npm owner `add alice foo` to add Alice as an owner of the
+   foo package.
+3. 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
+   4 weeks.)

 ## REASONING

-In almost every case so far, the parties involved have been able to reach
-an amicable resolution without any major intervention.  Most people
-really do want to be reasonable, and are probably not even aware that
-they're in your way.
+In almost every case so far, the parties involved have been able to reach an
+amicable resolution without any major intervention. Most people really do want
+to be reasonable, and are probably not even aware that they're in your way.

-Module ecosystems are most vibrant and powerful when they are as
-self-directed as possible.  If an admin one day deletes something you
-had worked on, then that is going to make most people quite upset,
-regardless of the justification.  When humans solve their problems by
-talking to other humans with respect, everyone has the chance to end up
-feeling good about the interaction.
+Module ecosystems are most vibrant and powerful when they are as self-directed
+as possible. If an admin one day deletes something you had worked on, then that
+is going to make most people quite upset, regardless of the justification. When
+humans solve their problems by talking to other humans with respect, everyone
+has the chance to end up feeling good about the interaction.

 ## EXCEPTIONS

-Some things are not allowed, and will be removed without discussion if
-they are brought to the attention of the npm registry admins, including
-but not limited to:
+Some things are not allowed, and will be removed without discussion if they are
+brought to the attention of the npm registry admins, including but not limited
+to:

-1. Malware (that is, a package designed to exploit or harm the machine on
-   which it is installed).
-2. Violations of copyright or licenses (for example, cloning an
-   MIT-licensed program, and then removing or changing the copyright and
-   license statement).
+1. Malware (that is, a package designed to exploit or harm the machine on which
+   it is installed).
+2. Violations of copyright or licenses (for example, cloning an MIT-licensed
+   program, and then removing or changing the copyright and license statement).
 3. Illegal content.
-4. "Squatting" on a package name that you *plan* to use, but aren't
-   actually using.  Sorry, I don't care how great the name is, or how
-   perfect a fit it is for the thing that someday might happen.  If
-   someone wants to use it today, and you're just taking up space with
-   an empty tarball, you're going to be evicted.
-5. Putting empty packages in the registry.  Packages must have SOME
-   functionality.  It can be silly, but it can't be *nothing*.  (See
-   also: squatting.)
-6. Doing weird things with the registry, like using it as your own
-   personal application database or otherwise putting non-packagey
-   things into it.
+4. "Squatting" on a package name that you plan to use, but aren't actually
+   using. Sorry, I don't care how great the name is, or how perfect a fit it is
+   for the thing that someday might happen. If someone wants to use it today,
+   and you're just taking up space with an empty tarball, you're going to be
+   evicted.
+5. Putting empty packages in the registry. Packages must have SOME
+   functionality. It can be silly, but it can't be nothing. (See also:
+   squatting.)
+6. Doing weird things with the registry, like using it as your own personal
+   application database or otherwise putting non-packagey things into it.
+7. Other things forbidden by the npm
+   [Code of Conduct](https://www.npmjs.com/policies/conduct) such as hateful
+   language, pornographic content, or harassment.

-If you see bad behavior like this, please report it right away.
+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
+the package or user account on [https://npmjs.com](https://npmjs.com). Attach a
+copy of your trademark registration certificate.
+
+If we see that the package's publisher is intentionally misleading others by
+misusing your registered mark without permission, we will transfer the package
+name to you. Otherwise, we will contact the package publisher and ask them to
+clear up any confusion with changes to their package's `README` file or
+metadata.
+
+## CHANGES
+
+This is a living document and may be updated from time to time. Please refer to
+the [git history for this document](https://github.com/npm/npm/commits/master/doc/misc/npm-disputes.md)
+to view the changes.
+
+## LICENSE
+
+Copyright (C) npm, Inc., All rights reserved
+
+This document may be reused under a Creative Commons Attribution-ShareAlike
+License.

 ## SEE ALSO

--- a/deps/npm/doc/misc/npm-index.md
+++ b/deps/npm/doc/misc/npm-index.md
@ -177,10 +177,6 @@ Start a package

 Stop a package

-### npm-tag(1)
-
-Tag a published version
-
 ### npm-team(1)

 Manage organization teams and team memberships
--- a/deps/npm/doc/misc/npm-registry.md
+++ b/deps/npm/doc/misc/npm-registry.md
@ -21,6 +21,29 @@ The registry URL used is determined by the scope of the package (see
 supplied by the `registry` config parameter.  See `npm-config(1)`,
 `npmrc(5)`, and `npm-config(7)` for more on managing npm's configuration.

+## Does npm send any information about me back to the registry?
+
+Yes.
+
+When making requests of the registry npm adds two headers with information
+about your environment:
+
+* `Npm-Scope` – If your project is scoped, this header will contain its
+  scope. In the future npm hopes to build registry features that use this
+  information to allow you to customize your experience for your
+  organization.
+* `Npm-In-CI` – Set to "true" if npm believes this install is running in a
+  continous integration environment, "false" otherwise. This is detected by
+  looking for the following environment variables: `CI`, `TDDIUM`,
+  `JENKINS_URL`, `bamboo.buildKey`. If you'd like to learn more you may find
+  the [original PR](https://github.com/npm/npm-registry-client/pull/129)
+  interesting.
+  This is used to gather better metrics on how npm is used by humans, versus
+  build farms.
+
+The npm registry does not to correlate the information in these headers with
+any authenticated accounts that may be used in the same requests.
+
 ## Can I run my own private registry?

 Yes!
--- a/deps/npm/doc/misc/npm-scripts.md
+++ b/deps/npm/doc/misc/npm-scripts.md
@ -8,7 +8,13 @@ following scripts:

 * prepublish:
  Run BEFORE the package is published.  (Also run on local `npm
-  install` without any arguments.)
+  install` without any arguments. See below.)
+* prepare:
+  Run both BEFORE the package is published, and on local `npm
+  install` without any arguments. (See below.) This is run
+  AFTER `prepublish`, but BEFORE `prepublishOnly`.
+* prepublishOnly:
+  Run BEFORE the package is published. (See below.)
 * publish, postpublish:
  Run AFTER the package is published.
 * preinstall:
@ -43,7 +49,30 @@ names will be run for those as well (e.g. `premyscript`, `myscript`,
 `postmyscript`). Scripts from dependencies can be run with `npm explore
 <pkg> -- npm run <stage>`.

-## COMMON USES
+## PREPUBLISH AND PREPARE
+
+### DEPRECATION NOTE
+
+Since `npm@1.1.71`, the npm CLI has run the `prepublish` script for both `npm
+publish` and `npm install`, because it's a convenient way to prepare a package
+for use (some common use cases are described in the section below).  It has
+also turned out to be, in practice, [very
+confusing](https://github.com/npm/npm/issues/10074).  As of `npm@4.0.0`, a new
+event has been introduced, `prepare`, that preserves this existing behavior. A
+_new_ event, `prepublishOnly` has been added as a transitional strategy to
+allow users to avoid the confusing behavior of existing npm versions and only
+run on `npm publish` (for instance, running the tests one last time to ensure
+they're in good shape).
+
+**IMPORTANT:** As of `npm@5`, `prepublish` will _only_ be run for `npm
+publish`.  This will make its behavior identical to `prepublishOnly`, so
+`npm@6` or later may drop support for the use of `prepublishOnly`, and then
+maybe we can all forget this embarrassing thing ever happened.
+
+See <https://github.com/npm/npm/issues/10074> for a much lengthier
+justification, with further reading, for this change.
+
+### USE CASES

 If you need to perform operations on your package before it is used, in a way
 that is not dependent on the operating system or architecture of the
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@ -10,7 +10,7 @@
    <div id="wrapper">

 <h1><a href="cli/npm.html">npm</a></h1> <p>a JavaScript package manager</p>
-<p><a href="https://travis-ci.org/npm/npm"><img src="https://img.shields.io/travis/npm/npm/master.svg" alt="Build Status"></a></p>
+<p><a href="https://travis-ci.org/npm/npm"><img src="https://img.shields.io/travis/npm/npm/latest.svg" alt="Build Status"></a></p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <p>This is just enough info to get you up and running.</p>
 <p>Much more info available via <code>npm help</code> once it&#39;s installed.</p>
@ -27,11 +27,11 @@ registries</a>.</p>
 terms of use for the default public registry are available at
 <a href="https://www.npmjs.com">https://www.npmjs.com</a>.</p>
 <h2 id="super-easy-install">Super Easy Install</h2>
-<p>npm is bundled with <a href="http://nodejs.org/download/">node</a>.</p>
+<p>npm is bundled with <a href="https://nodejs.org/en/download/">node</a>.</p>
 <h3 id="windows-computers">Windows Computers</h3>
-<p><a href="http://nodejs.org/download/">Get the MSI</a>.  npm is in it.</p>
+<p><a href="https://nodejs.org/en/download/">Get the MSI</a>.  npm is in it.</p>
 <h3 id="apple-macintosh-computers">Apple Macintosh Computers</h3>
-<p><a href="http://nodejs.org/download/">Get the pkg</a>.  npm is in it.</p>
+<p><a href="https://nodejs.org/en/download/">Get the pkg</a>.  npm is in it.</p>
 <h3 id="other-sorts-of-unices">Other Sorts of Unices</h3>
 <p>Run <code>make install</code>.  npm will be installed with node.</p>
 <p>If you want a more fancy pants install (a different version, customized
@ -106,7 +106,7 @@ you should <a href="https://docs.npmjs.com/misc/developers">read this</a></p>
 </ul>
 <p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
 as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p>
-<p>You can also look for isaacs in #node.js on irc://irc.freenode.net.  He
+<p>You can also look for isaacs in #node.js on irc://irc.freenode.net.  She
 will no doubt tell you to put the output in a gist or email.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
@ -126,5 +126,5 @@ will no doubt tell you to put the output in a gist or email.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@3.10.10</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-access.html
+++ b/deps/npm/html/doc/cli/npm-access.html
@ -84,5 +84,5 @@ with an HTTP 402 status code (logically enough), unless you use
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-access &mdash; npm@3.10.10</p>
+<p id="footer">npm-access &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-adduser.html
+++ b/deps/npm/html/doc/cli/npm-adduser.html
@ -30,7 +30,8 @@ your existing record.</p>
 <h3 id="registry">registry</h3>
 <p>Default: <a href="https://registry.npmjs.org/">https://registry.npmjs.org/</a></p>
 <p>The base URL of the npm package registry. If <code>scope</code> is also specified,
-this registry will only be used for packages with that scope. See <code><a href="../misc/npm-scope.html">npm-scope(7)</a></code>.</p>
+this registry will only be used for packages with that scope. <code>scope</code> defaults
+to the scope of the project directory you&#39;re currently in, if any. See <code><a href="../misc/npm-scope.html">npm-scope(7)</a></code>.</p>
 <h3 id="scope">scope</h3>
 <p>Default: none</p>
 <p>If specified, the user and login credentials given will be associated
@ -72,5 +73,5 @@ over any global configuration.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-adduser &mdash; npm@3.10.10</p>
+<p id="footer">npm-adduser &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-bin.html
+++ b/deps/npm/html/doc/cli/npm-bin.html
@ -35,5 +35,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@3.10.10</p>
+<p id="footer">npm-bin &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-bugs.html
+++ b/deps/npm/html/doc/cli/npm-bugs.html
@ -55,5 +55,5 @@ a <code>package.json</code> in the current folder and use the <code>name</code>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@3.10.10</p>
+<p id="footer">npm-bugs &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-build.html
+++ b/deps/npm/html/doc/cli/npm-build.html
@ -40,5 +40,5 @@ directly, run:</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-build &mdash; npm@3.10.10</p>
+<p id="footer">npm-build &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-bundle.html
+++ b/deps/npm/html/doc/cli/npm-bundle.html
@ -31,5 +31,5 @@ install packages into the local space.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bundle &mdash; npm@3.10.10</p>
+<p id="footer">npm-bundle &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-cache.html
+++ b/deps/npm/html/doc/cli/npm-cache.html
@ -81,5 +81,5 @@ they do not make an HTTP request to the registry.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-cache &mdash; npm@3.10.10</p>
+<p id="footer">npm-cache &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-completion.html
+++ b/deps/npm/html/doc/cli/npm-completion.html
@ -43,5 +43,5 @@ completions based on the arguments.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-completion &mdash; npm@3.10.10</p>
+<p id="footer">npm-completion &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-config.html
+++ b/deps/npm/html/doc/cli/npm-config.html
@ -67,5 +67,5 @@ global config.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@3.10.10</p>
+<p id="footer">npm-config &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-dedupe.html
+++ b/deps/npm/html/doc/cli/npm-dedupe.html
@ -61,5 +61,5 @@ result in new modules being installed.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dedupe &mdash; npm@3.10.10</p>
+<p id="footer">npm-dedupe &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-deprecate.html
+++ b/deps/npm/html/doc/cli/npm-deprecate.html
@ -38,5 +38,5 @@ something like this:</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@3.10.10</p>
+<p id="footer">npm-deprecate &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-dist-tag.html
+++ b/deps/npm/html/doc/cli/npm-dist-tag.html
@ -66,7 +66,6 @@ example, <code>v1.4</code> cannot be used as a tag, because it is interpreted by
 begin with a number or the letter <code>v</code>.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../cli/npm-tag.html">npm-tag(1)</a></li>
 <li><a href="../cli/npm-publish.html">npm-publish(1)</a></li>
 <li><a href="../cli/npm-install.html">npm-install(1)</a></li>
 <li><a href="../cli/npm-dedupe.html">npm-dedupe(1)</a></li>
@ -87,5 +86,5 @@ begin with a number or the letter <code>v</code>.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dist-tag &mdash; npm@3.10.10</p>
+<p id="footer">npm-dist-tag &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-docs.html
+++ b/deps/npm/html/doc/cli/npm-docs.html
@ -56,5 +56,5 @@ the current folder and use the <code>name</code> property.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@3.10.10</p>
+<p id="footer">npm-docs &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-edit.html
+++ b/deps/npm/html/doc/cli/npm-edit.html
@ -49,5 +49,5 @@ or <code>&quot;notepad&quot;</code> on Windows.</li>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@3.10.10</p>
+<p id="footer">npm-edit &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-explore.html
+++ b/deps/npm/html/doc/cli/npm-explore.html
@ -49,5 +49,5 @@ Windows</li>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@3.10.10</p>
+<p id="footer">npm-explore &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-help-search.html
+++ b/deps/npm/html/doc/cli/npm-help-search.html
@ -45,5 +45,5 @@ where the terms were found in the documentation.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@3.10.10</p>
+<p id="footer">npm-help-search &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-help.html
+++ b/deps/npm/html/doc/cli/npm-help.html
@ -50,5 +50,5 @@ matches are equivalent to specifying a topic name.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help &mdash; npm@3.10.10</p>
+<p id="footer">npm-help &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-init.html
+++ b/deps/npm/html/doc/cli/npm-init.html
@ -48,5 +48,5 @@ defaults and not prompt you for any options.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@3.10.10</p>
+<p id="footer">npm-init &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-install-test.html
+++ b/deps/npm/html/doc/cli/npm-install-test.html
@ -42,5 +42,5 @@ takes exactly the same arguments as <code>npm install</code>.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install-test &mdash; npm@3.10.10</p>
+<p id="footer">npm-install-test &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-install.html
+++ b/deps/npm/html/doc/cli/npm-install.html
@ -269,6 +269,9 @@ privately for itself.</p>
 <p>See <a href="../files/npm-folders.html">npm-folders(5)</a> for a more detailed description of the specific
 folder structures that npm creates.</p>
 <h3 id="limitations-of-npm-s-install-algorithm">Limitations of npm&#39;s Install Algorithm</h3>
+<p>npm will refuse to install any package with an identical name to the
+current package. This can be overridden with the <code>--force</code> flag, but in
+most cases can simply be addressed by changing the local package name.</p>
 <p>There are some very rare and pathological edge-cases where a cycle can
 cause npm to try to install a never-ending tree of packages.  Here is
 the simplest case:</p>
@ -296,7 +299,7 @@ affects a real use-case, it will be investigated.</p>
 <li><a href="../misc/npm-config.html">npm-config(7)</a></li>
 <li><a href="../files/npmrc.html">npmrc(5)</a></li>
 <li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
-<li><a href="../cli/npm-tag.html">npm-tag(1)</a></li>
+<li><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></li>
 <li><a href="../cli/npm-uninstall.html">npm-uninstall(1)</a></li>
 <li><a href="../cli/npm-shrinkwrap.html">npm-shrinkwrap(1)</a></li>
 <li><a href="../files/package.json.html">package.json(5)</a></li>
@ -313,5 +316,5 @@ affects a real use-case, it will be investigated.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@3.10.10</p>
+<p id="footer">npm-install &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-link.html
+++ b/deps/npm/html/doc/cli/npm-link.html
@ -74,5 +74,5 @@ include that scope, e.g.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@3.10.10</p>
+<p id="footer">npm-link &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-logout.html
+++ b/deps/npm/html/doc/cli/npm-logout.html
@ -27,7 +27,7 @@ connected to that scope, if set.</p>
 <p>The base URL of the npm package registry. If <code>scope</code> is also specified,
 it takes precedence.</p>
 <h3 id="scope">scope</h3>
-<p>Default: none</p>
+<p>Default: The scope of your current project, if any, otherwise none.</p>
 <p>If specified, you will be logged out of the specified scope. See <code><a href="../misc/npm-scope.html">npm-scope(7)</a></code>.</p>
 <pre><code>npm logout --scope=@myco
 </code></pre><h2 id="see-also">SEE ALSO</h2>
@ -51,5 +51,5 @@ it takes precedence.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-logout &mdash; npm@3.10.10</p>
+<p id="footer">npm-logout &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-ls.html
+++ b/deps/npm/html/doc/cli/npm-ls.html
@ -21,7 +21,7 @@ installed, as well as their dependencies, in a tree-structure.</p>
 limit the results to only the paths to the packages named.  Note that
 nested packages will <em>also</em> show the paths to the specified packages.
 For example, running <code>npm ls promzard</code> in npm&#39;s source tree will show:</p>
-<pre><code>npm@3.10.10 /path/to/npm
+<pre><code>npm@4.0.5 /path/to/npm
 └─┬ init-package-json@0.0.4
  └── promzard@0.1.5
 </code></pre><p>It will print out extraneous, missing, and invalid packages.</p>
@ -104,5 +104,5 @@ project.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ls &mdash; npm@3.10.10</p>
+<p id="footer">npm-ls &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@ -116,5 +116,5 @@ project.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-outdated &mdash; npm@3.10.10</p>
+<p id="footer">npm-outdated &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@ -51,5 +51,5 @@ that is not implemented at this time.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-owner &mdash; npm@3.10.10</p>
+<p id="footer">npm-owner &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@ -41,5 +41,5 @@ overwritten the second time.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-pack &mdash; npm@3.10.10</p>
+<p id="footer">npm-pack &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-ping.html
+++ b/deps/npm/html/doc/cli/npm-ping.html
@ -32,5 +32,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ping &mdash; npm@3.10.10</p>
+<p id="footer">npm-ping &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@ -38,5 +38,5 @@ to contain a package.json file unless <code>-g</code> is also specified.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prefix &mdash; npm@3.10.10</p>
+<p id="footer">npm-prefix &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@ -40,5 +40,5 @@ negate <code>NODE_ENV</code> being set to <code>production</code>.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prune &mdash; npm@3.10.10</p>
+<p id="footer">npm-prune &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@ -61,7 +61,7 @@ packs them into a tarball to be uploaded to the registry.</p>
 <li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li>
 <li><a href="../cli/npm-owner.html">npm-owner(1)</a></li>
 <li><a href="../cli/npm-deprecate.html">npm-deprecate(1)</a></li>
-<li><a href="../cli/npm-tag.html">npm-tag(1)</a></li>
+<li><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></li>
 <li><a href="../cli/npm-pack.html">npm-pack(1)</a></li>
 </ul>

@ -76,5 +76,5 @@ packs them into a tarball to be uploaded to the registry.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-publish &mdash; npm@3.10.10</p>
+<p id="footer">npm-publish &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@ -35,5 +35,5 @@ the new binary.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-rebuild &mdash; npm@3.10.10</p>
+<p id="footer">npm-rebuild &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@ -41,5 +41,5 @@ a <code>package.json</code> in the current folder and use the <code>name</code>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-repo &mdash; npm@3.10.10</p>
+<p id="footer">npm-repo &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@ -53,5 +53,5 @@ behavior will be accompanied by an increase in major version number</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-restart &mdash; npm@3.10.10</p>
+<p id="footer">npm-restart &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@ -35,5 +35,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-root &mdash; npm@3.10.10</p>
+<p id="footer">npm-root &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@ -39,8 +39,11 @@ you should write:</p>
 <pre><code>&quot;scripts&quot;: {&quot;test&quot;: &quot;tap test/\*.js&quot;}
 </code></pre><p>instead of <code>&quot;scripts&quot;: {&quot;test&quot;: &quot;node_modules/.bin/tap test/\*.js&quot;}</code> to run your tests.</p>
 <p><code>npm run</code> sets the <code>NODE</code> environment variable to the <code>node</code> executable with
-which <code>npm</code> is executed. Also, the directory within which it resides is added to the
-<code>PATH</code>, if the <code>node</code> executable is not in the <code>PATH</code>.</p>
+which <code>npm</code> is executed. Also, if the <code>--scripts-prepend-node-path</code> is passed,
+the directory within which <code>node</code> resides is added to the
+<code>PATH</code>. If <code>--scripts-prepend-node-path=auto</code> is passed (which has been the
+default in <code>npm</code> v3), this is only performed when that <code>node</code> executable is
+not found in the <code>PATH</code>.</p>
 <p>If you try to run a script without having a <code>node_modules</code> directory and it fails,
 you will be given a warning to run <code>npm install</code>, just in case you&#39;ve forgotten.</p>
 <h2 id="see-also">SEE ALSO</h2>
@ -63,5 +66,5 @@ you will be given a warning to run <code>npm install</code>, just in case you&#3
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-run-script &mdash; npm@3.10.10</p>
+<p id="footer">npm-run-script &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@ -11,15 +11,47 @@

 <h1><a href="../cli/npm-search.html">npm-search</a></h1> <p>Search for packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm search [-l|--long] [search terms ...]
+<pre><code>npm search [-l|--long] [--json] [--parseable] [--no-description] [search terms ...]

 aliases: s, se, find
 </code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Search the registry for packages matching the search terms.</p>
-<p>If a term starts with <code>/</code>, then it&#39;s interpreted as a regular expression.
-A trailing <code>/</code> will be ignored in this case.  (Note that many regular
-expression characters must be escaped or quoted in most shells.)</p>
+<p>Search the registry for packages matching the search terms. <code>npm search</code>
+performs a linear, incremental, lexically-ordered search through package
+metadata for all files in the registry. If color is enabled, it will further
+highlight the matches in the results.</p>
+<p>Additionally, using the <code>--searchopts</code> and <code>--searchexclude</code> options paired with
+more search terms will respectively include and exclude further patterns. The
+main difference between <code>--searchopts</code> and the standard search terms is that the
+former does not highlight results in the output and can be used for more
+fine-grained filtering. Additionally, both of these can be added to <code>.npmrc</code> for
+default search filtering behavior.</p>
+<p>Search also allows targeting of maintainers in search results, by prefixing
+their npm username with <code>=</code>.</p>
+<p>If a term starts with <code>/</code>, then it&#39;s interpreted as a regular expression and
+supports standard JavaScript RegExp syntax. A trailing <code>/</code> will be ignored in
+this case. (Note that many regular expression characters must be escaped or
+quoted in most shells.)</p>
+<h3 id="a-note-on-caching">A Note on caching</h3>
 <h2 id="configuration">CONFIGURATION</h2>
+<h3 id="description">description</h3>
+<ul>
+<li>Default: true</li>
+<li>Type: Boolean</li>
+</ul>
+<p>Used as <code>--no-description</code>, disables search matching in package descriptions and
+suppresses display of that field in results.</p>
+<h3 id="json">json</h3>
+<ul>
+<li>Default: false</li>
+<li>Type: Boolean</li>
+</ul>
+<p>Output search results as a JSON array.</p>
+<h3 id="parseable">parseable</h3>
+<ul>
+<li>Default: false</li>
+<li>Type: Boolean</li>
+</ul>
+<p>Output search results as lines with tab-separated columns.</p>
 <h3 id="long">long</h3>
 <ul>
 <li>Default: false</li>
@ -29,14 +61,34 @@ expression characters must be escaped or quoted in most shells.)</p>
 lines. When disabled (default) search results are truncated to fit
 neatly on a single line. Modules with extremely long names will
 fall on multiple lines.</p>
+<h3 id="searchopts">searchopts</h3>
+<ul>
+<li>Default: &quot;&quot;</li>
+<li>Type: String</li>
+</ul>
+<p>Space-separated options that are always passed to search.</p>
+<h3 id="searchexclude">searchexclude</h3>
+<ul>
+<li>Default: &quot;&quot;</li>
+<li>Type: String</li>
+</ul>
+<p>Space-separated options that limit the results from search.</p>
+<h3 id="searchstaleness">searchstaleness</h3>
+<ul>
+<li>Default: 900 (15 minutes)</li>
+<li>Type: Number</li>
+</ul>
+<p>The age of the cache, in seconds, before another registry request is made.</p>
 <h3 id="registry">registry</h3>
 <ul>
 <li>Default: <a href="https://registry.npmjs.org/">https://registry.npmjs.org/</a></li>
-<li>Type   : url</li>
+<li>Type: url</li>
 </ul>
-<p>Search the specified registry for modules. If you have configured npm to point to a different default registry,
-such as your internal private module repository, <code>npm search</code> will default to that registry when searching.
-Pass a different registry url such as the default above in order to override this setting.</p>
+<p>Search the specified registry for modules. If you have configured npm to point
+to a different default registry, such as your internal private module
+repository, <code>npm search</code> will default to that registry when searching. Pass a
+different registry url such as the default above in order to override this
+setting.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
@ -57,5 +109,5 @@ Pass a different registry url such as the default above in order to override thi
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-search &mdash; npm@3.10.10</p>
+<p id="footer">npm-search &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@ -139,12 +139,16 @@ already installed, since that would result in a shrinkwrap that
 wouldn&#39;t actually work. Similarly, the command will fail if there are
 extraneous packages (not referenced by <code>package.json</code>), since that would
 indicate that <code>package.json</code> is not correct.</p>
-<p>Since <code>npm shrinkwrap</code> is intended to lock down your dependencies for
-production use, <code>devDependencies</code> will not be included unless you
-explicitly set the <code>--dev</code> flag when you run <code>npm shrinkwrap</code>.  If
-installed <code>devDependencies</code> are excluded, then npm will print a
-warning.  If you want them to be installed with your module by
-default, please consider adding them to <code>dependencies</code> instead.</p>
+<p>Starting with npm v4.0.1, <code>devDependencies</code> are included when you run
+<code>npm shrinkwrap</code> and follow the usual rules as to when they&#39;re installed.
+As of npm v3.10.8, if you run <code>npm install --only=production</code> or
+<code>npm install --production</code> with a shrinkwrap including your development
+dependencies they won&#39;t be installed. Similarly, if the environment
+variable <code>NODE_ENV</code> is <code>production</code> then they won&#39;t be installed. If you
+need compatibility with versions of npm prior to v3.10.8 or otherwise
+don&#39;t want them in your shrinkwrap you can exclude development
+dependencies with:
+<code>npm shrinkwrap --only=prod</code> or <code>npm shrinkwrap --production</code>.</p>
 <p>If shrinkwrapped package A depends on shrinkwrapped package B, B&#39;s
 shrinkwrap will not be used as part of the installation of A. However,
 because A&#39;s shrinkwrap is constructed from a valid installation of B
@ -176,5 +180,5 @@ contents rather than versions.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-shrinkwrap &mdash; npm@3.10.10</p>
+<p id="footer">npm-shrinkwrap &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@ -36,5 +36,5 @@ a vaguely positive way to show that you care.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-star &mdash; npm@3.10.10</p>
+<p id="footer">npm-star &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@ -36,5 +36,5 @@ you will most certainly enjoy this command.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stars &mdash; npm@3.10.10</p>
+<p id="footer">npm-stars &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@ -39,5 +39,5 @@ more details.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-start &mdash; npm@3.10.10</p>
+<p id="footer">npm-start &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@ -34,5 +34,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stop &mdash; npm@3.10.10</p>
+<p id="footer">npm-stop &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@ -1,67 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-tag</title>
-  <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/cli/npm-tag.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../cli/npm-tag.html">npm-tag</a></h1> <p>Tag a published version</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>[DEPRECATED] npm tag &lt;name&gt;@&lt;version&gt; [&lt;tag&gt;]
-See `dist-tag`
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>THIS COMMAND IS DEPRECATED. See <a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a> for details.</p>
-<p>Tags the specified version of the package with the specified tag, or the
-<code>--tag</code> config if not specified.</p>
-<p>A tag can be used when installing packages as a reference to a version instead
-of using a specific version number:</p>
-<pre><code>npm install &lt;name&gt;@&lt;tag&gt;
-</code></pre><p>When installing dependencies, a preferred tagged version may be specified:</p>
-<pre><code>npm install --tag &lt;tag&gt;
-</code></pre><p>This also applies to <code>npm dedupe</code>.</p>
-<p>Publishing a package always sets the &quot;latest&quot; tag to the published version.</p>
-<h2 id="purpose">PURPOSE</h2>
-<p>Tags can be used to provide an alias instead of version numbers.  For
-example, <code>npm</code> currently uses the tag &quot;next&quot; to identify the upcoming
-version, and the tag &quot;latest&quot; to identify the current version.</p>
-<p>A project might choose to have multiple streams of development, e.g.,
-&quot;stable&quot;, &quot;canary&quot;.</p>
-<h2 id="caveats">CAVEATS</h2>
-<p>Tags must share a namespace with version numbers, because they are
-specified in the same slot: <code>npm install &lt;pkg&gt;@&lt;version&gt;</code> vs <code>npm
-install &lt;pkg&gt;@&lt;tag&gt;</code>.</p>
-<p>Tags that can be interpreted as valid semver ranges will be
-rejected. For example, <code>v1.4</code> cannot be used as a tag, because it is
-interpreted by semver as <code>&gt;=1.4.0 &lt;1.5.0</code>.  See
-<a href="https://github.com/npm/npm/issues/6082">https://github.com/npm/npm/issues/6082</a>.</p>
-<p>The simplest way to avoid semver problems with tags is to use tags
-that do not begin with a number or the letter <code>v</code>.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../cli/npm-publish.html">npm-publish(1)</a></li>
-<li><a href="../cli/npm-install.html">npm-install(1)</a></li>
-<li><a href="../cli/npm-dedupe.html">npm-dedupe(1)</a></li>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
-<li><a href="../cli/npm-config.html">npm-config(1)</a></li>
-<li><a href="../misc/npm-config.html">npm-config(7)</a></li>
-<li><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></li>
-<li><a href="../files/npmrc.html">npmrc(5)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-tag &mdash; npm@3.10.10</p>
-
--- a/deps/npm/html/doc/cli/npm-team.html
+++ b/deps/npm/html/doc/cli/npm-team.html
@ -67,5 +67,5 @@ use the <code>npm access</code> command to grant or revoke the appropriate permi
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-team &mdash; npm@3.10.10</p>
+<p id="footer">npm-team &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@ -16,8 +16,6 @@
  aliases: t, tst
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This runs a package&#39;s &quot;test&quot; script, if one was provided.</p>
-<p>To run tests as a condition of installation, set the <code>npat</code> config to
-true.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-run-script.html">npm-run-script(1)</a></li>
@ -38,5 +36,5 @@ true.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-test &mdash; npm@3.10.10</p>
+<p id="footer">npm-test &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@ -60,5 +60,5 @@ npm uninstall dtrace-provider --save-optional
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-uninstall &mdash; npm@3.10.10</p>
+<p id="footer">npm-uninstall &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@ -47,5 +47,5 @@ package again, a new version number must be used.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-unpublish &mdash; npm@3.10.10</p>
+<p id="footer">npm-unpublish &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@ -118,5 +118,5 @@ be <em>downgraded</em>.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-update &mdash; npm@3.10.10</p>
+<p id="footer">npm-update &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@ -79,6 +79,13 @@ and tag up to the server, and deletes the <code>build/temp</code> directory.</p>
 <li>Type: Boolean</li>
 </ul>
 <p>Commit and tag the version change.</p>
+<h3 id="sign-git-tag">sign-git-tag</h3>
+<ul>
+<li>Default: false</li>
+<li>Type: Boolean</li>
+</ul>
+<p>Pass the <code>-s</code> flag to git to sign the tag.</p>
+<p>Note that you must have a default GPG key set up in your git config for this to work properly.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-init.html">npm-init(1)</a></li>
@ -100,5 +107,5 @@ and tag up to the server, and deletes the <code>build/temp</code> directory.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-version &mdash; npm@3.10.10</p>
+<p id="footer">npm-version &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@ -86,5 +86,5 @@ the field name.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-view &mdash; npm@3.10.10</p>
+<p id="footer">npm-view &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@ -33,5 +33,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-whoami &mdash; npm@3.10.10</p>
+<p id="footer">npm-whoami &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@ -13,7 +13,7 @@
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm &lt;command&gt; [args]
 </code></pre><h2 id="version">VERSION</h2>
-<p>3.10.10</p>
+<p>4.0.5</p>
 <h2 id="description">DESCRIPTION</h2>
 <p>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 @@ will no doubt tell you to put the output in a gist or email.</p>
 <p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
 <a href="https://github.com/isaacs/">isaacs</a> ::
 <a href="http://twitter.com/izs">@izs</a> ::
-<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x69;&#64;&#x69;&#x7a;&#x73;&#x2e;&#x6d;&#x65;">&#x69;&#64;&#x69;&#x7a;&#x73;&#x2e;&#x6d;&#x65;</a></p>
+<a href="&#109;&#x61;&#x69;&#108;&#x74;&#x6f;&#58;&#x69;&#x40;&#x69;&#x7a;&#x73;&#x2e;&#x6d;&#x65;">&#x69;&#x40;&#x69;&#x7a;&#x73;&#x2e;&#x6d;&#x65;</a></p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-help.html">npm-help(1)</a></li>
@ -150,5 +150,5 @@ will no doubt tell you to put the output in a gist or email.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm &mdash; npm@3.10.10</p>
+<p id="footer">npm &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/files/npm-folders.html
+++ b/deps/npm/html/doc/files/npm-folders.html
@ -182,5 +182,5 @@ cannot be found elsewhere.  See <code><a href="../files/package.json.html">packa
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@3.10.10</p>
+<p id="footer">npm-folders &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/files/npm-global.html
+++ b/deps/npm/html/doc/files/npm-global.html
@ -182,5 +182,5 @@ cannot be found elsewhere.  See <code><a href="../files/package.json.html">packa
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@3.10.10</p>
+<p id="footer">npm-folders &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/files/npm-json.html
+++ b/deps/npm/html/doc/files/npm-json.html
@ -317,7 +317,7 @@ tarball or git URL.</p>
 <li><code>range1 || range2</code> Passes if either range1 or range2 are satisfied.</li>
 <li><code>git...</code> See &#39;Git URLs as Dependencies&#39; below</li>
 <li><code>user/repo</code> See &#39;GitHub URLs&#39; below</li>
-<li><code>tag</code> A specific version tagged and published as <code>tag</code>  See <code><a href="../cli/npm-tag.html">npm-tag(1)</a></code></li>
+<li><code>tag</code> A specific version tagged and published as <code>tag</code>  See <code><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></code></li>
 <li><code>path/path/path</code> See <a href="#local-paths">Local Paths</a> below</li>
 </ul>
 <p>For example, these are all valid:</p>
@ -357,8 +357,8 @@ included.  For example:</p>
  &quot;name&quot;: &quot;foo&quot;,
  &quot;version&quot;: &quot;0.0.0&quot;,
  &quot;dependencies&quot;: {
-    &quot;express&quot;: &quot;visionmedia/express&quot;,
-    &quot;mocha&quot;: &quot;visionmedia/mocha#4727d357ea&quot;,
+    &quot;express&quot;: &quot;expressjs/express&quot;,
+    &quot;mocha&quot;: &quot;mochajs/mocha#4727d357ea&quot;,
    &quot;module&quot;: &quot;user/repo#feature\/branch&quot;
  }
 }
@ -392,7 +392,7 @@ object.</p>
 from the root of a package, and can be managed like any other npm
 configuration param.  See <code><a href="../misc/npm-config.html">npm-config(7)</a></code> for more on the topic.</p>
 <p>For build steps that are not platform-specific, such as compiling
-CoffeeScript or other languages to JavaScript, use the <code>prepublish</code>
+CoffeeScript or other languages to JavaScript, use the <code>prepare</code>
 script to do this, and make the required package a devDependency.</p>
 <p>For example:</p>
 <pre><code>{ &quot;name&quot;: &quot;ethopia-waza&quot;,
@ -402,11 +402,11 @@ script to do this, and make the required package a devDependency.</p>
    &quot;coffee-script&quot;: &quot;~1.6.3&quot;
  },
  &quot;scripts&quot;: {
-    &quot;prepublish&quot;: &quot;coffee -o lib/ -c src/waza.coffee&quot;
+    &quot;prepare&quot;: &quot;coffee -o lib/ -c src/waza.coffee&quot;
  },
  &quot;main&quot;: &quot;lib/waza.js&quot;
 }
-</code></pre><p>The <code>prepublish</code> script will be run before publishing, so that users
+</code></pre><p>The <code>prepare</code> script will be run before publishing, so that users
 can consume the functionality without requiring them to compile it
 themselves.  In dev mode (ie, locally running <code>npm install</code>), it&#39;ll
 run this script as well, so that you can test it easily.</p>
@ -586,5 +586,5 @@ ignored.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@3.10.10</p>
+<p id="footer">package.json &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@ -35,11 +35,7 @@ override the setting in the globalconfig file.</p>
 example:</p>
 <pre><code>key[] = &quot;first value&quot;
 key[] = &quot;second value&quot;
-</code></pre><p><strong>NOTE:</strong> Because local (per-project or per-user) <code>.npmrc</code> files can contain
-sensitive credentials, they must be readable and writable <em>only</em> by your user
-account (i.e. must have a mode of <code>0600</code>), otherwise they <em>will be ignored by
-npm!</em></p>
-<h4 id="comments">Comments</h4>
+</code></pre><h4 id="comments">Comments</h4>
 <p>Lines in <code>.npmrc</code> files are interpreted as comments when they begin with a <code>;</code> or <code>#</code> character. <code>.npmrc</code> files are parsed by <a href="https://github.com/npm/ini">npm/ini</a>, which specifies this comment syntax.</p>
 <p>For example:</p>
 <pre><code># last modified: 01 Jan 2016
@ -89,5 +85,5 @@ manner.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npmrc &mdash; npm@3.10.10</p>
+<p id="footer">npmrc &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@ -317,7 +317,7 @@ tarball or git URL.</p>
 <li><code>range1 || range2</code> Passes if either range1 or range2 are satisfied.</li>
 <li><code>git...</code> See &#39;Git URLs as Dependencies&#39; below</li>
 <li><code>user/repo</code> See &#39;GitHub URLs&#39; below</li>
-<li><code>tag</code> A specific version tagged and published as <code>tag</code>  See <code><a href="../cli/npm-tag.html">npm-tag(1)</a></code></li>
+<li><code>tag</code> A specific version tagged and published as <code>tag</code>  See <code><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></code></li>
 <li><code>path/path/path</code> See <a href="#local-paths">Local Paths</a> below</li>
 </ul>
 <p>For example, these are all valid:</p>
@ -357,8 +357,8 @@ included.  For example:</p>
  &quot;name&quot;: &quot;foo&quot;,
  &quot;version&quot;: &quot;0.0.0&quot;,
  &quot;dependencies&quot;: {
-    &quot;express&quot;: &quot;visionmedia/express&quot;,
-    &quot;mocha&quot;: &quot;visionmedia/mocha#4727d357ea&quot;,
+    &quot;express&quot;: &quot;expressjs/express&quot;,
+    &quot;mocha&quot;: &quot;mochajs/mocha#4727d357ea&quot;,
    &quot;module&quot;: &quot;user/repo#feature\/branch&quot;
  }
 }
@ -392,7 +392,7 @@ object.</p>
 from the root of a package, and can be managed like any other npm
 configuration param.  See <code><a href="../misc/npm-config.html">npm-config(7)</a></code> for more on the topic.</p>
 <p>For build steps that are not platform-specific, such as compiling
-CoffeeScript or other languages to JavaScript, use the <code>prepublish</code>
+CoffeeScript or other languages to JavaScript, use the <code>prepare</code>
 script to do this, and make the required package a devDependency.</p>
 <p>For example:</p>
 <pre><code>{ &quot;name&quot;: &quot;ethopia-waza&quot;,
@ -402,11 +402,11 @@ script to do this, and make the required package a devDependency.</p>
    &quot;coffee-script&quot;: &quot;~1.6.3&quot;
  },
  &quot;scripts&quot;: {
-    &quot;prepublish&quot;: &quot;coffee -o lib/ -c src/waza.coffee&quot;
+    &quot;prepare&quot;: &quot;coffee -o lib/ -c src/waza.coffee&quot;
  },
  &quot;main&quot;: &quot;lib/waza.js&quot;
 }
-</code></pre><p>The <code>prepublish</code> script will be run before publishing, so that users
+</code></pre><p>The <code>prepare</code> script will be run before publishing, so that users
 can consume the functionality without requiring them to compile it
 themselves.  In dev mode (ie, locally running <code>npm install</code>), it&#39;ll
 run this script as well, so that you can test it easily.</p>
@ -586,5 +586,5 @@ ignored.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@3.10.10</p>
+<p id="footer">package.json &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@ -98,8 +98,6 @@
 <p>Start a package</p>
 <h3 id="npm-stop-1-"><a href="cli/npm-stop.html">npm-stop(1)</a></h3>
 <p>Stop a package</p>
-<h3 id="npm-tag-1-"><a href="cli/npm-tag.html">npm-tag(1)</a></h3>
-<p>Tag a published version</p>
 <h3 id="npm-team-1-"><a href="cli/npm-team.html">npm-team(1)</a></h3>
 <p>Manage organization teams and team memberships</p>
 <h3 id="npm-test-1-"><a href="cli/npm-test.html">npm-test(1)</a></h3>
@ -162,5 +160,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-index &mdash; npm@3.10.10</p>
+<p id="footer">npm-index &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@ -153,5 +153,5 @@ set to anything.&quot;</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-coding-style &mdash; npm@3.10.10</p>
+<p id="footer">npm-coding-style &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@ -24,7 +24,10 @@ interpreted as a configuration parameter.  For example, putting
 configuration parameter to <code>bar</code>.  Any environment configurations that
 are not given a value will be given the value of <code>true</code>.  Config
 values are case-insensitive, so <code>NPM_CONFIG_FOO=bar</code> will work the
-same.</p>
+same. However, please note that inside <a href="/misc/scripts">npm-scripts</a>
+npm will set it&#39;s own environment variables and Node will prefer
+those lowercase versions over any uppercase ones that you might set.
+For details see <a href="https://github.com/npm/npm/issues/14528">this issue</a>.</p>
 <h3 id="npmrc-files">npmrc Files</h3>
 <p>The four relevant files are:</p>
 <ul>
@ -236,8 +239,6 @@ e.g., <code>npm outdated --depth 9999</code></p>
 <li>Type: Boolean</li>
 </ul>
 <p>Install <code>dev-dependencies</code> along with packages.</p>
-<p>Note that <code>dev-dependencies</code> are also installed if the <code>npat</code> flag is
-set.</p>
 <h3 id="dry-run">dry-run</h3>
 <ul>
 <li>Default: false</li>
@ -431,9 +432,9 @@ version number, if not already set in package.json.</p>
 <li>Type: Boolean</li>
 </ul>
 <p>Whether or not to output JSON data, rather than the normal output.</p>
-<p>This feature is currently experimental, and the output data structures
-for many commands is either not implemented in JSON yet, or subject to
-change.  Only the output from <code>npm ls --json</code> is currently valid.</p>
+<p>This feature is currently experimental, and the output data structures for many
+commands is either not implemented in JSON yet, or subject to change.  Only the
+output from <code>npm ls --json</code> and <code>npm search --json</code> are currently valid.</p>
 <h3 id="key">key</h3>
 <ul>
 <li>Default: <code>null</code></li>
@ -522,12 +523,6 @@ combination). Passed to the <code>http</code> <code>Agent</code> used to make th
 <li>Type: semver or false</li>
 </ul>
 <p>The node version to use when checking a package&#39;s <code>engines</code> map.</p>
-<h3 id="npat">npat</h3>
-<ul>
-<li>Default: false</li>
-<li>Type: Boolean</li>
-</ul>
-<p>Run tests on installation.</p>
 <h3 id="onload-script">onload-script</h3>
 <ul>
 <li>Default: false</li>
@ -563,7 +558,7 @@ process is not aborted.</p>
 <li>Type: Boolean</li>
 </ul>
 <p>Output parseable results from commands that write to
-standard output.</p>
+standard output. For <code>npm search</code>, this will be tab-separated table format.</p>
 <h3 id="prefix">prefix</h3>
 <ul>
 <li>Default: see <a href="../files/npm-folders.html">npm-folders(5)</a></li>
@ -685,7 +680,7 @@ set to <code>^1.2.3</code> which allows minor upgrades for that package, but aft
 patch upgrades.</p>
 <h3 id="scope">scope</h3>
 <ul>
-<li>Default: &quot;&quot;</li>
+<li>Default: the scope of the current project, if any, or &quot;&quot;</li>
 <li>Type: String</li>
 </ul>
 <p>Associate an operation with a scope for a scoped registry. Useful when logging
@ -693,27 +688,40 @@ in to a private registry for the first time:
 <code>npm login --scope=@organization --registry=registry.organization.com</code>, which
 will cause <code>@organization</code> to be mapped to the registry for future installation
 of packages specified according to the pattern <code>@organization/package</code>.</p>
-<h3 id="searchopts">searchopts</h3>
+<h3 id="scripts-prepend-node-path">scripts-prepend-node-path</h3>
 <ul>
-<li>Default: &quot;&quot;</li>
-<li>Type: String</li>
+<li>Default: &quot;warn-only&quot;</li>
+<li>Type: Boolean, <code>&quot;auto&quot;</code> or <code>&quot;warn-only&quot;</code></li>
 </ul>
-<p>Space-separated options that are always passed to search.</p>
+<p>If set to <code>true</code>, add the directory in which the current <code>node</code> executable
+resides to the <code>PATH</code> environment variable when running scripts,
+even if that means that <code>npm</code> will invoke a different <code>node</code> executable than
+the one which it is running.</p>
+<p>If set to <code>false</code>, never modify <code>PATH</code> with that.</p>
+<p>If set to <code>&quot;warn-only&quot;</code>, never modify <code>PATH</code> but print a warning if <code>npm</code> thinks
+that you may want to run it with <code>true</code>, e.g. because the <code>node</code> executable
+in the <code>PATH</code> is not the one <code>npm</code> was invoked with.</p>
+<p>If set to <code>auto</code>, only add that directory to the <code>PATH</code> environment variable
+if the <code>node</code> executable with which <code>npm</code> was invoked and the one that is found
+first on the <code>PATH</code> are different.</p>
 <h3 id="searchexclude">searchexclude</h3>
 <ul>
 <li>Default: &quot;&quot;</li>
 <li>Type: String</li>
 </ul>
 <p>Space-separated options that limit the results from search.</p>
-<h3 id="searchsort">searchsort</h3>
+<h3 id="searchopts">searchopts</h3>
 <ul>
-<li>Default: &quot;name&quot;</li>
+<li>Default: &quot;&quot;</li>
 <li>Type: String</li>
-<li>Values: &quot;name&quot;, &quot;-name&quot;, &quot;date&quot;, &quot;-date&quot;, &quot;description&quot;,
-&quot;-description&quot;, &quot;keywords&quot;, &quot;-keywords&quot;</li>
 </ul>
-<p>Indication of which field to sort search results by.  Prefix with a <code>-</code>
-character to indicate reverse sort.</p>
+<p>Space-separated options that are always passed to search.</p>
+<h3 id="searchstaleness">searchstaleness</h3>
+<ul>
+<li>Default: 900 (15 minutes)</li>
+<li>Type: Number</li>
+</ul>
+<p>The age of the cache, in seconds, before another registry request is made.</p>
 <h3 id="shell">shell</h3>
 <ul>
 <li>Default: SHELL environment variable, or &quot;bash&quot; on Posix, or &quot;cmd&quot; on
@ -864,5 +872,5 @@ exit successfully.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@3.10.10</p>
+<p id="footer">npm-config &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@ -194,5 +194,5 @@ from a fresh checkout.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-developers &mdash; npm@3.10.10</p>
+<p id="footer">npm-developers &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@ -10,91 +10,113 @@
    <div id="wrapper">

 <h1><a href="../misc/npm-disputes.html">npm-disputes</a></h1> <p>Handling Module Name Disputes</p>
-<h2 id="synopsis">SYNOPSIS</h2>
+<p>This document describes the steps that you should take to resolve module name
+disputes with other npm publishers. It also describes special steps you should
+take about names you think infringe your trademarks.</p>
+<p>This document is a clarification of the acceptable behavior outlined in the
+<a href="https://www.npmjs.com/policies/conduct">npm Code of Conduct</a>, and nothing in
+this document should be interpreted to contradict any aspect of the npm Code of
+Conduct.</p>
+<h2 id="tl-dr">TL;DR</h2>
 <ol>
 <li>Get the author email with <code>npm owner ls &lt;pkgname&gt;</code></li>
-<li>Email the author, CC <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#115;&#117;&#112;&#x70;&#x6f;&#114;&#116;&#64;&#110;&#112;&#109;&#x6a;&#115;&#46;&#99;&#x6f;&#109;">&#115;&#117;&#112;&#x70;&#x6f;&#114;&#116;&#64;&#110;&#112;&#109;&#x6a;&#115;&#46;&#99;&#x6f;&#109;</a></li>
+<li>Email the author, CC <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#x73;&#117;&#112;&#x70;&#111;&#114;&#116;&#x40;&#110;&#x70;&#x6d;&#x6a;&#x73;&#46;&#x63;&#111;&#109;">&#x73;&#117;&#112;&#x70;&#111;&#114;&#116;&#x40;&#110;&#x70;&#x6d;&#x6a;&#x73;&#46;&#x63;&#111;&#109;</a></li>
 <li>After a few weeks, if there&#39;s no resolution, we&#39;ll sort it out.</li>
 </ol>
 <p>Don&#39;t squat on package names.  Publish code or move out of the way.</p>
 <h2 id="description">DESCRIPTION</h2>
-<p>There sometimes arise cases where a user publishes a module, and then
-later, some other user wants to use that name.  Here are some common
-ways that happens (each of these is based on actual events.)</p>
+<p>There sometimes arise cases where a user publishes a module, and then later,
+some other user wants to use that name. Here are some common ways that happens
+(each of these is based on actual events.)</p>
 <ol>
-<li>Joe writes a JavaScript module <code>foo</code>, which is not node-specific.
-Joe doesn&#39;t use node at all.  Bob   wants to use <code>foo</code> in node, so he
-wraps it in an npm module.  Some time later, Joe starts using node,
-and wants to take over management of his program.</li>
-<li>Bob writes an npm module <code>foo</code>, and publishes it.  Perhaps much
-later, Joe finds a bug in <code>foo</code>, and fixes it.  He sends a pull
-request to Bob, but Bob doesn&#39;t have the time to deal with it,
-because he has a new job and a new baby and is focused on his new
-erlang project, and kind of not involved with node any more.  Joe
-would like to publish a new <code>foo</code>, but can&#39;t, because the name is
-taken.</li>
-<li>Bob writes a 10-line flow-control library, and calls it <code>foo</code>, and
-publishes it to the npm registry.  Being a simple little thing, it
-never really has to be updated.  Joe works for Foo Inc, the makers
-of the critically acclaimed and widely-marketed <code>foo</code> JavaScript
-toolkit framework.  They publish it to npm as <code>foojs</code>, but people are
-routinely confused when <code>npm install foo</code> is some different thing.</li>
-<li>Bob writes a parser for the widely-known <code>foo</code> file format, because
-he needs it for work.  Then, he gets a new job, and never updates the
-prototype.  Later on, Joe writes a much more complete <code>foo</code> parser,
-but can&#39;t publish, because Bob&#39;s <code>foo</code> is in the way.</li>
-</ol>
-<p>The validity of Joe&#39;s claim in each situation can be debated.  However,
-Joe&#39;s appropriate course of action in each case is the same.</p>
-<ol>
-<li><code>npm owner ls foo</code>.  This will tell Joe the email address of the
-owner (Bob).</li>
-<li>Joe emails Bob, explaining the situation <strong>as respectfully as
-possible</strong>, and what he would like to do with the module name.  He
-adds the npm support staff <a href="&#109;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#115;&#x75;&#112;&#x70;&#x6f;&#114;&#x74;&#64;&#110;&#112;&#x6d;&#106;&#115;&#46;&#99;&#x6f;&#x6d;">&#115;&#x75;&#112;&#x70;&#x6f;&#114;&#x74;&#64;&#110;&#112;&#x6d;&#106;&#115;&#46;&#99;&#x6f;&#x6d;</a> to the CC list of
-the email.  Mention in the email that Bob can run <code>npm owner add
-joe foo</code> to add Joe as an owner of the <code>foo</code> package.</li>
-<li>After a reasonable amount of time, if Bob has not responded, or if
-Bob and Joe can&#39;t come to any sort of resolution, email support
-<a href="&#109;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#x73;&#117;&#112;&#x70;&#x6f;&#x72;&#116;&#x40;&#x6e;&#x70;&#x6d;&#x6a;&#x73;&#46;&#99;&#111;&#109;">&#x73;&#117;&#112;&#x70;&#x6f;&#x72;&#116;&#x40;&#x6e;&#x70;&#x6d;&#x6a;&#x73;&#46;&#99;&#111;&#109;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
-usually at least 4 weeks, but extra time is allowed around common
-holidays.)</li>
+<li>Alice writes a JavaScript module <code>foo</code>, which is not node-specific. Alice
+doesn&#39;t use node at all. Yusuf wants to use <code>foo</code> in node, so he wraps it in
+an npm module. Some time later, Alice starts using node, and wants to take
+over management of her program.</li>
+<li>Yusuf writes an npm module <code>foo</code>, and publishes it. Perhaps much later, Alice
+finds a bug in <code>foo</code>, and fixes it. She sends a pull request to Yusuf, but
+Yusuf doesn&#39;t have the time to deal with it, because he has a new job and a
+new baby and is focused on his new Erlang project, and kind of not involved
+with node any more. Alice would like to publish a new <code>foo</code>, but can&#39;t,
+because the name is taken.</li>
+<li>Yusuf writes a 10-line flow-control library, and calls it <code>foo</code>, and
+publishes it to the npm registry. Being a simple little thing, it never
+really has to be updated. Alice works for Foo Inc, the makers of the
+critically acclaimed and widely-marketed <code>foo</code> JavaScript toolkit framework.
+They publish it to npm as <code>foojs</code>, but people are routinely confused when
+<code>npm install</code>foo`` is some different thing.</li>
+<li><p>Yusuf writes a parser for the widely-known <code>foo</code> file format, because he
+needs it for work. Then, he gets a new job, and never updates the prototype.
+Later on, Alice writes a much more complete <code>foo</code> parser, but can&#39;t publish,
+because Yusuf&#39;s <code>foo</code> is in the way.</p>
+</li>
+<li><p><code>npm owner ls foo</code>. This will tell Alice the email address of the owner
+(Yusuf).</p>
+</li>
+<li>Alice emails Yusuf, explaining the situation <strong>as respectfully as possible</strong>,
+and what she would like to do with the module name. She adds the npm support
+staff <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#115;&#x75;&#x70;&#x70;&#x6f;&#x72;&#x74;&#x40;&#110;&#x70;&#x6d;&#x6a;&#x73;&#x2e;&#x63;&#111;&#x6d;">&#115;&#x75;&#x70;&#x70;&#x6f;&#x72;&#x74;&#x40;&#110;&#x70;&#x6d;&#x6a;&#x73;&#x2e;&#x63;&#111;&#x6d;</a> to the CC list of the email. Mention in the email
+that Yusuf can run npm owner <code>add alice foo</code> to add Alice as an owner of the
+foo package.</li>
+<li>After a reasonable amount of time, if Yusuf has not responded, or if Yusuf
+and Alice can&#39;t come to any sort of resolution, email support
+<a href="&#109;&#97;&#x69;&#108;&#116;&#x6f;&#58;&#115;&#x75;&#112;&#112;&#x6f;&#x72;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#x73;&#46;&#x63;&#x6f;&#109;">&#115;&#x75;&#112;&#112;&#x6f;&#x72;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#x73;&#46;&#x63;&#x6f;&#109;</a> and we&#39;ll sort it out. (&quot;Reasonable&quot; is usually at least
+4 weeks.)</li>
 </ol>
 <h2 id="reasoning">REASONING</h2>
-<p>In almost every case so far, the parties involved have been able to reach
-an amicable resolution without any major intervention.  Most people
-really do want to be reasonable, and are probably not even aware that
-they&#39;re in your way.</p>
-<p>Module ecosystems are most vibrant and powerful when they are as
-self-directed as possible.  If an admin one day deletes something you
-had worked on, then that is going to make most people quite upset,
-regardless of the justification.  When humans solve their problems by
-talking to other humans with respect, everyone has the chance to end up
-feeling good about the interaction.</p>
+<p>In almost every case so far, the parties involved have been able to reach an
+amicable resolution without any major intervention. Most people really do want
+to be reasonable, and are probably not even aware that they&#39;re in your way.</p>
+<p>Module ecosystems are most vibrant and powerful when they are as self-directed
+as possible. If an admin one day deletes something you had worked on, then that
+is going to make most people quite upset, regardless of the justification. When
+humans solve their problems by talking to other humans with respect, everyone
+has the chance to end up feeling good about the interaction.</p>
 <h2 id="exceptions">EXCEPTIONS</h2>
-<p>Some things are not allowed, and will be removed without discussion if
-they are brought to the attention of the npm registry admins, including
-but not limited to:</p>
+<p>Some things are not allowed, and will be removed without discussion if they are
+brought to the attention of the npm registry admins, including but not limited
+to:</p>
 <ol>
-<li>Malware (that is, a package designed to exploit or harm the machine on
-which it is installed).</li>
-<li>Violations of copyright or licenses (for example, cloning an
-MIT-licensed program, and then removing or changing the copyright and
-license statement).</li>
+<li>Malware (that is, a package designed to exploit or harm the machine on which
+it is installed).</li>
+<li>Violations of copyright or licenses (for example, cloning an MIT-licensed
+program, and then removing or changing the copyright and license statement).</li>
 <li>Illegal content.</li>
-<li>&quot;Squatting&quot; on a package name that you <em>plan</em> to use, but aren&#39;t
-actually using.  Sorry, I don&#39;t care how great the name is, or how
-perfect a fit it is for the thing that someday might happen.  If
-someone wants to use it today, and you&#39;re just taking up space with
-an empty tarball, you&#39;re going to be evicted.</li>
-<li>Putting empty packages in the registry.  Packages must have SOME
-functionality.  It can be silly, but it can&#39;t be <em>nothing</em>.  (See
-also: squatting.)</li>
-<li>Doing weird things with the registry, like using it as your own
-personal application database or otherwise putting non-packagey
-things into it.</li>
+<li>&quot;Squatting&quot; on a package name that you plan to use, but aren&#39;t actually
+using. Sorry, I don&#39;t care how great the name is, or how perfect a fit it is
+for the thing that someday might happen. If someone wants to use it today,
+and you&#39;re just taking up space with an empty tarball, you&#39;re going to be
+evicted.</li>
+<li>Putting empty packages in the registry. Packages must have SOME
+functionality. It can be silly, but it can&#39;t be nothing. (See also:
+squatting.)</li>
+<li>Doing weird things with the registry, like using it as your own personal
+application database or otherwise putting non-packagey things into it.</li>
+<li>Other things forbidden by the npm
+<a href="https://www.npmjs.com/policies/conduct">Code of Conduct</a> such as hateful
+language, pornographic content, or harassment.</li>
 </ol>
-<p>If you see bad behavior like this, please report it right away.</p>
+<p>If you see bad behavior like this, please report it to <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#98;&#117;&#115;&#x65;&#x40;&#110;&#112;&#109;&#106;&#x73;&#x2e;&#99;&#111;&#x6d;">&#97;&#98;&#117;&#115;&#x65;&#x40;&#110;&#112;&#109;&#106;&#x73;&#x2e;&#99;&#111;&#x6d;</a> right
+away. <strong>You are never expected to resolve abusive behavior on your own. We are
+here to help.</strong></p>
+<h2 id="trademarks">TRADEMARKS</h2>
+<p>If you think another npm publisher is infringing your trademark, such as by
+using a confusingly similar package name, email <a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#98;&#x75;&#x73;&#x65;&#x40;&#110;&#x70;&#x6d;&#106;&#x73;&#46;&#99;&#111;&#109;">&#97;&#98;&#x75;&#x73;&#x65;&#x40;&#110;&#x70;&#x6d;&#106;&#x73;&#46;&#99;&#111;&#109;</a> with a link to
+the package or user account on <a href="https://npmjs.com">https://npmjs.com</a>. Attach a
+copy of your trademark registration certificate.</p>
+<p>If we see that the package&#39;s publisher is intentionally misleading others by
+misusing your registered mark without permission, we will transfer the package
+name to you. Otherwise, we will contact the package publisher and ask them to
+clear up any confusion with changes to their package&#39;s <code><a href="../../doc/README.html">README</a></code> file or
+metadata.</p>
+<h2 id="changes">CHANGES</h2>
+<p>This is a living document and may be updated from time to time. Please refer to
+the <a href="https://github.com/npm/npm/commits/master/doc/misc/npm-disputes.md">git history for this document</a>
+to view the changes.</p>
+<h2 id="license">LICENSE</h2>
+<p>Copyright (C) npm, Inc., All rights reserved</p>
+<p>This document may be reused under a Creative Commons Attribution-ShareAlike
+License.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
@ -112,5 +134,5 @@ things into it.</li>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-disputes &mdash; npm@3.10.10</p>
+<p id="footer">npm-disputes &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-index.html
+++ b/deps/npm/html/doc/misc/npm-index.html
@ -98,8 +98,6 @@
 <p>Start a package</p>
 <h3 id="npm-stop-1-"><a href="../cli/npm-stop.html">npm-stop(1)</a></h3>
 <p>Stop a package</p>
-<h3 id="npm-tag-1-"><a href="../cli/npm-tag.html">npm-tag(1)</a></h3>
-<p>Tag a published version</p>
 <h3 id="npm-team-1-"><a href="../cli/npm-team.html">npm-team(1)</a></h3>
 <p>Manage organization teams and team memberships</p>
 <h3 id="npm-test-1-"><a href="../cli/npm-test.html">npm-test(1)</a></h3>
@ -162,5 +160,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-index &mdash; npm@3.10.10</p>
+<p id="footer">npm-index &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-orgs.html
+++ b/deps/npm/html/doc/misc/npm-orgs.html
@ -86,5 +86,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-orgs &mdash; npm@3.10.10</p>
+<p id="footer">npm-orgs &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@ -25,6 +25,26 @@ available at <a href="https://github.com/npm/npm-registry-couchapp">https://gith
 <code><a href="../misc/npm-scope.html">npm-scope(7)</a></code>). If no scope is specified, the default registry is used, which is
 supplied by the <code>registry</code> config parameter.  See <code><a href="../cli/npm-config.html">npm-config(1)</a></code>,
 <code><a href="../files/npmrc.html">npmrc(5)</a></code>, and <code><a href="../misc/npm-config.html">npm-config(7)</a></code> for more on managing npm&#39;s configuration.</p>
+<h2 id="does-npm-send-any-information-about-me-back-to-the-registry-">Does npm send any information about me back to the registry?</h2>
+<p>Yes.</p>
+<p>When making requests of the registry npm adds two headers with information
+about your environment:</p>
+<ul>
+<li><code>Npm-Scope</code> – If your project is scoped, this header will contain its
+scope. In the future npm hopes to build registry features that use this
+information to allow you to customize your experience for your
+organization.</li>
+<li><code>Npm-In-CI</code> – Set to &quot;true&quot; if npm believes this install is running in a
+continous integration environment, &quot;false&quot; otherwise. This is detected by
+looking for the following environment variables: <code>CI</code>, <code>TDDIUM</code>,
+<code>JENKINS_URL</code>, <code>bamboo.buildKey</code>. If you&#39;d like to learn more you may find
+the <a href="https://github.com/npm/npm-registry-client/pull/129">original PR</a>
+interesting.
+This is used to gather better metrics on how npm is used by humans, versus
+build farms.</li>
+</ul>
+<p>The npm registry does not to correlate the information in these headers with
+any authenticated accounts that may be used in the same requests.</p>
 <h2 id="can-i-run-my-own-private-registry-">Can I run my own private registry?</h2>
 <p>Yes!</p>
 <p>The easiest way is to replicate the couch database, and use the same (or
@ -70,5 +90,5 @@ effectively implement the entire CouchDB API anyway.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-registry &mdash; npm@3.10.10</p>
+<p id="footer">npm-registry &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@ -94,5 +94,5 @@ that registry instead.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scope &mdash; npm@3.10.10</p>
+<p id="footer">npm-scope &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@ -16,7 +16,13 @@ following scripts:</p>
 <ul>
 <li>prepublish:
 Run BEFORE the package is published.  (Also run on local <code>npm
-install</code> without any arguments.)</li>
+install</code> without any arguments. See below.)</li>
+<li>prepare:
+Run both BEFORE the package is published, and on local <code>npm
+install</code> without any arguments. (See below.) This is run
+AFTER <code>prepublish</code>, but BEFORE <code>prepublishOnly</code>.</li>
+<li>prepublishOnly:
+Run BEFORE the package is published. (See below.)</li>
 <li>publish, postpublish:
 Run AFTER the package is published.</li>
 <li>preinstall:
@ -50,7 +56,25 @@ run-script &lt;stage&gt;</code>. <em>Pre</em> and <em>post</em> commands with ma
 names will be run for those as well (e.g. <code>premyscript</code>, <code>myscript</code>,
 <code>postmyscript</code>). Scripts from dependencies can be run with `npm explore</p>
 <p><pkg> -- npm run <stage>`.</p>
-<h2 id="common-uses">COMMON USES</h2>
+<h2 id="prepublish-and-prepare">PREPUBLISH AND PREPARE</h2>
+<h3 id="deprecation-note">DEPRECATION NOTE</h3>
+<p>Since <code>npm@1.1.71</code>, the npm CLI has run the <code>prepublish</code> script for both <code>npm
+publish</code> and <code>npm install</code>, because it&#39;s a convenient way to prepare a package
+for use (some common use cases are described in the section below).  It has
+also turned out to be, in practice, <a href="https://github.com/npm/npm/issues/10074">very
+confusing</a>.  As of <code>npm@4.0.0</code>, a new
+event has been introduced, <code>prepare</code>, that preserves this existing behavior. A
+<em>new</em> event, <code>prepublishOnly</code> has been added as a transitional strategy to
+allow users to avoid the confusing behavior of existing npm versions and only
+run on <code>npm publish</code> (for instance, running the tests one last time to ensure
+they&#39;re in good shape).</p>
+<p><strong>IMPORTANT:</strong> As of <code>npm@5</code>, <code>prepublish</code> will <em>only</em> be run for <code>npm
+publish</code>.  This will make its behavior identical to <code>prepublishOnly</code>, so
+<code>npm@6</code> or later may drop support for the use of <code>prepublishOnly</code>, and then
+maybe we can all forget this embarrassing thing ever happened.</p>
+<p>See <a href="https://github.com/npm/npm/issues/10074">https://github.com/npm/npm/issues/10074</a> for a much lengthier
+justification, with further reading, for this change.</p>
+<h3 id="use-cases">USE CASES</h3>
 <p>If you need to perform operations on your package before it is used, in a way
 that is not dependent on the operating system or architecture of the
 target system, use a <code>prepublish</code> script.  This includes
@ -213,5 +237,5 @@ scripts is for compilation which must be done on the target architecture.</li>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scripts &mdash; npm@3.10.10</p>
+<p id="footer">npm-scripts &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@ -57,5 +57,5 @@ modules.  To track those down, you can do the following:</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">removing-npm &mdash; npm@3.10.10</p>
+<p id="footer">removing-npm &mdash; npm@4.0.5</p>

--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@ -325,5 +325,5 @@ range, use the <code>satisfies(version, range)</code> function.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">semver &mdash; npm@3.10.10</p>
+<p id="footer">semver &mdash; npm@4.0.5</p>

--- a/deps/npm/lib/adduser.js
+++ b/deps/npm/lib/adduser.js
@ -137,8 +137,6 @@ function save (c, u, cb) {

  // there may be a saved scope and no --registry (for login)
  if (scope) {
-    if (scope.charAt(0) !== '@') scope = '@' + scope
-
    var scopedRegistry = npm.config.get(scope + ':registry')
    var cliRegistry = npm.config.get('registry', 'cli')
    if (scopedRegistry && !cliRegistry) uri = scopedRegistry
--- a/deps/npm/lib/build.js
+++ b/deps/npm/lib/build.js
@ -66,8 +66,7 @@ function build_ (global, didPre, didRB) {
        [linkStuff, pkg, folder, global, didRB],
        [writeBuiltinConf, pkg, folder],
        didPre !== build._noLC && [lifecycle, pkg, 'install', folder],
-        didPre !== build._noLC && [lifecycle, pkg, 'postinstall', folder],
-        didPre !== build._noLC && npm.config.get('npat') && [lifecycle, pkg, 'test', folder]
+        didPre !== build._noLC && [lifecycle, pkg, 'postinstall', folder]
      ],
      cb)
    })
@ -191,7 +190,7 @@ function linkBins (pkg, folder, parent, gtop, cb) {
  }
  var binRoot = gtop ? npm.globalBin
                     : path.resolve(parent, '.bin')
-  log.verbose('link bins', [pkg.bin, binRoot, gtop])
+  log.verbose('linkBins', [pkg.bin, binRoot, gtop])

  asyncMap(Object.keys(pkg.bin), function (b, cb) {
    linkBin(
--- a/deps/npm/lib/cache/add-local.js
+++ b/deps/npm/lib/cache/add-local.js
@ -8,6 +8,7 @@ var log = require('npmlog')
 var npm = require('../npm.js')
 var tar = require('../utils/tar.js')
 var deprCheck = require('../utils/depr-check.js')
+var prepublishWarning = require('../utils/warn-deprecated.js')('prepublish-on-install')
 var getCacheStat = require('./get-stat.js')
 var cachedPackageRoot = require('./cached-package-root.js')
 var addLocalTarball = require('./add-local-tarball.js')
@ -15,6 +16,7 @@ var sha = require('sha')
 var inflight = require('inflight')
 var lifecycle = require('../utils/lifecycle.js')
 var iferr = require('iferr')
+var chain = require('slide').chain

 module.exports = addLocal

@ -94,7 +96,23 @@ function addLocalDirectory (p, pkgData, shasum, cb) {
        if (er) return wrapped(er)
        var doPrePublish = !pathIsInside(p, npm.tmp)
        if (doPrePublish) {
-          lifecycle(data, 'prepublish', p, iferr(wrapped, thenPack))
+          // TODO: for `npm@5`, change the behavior and remove this warning.
+          // see https://github.com/npm/npm/issues/10074 for details
+          if (data && data.scripts && data.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`.)',
+              'See the deprecation note in `npm help scripts` for more information.'
+            ])
+          }
+
+          chain(
+            [
+              [lifecycle, data, 'prepublish', p],
+              [lifecycle, data, 'prepare', p]
+            ],
+            iferr(wrapped, thenPack)
+          )
        } else {
          thenPack()
        }
--- a/deps/npm/lib/cache/caching-client.js
+++ b/deps/npm/lib/cache/caching-client.js
@ -214,6 +214,7 @@ function adaptConfig (config) {
    log: log,
    defaultTag: config.get('tag'),
    couchToken: config.get('_token'),
-    maxSockets: config.get('maxsockets')
+    maxSockets: config.get('maxsockets'),
+    scope: npm.projectScope
  }
 }
--- a/deps/npm/lib/cache/update-index.js
+++ b/deps/npm/lib/cache/update-index.js
@ -1,105 +0,0 @@
-module.exports = updateIndex
-
-var fs = require('graceful-fs')
-var assert = require('assert')
-var path = require('path')
-var mkdir = require('mkdirp')
-var chownr = require('chownr')
-var npm = require('../npm.js')
-var log = require('npmlog')
-var cacheFile = require('npm-cache-filename')
-var getCacheStat = require('./get-stat.js')
-var mapToRegistry = require('../utils/map-to-registry.js')
-var pulseTillDone = require('../utils/pulse-till-done.js')
-var parseJSON = require('../utils/parse-json.js')
-
-/* /-/all is special.
- * It uses timestamp-based caching and partial updates,
- * because it is a monster.
- */
-function updateIndex (staleness, cb) {
-  assert(typeof cb === 'function', 'must pass callback to updateIndex')
-
-  mapToRegistry('-/all', npm.config, function (er, uri, auth) {
-    if (er) return cb(er)
-
-    var params = {
-      timeout: staleness,
-      follow: true,
-      staleOk: true,
-      auth: auth
-    }
-    var cacheBase = cacheFile(npm.config.get('cache'))(uri)
-    var cachePath = path.join(cacheBase, '.cache.json')
-    log.info('updateIndex', cachePath)
-
-    getCacheStat(function (er, st) {
-      if (er) return cb(er)
-
-      mkdir(cacheBase, function (er, made) {
-        if (er) return cb(er)
-
-        fs.readFile(cachePath, function (er, data) {
-          if (er) {
-            log.warn('', 'Building the local index for the first time, please be patient')
-            return updateIndex_(uri, params, {}, cachePath, cb)
-          }
-
-          chownr(made || cachePath, st.uid, st.gid, function (er) {
-            if (er) return cb(er)
-
-            data = parseJSON.noExceptions(data)
-            if (!data) {
-              fs.writeFile(cachePath, '{}', function (er) {
-                if (er) return cb(new Error('Broken cache.'))
-
-                log.warn('', 'Building the local index for the first time, please be patient')
-                return updateIndex_(uri, params, {}, cachePath, cb)
-              })
-            }
-
-            var t = +data._updated || 0
-            // use the cache and update in the background if it's not too old
-            if (Date.now() - t < 60000) {
-              cb(null, data)
-              cb = function () {}
-            }
-
-            if (t === 0) {
-              log.warn('', 'Building the local index for the first time, please be patient')
-            } else {
-              log.verbose('updateIndex', 'Cached search data present with timestamp', t)
-              uri += '/since?stale=update_after&startkey=' + t
-            }
-            updateIndex_(uri, params, data, cachePath, cb)
-          })
-        })
-      })
-    })
-  })
-}
-
-function updateIndex_ (all, params, data, cachePath, cb) {
-  log.silly('update-index', 'fetching', all)
-  npm.registry.request(all, params, pulseTillDone('updateIndex', function (er, updates, _, res) {
-    if (er) return cb(er, data)
-
-    var headers = res.headers
-    var updated = updates._updated || Date.parse(headers.date)
-
-    Object.keys(updates).forEach(function (p) { data[p] = updates[p] })
-
-    data._updated = updated
-    getCacheStat(function (er, st) {
-      if (er) return cb(er)
-
-      fs.writeFile(cachePath, JSON.stringify(data), function (er) {
-        delete data._updated
-        if (er) return cb(er)
-        chownr(cachePath, st.uid, st.gid, function (er) {
-          cb(er, data)
-        })
-      })
-    })
-  }))
-}
--- a/deps/npm/lib/config/cmd-list.js
+++ b/deps/npm/lib/config/cmd-list.js
@ -64,7 +64,6 @@ var cmdList = [
  'publish',
  'star',
  'stars',
-  'tag',
  'adduser',
  'login', // This is an alias for `adduser` but it can be confusing
  'logout',
--- a/deps/npm/lib/config/defaults.js
+++ b/deps/npm/lib/config/defaults.js
@ -168,7 +168,6 @@ Object.defineProperty(exports, 'defaults', {get: function () {
    maxsockets: 50,
    message: '%s',
    'node-version': process.version,
-    npat: false,
    'onload-script': false,
    only: null,
    optional: true,
@ -193,9 +192,10 @@ Object.defineProperty(exports, 'defaults', {get: function () {
    'save-optional': false,
    'save-prefix': '^',
    scope: '',
+    'scripts-prepend-node-path': 'warn-only',
    searchopts: '',
    searchexclude: null,
-    searchsort: 'name',
+    searchstaleness: 15 * 60,
    shell: osenv.shell(),
    shrinkwrap: true,
    'sign-git-tag': false,
@ -280,7 +280,6 @@ exports.types = {
  maxsockets: Number,
  message: String,
  'node-version': [null, semver],
-  npat: Boolean,
  'onload-script': [null, String],
  only: [null, 'dev', 'development', 'prod', 'production'],
  optional: Boolean,
@ -300,15 +299,10 @@ exports.types = {
  'save-optional': Boolean,
  'save-prefix': String,
  scope: String,
+  'scripts-prepend-node-path': [false, true, 'auto', 'warn-only'],
  searchopts: String,
  searchexclude: [null, String],
-  searchsort: [
-    'name', '-name',
-    'description', '-description',
-    'author', '-author',
-    'date', '-date',
-    'keywords', '-keywords'
-  ],
+  searchstaleness: Number,
  shell: String,
  shrinkwrap: Boolean,
  'sign-git-tag': Boolean,
@ -370,8 +364,6 @@ exports.shorthands = {
  help: ['--usage'],
  v: ['--version'],
  f: ['--force'],
-  gangster: ['--force'],
-  gangsta: ['--force'],
  desc: ['--description'],
  'no-desc': ['--no-description'],
  'local': ['--no-global'],
--- a/Show More
+++ b/Show More