deps: upgrade npm to 4.0.2

deps/npm/.npmignore

@@ -30,3 +30,5 @@ html/*.png
 /test/tap/builtin-config
 
 .nyc_output
+
+npm-shrinkwrap.json

deps/npm/.travis.yml

@@ -7,25 +7,42 @@ language: node_js
 matrix:
   include:
     # LTS is our most important target
-    - node_js: "4"
+    - node_js: "6"
       # DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
       # only gather coverage info for LTS
       env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
-    # next LTS and master is next most important
-    - node_js: "6"
-      env: DEPLOY_VERSION=testing
-    # still in LTS maintenance until fall 2016 (also still in wide use)
-    - node_js: "0.10"
-      env: DEPLOY_VERSION=testing
-    # will be unsupported as soon as 6 becomes LTS and 7 released
-    - node_js: "5"
+      script:
+        - "node . run tap-cover -- \"test/tap/*.js\""
+        - "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/slow/*.js\" \"test/broken-under-*/*.js\""
+    # previous LTS is next most important
+    - node_js: "4"
       env: DEPLOY_VERSION=testing
-    # technically in LTS / distros, unbeloved
-    - node_js: "0.12"
+    # then master
+    - node_js: "7"
       env: DEPLOY_VERSION=testing
 before_install:
-  - "node . install -g ."
   # required by test/tap/registry.js
   - "mkdir -p /var/run/couchdb"
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
+cache:
+  directories:
+  - $HOME/.npm
+  - node_modules/.bin
+  - node_modules/deep-equal
+  - node_modules/marked
+  - node_modules/marked-man
+  - node_modules/npm-registry-couchapp
+  - node_modules/npm-registry-mock
+  - node_modules/require-inject
+  - node_modules/sprintf-js
+  - node_modules/standard
+  - node_modules/tacks
+  - node_modules/tap
+install:
+  - "node . prune"
+  - "node . rebuild --depth=0"
+  - "node . install --ignore-scripts"
+  - "make -j4 doc"
+script:
+  - "node . run tap -- \"test/tap/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc/*.js\""

deps/npm/AUTHORS

@@ -435,3 +435,6 @@ 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>

deps/npm/README.md

@@ -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
 

deps/npm/appveyor.yml

@@ -1,16 +1,11 @@
 environment:
   matrix:
     # LTS is our most important target
-    - nodejs_version: "4"
-    # next LTS and master is next most important
     - nodejs_version: "6"
-    # still in LTS maintenance until fall 2016
-    # (also still in wide use)
-    - nodejs_version: "0.10"
-    # will be unsupported as soon as 6 becomes LTS and 7 released
+    # previous LTS is next most important
+    - nodejs_version: "4"
+    # then master
     - nodejs_version: "5"
-    # technically in LTS / distros, unbeloved
-    - nodejs_version: "0.12"
   COVERALLS_REPO_TOKEN:
     secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ
 platform:
@@ -26,7 +21,7 @@ install:
 test_script:
   - node --version
   - npm --version
-  - npm test
+  - npm run test -- --reporter=classic
 notifications:
 - provider: Slack
   incoming_webhook:

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')