npm: upgrade to v2.1.18

PR-URL: #266
Reviewed-By: Ben Noordhuis <[email protected]>

deps/npm/.eslintrc

@@ -12,6 +12,8 @@
     "no-lonely-if": 1,
     "no-unused-vars": [2, {"vars" : "all", "args" : "after-used"}],
     "no-mixed-requires": 0,
-    "space-infix-ops": 0
+    "space-infix-ops": 0,
+    "key-spacing": 0,
+    "no-multi-spaces": 0
   }
 }

deps/npm/.travis.yml

@@ -8,4 +8,4 @@ before_install:
   - "npm config set spin false"
   - "npm install -g npm@^2"
   - "sudo mkdir -p /var/run/couchdb"
-script: "npm run-script tap"
+script: "npm run-script test-all"

deps/npm/CONTRIBUTING.md

@@ -7,3 +7,6 @@
   issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues).
 * Ensure your new issue conforms to the [Contributing
   Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines).
+
+Participation in this open source project is subject to the [npm Code
+of Conduct](http://www.npmjs.com/policies/conduct).

deps/npm/README.md

@@ -1,4 +1,4 @@
-npm(1) -- node package manager
+npm(1) -- a JavaScript package manager
 ==============================
 [![Build Status](https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm)
 ## SYNOPSIS
@@ -36,11 +36,11 @@ paths, etc.) then read on.
 ## Fancy Install (Unix)
 
 There's a pretty robust install script at
-<https://www.npmjs.org/install.sh>.  You can download that and run it.
+<https://www.npmjs.com/install.sh>.  You can download that and run it.
 
 Here's an example using curl:
 
-    curl -L https://npmjs.org/install.sh | sh
+    curl -L https://npmjs.com/install.sh | sh
 
 ### Slightly Fancier
 
@@ -62,43 +62,23 @@ arbitrary config keys using the `./configure --key=val ...`, and then
 run npm commands by doing `node cli.js <cmd> <args>`.  (This is helpful
 for testing, or running stuff without actually installing npm itself.)
 
-## Fancy Windows Install
+## Windows Install or Upgrade
 
-You can download a zip file from <https://npmjs.org/dist/>, and unpack it
+You can download a zip file from <https://github.com/npm/npm/releases>, and unpack it
 in the same folder where node.exe lives.
 
+The latest version in a zip file is 1.4.12.  To upgrade to npm 2, follow the
+Windows upgrade instructions in the npm Troubleshooting Guide:
+
+<https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows>
+
 If that's not fancy enough for you, then you can fetch the code with
 git, and mess with it directly.
 
 ## Installing on Cygwin
 
 No.
 
-## Permissions when Using npm to Install Other Stuff
-
-**tl;dr**
-
-* Use `sudo` for greater safety.  Or don't, if you prefer not to.
-* npm will downgrade permissions if it's root before running any build
-  scripts that package authors specified.
-
-### More details...
-
-As of version 0.3, it is recommended to run npm as root.
-This allows npm to change the user identifier to the `nobody` user prior
-to running any package build or test commands.
-
-If you are not the root user, or if you are on a platform that does not
-support uid switching, then npm will not attempt to change the userid.
-
-If you would like to ensure that npm **always** runs scripts as the
-"nobody" user, and have it fail if it cannot downgrade permissions, then
-set the following configuration param:
-
-    npm config set unsafe-perm false
-
-This will prevent running in unsafe mode, even as non-root users.
-
 ## Uninstalling
 
 So sad to see you go.
@@ -173,13 +153,13 @@ help config` to learn about all the options you can set there.
 
 ## More Docs
 
-Check out the [docs](https://www.npmjs.org/doc/),
-especially the [faq](https://www.npmjs.org/doc/faq.html).
+Check out the [docs](https://docs.npmjs.com/),
+especially the [faq](https://docs.npmjs.com/misc/faq).
 
 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://www.npmjs.org/doc/developers.html)
+you should [read this](https://docs.npmjs.com/misc/developers)
 
 ## Legal Stuff
 
@@ -199,7 +179,7 @@ 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://www.npmjs.org/doc/misc/npm-disputes.html), please email
+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
@@ -228,8 +208,6 @@ When you find issues, please report them:
 
 * web:
   <https://github.com/npm/npm/issues>
-* email:
-  <[email protected]>
 
 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.

deps/npm/doc/api/npm-ls.md

@@ -52,5 +52,5 @@ List packages in the global install prefix instead of in the current
 project.
 
 Note, if parseable is set or long isn't set, then duplicates will be trimmed.
-This means that if a submodule a same dependency as a parent module, then the
+This means that if a submodule has the same dependency as a parent module, then the
 dependency will only be output once.

deps/npm/doc/api/npm-restart.md

@@ -1,20 +1,39 @@
-npm-restart(3) -- Start a package
-=================================
+npm-restart(3) -- Restart a package
+===================================
 
 ## SYNOPSIS
 
     npm.commands.restart(packages, callback)
 
 ## DESCRIPTION
 
-This runs a package's "restart" script, if one was provided.
-Otherwise it runs package's "stop" script, if one was provided, and then
-the "start" script.
+This restarts a package (or multiple packages).
+
+This runs a package's "stop", "restart", and "start" scripts, and associated
+pre- and post- scripts, in the order given below:
+
+1. prerestart
+2. prestop
+3. stop
+4. poststop
+5. restart
+6. prestart
+7. start
+8. poststart
+9. postrestart
 
 If no version is specified, then it restarts the "active" version.
 
-npm can run tests on multiple packages. Just specify multiple packages
-in the `packages` parameter.
+npm can restart multiple packages. Just specify multiple packages in
+the `packages` parameter.
+
+## NOTE
+
+Note that the "restart" script is run **in addition to** the "stop"
+and "start" scripts, not instead of them.
+
+This is the behavior as of `npm` major version 2.  A change in this
+behavior will be accompanied by an increase in major version number
 
 ## SEE ALSO
 

deps/npm/doc/api/npm-start.md

@@ -9,5 +9,5 @@ npm-start(3) -- Start a package
 
 This runs a package's "start" script, if one was provided.
 
-npm can run tests on multiple packages. Just specify multiple packages
-in the `packages` parameter.
+npm can start multiple packages. Just specify multiple packages in the
+`packages` parameter.

deps/npm/doc/cli/npm-adduser.md

@@ -13,13 +13,14 @@ the default registry will be used (see `npm-config(7)`).
 
 The username, password, and email are read in from prompts.
 
-You may use this command to change your email address, but not username
-or password.
+To reset your password, go to <https://www.npmjs.com/forgot>
 
-To reset your password, go to <https://www.npmjs.org/forgot>
+To change your email address, go to <https://www.npmjs.com/email-edit>
 
 You may use this command multiple times with the same user account to
-authorize on a new machine.
+authorize on a new machine.  When authenticating on a new machine,
+the username, password and email address must all match with
+your existing record.
 
 `npm login` is an alias to `adduser` and behaves exactly the same way.
 
@@ -57,7 +58,7 @@ registries. Can be used with `--registry` and / or `--scope`, e.g.
 
 This will ensure that all requests to that registry (including for tarballs)
 include an authorization header. See `always-auth` in `npm-config(7)` for more
-details on always-auth. Registry-specific configuaration of `always-auth` takes
+details on always-auth. Registry-specific configuration of `always-auth` takes
 precedence over any global configuration.
 
 ## SEE ALSO

deps/npm/doc/cli/npm-link.md

@@ -22,7 +22,7 @@ Note that `package-name` is taken from `package.json`,
 not from directory name.
 
 The package name can be optionally prefixed with a scope. See `npm-scope(7)`.
-The scope must by preceded by an @-symbol and followed by a slash.
+The scope must be preceded by an @-symbol and followed by a slash.
 
 When creating tarballs for `npm publish`, the linked packages are
 "snapshotted" to their current state by resolving the symbolic links.

deps/npm/doc/cli/npm-restart.md

@@ -1,14 +1,34 @@
-npm-restart(1) -- Start a package
-=================================
+npm-restart(1) -- Restart a package
+===================================
 
 ## SYNOPSIS
 
     npm restart [-- <args>]
 
 ## DESCRIPTION
 
-This runs a package's "restart" script, if one was provided.  Otherwise it runs
-package's "stop" script, if one was provided, and then the "start" script.
+This restarts a package.
+
+This runs a package's "stop", "restart", and "start" scripts, and associated
+pre- and post- scripts, in the order given below:
+
+1. prerestart
+2. prestop
+3. stop
+4. poststop
+5. restart
+6. prestart
+7. start
+8. poststart
+9. postrestart
+
+## NOTE
+
+Note that the "restart" script is run **in addition to** the "stop"
+and "start" scripts, not instead of them.
+
+This is the behavior as of `npm` major version 2.  A change in this
+behavior will be accompanied by an increase in major version number
 
 ## SEE ALSO
 
@@ -17,3 +37,4 @@ package's "stop" script, if one was provided, and then the "start" script.
 * npm-test(1)
 * npm-start(1)
 * npm-stop(1)
+* npm-restart(3)

deps/npm/doc/cli/npm-version.md

@@ -8,7 +8,7 @@ npm-version(1) -- Bump a package version
 ## DESCRIPTION
 
 Run this in a package directory to bump the version and write the new
-data back to the package.json file.
+data back to `package.json` and, if present, `npm-shrinkwrap.json`.
 
 The `newversion` argument should be a valid semver string, *or* a
 valid second argument to semver.inc (one of "patch", "minor", "major",
@@ -38,6 +38,7 @@ in your git config for this to work properly.  For example:
 
     Enter passphrase:
 
+
 ## SEE ALSO
 
 * npm-init(1)

deps/npm/doc/files/npmrc.md

@@ -30,6 +30,12 @@ Each of these files is loaded, and config options are resolved in
 priority order.  For example, a setting in the userconfig file would
 override the setting in the globalconfig file.
 
+Array values are specified by adding "[]" after the key name. For
+example:
+
+    key[] = "first value"
+    key[] = "second value"
+
 ### Per-project config file
 
 When working locally in a project, a `.npmrc` file in the root of the

deps/npm/doc/files/package.json.md

@@ -253,7 +253,7 @@ Put example scripts in here.  Someday, it might be exposed in some clever way.
 ## repository
 
 Specify the place where your code lives. This is helpful for people who
-want to contribute.  If the git repo is on github, then the `npm docs`
+want to contribute.  If the git repo is on GitHub, then the `npm docs`
 command will be able to find you.
 
 Do it like this:
@@ -366,13 +366,16 @@ an argument to `git checkout`.  The default is `master`.
 
 ## GitHub URLs
 
-As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-project". For example:
+As of version 1.1.65, you can refer to GitHub urls as just "foo":
+"user/foo-project".  Just as with git URLs, a `commit-ish` suffix can be
+included.  For example:
 
     {
       "name": "foo",
       "version": "0.0.0",
       "dependencies": {
-        "express": "visionmedia/express"
+        "express": "visionmedia/express",
+        "mocha": "visionmedia/mocha#4727d357ea"
       }
     }
 
@@ -442,7 +445,7 @@ run this script as well, so that you can test it easily.
 
 In some cases, you want to express the compatibility of your package with an
 host tool or library, while not necessarily doing a `require` of this host.
-This is usually refered to as a *plugin*. Notably, your module may be exposing
+This is usually referred to as a *plugin*. Notably, your module may be exposing
 a specific interface, expected and specified by the host documentation.
 
 For example:

deps/npm/doc/misc/npm-coding-style.md

@@ -10,7 +10,7 @@ designed to reduce visual clutter and make bugs more apparent.
 If you want to contribute to npm (which is very encouraged), you should
 make your code conform to npm's style.
 
-Note: this concerns npm's code not the specific packages at npmjs.org
+Note: this concerns npm's code not the specific packages that you can download from the npm registry.
 
 ## Line Length
 
@@ -21,7 +21,7 @@ statements onto multiple lines.
 ## Indentation
 
 Two-spaces.  Tabs are better, but they look like hell in web browsers
-(and on github), and node uses 2 spaces, so that's that.
+(and on GitHub), and node uses 2 spaces, so that's that.
 
 Configure your editor appropriately.