deps: upgrade npm to 2.14.9

This is a roll-up release that includes all changes to npm since 2.13.4.

PR-URL: #3684
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: James M Snell <[email protected]>

Author: othiym23

deps/npm/.npmrc

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

deps/npm/.travis.yml

@@ -302,3 +302,14 @@ Steve Klabnik <[email protected]>
 Andrew Murray <[email protected]>
 Stephan Bönnemann <[email protected]>
 Kyle M. Tarplee <[email protected]>
+Derek Peterson <[email protected]>
+Greg Whiteley <[email protected]>
+murgatroid99 <[email protected]>
+Marcin Cieslak <[email protected]>
+João Reis <[email protected]>
+Matthew Hasbach <[email protected]>
+Anna Henningsen <[email protected]>
+Jon Hall <[email protected]>
+James Hartig <[email protected]>
+snopeks <[email protected]>
+Jason Kurian <[email protected]>

deps/npm/AUTHORS

@@ -31,28 +31,6 @@ misc_mandocs = $(shell find doc/misc -name '*.md' \
                |sed 's|doc/misc/|man/man7/|g' ) \
                man/man7/npm-index.7
 
-
-cli_partdocs = $(shell find doc/cli -name '*.md' \
-                |sed 's|.md|.html|g' \
-                |sed 's|doc/cli/|html/partial/doc/cli/|g' ) \
-                html/partial/doc/README.html
-
-api_partdocs = $(shell find doc/api -name '*.md' \
-                |sed 's|.md|.html|g' \
-                |sed 's|doc/api/|html/partial/doc/api/|g' )
-
-files_partdocs = $(shell find doc/files -name '*.md' \
-                  |sed 's|.md|.html|g' \
-                  |sed 's|doc/files/|html/partial/doc/files/|g' ) \
-                  html/partial/doc/files/npm-json.html \
-                  html/partial/doc/files/npm-global.html
-
-misc_partdocs = $(shell find doc/misc -name '*.md' \
-                 |sed 's|.md|.html|g' \
-                 |sed 's|doc/misc/|html/partial/doc/misc/|g' ) \
-                 html/partial/doc/index.html
-
-
 cli_htmldocs = $(shell find doc/cli -name '*.md' \
                 |sed 's|.md|.html|g' \
                 |sed 's|doc/cli/|html/doc/cli/|g' ) \
@@ -75,8 +53,6 @@ misc_htmldocs = $(shell find doc/misc -name '*.md' \
 
 mandocs = $(api_mandocs) $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
 
-partdocs = $(api_partdocs) $(cli_partdocs) $(files_partdocs) $(misc_partdocs)
-
 htmldocs = $(api_htmldocs) $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
 
 all: doc
@@ -103,7 +79,7 @@ clean: markedclean marked-manclean doc-clean uninstall
 uninstall:
 	node cli.js rm npm -g -f
 
-doc: $(mandocs) $(htmldocs) $(partdocs)
+doc: $(mandocs) $(htmldocs)
 
 markedclean:
 	rm -rf node_modules/marked node_modules/.bin/marked .building_marked
@@ -143,73 +119,43 @@ man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json
 	@[ -d man/man5 ] || mkdir -p man/man5
 	scripts/doc-build.sh $< $@
 
-man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
-	@[ -d man/man7 ] || mkdir -p man/man7
-	scripts/doc-build.sh $< $@
-
-
 doc/misc/npm-index.md: scripts/index-build.js package.json
 	node scripts/index-build.js > $@
 
-
-# html/doc depends on html/partial/doc
-html/doc/%.html: html/partial/doc/%.html
-	@[ -d html/doc ] || mkdir -p html/doc
-	scripts/doc-build.sh $< $@
-
-html/doc/README.html: html/partial/doc/README.html
+html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
 	@[ -d html/doc ] || mkdir -p html/doc
 	scripts/doc-build.sh $< $@
 
-html/doc/cli/%.html: html/partial/doc/cli/%.html
-	@[ -d html/doc/cli ] || mkdir -p html/doc/cli
+man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
+	@[ -d man/man7 ] || mkdir -p man/man7
 	scripts/doc-build.sh $< $@
 
-html/doc/misc/%.html: html/partial/doc/misc/%.html
-	@[ -d html/doc/misc ] || mkdir -p html/doc/misc
+html/doc/README.html: README.md $(html_docdeps)
+	@[ -d html/doc ] || mkdir -p html/doc
 	scripts/doc-build.sh $< $@
 
-html/doc/files/%.html: html/partial/doc/files/%.html
-	@[ -d html/doc/files ] || mkdir -p html/doc/files
+html/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
+	@[ -d html/doc/cli ] || mkdir -p html/doc/cli
 	scripts/doc-build.sh $< $@
 
-html/doc/api/%.html: html/partial/doc/api/%.html
+html/doc/api/%.html: doc/api/%.md $(html_docdeps)
 	@[ -d html/doc/api ] || mkdir -p html/doc/api
 	scripts/doc-build.sh $< $@
 
-
-html/partial/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
-	@[ -d html/partial/doc ] || mkdir -p html/partial/doc
-	scripts/doc-build.sh $< $@
-
-html/partial/doc/README.html: README.md $(html_docdeps)
-	@[ -d html/partial/doc ] || mkdir -p html/partial/doc
-	scripts/doc-build.sh $< $@
-
-html/partial/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
-	@[ -d html/partial/doc/cli ] || mkdir -p html/partial/doc/cli
-	scripts/doc-build.sh $< $@
-
-html/partial/doc/api/%.html: doc/api/%.md $(html_docdeps)
-	@[ -d html/partial/doc/api ] || mkdir -p html/partial/doc/api
-	scripts/doc-build.sh $< $@
-
-html/partial/doc/files/npm-json.html: html/partial/doc/files/package.json.html
+html/doc/files/npm-json.html: html/doc/files/package.json.html
 	cp $< $@
-html/partial/doc/files/npm-global.html: html/partial/doc/files/npm-folders.html
+html/doc/files/npm-global.html: html/doc/files/npm-folders.html
 	cp $< $@
 
-html/partial/doc/files/%.html: doc/files/%.md $(html_docdeps)
-	@[ -d html/partial/doc/files ] || mkdir -p html/partial/doc/files
+html/doc/files/%.html: doc/files/%.md $(html_docdeps)
+	@[ -d html/doc/files ] || mkdir -p html/doc/files
 	scripts/doc-build.sh $< $@
 
-html/partial/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
-	@[ -d html/partial/doc/misc ] || mkdir -p html/partial/doc/misc
+html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
+	@[ -d html/doc/misc ] || mkdir -p html/doc/misc
 	scripts/doc-build.sh $< $@
 
 
-
-
 marked: node_modules/.bin/marked
 
 node_modules/.bin/marked:

deps/npm/CHANGELOG.md

@@ -16,7 +16,7 @@ and prior, clone the git repo and dig through the old tags and branches.
 
 ## Super Easy Install
 
-npm comes with [node](http://nodejs.org/download/) now.
+npm is bundled with [node](http://nodejs.org/download/).
 
 ### Windows Computers
 

deps/npm/Makefile

@@ -7,8 +7,21 @@ case `uname` in
     *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
 esac
 
-if [ -x "$basedir/node.exe" ]; then
-  "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-else
-  node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+NODE_EXE="$basedir/node.exe"
+if ! [ -x "$NODE_EXE" ]; then
+  NODE_EXE=node
 fi
+
+NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
+
+case `uname` in
+  *CYGWIN*)
+    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
+    if [ -f "$NPM_PREFIX_NPM_CLI_JS" ]; then
+      NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
+    fi
+    ;;
+esac
+
+"$NODE_EXE" "$NPM_CLI_JS" "$@"

deps/npm/README.md

@@ -1,6 +1,19 @@
-:: Created by npm, please don't edit manually.
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-) ELSE (
-  node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-)
+:: Created by npm, please don't edit manually.
+@ECHO OFF
+
+SETLOCAL
+
+SET "NODE_EXE=%~dp0\node.exe"
+IF NOT EXIST "%NODE_EXE%" (
+  SET "NODE_EXE=node"
+)
+
+SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
+FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
+  SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
+)
+IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
+  SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
+)
+
+"%NODE_EXE%" "%NPM_CLI_JS%" %*

deps/npm/bin/npm

@@ -65,7 +65,7 @@ If a version range is provided, then data will be printed for every
 matching version of the package.  This will show which version of jsdom
 was required by each matching version of yui3:
 
-    npm.commands.view(["yui3@'>0.5.4'", "dependencies.jsdom"], callback)
+    npm.commands.view(["yui3@>0.5.4", "dependencies.jsdom"], callback)
 
 ## OUTPUT
 

deps/npm/bin/npm.cmd

@@ -6,10 +6,11 @@ npm-access(1) -- Set access level on published packages
     npm access public [<package>]
     npm access restricted [<package>]
 
-    npm access add <read-only|read-write> <entity> [<package>]
-    npm access rm <entity> [<package>]
+    npm access grant <read-only|read-write> <scope:team> [<package>]
+    npm access revoke <scope:team> [<package>]
 
-    npm access ls [<package>]
+    npm access ls-packages [<user>|<scope>|<scope:team>]
+    npm access ls-collaborators [<package> [<user>]]
     npm access edit [<package>]
 
 ## DESCRIPTION
@@ -23,13 +24,20 @@ subcommand.
 * public / restricted:
   Set a package to be either publicly accessible or restricted.
 
-* add / rm:
+* grant / revoke:
   Add or remove the ability of users and teams to have read-only or read-write
   access to a package.
 
-* ls:
+* ls-packages:
+
+  Show all of the packages a user or a team is able to access, along with the
+  access level, except for read-only public packages (it won't print the whole
+  registry listing)
+
+* ls-collaborators:
   Show all of the access privileges for a package. Will only show permissions
-  for packages to which you have at least read access.
+  for packages to which you have at least read access. If `<user>` is passed in,
+  the list is filtered only to teams _that_ user happens to belong to.
 
 * edit:
   Set the access privileges for a package at once using `$EDITOR`.
@@ -56,8 +64,11 @@ If your account is not paid, then attempts to publish scoped packages will fail
 with an HTTP 402 status code (logically enough), unless you use
 `--access=public`.
 
+Management of teams and team memberships is done with the `npm team` command.
+
 ## SEE ALSO
 
+* npm-team(1)
 * npm-publish(1)
 * npm-config(7)
 * npm-registry(7)