npm: Upgrade to v1.4.21

Author: tjfontaine

deps/npm/.eslintrc

@@ -0,0 +1,18 @@
+{
+  "env" : {
+    "node" : true
+  },
+  "rules" : {
+    "curly" : 0,
+    "no-lonely-if" : 1,
+    "no-mixed-requires" : 0,
+    "no-underscore-dangle" : 0,
+    "no-unused-vars" : [2, {"vars" : "all", "args" : "after-used"}],
+    "no-use-before-define" : [2, "nofunc"],
+    "quotes" : [1, "double", "avoid-escape"],
+    "semi" : [2, "never"],
+    "space-after-keywords" : 1,
+    "space-infix-ops" : 0,
+    "strict" : 0
+  }
+}

deps/npm/.npmignore

@@ -7,6 +7,7 @@ npm-debug.log
 /test/packages/npm-test-depends-on-spark/which-spark.log
 /test/packages/test-package/random-data.txt
 /test/root
+node_modules/marked
 node_modules/ronn
 node_modules/tap
 node_modules/.bin

deps/npm/.tern-project

@@ -69,7 +69,7 @@ dev: install
 link: uninstall
 	node cli.js link -f
 
-clean: ronnclean doc-clean uninstall
+clean: markedclean ronnclean doc-clean uninstall
 	rm -rf npmrc
 	node cli.js cache clean
 
@@ -78,12 +78,16 @@ uninstall:
 
 doc: $(mandocs) $(htmldocs)
 
+markedclean:
+	rm -rf node_modules/marked node_modules/.bin/marked .building_marked
+
 ronnclean:
 	rm -rf node_modules/ronn node_modules/.bin/ronn .building_ronn
 
 docclean: doc-clean
 doc-clean:
 	rm -rf \
+    .building_marked \
     .building_ronn \
     html/doc \
     html/api \
@@ -149,6 +153,10 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
 	scripts/doc-build.sh $< $@
 
 
+marked: node_modules/.bin/marked
+
+node_modules/.bin/marked:
+	node cli.js install marked --no-global
 
 ronn: node_modules/.bin/ronn
 

deps/npm/Makefile

@@ -3,8 +3,8 @@ npm-link(3) -- Symlink a package folder
 
 ## SYNOPSIS
 
-    npm.command.link(callback)
-    npm.command.link(packages, callback)
+    npm.commands.link(callback)
+    npm.commands.link(packages, callback)
 
 ## DESCRIPTION
 

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

@@ -3,7 +3,7 @@ npm-explore(1) -- Browse an installed package
 
 ## SYNOPSIS
 
-    npm explore <name>[@<version>] [ -- <cmd>]
+    npm explore <name> [ -- <cmd>]
 
 ## DESCRIPTION
 

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

@@ -163,15 +163,6 @@ shrinkwrap will implicitly be included in A's shrinkwrap.
 
 ### Caveats
 
-Shrinkwrap files only lock down package versions, not actual package
-contents.  While discouraged, a package author can republish an
-existing version of a package, causing shrinkwrapped packages using
-that version to pick up different code than they were before. If you
-want to avoid any risk that a byzantine author replaces a package
-you're using with code that breaks your application, you could modify
-the shrinkwrap file to use git URL references rather than version
-numbers so that npm always fetches all packages from git.
-
 If you wish to lock down the specific bytes included in a package, for
 example to have 100% confidence in being able to reproduce a
 deployment or build, then you ought to check your dependencies into

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

@@ -146,6 +146,15 @@ to trust only that specific signing authority.
 
 See also the `strict-ssl` config.
 
+### cafile
+
+* Default: `null`
+* Type: path
+
+A path to a file containing one or multiple Certificate Authority signing
+certificates. Similar to the `ca` setting, but allows for multiple CA's, as
+well as for the CA information to be stored in a file on disk.
+
 ### cache
 
 * Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm`

deps/npm/doc/misc/npm-config.md

@@ -141,7 +141,7 @@ <h2 id="legal-stuff">Legal Stuff</h2>
 <p>If you have a complaint about a package in the public npm registry,
 and cannot <a href="https://www.npmjs.org/doc/misc/npm-disputes.html">resolve it with the package
 owner</a>, please email
-<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#115;&#117;&#x70;&#112;&#111;&#114;&#116;&#64;&#110;&#x70;&#109;&#x6a;&#x73;&#x2e;&#x63;&#x6f;&#x6d;">&#115;&#117;&#x70;&#112;&#111;&#114;&#116;&#64;&#110;&#x70;&#109;&#x6a;&#x73;&#x2e;&#x63;&#x6f;&#x6d;</a> and explain the situation.</p>
+<a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#115;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#64;&#110;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#x6f;&#x6d;">&#115;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#64;&#110;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#x6f;&#x6d;</a> and explain the situation.</p>
 <p>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.</p>
@@ -161,7 +161,7 @@ <h2 id="bugs">BUGS</h2>
 <li>web:
 <a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a></li>
 <li>email:
-<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#x2e;&#x63;&#111;&#109;">&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#x2e;&#x63;&#111;&#109;</a></li>
+<a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#110;&#x70;&#x6d;&#x2d;&#x40;&#x67;&#x6f;&#111;&#x67;&#x6c;&#x65;&#103;&#x72;&#111;&#x75;&#112;&#x73;&#46;&#99;&#111;&#x6d;">&#110;&#x70;&#x6d;&#x2d;&#x40;&#x67;&#x6f;&#111;&#x67;&#x6c;&#x65;&#103;&#x72;&#111;&#x75;&#112;&#x73;&#46;&#99;&#111;&#x6d;</a></li>
 </ul>
 <p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
 as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p>
@@ -186,5 +186,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.14</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.21</p>
 

deps/npm/html/doc/README.html

@@ -28,5 +28,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@1.4.14</p>
+<p id="footer">npm-bin &mdash; npm@1.4.21</p>