deps: upgrade npm to 3.6.0

PR-URL: #4958
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: Kat Marchán <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>

deps/npm/.mailmap

@@ -2,6 +2,8 @@ Alex K. Wolfe <[email protected]>
 Andrew Bradley <[email protected]>
 Andrew Lunny <[email protected]>
 Arlo Breault <[email protected]>
+Ashley Williams <[email protected]> <[email protected]>
+Ashley Williams <[email protected]> <[email protected]>
 Benjamin Coe <[email protected]>
 Benjamin Coe <[email protected]> <[email protected]>
 Brian White <[email protected]> <[email protected]>
@@ -28,10 +30,12 @@ James Treworgy <[email protected]>
 Jason Smith <[email protected]>
 Jonas Weber <[email protected]>
 Julien Meddah <[email protected]>
+Kevin Lorenz <[email protected]>
 Kris Windham <[email protected]>
 Lin Clark <[email protected]>
 Luke Arduini <[email protected]> <[email protected]>
 Maciej Małecki <[email protected]> <[email protected]>
+Martin Ek <[email protected]>
 Max Goodman <[email protected]>
 Maxim Bogushevich <[email protected]>
 Maximilian Antoni <[email protected]> <[email protected]>

deps/npm/.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "4.1"
-  - "4.0"
+  - "5"
+  - "4"
   - iojs
   - "0.12"
   - "0.10"

deps/npm/AUTHORS

@@ -324,3 +324,31 @@ Jason Kurian <[email protected]>
 Sebastiaan Deckers <[email protected]>
 lady3bean <[email protected]>
 Tomi Carr <[email protected]>
+Juan Caicedo <[email protected]>
+Ashley Williams <[email protected]>
+Andrew Marcinkevičius <[email protected]>
+Jorrit Schippers <[email protected]>
+Alex Lukin <[email protected]>
+Aria Stewart <[email protected]>
+Tiago Rodrigues <[email protected]>
+Tim <[email protected]>
+Nick Williams <[email protected]>
+Louis Larry <[email protected]>
+Ben Gotow <[email protected]>
+Jakub Gieryluk <[email protected]>
+Kevin Lorenz <[email protected]>
+Martin von Gagern <[email protected]>
+Eymen Gunay <[email protected]>
+Martin Ek <[email protected]>
+Rafał Pocztarski <[email protected]>
+Mark Reeder <[email protected]>
+Chris Rebert <[email protected]>
+Scott Addie <[email protected]>
+Jeff McMahan <[email protected]>
+Tim Krins <[email protected]>
+Hal Henke <[email protected]>
+Julian Simioni <[email protected]>
+Jimb Esser <[email protected]>
+Alexis Campailla <[email protected]>
+Chris Chua <[email protected]>
+Beau Gunderson <[email protected]>

deps/npm/LICENSE

@@ -1,11 +1,29 @@
+The npm application
 Copyright (c) npm, Inc. and Contributors
-All rights reserved.
+Licensed on the terms of The Artistic License 2.0
 
-npm is released under the Artistic License 2.0, subject to additional terms
-that are listed below.
+Node package dependencies of the npm application
+Copyright (c) their respective copyright owners
+Licensed on their respective license terms
 
-The text of the npm License follows and the text of the additional terms
-follows the Artistic License 2.0 terms:
+The npm public registry at https://registry.npmjs.org
+and the npm website at https://www.npmjs.com
+Operated by npm, Inc.
+Use governed by terms published on https://www.npmjs.com
+
+"Node.js"
+Trademark Joyent, Inc., https://joyent.com
+Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
+
+The Node.js application
+Project of Node Foundation, https://nodejs.org
+
+The npm Logo
+Copyright (c) Mathias Pettersson and Brian Hammond
+
+"Gubblebum Blocky" typeface
+Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
+Used with permission
 
 
 --------
@@ -215,49 +233,3 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 --------
-
-
-The following additional terms shall apply to use of the npm software, the npm
-website, the npm repository and any other services or products offered by npm,
-Inc.:
-
-"Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
-project, and is neither owned by nor affiliated with Joyent, Inc.
-
-"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
-
-Modules published on the npm registry are not officially endorsed by npm, Inc.
-or the Node.js project.
-
-Data published to the npm registry is not part of npm itself, and is the sole
-property of the publisher. While every effort is made to ensure accountability,
-there is absolutely no guarantee, warrantee, or assertion expressed or implied
-as to the quality, fitness for a specific purpose, or lack of malice in any
-given npm package.  Packages downloaded through the npm registry are
-independently licensed and are not covered by this license.
-
-Additional policies relating to, and restrictions on use of, npm products and
-services are available on the npm website.  All such policies and restrictions,
-as updated from time to time, are hereby incorporated into this license
-agreement.  By using npm, you acknowledge your agreement to all such policies
-and restrictions.
-
-If you have a complaint about a package in the public npm registry, and cannot
-resolve it with the package owner, please email [email protected] and explain
-the situation.  See the [npm Dispute Resolution
-policy](https://github.com/npm/policies/blob/master/disputes.md) for more
-details.
-
-Any data published to The npm Registry (including user account information) may
-be removed or modified at the sole discretion of the npm server administrators.
-
-"npm Logo" contributed by Mathias Pettersson and Brian Hammond,
-use is subject to https://www.npmjs.com/policies/trademark
-
-"Gubblebum Blocky" font
-Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
-included for use in the npm website and documentation,
-used with permission.
-
-This program uses several Node modules contained in the node_modules/
-subdirectory, according to the terms of their respective licenses.

deps/npm/Makefile

@@ -167,7 +167,8 @@ publish: link doc
 	git push origin --tags &&\
 	npm publish --tag=$(PUBLISHTAG)
 
-release:
+release: markedclean marked-manclean doc-clean doc
+	node cli.js prune --production
 	@bash scripts/release.sh
 
 sandwich:

deps/npm/README.md

@@ -14,6 +14,17 @@ Much more info available via `npm help` once it's installed.
 To install an old **and unsupported** version of npm that works on node 0.3
 and prior, clone the git repo and dig through the old tags and branches.
 
+**npm is configured to use npm, Inc.'s public package registry at
+<https://registry.npmjs.org> by default.**
+
+You can configure npm to use any compatible registry you
+like, and even run your own registry. Check out the [doc on
+registries](https://docs.npmjs.com/misc/registry).
+
+Use of someone else's registry may be governed by terms of use. The
+terms of use for the default public registry are available at
+<https://www.npmjs.com>.
+
 ## Super Easy Install
 
 npm is bundled with [node](http://nodejs.org/download/).
@@ -127,52 +138,6 @@ must remove them yourself manually if you want them gone.  Note that
 this means that future npm installs will not remember the settings that
 you have chosen.
 
-## Using npm Programmatically
-
-Although npm can be used programmatically, its API is meant for use by the CLI
-*only*, and no guarantees are made regarding its fitness for any other purpose.
-If you want to use npm to reliably perform some task, the safest thing to do is
-to invoke the desired `npm` command with appropriate arguments.
-
-The semantic version of npm refers to the CLI itself, rather than the
-underlying API. _The internal API is not guaranteed to remain stable even when
-npm's version indicates no breaking changes have been made according to
-semver._
-
-If you _still_ would like to use npm programmatically, it's _possible_. The API
-isn't very well documented, but it _is_ rather simple.
-
-Eventually, npm will be just a thin CLI wrapper around the modules that it
-depends on, but for now, there are some things that only the CLI can do. You
-should try using one of npm's dependencies first, and only use the API if what
-you're trying to do is only supported by npm itself.
-
-```javascript
-var npm = require("npm")
-npm.load(myConfigObject, function (er) {
-  if (er) return handlError(er)
-  npm.commands.install(["some", "args"], function (er, data) {
-    if (er) return commandFailed(er)
-    // command succeeded, and data might have some info
-  })
-  npm.registry.log.on("log", function (message) { .... })
-})
-```
-
-The `load` function takes an object hash of the command-line configs.
-The various `npm.commands.<cmd>` functions take an **array** of
-positional argument **strings**.  The last argument to any
-`npm.commands.<cmd>` function is a callback.  Some commands take other
-optional arguments.  Read the source.
-
-You cannot set configs individually for any single npm function at this
-time.  Since `npm` is a singleton, any call to `npm.config.set` will
-change the value for *all* npm commands in that process.
-
-See `./bin/npm-cli.js` for an example of pulling config values off of the
-command line arguments using nopt.  You may also want to check out `npm
-help config` to learn about all the options you can set there.
-
 ## More Docs
 
 Check out the [docs](https://docs.npmjs.com/),
@@ -183,47 +148,6 @@ You can use the `npm help` command to read any of them.
 If you're a developer, and you want to use npm to publish your program,
 you should [read this](https://docs.npmjs.com/misc/developers)
 
-## Legal Stuff
-
-"npm" and "The npm Registry" are owned by npm, Inc.
-All rights reserved.  See the included LICENSE file for more details.
-
-"Node.js" and "node" are trademarks owned by Joyent, Inc.
-
-Modules published on the npm registry are not officially endorsed by
-npm, Inc. or the Node.js project.
-
-Data published to the npm registry is not part of npm itself, and is
-the sole property of the publisher.  While every effort is made to
-ensure accountability, there is absolutely no guarantee, warranty, or
-assertion expressed or implied as to the quality, fitness for a
-specific purpose, or lack of malice in any given npm package.
-
-If you have a complaint about a package in the public npm registry,
-and cannot [resolve it with the package
-owner](https://docs.npmjs.com/misc/disputes), please email
-<[email protected]> and explain the situation.
-
-Any data published to The npm Registry (including user account
-information) may be removed or modified at the sole discretion of the
-npm server administrators.
-
-### In plainer English
-
-npm is the property of npm, Inc.
-
-If you publish something, it's yours, and you are solely accountable
-for it.
-
-If other people publish something, it's theirs.
-
-Users can publish Bad Stuff.  It will be removed promptly if reported.
-But there is no vetting process for published modules, and you use
-them at your own risk.  Please inspect the source.
-
-If you publish Bad Stuff, we may delete it from the registry, or even
-ban your account in extreme cases.  So don't do that.
-
 ## BUGS
 
 When you find issues, please report them:

deps/npm/bin/node-gyp-bin/node-gyp.cmd

@@ -1,5 +1,5 @@
 if not defined npm_config_node_gyp (
   node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
 ) else (
-  node %npm_config_node_gyp% %*
+  node "%npm_config_node_gyp%" %*
 )