nodejs · zkat · Sep 22, 2016 · Sep 22, 2016
diff --git a/deps/npm/.github/issue_template.md b/deps/npm/.github/issue_template.md
@@ -0,0 +1,69 @@
+#### I'm opening this issue because:
+
+  - [ ] npm is crashing.
+  - [ ] npm is producing an incorrect install.
+  - [ ] npm is doing something I don't understand.
+  - [ ] Other (_see below for feature requests_):
+
+#### What's going wrong?
+
+#### How can the CLI team reproduce the problem?
+
+<!--
+    Please a complete description of how to reproduce the problem.
+    Include a gist of your npm-debug.log file.
+    If you've never used gist.github.com, start here:
+      https://github.com/EmmaRamirez/how-to-submit-your-npm-debug-log
+-->
+
+### supporting information:
+
+ - `npm -v` prints:
+ - `node -v` prints:
+ - `npm config get registry` prints:
+ - Windows, OS X, or Linux?:
+ - Network issues:
+   - Geographic location where npm was run:
+   - [ ] I use a proxy to connect to the npm registry.
+   - [ ] I use a proxy to connect to the web.
+   - [ ] I use a proxy when downloading Git repos.
+   - [ ] I access the npm registry via a VPN
+   - [ ] I don't use a proxy, but have limited or unreliable internet access.
+ - Container:
+   - [ ] I develop using Vagrant on Windows.
+   - [ ] I develop using Vagrant on OS X or Linux.
+   - [ ] I develop / deploy using Docker.
+   - [ ] I deploy to a PaaS (Triton, Heroku).
+
+<!--
+    Thank you for contributing to npm! Please review this checklist
+    before submitting your issue.
+
+    - Please check if there's a solution in the troubleshooting wiki:
+      https://github.com/npm/npm/wiki/Troubleshooting
+
+    - Also ensure that your new issue conforms to npm's contribution guidelines:
+      https://github.com/npm/npm/wiki/Contributing-Guidelines
+
+    - Participation in this open source project is subject to the npm Code of Conduct:
+      https://www.npmjs.com/policies/conduct
+
+    For feature requests, delete the above and uncomment the section following this one. But first, review the existing feature requests
+    and make sure there isn't one that already describes the feature
+    you'd like to see added:
+      https://github.com/npm/npm/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+label%3Aalready-looked-at
+-->
+
+<!--
+
+#### What's the feature?
+
+#### What problem is the feature intended to solve?
+
+#### Is the absence of this feature blocking you or your team? If so, how?
+
+#### Is this feature similar to an existing feature in another tool?
+
+#### Is this a feature you're prepared to implement, with support from the npm CLI team?
+
+-->
diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
@@ -15,6 +15,7 @@ Dave Galbraith <dave@jut.io>
 David Beitey <david@davidjb.com>
 Domenic Denicola <domenic@domenicdenicola.com>
 Einar Otto Stangvik <einaros@gmail.com>
+Emma Ramirez <ramirez.emma.g@gmail.com>
 Erik Wienhold <git@ewie.name>
 Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
 Evan Lucas <evan@btc.com> <evanlucas@me.com>
@@ -23,6 +24,7 @@ Forbes Lindesay <forbes@lindesay.co.uk>
 Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
 Gabriel Barros <descartavel1@gmail.com>
 Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
+Gregers Gram Rygg <gregers.gram.rygg@finn.no>
 Ifeanyi Oraelosi <ifeanyioraelosi@gmail.com>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>

diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
@@ -1,23 +1,31 @@
+sudo: false
+# need to declare the language as well as the matrix below
 language: node_js
-node_js:
-  # LTS is our most important target
-  - "4"
-  # next LTS and master is next most important
-  - "6"
-  # still in LTS maintenance until fall 2016
-  # (also still in wide use)
-  - "0.10"
-  # will be unsupported as soon as 6 becomes LTS and 7 released
-  - "5"
-  # technically in LTS / distros, unbeloved
-  - "0.12"
-env:
-  - DEPLOY_VERSION=testing
+# having top-level `env:` adds a phantom build
+# https://github.com/travis-ci/travis-ci/issues/4681
+#env: DEPLOY_VERSION=testing
+matrix:
+  include:
+    # LTS is our most important target
+    - node_js: "4"
+      # 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"
+      env: DEPLOY_VERSION=testing
+    # technically in LTS / distros, unbeloved
+    - node_js: "0.12"
+      env: DEPLOY_VERSION=testing
 before_install:
-  - "npm config set spin false"
   - "node . install -g ."
+  # required by test/tap/registry.js
   - "mkdir -p /var/run/couchdb"
-sudo: false
-script: "npm test"
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -408,3 +408,25 @@ Aaron Tribou <aaron.tribou@gmail.com>
 Tapani Moilanen <moilanen.tapani@gmail.com>
 Han Seoul-Oh <laughinghan@gmail.com>
 Aleksey Shvayka <shvaikalesh@gmail.com>
+Emma Ramirez <ramirez.emma.g@gmail.com>
+Julian Duque <julianduquej@gmail.com>
+Simon MacDonald <simon.macdonald@gmail.com>
+Adam Stankiewicz <sheerun@sher.pl>
+Gregers Gram Rygg <gregers.gram.rygg@finn.no>
+Peter Dave Hello <hsu@peterdavehello.org>
+Jordan Klassen <forivall@gmail.com>
+Jason Palmer <jason@jason-palmer.com>
+Michael Hart <michael.hart.au@gmail.com>
+Sasha Koss <koss@nocorp.me>
+David Emmerson <david.emmerson@gmail.com>
+Christophe Hurpeau <christophe@hurpeau.com>
+Daniel Paz-Soldan <daniel.pazsoldan@gmail.com>
+Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
+Zach Renner <zarenner@microsoft.com>
+Christopher Hiller <boneskull@boneskull.com>
+legodude17 <legodudejb@gmail.com>
+Andrew Meyer <andrewm.bpi@gmail.com>
+Michael Jasper <mdjasper@gmail.com>
+Max <contact@mstoiber.com>
+Szymon Nowak <szimek@gmail.com>
+Jason Karns <jason.karns@gmail.com>