diff --git a/Makefile b/Makefile index 51c6b9048b7..a663513b47d 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ website_files = \ out/doc/sh_main.js \ out/doc/sh_javascript.min.js -doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ node +doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ out/doc/changelog.html node $(apidoc_dirs): mkdir -p $@ diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml new file mode 100644 index 00000000000..0fbe8dc335f --- /dev/null +++ b/deps/npm/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +script: "npm run-script tap" +node_js: + - "0.11" + - "0.10" diff --git a/deps/npm/Makefile b/deps/npm/Makefile index b0b85216d89..870965b52e4 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -169,7 +169,6 @@ publish: link doc git push origin &&\ git push origin --tags &&\ npm publish &&\ - npm tag npm@$(shell npm -v) $(shell npm -v | awk -F. '{print $$1 "." $$2}') &&\ make doc-publish &&\ make zip-publish diff --git a/deps/npm/README.md b/deps/npm/README.md index 676d2003b34..0c08862fce9 100644 --- a/deps/npm/README.md +++ b/deps/npm/README.md @@ -1,6 +1,6 @@ npm(1) -- node package manager ============================== - +[![Build Status](https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm) ## SYNOPSIS This is just enough info to get you up and running. @@ -38,6 +38,10 @@ paths, etc.) then read on. There's a pretty robust install script at . You can download that and run it. +Here's an example using curl: + + curl -L https://npmjs.org/install.sh | sh + ### Slightly Fancier You can set any npm configuration params with that script: diff --git a/deps/npm/doc/api/npm.md b/deps/npm/doc/api/npm.md index dea8773b80b..d05684e8b9d 100644 --- a/deps/npm/doc/api/npm.md +++ b/deps/npm/doc/api/npm.md @@ -4,7 +4,7 @@ npm(3) -- node package manager ## SYNOPSIS var npm = require("npm") - npm.load([configObject], function (er, npm) { + npm.load([configObject, ]function (er, npm) { // use the npm object, now that it's loaded. npm.config.set(key, val) diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md index 47820a73c0e..62eec2d8e34 100644 --- a/deps/npm/doc/cli/npm-install.md +++ b/deps/npm/doc/cli/npm-install.md @@ -24,7 +24,7 @@ A `package` is: * a) a folder containing a program described by a package.json file * b) a gzipped tarball containing (a) * c) a url that resolves to (b) -* d) a `@` that is published on the registry with (c) +* d) a `@` that is published on the registry (see `npm-registry(7)`) with (c) * e) a `@` that points to (d) * f) a `` that has a "latest" tag satisfying (e) * g) a `` that resolves to (b) @@ -254,7 +254,6 @@ affects a real use-case, it will be investigated. * npm-config(7) * npmrc(5) * npm-registry(7) -* npm-folders(5) * npm-tag(1) * npm-rm(1) * npm-shrinkwrap(1) diff --git a/deps/npm/doc/cli/npm-run-script.md b/deps/npm/doc/cli/npm-run-script.md index 6c3c2b7a9cf..80b813cff7f 100644 --- a/deps/npm/doc/cli/npm-run-script.md +++ b/deps/npm/doc/cli/npm-run-script.md @@ -3,11 +3,13 @@ npm-run-script(1) -- Run arbitrary package scripts ## SYNOPSIS - npm run-script @@ -10,7 +11,8 @@

npm

node package manager

-

SYNOPSIS

+

![Build Status +## SYNOPSIS

This is just enough info to get you up and running.

@@ -47,6 +49,10 @@ paths, etc.) then read on.

There's a pretty robust install script at https://www.npmjs.org/install.sh. You can download that and run it.

+

Here's an example using curl:

+ +
curl -L https://npmjs.org/install.sh | sh
+

Slightly Fancier

You can set any npm configuration params with that script:

@@ -254,5 +260,5 @@ will no doubt tell you to put the output in a gist or email.

       - + diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html index e385fc75f23..50bc54e4a9a 100644 --- a/deps/npm/html/doc/api/npm-bin.html +++ b/deps/npm/html/doc/api/npm-bin.html @@ -3,6 +3,7 @@ npm-bin + @@ -31,5 +32,5 @@ to the npm.bin member.

       - + diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html index 732ffe14b82..d0cf9f376f3 100644 --- a/deps/npm/html/doc/api/npm-bugs.html +++ b/deps/npm/html/doc/api/npm-bugs.html @@ -3,6 +3,7 @@ npm-bugs + @@ -37,5 +38,5 @@ friendly for programmatic use.

       - + diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html index 9236ce2ef1b..735905e295a 100644 --- a/deps/npm/html/doc/api/npm-commands.html +++ b/deps/npm/html/doc/api/npm-commands.html @@ -3,6 +3,7 @@ npm-commands + @@ -40,5 +41,5 @@ usage, or man 3 npm-<command> for programmatic usage.

       - + diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html index 746151c271a..e1d685560e9 100644 --- a/deps/npm/html/doc/api/npm-config.html +++ b/deps/npm/html/doc/api/npm-config.html @@ -3,6 +3,7 @@ npm-config + @@ -45,5 +46,5 @@ functions instead.

       - + diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html index 53c02c439f5..2513519559a 100644 --- a/deps/npm/html/doc/api/npm-deprecate.html +++ b/deps/npm/html/doc/api/npm-deprecate.html @@ -3,6 +3,7 @@ npm-deprecate + @@ -44,5 +45,5 @@ install the package.

       - + diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html index ce514123a1f..ad50e542221 100644 --- a/deps/npm/html/doc/api/npm-docs.html +++ b/deps/npm/html/doc/api/npm-docs.html @@ -3,6 +3,7 @@ npm-docs + @@ -37,5 +38,5 @@ friendly for programmatic use.

       - + diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html index c13f00443e8..38e691567f0 100644 --- a/deps/npm/html/doc/api/npm-edit.html +++ b/deps/npm/html/doc/api/npm-edit.html @@ -3,6 +3,7 @@ npm-edit + @@ -42,5 +43,5 @@ and how this is used.

       - + diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html index a719e860b08..7991f75139c 100644 --- a/deps/npm/html/doc/api/npm-explore.html +++ b/deps/npm/html/doc/api/npm-explore.html @@ -3,6 +3,7 @@ npm-explore + @@ -36,5 +37,5 @@ sure to use npm rebuild <pkg> if you make any changes.

       - + diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html index f22d96937ea..4bfb677ebc4 100644 --- a/deps/npm/html/doc/api/npm-help-search.html +++ b/deps/npm/html/doc/api/npm-help-search.html @@ -3,6 +3,7 @@ npm-help-search + @@ -44,5 +45,5 @@ Name of the file that matched        - + diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html index f007797eed0..90eac28a0cc 100644 --- a/deps/npm/html/doc/api/npm-init.html +++ b/deps/npm/html/doc/api/npm-init.html @@ -3,6 +3,7 @@ npm-init + @@ -47,5 +48,5 @@ then go ahead and use this programmatically.

       - + diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html index e74d4f7eba7..d78b3f41dcb 100644 --- a/deps/npm/html/doc/api/npm-install.html +++ b/deps/npm/html/doc/api/npm-install.html @@ -3,6 +3,7 @@ npm-install + @@ -37,5 +38,5 @@ installed or when an error has been encountered.

       - + diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html index cfa3524c06f..24461c092aa 100644 --- a/deps/npm/html/doc/api/npm-link.html +++ b/deps/npm/html/doc/api/npm-link.html @@ -3,6 +3,7 @@ npm-link + @@ -51,5 +52,5 @@ the package in the current working directory

       - + diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html index 3c7458276fb..55e4500b34a 100644 --- a/deps/npm/html/doc/api/npm-load.html +++ b/deps/npm/html/doc/api/npm-load.html @@ -3,6 +3,7 @@ npm-load + @@ -44,5 +45,5 @@ config object.

       - + diff --git a/deps/npm/html/doc/api/npm-ls.html b/deps/npm/html/doc/api/npm-ls.html index ab8e3381867..56553d2b239 100644 --- a/deps/npm/html/doc/api/npm-ls.html +++ b/deps/npm/html/doc/api/npm-ls.html @@ -3,6 +3,7 @@ npm-ls + @@ -71,5 +72,5 @@ dependency will only be output once.

       - + diff --git a/deps/npm/html/doc/api/npm-outdated.html b/deps/npm/html/doc/api/npm-outdated.html index 32c66b1be00..311922f7c0d 100644 --- a/deps/npm/html/doc/api/npm-outdated.html +++ b/deps/npm/html/doc/api/npm-outdated.html @@ -3,6 +3,7 @@ npm-outdated + @@ -31,5 +32,5 @@ currently outdated.

       - + diff --git a/deps/npm/html/doc/api/npm-owner.html b/deps/npm/html/doc/api/npm-owner.html index 32e675104ee..fbaef4359f7 100644 --- a/deps/npm/html/doc/api/npm-owner.html +++ b/deps/npm/html/doc/api/npm-owner.html @@ -3,6 +3,7 @@ npm-owner + @@ -46,5 +47,5 @@ that is not implemented at this time.

       - + diff --git a/deps/npm/html/doc/api/npm-pack.html b/deps/npm/html/doc/api/npm-pack.html index 1b88797fb6b..7af6b832301 100644 --- a/deps/npm/html/doc/api/npm-pack.html +++ b/deps/npm/html/doc/api/npm-pack.html @@ -3,6 +3,7 @@ npm-pack + @@ -37,5 +38,5 @@ overwritten the second time.

       - + diff --git a/deps/npm/html/doc/api/npm-prefix.html b/deps/npm/html/doc/api/npm-prefix.html index b67be748c7e..808290ca2e1 100644 --- a/deps/npm/html/doc/api/npm-prefix.html +++ b/deps/npm/html/doc/api/npm-prefix.html @@ -3,6 +3,7 @@ npm-prefix + @@ -33,5 +34,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-prune.html b/deps/npm/html/doc/api/npm-prune.html index 5d95dcef913..1ade79fab4e 100644 --- a/deps/npm/html/doc/api/npm-prune.html +++ b/deps/npm/html/doc/api/npm-prune.html @@ -3,6 +3,7 @@ npm-prune + @@ -35,5 +36,5 @@ package's dependencies list.

       - + diff --git a/deps/npm/html/doc/api/npm-publish.html b/deps/npm/html/doc/api/npm-publish.html index f67cba0cb7d..1220fd6080d 100644 --- a/deps/npm/html/doc/api/npm-publish.html +++ b/deps/npm/html/doc/api/npm-publish.html @@ -3,6 +3,7 @@ npm-publish + @@ -44,5 +45,5 @@ the registry. Overwrites when the "force" environment variable is set        - + diff --git a/deps/npm/html/doc/api/npm-rebuild.html b/deps/npm/html/doc/api/npm-rebuild.html index 4e5b1b3edb0..0e22893c402 100644 --- a/deps/npm/html/doc/api/npm-rebuild.html +++ b/deps/npm/html/doc/api/npm-rebuild.html @@ -3,6 +3,7 @@ npm-rebuild + @@ -34,5 +35,5 @@ the new binary. If no 'packages' parameter is specify, every package wil        - + diff --git a/deps/npm/html/doc/api/npm-repo.html b/deps/npm/html/doc/api/npm-repo.html index 847b8603280..a4a98208041 100644 --- a/deps/npm/html/doc/api/npm-repo.html +++ b/deps/npm/html/doc/api/npm-repo.html @@ -3,6 +3,7 @@ npm-repo + @@ -37,5 +38,5 @@ friendly for programmatic use.

       - + diff --git a/deps/npm/html/doc/api/npm-restart.html b/deps/npm/html/doc/api/npm-restart.html index 6ed268a535a..71cad00b944 100644 --- a/deps/npm/html/doc/api/npm-restart.html +++ b/deps/npm/html/doc/api/npm-restart.html @@ -3,6 +3,7 @@ npm-restart + @@ -39,5 +40,5 @@ in the packages parameter.

       - + diff --git a/deps/npm/html/doc/api/npm-root.html b/deps/npm/html/doc/api/npm-root.html index ffaea420f3f..e1dd216bbde 100644 --- a/deps/npm/html/doc/api/npm-root.html +++ b/deps/npm/html/doc/api/npm-root.html @@ -3,6 +3,7 @@ npm-root + @@ -33,5 +34,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-run-script.html b/deps/npm/html/doc/api/npm-run-script.html index 99288bd06ea..c6be4c6fe21 100644 --- a/deps/npm/html/doc/api/npm-run-script.html +++ b/deps/npm/html/doc/api/npm-run-script.html @@ -3,6 +3,7 @@ npm-run-script + @@ -41,5 +42,5 @@ assumed to be the command to run. All other elements are ignored.

       - + diff --git a/deps/npm/html/doc/api/npm-search.html b/deps/npm/html/doc/api/npm-search.html index d3aac2dffd0..dcb5e0fde92 100644 --- a/deps/npm/html/doc/api/npm-search.html +++ b/deps/npm/html/doc/api/npm-search.html @@ -3,6 +3,7 @@ npm-search + @@ -44,5 +45,5 @@ like).

       - + diff --git a/deps/npm/html/doc/api/npm-shrinkwrap.html b/deps/npm/html/doc/api/npm-shrinkwrap.html index a40a389ea35..cce22640fae 100644 --- a/deps/npm/html/doc/api/npm-shrinkwrap.html +++ b/deps/npm/html/doc/api/npm-shrinkwrap.html @@ -3,6 +3,7 @@ npm-shrinkwrap + @@ -38,5 +39,5 @@ been saved.

       - + diff --git a/deps/npm/html/doc/api/npm-start.html b/deps/npm/html/doc/api/npm-start.html index 7628317bec7..ec2f3694193 100644 --- a/deps/npm/html/doc/api/npm-start.html +++ b/deps/npm/html/doc/api/npm-start.html @@ -3,6 +3,7 @@ npm-start + @@ -31,5 +32,5 @@ in the packages parameter.

       - + diff --git a/deps/npm/html/doc/api/npm-stop.html b/deps/npm/html/doc/api/npm-stop.html index 86b03c55fa6..882ebbe02a9 100644 --- a/deps/npm/html/doc/api/npm-stop.html +++ b/deps/npm/html/doc/api/npm-stop.html @@ -3,6 +3,7 @@ npm-stop + @@ -31,5 +32,5 @@ in the packages parameter.

       - + diff --git a/deps/npm/html/doc/api/npm-submodule.html b/deps/npm/html/doc/api/npm-submodule.html index e80f44e82e4..42b82ac15de 100644 --- a/deps/npm/html/doc/api/npm-submodule.html +++ b/deps/npm/html/doc/api/npm-submodule.html @@ -3,6 +3,7 @@ npm-submodule + @@ -45,5 +46,5 @@ dependencies into the submodule folder.

       - + diff --git a/deps/npm/html/doc/api/npm-tag.html b/deps/npm/html/doc/api/npm-tag.html index d3807db1978..dbf97be1aed 100644 --- a/deps/npm/html/doc/api/npm-tag.html +++ b/deps/npm/html/doc/api/npm-tag.html @@ -3,6 +3,7 @@ npm-tag + @@ -41,5 +42,5 @@ used. For more information about how to set this config, check        - + diff --git a/deps/npm/html/doc/api/npm-test.html b/deps/npm/html/doc/api/npm-test.html index 24811c2d637..2820fa70965 100644 --- a/deps/npm/html/doc/api/npm-test.html +++ b/deps/npm/html/doc/api/npm-test.html @@ -3,6 +3,7 @@ npm-test + @@ -34,5 +35,5 @@ in the packages parameter.

       - + diff --git a/deps/npm/html/doc/api/npm-uninstall.html b/deps/npm/html/doc/api/npm-uninstall.html index 517f33e66bb..2a568d9e6a9 100644 --- a/deps/npm/html/doc/api/npm-uninstall.html +++ b/deps/npm/html/doc/api/npm-uninstall.html @@ -3,6 +3,7 @@ npm-uninstall + @@ -34,5 +35,5 @@ uninstalled or when an error has been encountered.

       - + diff --git a/deps/npm/html/doc/api/npm-unpublish.html b/deps/npm/html/doc/api/npm-unpublish.html index bd15c465c63..09748b7cc20 100644 --- a/deps/npm/html/doc/api/npm-unpublish.html +++ b/deps/npm/html/doc/api/npm-unpublish.html @@ -3,6 +3,7 @@ npm-unpublish + @@ -38,5 +39,5 @@ the root package entry is removed from the registry entirely.

       - + diff --git a/deps/npm/html/doc/api/npm-update.html b/deps/npm/html/doc/api/npm-update.html index 11b706ed2dd..b929ad73926 100644 --- a/deps/npm/html/doc/api/npm-update.html +++ b/deps/npm/html/doc/api/npm-update.html @@ -3,6 +3,7 @@ npm-update + @@ -30,5 +31,5 @@        - + diff --git a/deps/npm/html/doc/api/npm-version.html b/deps/npm/html/doc/api/npm-version.html index 7502ad6e264..ffe2a4093fa 100644 --- a/deps/npm/html/doc/api/npm-version.html +++ b/deps/npm/html/doc/api/npm-version.html @@ -3,6 +3,7 @@ npm-version + @@ -36,5 +37,5 @@ not have exactly one element. The only element should be a version number.

       - + diff --git a/deps/npm/html/doc/api/npm-view.html b/deps/npm/html/doc/api/npm-view.html index a22755396ff..09dfffce1ad 100644 --- a/deps/npm/html/doc/api/npm-view.html +++ b/deps/npm/html/doc/api/npm-view.html @@ -3,6 +3,7 @@ npm-view + @@ -111,5 +112,5 @@ the field name.

       - + diff --git a/deps/npm/html/doc/api/npm-whoami.html b/deps/npm/html/doc/api/npm-whoami.html index e81a84bee1b..cccc2f5555f 100644 --- a/deps/npm/html/doc/api/npm-whoami.html +++ b/deps/npm/html/doc/api/npm-whoami.html @@ -3,6 +3,7 @@ npm-whoami + @@ -33,5 +34,5 @@        - + diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html index 6ba4f26b5f0..75f85657d73 100644 --- a/deps/npm/html/doc/api/npm.html +++ b/deps/npm/html/doc/api/npm.html @@ -3,6 +3,7 @@ npm + @@ -13,7 +14,7 @@

SYNOPSIS

var npm = require("npm")
-npm.load([configObject], function (er, npm) {
+npm.load([configObject, ]function (er, npm) {
   // use the npm object, now that it's loaded.
 
   npm.config.set(key, val)
@@ -26,7 +27,7 @@ npm.load([configObject], function (er, npm) {
 
 

VERSION

-

1.4.6

+

1.4.8

DESCRIPTION

@@ -104,5 +105,5 @@ method names. Use the npm.deref method to find the real name.

       - + diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html index 305d74a1de6..e97c3c21b1c 100644 --- a/deps/npm/html/doc/cli/npm-adduser.html +++ b/deps/npm/html/doc/cli/npm-adduser.html @@ -3,6 +3,7 @@ npm-adduser + @@ -51,5 +52,5 @@ authorize on a new machine.

       - + diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html index a3489d72c3b..f753966fe8f 100644 --- a/deps/npm/html/doc/cli/npm-bin.html +++ b/deps/npm/html/doc/cli/npm-bin.html @@ -3,6 +3,7 @@ npm-bin + @@ -32,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html index 026bc2fc061..821dbb3a640 100644 --- a/deps/npm/html/doc/cli/npm-bugs.html +++ b/deps/npm/html/doc/cli/npm-bugs.html @@ -3,6 +3,7 @@ npm-bugs + @@ -50,5 +51,5 @@ a package.json in the current folder and use the name        - + diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html index 9cb323bb63f..89d75f1f714 100644 --- a/deps/npm/html/doc/cli/npm-build.html +++ b/deps/npm/html/doc/cli/npm-build.html @@ -3,6 +3,7 @@ npm-build + @@ -37,5 +38,5 @@ A folder containing a package.json file in its root.        - + diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html index a128149c3fd..4c1de8ceedf 100644 --- a/deps/npm/html/doc/cli/npm-bundle.html +++ b/deps/npm/html/doc/cli/npm-bundle.html @@ -3,6 +3,7 @@ npm-bundle + @@ -32,5 +33,5 @@ install packages into the local space.

       - + diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html index d16fdda5b2d..90013f941e8 100644 --- a/deps/npm/html/doc/cli/npm-cache.html +++ b/deps/npm/html/doc/cli/npm-cache.html @@ -3,6 +3,7 @@ npm-cache + @@ -78,5 +79,5 @@ they do not make an HTTP request to the registry.

       - + diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html index 2faaff8c19d..357d095d78d 100644 --- a/deps/npm/html/doc/cli/npm-completion.html +++ b/deps/npm/html/doc/cli/npm-completion.html @@ -3,6 +3,7 @@ npm-completion + @@ -45,5 +46,5 @@ completions based on the arguments.

       - + diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html index 10449a29d8b..ad93e7803d7 100644 --- a/deps/npm/html/doc/cli/npm-config.html +++ b/deps/npm/html/doc/cli/npm-config.html @@ -3,6 +3,7 @@ npm-config + @@ -85,5 +86,5 @@ global config.

       - + diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html index 992fb5c0c20..2576a78c6ca 100644 --- a/deps/npm/html/doc/cli/npm-dedupe.html +++ b/deps/npm/html/doc/cli/npm-dedupe.html @@ -3,6 +3,7 @@ npm-dedupe + @@ -74,5 +75,5 @@ versions.

       - + diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html index 4e9684cc863..13a9b3b0f68 100644 --- a/deps/npm/html/doc/cli/npm-deprecate.html +++ b/deps/npm/html/doc/cli/npm-deprecate.html @@ -3,6 +3,7 @@ npm-deprecate + @@ -43,5 +44,5 @@ something like this:

       - + diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html index c64593fbf86..af1fcc0ba4f 100644 --- a/deps/npm/html/doc/cli/npm-docs.html +++ b/deps/npm/html/doc/cli/npm-docs.html @@ -3,6 +3,7 @@ npm-docs + @@ -53,5 +54,5 @@ the current folder and use the name property.

       - + diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html index 7046f155447..91b064cd49e 100644 --- a/deps/npm/html/doc/cli/npm-edit.html +++ b/deps/npm/html/doc/cli/npm-edit.html @@ -3,6 +3,7 @@ npm-edit + @@ -49,5 +50,5 @@ or "notepad" on Windows.
  • Type: path
  •        - + diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html index caf9be4b6de..7febeee318a 100644 --- a/deps/npm/html/doc/cli/npm-explore.html +++ b/deps/npm/html/doc/cli/npm-explore.html @@ -3,6 +3,7 @@ npm-explore + @@ -52,5 +53,5 @@ Windows
  • Type: path
  •        - + diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html index b043ae744a4..16e3773de84 100644 --- a/deps/npm/html/doc/cli/npm-help-search.html +++ b/deps/npm/html/doc/cli/npm-help-search.html @@ -3,6 +3,7 @@ npm-help-search + @@ -50,5 +51,5 @@ where the terms were found in the documentation.

           - + diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html index adf4043e59c..24ec2533014 100644 --- a/deps/npm/html/doc/cli/npm-help.html +++ b/deps/npm/html/doc/cli/npm-help.html @@ -3,6 +3,7 @@ npm-help + @@ -48,5 +49,5 @@ matches are equivalent to specifying a topic name.

           - + diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html index 65f8d335500..fe2d1af96fa 100644 --- a/deps/npm/html/doc/cli/npm-init.html +++ b/deps/npm/html/doc/cli/npm-init.html @@ -3,6 +3,7 @@ npm-init + @@ -41,5 +42,5 @@ without a really good reason to do so.

           - + diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html index 625174cf59e..3e0a78f3f6f 100644 --- a/deps/npm/html/doc/cli/npm-install.html +++ b/deps/npm/html/doc/cli/npm-install.html @@ -3,6 +3,7 @@ npm-install + @@ -30,7 +31,7 @@ by that. See npm-shrinkwrap(1).

    A package is:

    -
    • a) a folder containing a program described by a package.json file
    • b) a gzipped tarball containing (a)
    • c) a url that resolves to (b)
    • d) a <name>@<version> that is published on the registry with (c)
    • e) a <name>@<tag> that points to (d)
    • f) a <name> that has a "latest" tag satisfying (e)
    • g) a <git remote url> that resolves to (b)
    +
    • a) a folder containing a program described by a package.json file
    • b) a gzipped tarball containing (a)
    • c) a url that resolves to (b)
    • d) a <name>@<version> that is published on the registry (see npm-registry(7)) with (c)
    • e) a <name>@<tag> that points to (d)
    • f) a <name> that has a "latest" tag satisfying (e)
    • g) a <git remote url> that resolves to (b)

    Even if you never publish your package, you can still get a lot of benefits of using npm if you just want to write a node program (a), and @@ -153,7 +154,7 @@ affects a real use-case, it will be investigated.

    SEE ALSO

    - + @@ -165,5 +166,5 @@ affects a real use-case, it will be investigated.

    - + diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html index f8b8dee121e..063b2a4c4a9 100644 --- a/deps/npm/html/doc/cli/npm-link.html +++ b/deps/npm/html/doc/cli/npm-link.html @@ -3,6 +3,7 @@ npm-link + @@ -74,5 +75,5 @@ installation target into your project's node_modules folder.

           - + diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html index 8b75ccc76e3..568e4e142de 100644 --- a/deps/npm/html/doc/cli/npm-ls.html +++ b/deps/npm/html/doc/cli/npm-ls.html @@ -3,6 +3,7 @@ npm-ls + @@ -27,7 +28,7 @@ limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

    -
    npm@1.4.6 /path/to/npm
    +
    npm@1.4.8 /path/to/npm
     └─┬ init-package-json@0.0.4
       └── promzard@0.1.5
    @@ -86,5 +87,5 @@ project.

           - + diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html index 015d9120c32..ee938ac08a2 100644 --- a/deps/npm/html/doc/cli/npm-outdated.html +++ b/deps/npm/html/doc/cli/npm-outdated.html @@ -3,6 +3,7 @@ npm-outdated + @@ -70,5 +71,5 @@ project.

           - + diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html index 542228cf412..2fba0e09310 100644 --- a/deps/npm/html/doc/cli/npm-owner.html +++ b/deps/npm/html/doc/cli/npm-owner.html @@ -3,6 +3,7 @@ npm-owner + @@ -46,5 +47,5 @@ that is not implemented at this time.

           - + diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html index 99608776fa9..323da3e70f2 100644 --- a/deps/npm/html/doc/cli/npm-pack.html +++ b/deps/npm/html/doc/cli/npm-pack.html @@ -3,6 +3,7 @@ npm-pack + @@ -41,5 +42,5 @@ overwritten the second time.

           - + diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html index e7a8eebbb91..fce8f433976 100644 --- a/deps/npm/html/doc/cli/npm-prefix.html +++ b/deps/npm/html/doc/cli/npm-prefix.html @@ -3,6 +3,7 @@ npm-prefix + @@ -32,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html index baf66973504..e7ee0ee6ae6 100644 --- a/deps/npm/html/doc/cli/npm-prune.html +++ b/deps/npm/html/doc/cli/npm-prune.html @@ -3,6 +3,7 @@ npm-prune + @@ -41,5 +42,5 @@ packages specified in your devDependencies.

           - + diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html index f11179ed98e..14572af70c6 100644 --- a/deps/npm/html/doc/cli/npm-publish.html +++ b/deps/npm/html/doc/cli/npm-publish.html @@ -3,6 +3,7 @@ npm-publish + @@ -48,5 +49,5 @@ it is removed with npm-unpublish(1).

           - + diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html index f2ff2f5ba9a..bc4061bd910 100644 --- a/deps/npm/html/doc/cli/npm-rebuild.html +++ b/deps/npm/html/doc/cli/npm-rebuild.html @@ -3,6 +3,7 @@ npm-rebuild + @@ -38,5 +39,5 @@ the new binary.

           - + diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html index bbf00663de9..17851420675 100644 --- a/deps/npm/html/doc/cli/npm-repo.html +++ b/deps/npm/html/doc/cli/npm-repo.html @@ -3,6 +3,7 @@ npm-repo + @@ -44,5 +45,5 @@ a package.json in the current folder and use the name        - + diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html index f36b69282ac..df666ff85f9 100644 --- a/deps/npm/html/doc/cli/npm-restart.html +++ b/deps/npm/html/doc/cli/npm-restart.html @@ -3,6 +3,7 @@ npm-restart + @@ -36,5 +37,5 @@ the "start" script.

           - + diff --git a/deps/npm/html/doc/cli/npm-rm.html b/deps/npm/html/doc/cli/npm-rm.html index 8d06cca21d2..5a66704a338 100644 --- a/deps/npm/html/doc/cli/npm-rm.html +++ b/deps/npm/html/doc/cli/npm-rm.html @@ -3,6 +3,7 @@ npm-rm + @@ -36,5 +37,5 @@ on its behalf.

           - + diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html index a4e0bd24c42..527667f7294 100644 --- a/deps/npm/html/doc/cli/npm-root.html +++ b/deps/npm/html/doc/cli/npm-root.html @@ -3,6 +3,7 @@ npm-root + @@ -32,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html index 13d2d43053e..c602aeb6985 100644 --- a/deps/npm/html/doc/cli/npm-run-script.html +++ b/deps/npm/html/doc/cli/npm-run-script.html @@ -3,6 +3,7 @@ npm-run-script + @@ -12,11 +13,13 @@

    SYNOPSIS

    -
    npm run-script <script> <name>
    +
    npm run-script [<pkg>] <command>

    DESCRIPTION

    -

    This runs an arbitrary command from a package's "scripts" object.

    +

    This runs an arbitrary command from a package's "scripts" object. +If no package name is provided, it will search for a package.json +in the current folder and use its "scripts" object.

    It is used by the test, start, restart, and stop commands, but can be called directly, as well.

    @@ -35,5 +38,5 @@ called directly, as well.

           - + diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html index f66445b01a0..7df4e26149e 100644 --- a/deps/npm/html/doc/cli/npm-search.html +++ b/deps/npm/html/doc/cli/npm-search.html @@ -3,6 +3,7 @@ npm-search + @@ -49,5 +50,5 @@ fall on multiple lines.

           - + diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html index ca5da85f4a2..1f0464e0b8d 100644 --- a/deps/npm/html/doc/cli/npm-shrinkwrap.html +++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html @@ -3,6 +3,7 @@ npm-shrinkwrap + @@ -195,5 +196,5 @@ contents rather than versions.

           - + diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html index a0761b533a3..a02ba32c02d 100644 --- a/deps/npm/html/doc/cli/npm-star.html +++ b/deps/npm/html/doc/cli/npm-star.html @@ -3,6 +3,7 @@ npm-star + @@ -38,5 +39,5 @@ a vaguely positive way to show that you care.

           - + diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html index 067c4154333..9f1568fc249 100644 --- a/deps/npm/html/doc/cli/npm-stars.html +++ b/deps/npm/html/doc/cli/npm-stars.html @@ -3,6 +3,7 @@ npm-stars + @@ -37,5 +38,5 @@ you will most certainly enjoy this command.

           - + diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html index 0208291c2e0..c8e48649576 100644 --- a/deps/npm/html/doc/cli/npm-start.html +++ b/deps/npm/html/doc/cli/npm-start.html @@ -3,6 +3,7 @@ npm-start + @@ -32,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html index 71b9bb66a1a..b746a6111f8 100644 --- a/deps/npm/html/doc/cli/npm-stop.html +++ b/deps/npm/html/doc/cli/npm-stop.html @@ -3,6 +3,7 @@ npm-stop + @@ -32,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-submodule.html b/deps/npm/html/doc/cli/npm-submodule.html index cd574596512..f4358281afa 100644 --- a/deps/npm/html/doc/cli/npm-submodule.html +++ b/deps/npm/html/doc/cli/npm-submodule.html @@ -3,6 +3,7 @@ npm-submodule + @@ -45,5 +46,5 @@ dependencies into the submodule folder.

           - + diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html index b0d248c6902..26c36d4f8f7 100644 --- a/deps/npm/html/doc/cli/npm-tag.html +++ b/deps/npm/html/doc/cli/npm-tag.html @@ -3,6 +3,7 @@ npm-tag + @@ -46,5 +47,5 @@ of using a specific version number:

           - + diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html index f11d1de7486..d36b4df7fbc 100644 --- a/deps/npm/html/doc/cli/npm-test.html +++ b/deps/npm/html/doc/cli/npm-test.html @@ -3,6 +3,7 @@ npm-test + @@ -36,5 +37,5 @@ true.

           - + diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html index 7f24b1ae2b9..f77e270b37a 100644 --- a/deps/npm/html/doc/cli/npm-uninstall.html +++ b/deps/npm/html/doc/cli/npm-uninstall.html @@ -3,6 +3,7 @@ npm-uninstall + @@ -52,5 +53,5 @@ npm uninstall dtrace-provider --save-optional
           - + diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html index 86dc398667e..e7864dca839 100644 --- a/deps/npm/html/doc/cli/npm-unpublish.html +++ b/deps/npm/html/doc/cli/npm-unpublish.html @@ -3,6 +3,7 @@ npm-unpublish + @@ -50,5 +51,5 @@ package again, a new version number must be used.

           - + diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html index 95548b6b1d6..ca7974d2ca2 100644 --- a/deps/npm/html/doc/cli/npm-update.html +++ b/deps/npm/html/doc/cli/npm-update.html @@ -3,6 +3,7 @@ npm-update + @@ -38,5 +39,5 @@ If no package name is specified, all packages in the specified location (global        - + diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html index 130b04b5bb0..88fc4e6470e 100644 --- a/deps/npm/html/doc/cli/npm-version.html +++ b/deps/npm/html/doc/cli/npm-version.html @@ -3,6 +3,7 @@ npm-version + @@ -61,5 +62,5 @@ Enter passphrase:
           - + diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html index 048bba314b6..83a295aa532 100644 --- a/deps/npm/html/doc/cli/npm-view.html +++ b/deps/npm/html/doc/cli/npm-view.html @@ -3,6 +3,7 @@ npm-view + @@ -103,5 +104,5 @@ the field name.

           - + diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html index ee4e9ef62fa..9330dc3b214 100644 --- a/deps/npm/html/doc/cli/npm-whoami.html +++ b/deps/npm/html/doc/cli/npm-whoami.html @@ -3,6 +3,7 @@ npm-whoami + @@ -32,5 +33,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html index e6671c00cd3..50a4bb65bd4 100644 --- a/deps/npm/html/doc/cli/npm.html +++ b/deps/npm/html/doc/cli/npm.html @@ -3,6 +3,7 @@ npm + @@ -16,7 +17,7 @@

    VERSION

    -

    1.4.6

    +

    1.4.8

    DESCRIPTION

    @@ -143,5 +144,5 @@ will no doubt tell you to put the output in a gist or email.

           - + diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html index 77a674b512f..eb9606b5c5b 100644 --- a/deps/npm/html/doc/files/npm-folders.html +++ b/deps/npm/html/doc/files/npm-folders.html @@ -3,6 +3,7 @@ npm-folders + @@ -217,5 +218,5 @@ cannot be found elsewhere. See packa        - + diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html index 77a674b512f..eb9606b5c5b 100644 --- a/deps/npm/html/doc/files/npm-global.html +++ b/deps/npm/html/doc/files/npm-global.html @@ -3,6 +3,7 @@ npm-folders + @@ -217,5 +218,5 @@ cannot be found elsewhere. See packa        - + diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html index 9dbb57d6d2a..bcb0a56bf8b 100644 --- a/deps/npm/html/doc/files/npm-json.html +++ b/deps/npm/html/doc/files/npm-json.html @@ -3,6 +3,7 @@ package.json + @@ -310,7 +311,7 @@ a tarball or git URL.

    See semver(7) for more details about specifying version ranges.

    -
    • version Must match version exactly
    • >version Must be greater than version
    • >=version etc
    • <version
    • <=version
    • ~version "Approximately equivalent to version" See semver(7)
    • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • http://... See 'URLs as Dependencies' below
    • * Matches any version
    • "" (just an empty string) Same as *
    • version1 - version2 Same as >=version1 <=version2.
    • range1 || range2 Passes if either range1 or range2 are satisfied.
    • git... See 'Git URLs as Dependencies' below
    • user/repo See 'GitHub URLs' below
    +
    • version Must match version exactly
    • >version Must be greater than version
    • >=version etc
    • <version
    • <=version
    • ~version "Approximately equivalent to version" See semver(7)
    • ^version "Compatible with version" See semver(7)
    • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • http://... See 'URLs as Dependencies' below
    • * Matches any version
    • "" (just an empty string) Same as *
    • version1 - version2 Same as >=version1 <=version2.
    • range1 || range2 Passes if either range1 or range2 are satisfied.
    • git... See 'Git URLs as Dependencies' below
    • user/repo See 'GitHub URLs' below

    For example, these are all valid:

    @@ -396,6 +397,40 @@ can consume the functionality without requiring them to compile it themselves. In dev mode (ie, locally running npm install), it'll run this script as well, so that you can test it easily.

    +

    peerDependencies

    + +

    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 +a specific interface, expected and specified by the host documentation.

    + +

    For example:

    + +
    {
    +  "name": "tea-latte",
    +  "version": "1.3.5"
    +  "peerDependencies": {
    +    "tea": "2.x"
    +  }
    +}
    + +

    This ensures your package tea-latte can be installed along with the second +major version of the host package tea only. The host package is automatically +installed if needed. npm install tea-latte could possibly yield the following +dependency graph:

    + +
    ├── tea-latte@1.3.5
    +└── tea@2.2.0
    + +

    Trying to install another plugin with a conflicting requirement will cause an +error. For this reason, make sure your plugin requirement is as broad as +possible, and not to lock it down to specific patch versions.

    + +

    Assuming the host complies with semver, only changes in +the host package's major version will break your plugin. Thus, if you've worked +with every 1.x version of the host package, use "^1.0" or "1.x" to express +this. If you depend on features introduced in 1.5.2, use ">= 1.5.2 < 2".

    +

    bundledDependencies

    Array of package names that will be bundled when publishing the package.

    @@ -554,5 +589,5 @@ ignored.

           - + diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html index f003e807e75..10dff0f1b6f 100644 --- a/deps/npm/html/doc/files/npmrc.html +++ b/deps/npm/html/doc/files/npmrc.html @@ -3,6 +3,7 @@ npmrc + @@ -71,5 +72,5 @@ manner.

           - + diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html index 9dbb57d6d2a..bcb0a56bf8b 100644 --- a/deps/npm/html/doc/files/package.json.html +++ b/deps/npm/html/doc/files/package.json.html @@ -3,6 +3,7 @@ package.json + @@ -310,7 +311,7 @@ a tarball or git URL.

    See semver(7) for more details about specifying version ranges.

    -
    • version Must match version exactly
    • >version Must be greater than version
    • >=version etc
    • <version
    • <=version
    • ~version "Approximately equivalent to version" See semver(7)
    • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • http://... See 'URLs as Dependencies' below
    • * Matches any version
    • "" (just an empty string) Same as *
    • version1 - version2 Same as >=version1 <=version2.
    • range1 || range2 Passes if either range1 or range2 are satisfied.
    • git... See 'Git URLs as Dependencies' below
    • user/repo See 'GitHub URLs' below
    +
    • version Must match version exactly
    • >version Must be greater than version
    • >=version etc
    • <version
    • <=version
    • ~version "Approximately equivalent to version" See semver(7)
    • ^version "Compatible with version" See semver(7)
    • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • http://... See 'URLs as Dependencies' below
    • * Matches any version
    • "" (just an empty string) Same as *
    • version1 - version2 Same as >=version1 <=version2.
    • range1 || range2 Passes if either range1 or range2 are satisfied.
    • git... See 'Git URLs as Dependencies' below
    • user/repo See 'GitHub URLs' below

    For example, these are all valid:

    @@ -396,6 +397,40 @@ can consume the functionality without requiring them to compile it themselves. In dev mode (ie, locally running npm install), it'll run this script as well, so that you can test it easily.

    +

    peerDependencies

    + +

    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 +a specific interface, expected and specified by the host documentation.

    + +

    For example:

    + +
    {
    +  "name": "tea-latte",
    +  "version": "1.3.5"
    +  "peerDependencies": {
    +    "tea": "2.x"
    +  }
    +}
    + +

    This ensures your package tea-latte can be installed along with the second +major version of the host package tea only. The host package is automatically +installed if needed. npm install tea-latte could possibly yield the following +dependency graph:

    + +
    ├── tea-latte@1.3.5
    +└── tea@2.2.0
    + +

    Trying to install another plugin with a conflicting requirement will cause an +error. For this reason, make sure your plugin requirement is as broad as +possible, and not to lock it down to specific patch versions.

    + +

    Assuming the host complies with semver, only changes in +the host package's major version will break your plugin. Thus, if you've worked +with every 1.x version of the host package, use "^1.0" or "1.x" to express +this. If you depend on features introduced in 1.5.2, use ">= 1.5.2 < 2".

    +

    bundledDependencies

    Array of package names that will be bundled when publishing the package.

    @@ -554,5 +589,5 @@ ignored.

           - + diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html index 1c673fa198e..8ddfe6853d8 100644 --- a/deps/npm/html/doc/index.html +++ b/deps/npm/html/doc/index.html @@ -3,6 +3,7 @@ npm-index + @@ -428,5 +429,5 @@        - + diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index 5e1992443cc..718683cc64e 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -3,6 +3,7 @@ npm-coding-style + @@ -194,5 +195,5 @@ set to anything."

           - + diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html index 5f4dec5acab..54ff62e0717 100644 --- a/deps/npm/html/doc/misc/npm-config.html +++ b/deps/npm/html/doc/misc/npm-config.html @@ -3,6 +3,7 @@ npm-config + @@ -565,6 +566,17 @@ devDependencies hash.

    Only works if there is already a package.json file present.

    +

    save-prefix

    + +
    • Default: '^'
    • Type: String
    + +

    Configure how versions of packages installed to a package.json file via +--save or --save-dev get prefixed.

    + +

    For example if a package has version 1.2.3, by default it's version is +set to ^1.2.3 which allows minor upgrades for that package, but after
    npm config set save-prefix='~' it would be set to ~1.2.3 which only allows +patch upgrades.

    +

    searchopts

    • Default: ""
    • Type: String
    @@ -731,5 +743,5 @@ hash, and exit successfully.

           - + diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html index 25a6348ca78..c079166bd9f 100644 --- a/deps/npm/html/doc/misc/npm-developers.html +++ b/deps/npm/html/doc/misc/npm-developers.html @@ -3,6 +3,7 @@ npm-developers + @@ -186,5 +187,5 @@ from a fresh checkout.

           - + diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html index 87cf6b2fd37..b6fa66273f6 100644 --- a/deps/npm/html/doc/misc/npm-disputes.html +++ b/deps/npm/html/doc/misc/npm-disputes.html @@ -3,6 +3,7 @@ npm-disputes + @@ -104,5 +105,5 @@ things into it.        - + diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html index 298b44548b8..556f1cb8e0e 100644 --- a/deps/npm/html/doc/misc/npm-faq.html +++ b/deps/npm/html/doc/misc/npm-faq.html @@ -3,6 +3,7 @@ npm-faq + @@ -85,7 +86,7 @@ in a shell script if you really wanted to.

    Mikeal Rogers answered this question very well:

    -

    http://www.mikealrogers.com/posts/nodemodules-in-git.html

    +

    http://www.futurealoof.com/posts/nodemodules-in-git.html

    tl;dr

    @@ -360,5 +361,5 @@ good folks at npm, Inc.

           - + diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html index b92a2147317..b4892a7bb0d 100644 --- a/deps/npm/html/doc/misc/npm-index.html +++ b/deps/npm/html/doc/misc/npm-index.html @@ -3,6 +3,7 @@ npm-index + @@ -428,5 +429,5 @@        - + diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html index 79c9957b753..0828d93f8c5 100644 --- a/deps/npm/html/doc/misc/npm-registry.html +++ b/deps/npm/html/doc/misc/npm-registry.html @@ -3,6 +3,7 @@ npm-registry + @@ -83,5 +84,5 @@ effectively implement the entire CouchDB API anyway.

           - + diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html index 16f9a53e619..c1e77d6fb53 100644 --- a/deps/npm/html/doc/misc/npm-scripts.html +++ b/deps/npm/html/doc/misc/npm-scripts.html @@ -3,6 +3,7 @@ npm-scripts + @@ -235,5 +236,5 @@ the user will sudo the npm command in question.        - + diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html index c79e6775426..08d7a4f7d87 100644 --- a/deps/npm/html/doc/misc/removing-npm.html +++ b/deps/npm/html/doc/misc/removing-npm.html @@ -3,6 +3,7 @@ removing-npm + @@ -70,5 +71,5 @@ modules. To track those down, you can do the following:

           - + diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html index 893858ab407..3dae36b08e2 100644 --- a/deps/npm/html/doc/misc/semver.html +++ b/deps/npm/html/doc/misc/semver.html @@ -3,6 +3,7 @@ semver + @@ -129,5 +130,5 @@ range, use the satisfies(version, range) function.

           - + diff --git a/deps/npm/html/dochead.html b/deps/npm/html/dochead.html index f2c8a6bad1a..e2f0e83d78e 100644 --- a/deps/npm/html/dochead.html +++ b/deps/npm/html/dochead.html @@ -3,6 +3,7 @@ @NAME@ + diff --git a/deps/npm/lib/adduser.js b/deps/npm/lib/adduser.js index 739f14243f1..94a119683a7 100644 --- a/deps/npm/lib/adduser.js +++ b/deps/npm/lib/adduser.js @@ -66,15 +66,24 @@ function readUsername (c, u, cb) { function readPassword (c, u, cb) { var v = userValidate.pw - if (!c.changed) { - u.p = c.p - return cb() + var prompt + if (c.p && !c.changed) { + prompt = "Password: (or leave unchanged) " + } else { + prompt = "Password: " } - read({prompt: "Password: ", silent: true}, function (er, pw) { + + read({prompt: prompt, silent: true}, function (er, pw) { if (er) { return cb(er.message === "cancelled" ? er.message : er) } + if (!c.changed && pw === "") { + // when the username was not changed, + // empty response means "use the old value" + pw = c.p + } + if (!pw) { return readPassword(c, u, cb) } @@ -85,6 +94,7 @@ function readPassword (c, u, cb) { return readPassword(c, u, cb) } + c.changed = c.changed || c.p != pw u.p = pw cb(er) }) diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js index 3b9a46f6978..5c2d07840ea 100644 --- a/deps/npm/lib/cache.js +++ b/deps/npm/lib/cache.js @@ -84,6 +84,7 @@ var mkdir = require("mkdirp") , which = require("which") , isGitUrl = require("./utils/is-git-url.js") , pathIsInside = require("path-is-inside") + , http = require("http") cache.usage = "npm cache add " + "\nnpm cache add " @@ -241,9 +242,10 @@ function add (args, cb) { log.verbose("cache add", "name=%j spec=%j args=%j", name, spec, args) - if (!name && !spec) return cb(usage) + cb = afterAdd([name, spec], cb) + // see if the spec is a url // otherwise, treat as name@version var p = url.parse(spec) || {} @@ -265,6 +267,23 @@ function add (args, cb) { add_(name, spec, p, cb) } +function afterAdd (arg, cb) { return function (er, data) { + if (er || !data || !data.name || !data.version) { + return cb(er, data) + } + + // Save the resolved, shasum, etc. into the data so that the next + // time we load from this cached data, we have all the same info. + var name = data.name + var ver = data.version + var pj = path.join(npm.cache, name, ver, "package", "package.json") + fs.writeFile(pj, JSON.stringify(data), "utf8", function (er) { + cb(er, data) + }) +}} + + + function maybeFile (spec, p, cb) { fs.stat(spec, function (er, stat) { if (!er) { @@ -316,7 +335,15 @@ function fetchAndShaCheck (u, tmp, shasum, cb) { log.error("fetch failed", u) return cb(er, response) } - if (!shasum) return cb(null, response) + + if (!shasum) { + // Well, we weren't given a shasum, so at least sha what we have + // in case we want to compare it to something else later + return sha.get(tmp, function (er, shasum) { + cb(er, response, shasum) + }) + } + // validate that the url we just downloaded matches the expected shasum. sha.check(tmp, shasum, function (er) { if (er != null && er.message) { @@ -331,7 +358,8 @@ function fetchAndShaCheck (u, tmp, shasum, cb) { // Only have a single download action at once for a given url // additional calls stack the callbacks. var inFlightURLs = {} -function addRemoteTarball (u, shasum, name, cb_) { +function addRemoteTarball (u, shasum, name, version, cb_) { + if (typeof cb_ !== "function") cb_ = version, version = "" if (typeof cb_ !== "function") cb_ = name, name = "" if (typeof cb_ !== "function") cb_ = shasum, shasum = null @@ -343,6 +371,7 @@ function addRemoteTarball (u, shasum, name, cb_) { function cb (er, data) { if (data) { data._from = u + data._shasum = data._shasum || shasum data._resolved = u } unlock(u, function () { @@ -366,7 +395,7 @@ function addRemoteTarball (u, shasum, name, cb_) { function done (er, resp, shasum) { if (er) return cb(er) - addLocalTarball(tmp, name, shasum, cb) + addLocalTarball(tmp, name, version, shasum, cb) } } @@ -681,6 +710,9 @@ function addNameTag (name, tag, data, cb_) { } registry.get(name, function (er, data, json, response) { + if (!er) { + er = errorResponse(name, resp) + } if (er) return cb(er) engineFilter(data) if (data["dist-tags"] && data["dist-tags"][tag] @@ -716,6 +748,16 @@ function engineFilter (data) { }) } +function errorResponse (name, response) { + if (response.statusCode >= 400) { + var er = new Error(http.STATUS_CODES[response.statusCode]) + er.statusCode = response.statusCode + er.code = "E" + er.statusCode + er.pkgid = name + } + return er +} + function addNameRange (name, range, data, cb) { if (typeof cb !== "function") cb = data, data = null @@ -727,6 +769,9 @@ function addNameRange (name, range, data, cb) { if (data) return next() registry.get(name, function (er, d, json, response) { + if (!er) { + er = errorResponse(name, response) + } if (er) return cb(er) data = d next() @@ -791,9 +836,18 @@ function addNameVersion (name, v, data, cb) { response = null return next() } - registry.get(name + "/" + ver, function (er, d, json, resp) { + registry.get(name, function (er, d, json, resp) { + if (!er) { + er = errorResponse(name, resp) + } if (er) return cb(er) - data = d + data = d && d.versions[ver] + if (!data) { + er = new Error('version not found: ' + name + '@' + ver) + er.package = name + er.statusCode = 404 + return cb(er) + } response = resp next() }) @@ -823,6 +877,10 @@ function addNameVersion (name, v, data, cb) { if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er) if (er) return fetchit() + // check the SHA of the package we have, to ensure it wasn't installed + // from somewhere other than the registry (eg, a fork) + if (data._shasum && dist.shasum && data._shasum !== dist.shasum) + return fetchit() return cb(null, data) }) } else return fetchit() @@ -853,7 +911,8 @@ function addNameVersion (name, v, data, cb) { } return addRemoteTarball( tb , dist.shasum - , name+"-"+ver + , name + , ver , cb ) } } @@ -924,13 +983,23 @@ function maybeGithub (p, name, er, cb) { } } -function addLocalTarball (p, name, shasum, cb_) { +function addLocalTarball (p, name, version, shasum, cb_) { if (typeof cb_ !== "function") cb_ = shasum, shasum = null + if (typeof cb_ !== "function") cb_ = version, version = "" if (typeof cb_ !== "function") cb_ = name, name = "" + + // If we don't have a shasum yet, then get the shasum now. + if (!shasum) { + return sha.get(p, function (er, shasum) { + if (er) return cb_(er) + addLocalTarball(p, name, version, shasum, cb_) + }) + } + // if it's a tar, and not in place, // then unzip to .tmp, add the tmp folder, and clean up tmp if (pathIsInside(p, npm.tmp)) - return addTmpTarball(p, name, shasum, cb_) + return addTmpTarball(p, name, version, shasum, cb_) if (pathIsInside(p, npm.cache)) { if (path.basename(p) !== "package.tgz") return cb_(new Error( @@ -939,7 +1008,10 @@ function addLocalTarball (p, name, shasum, cb_) { } function cb (er, data) { - if (data) data._resolved = p + if (data) { + data._resolved = p + data._shasum = data._shasum || shasum + } return cb_(er, data) } @@ -962,7 +1034,7 @@ function addLocalTarball (p, name, shasum, cb_) { log.verbose("chmod", tmp, npm.modes.file.toString(8)) fs.chmod(tmp, npm.modes.file, function (er) { if (er) return cb(er) - addTmpTarball(tmp, name, shasum, cb) + addTmpTarball(tmp, name, null, shasum, cb) }) }) from.pipe(to) @@ -1188,6 +1260,10 @@ function addLocalDirectory (p, name, shasum, cb) { , data.version, "package.tgz" ) , placeDirect = path.basename(p) === "package" , tgz = placeDirect ? placed : tmptgz + , version = data.version + + name = data.name + getCacheStat(function (er, cs) { mkdir(path.dirname(tgz), function (er, made) { if (er) return cb(er) @@ -1207,7 +1283,7 @@ function addLocalDirectory (p, name, shasum, cb) { chownr(made || tgz, cs.uid, cs.gid, function (er) { if (er) return cb(er) - addLocalTarball(tgz, name, shasum, cb) + addLocalTarball(tgz, name, version, shasum, cb) }) }) }) @@ -1215,21 +1291,75 @@ function addLocalDirectory (p, name, shasum, cb) { }) } -function addTmpTarball (tgz, name, shasum, cb) { - if (!cb) cb = name, name = "" +// XXX This is where it should be fixed +// Right now it's unpacking to a "package" folder, and then +// adding that local folder, for historical reasons. +// Instead, unpack to the *cache* folder, and then copy the +// tgz into place in the cache, so the shasum doesn't change. +function addTmpTarball (tgz, name, version, shasum, cb) { + // Just have a placeholder here so we can move it into place after. + var tmp = false + if (!version) { + tmp = true + version = 'tmp_' + crypto.randomBytes(6).toString('hex') + } + if (!name) { + tmp = true + name = 'tmp_' + crypto.randomBytes(6).toString('hex') + } + if (!tmp) { + var pdir = path.resolve(npm.cache, name, version, "package") + } else { + var pdir = path.resolve(npm.cache, name + version + "package") + } + getCacheStat(function (er, cs) { if (er) return cb(er) - var contents = path.dirname(tgz) - tar.unpack( tgz, path.resolve(contents, "package") - , null, null - , cs.uid, cs.gid - , function (er) { - if (er) { - return cb(er) - } - addLocalDirectory(path.resolve(contents, "package"), name, shasum, cb) - }) + tar.unpack(tgz, pdir, null, null, cs.uid, cs.gid, next) }) + + function next (er) { + if (er) return cb(er) + // it MUST be able to get a version now! + var pj = path.resolve(pdir, "package.json") + readJson(pj, function (er, data) { + if (er) return cb(er) + if (version === data.version && name === data.name && !tmp) { + addTmpTarball_(tgz, data, name, version, shasum, cb) + } else { + var old = pdir + name = data.name + version = data.version + pdir = path.resolve(npm.cache, name, version, "package") + mkdir(path.dirname(pdir), function(er) { + if (er) return cb(er) + rm(pdir, function(er) { + if (er) return cb(er) + fs.rename(old, pdir, function(er) { + if (er) return cb(er) + rm(old, function(er) { + if (er) return cb(er) + addTmpTarball_(tgz, data, name, version, shasum, cb) + }) + }) + }) + }) + } + }) + } +} + +function addTmpTarball_ (tgz, data, name, version, shasum, cb) { + cb = once(cb) + var target = path.resolve(npm.cache, name, version, "package.tgz") + var read = fs.createReadStream(tgz) + var write = fs.createWriteStream(target) + read.on("error", cb).pipe(write).on("error", cb).on("close", done) + + function done() { + data._shasum = data._shasum || shasum + cb(null, data) + } } function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb) { diff --git a/deps/npm/lib/dedupe.js b/deps/npm/lib/dedupe.js index 55823d96768..0c2b18a7842 100644 --- a/deps/npm/lib/dedupe.js +++ b/deps/npm/lib/dedupe.js @@ -354,4 +354,3 @@ function whoDepends_ (pkg, who, test) { }) return who } - diff --git a/deps/npm/lib/help.js b/deps/npm/lib/help.js index ea3970b2409..72b4393b6af 100644 --- a/deps/npm/lib/help.js +++ b/deps/npm/lib/help.js @@ -30,8 +30,11 @@ function help (args, cb) { var section = npm.deref(args[0]) || args[0] // npm help : show basic usage - if (!section) - return npmUsage(cb) + if (!section) { + var valid = argv[0] === 'help' ? 0 : 1 + return npmUsage(valid, cb) + } + // npm -h: show command usage if ( npm.config.get("usage") @@ -147,7 +150,7 @@ function htmlMan (man) { return path.resolve(__dirname, "..", "html", "doc", sect, f) } -function npmUsage (cb) { +function npmUsage (valid, cb) { npm.config.set("loglevel", "silent") log.level = "silent" console.log @@ -170,7 +173,7 @@ function npmUsage (cb) { , "" , "npm@" + npm.version + " " + path.dirname(__dirname) ].join("\n")) - cb() + cb(valid) } function usages () { diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js index 39c98ecff27..3e319fa6734 100644 --- a/deps/npm/lib/install.js +++ b/deps/npm/lib/install.js @@ -337,6 +337,7 @@ function save (where, installed, tree, pretty, hasArguments, cb) { } var saveBundle = npm.config.get('save-bundle') + var savePrefix = npm.config.get('save-prefix') || "^"; // each item in the tree is a top-level thing that should be saved // to the package.json file. @@ -353,7 +354,7 @@ function save (where, installed, tree, pretty, hasArguments, cb) { var rangeDescriptor = semver.valid(k[1], true) && semver.gte(k[1], "0.1.0", true) && !npm.config.get("save-exact") - ? "^" : "" + ? savePrefix : "" set[k[0]] = rangeDescriptor + k[1] return set }, {}) @@ -447,7 +448,7 @@ function prettify (tree, installed) { if (g) g = " (" + g + ")" return c.what + g }) - }) + }, "", { unicode: npm.config.get("unicode") }) }).join("\n") } diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js index c443b64998b..a529862d5ad 100644 --- a/deps/npm/lib/npm.js +++ b/deps/npm/lib/npm.js @@ -288,6 +288,14 @@ function load (npm, cli, cb) { npmconf.load(cli, builtin, function (er, config) { if (er === config) er = null + // Include npm-version and node-version in user-agent + var ua = config.get("user-agent") || "" + ua = ua.replace(/\{node-version\}/gi, process.version) + ua = ua.replace(/\{npm-version\}/gi, npm.version) + ua = ua.replace(/\{platform\}/gi, process.platform) + ua = ua.replace(/\{arch\}/gi, process.arch) + config.set("user-agent", ua) + npm.config = config var color = config.get("color") diff --git a/deps/npm/lib/shrinkwrap.js b/deps/npm/lib/shrinkwrap.js index 48a3e4ae12e..ef5732590e0 100644 --- a/deps/npm/lib/shrinkwrap.js +++ b/deps/npm/lib/shrinkwrap.js @@ -59,7 +59,7 @@ function shrinkwrap_ (pkginfo, silent, dev, cb) { function save (pkginfo, silent, cb) { // copy the keys over in a well defined order // because javascript objects serialize arbitrarily - pkginfo.dependencies = sortedObject(pkginfo.dependencies) + pkginfo.dependencies = sortedObject(pkginfo.dependencies || {}) try { var swdata = JSON.stringify(pkginfo, null, 2) + "\n" } catch (er) { diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js index 4286a1c2910..b025fdd371c 100644 --- a/deps/npm/lib/utils/error-handler.js +++ b/deps/npm/lib/utils/error-handler.js @@ -146,9 +146,10 @@ function errorHandler (er) { case "E404": er.code = "E404" + var msg = [er.message] if (er.pkgid && er.pkgid !== "-") { - var msg = ["'"+er.pkgid+"' is not in the npm registry." - ,"You should bug the author to publish it"] + msg.push("", "'"+er.pkgid+"' is not in the npm registry." + ,"You should bug the author to publish it") if (er.parent) { msg.push("It was specified as a dependency of '"+er.parent+"'") } @@ -161,8 +162,8 @@ function errorHandler (er) { } msg.push("\nNote that you can also install from a" ,"tarball, folder, or http url, or git url.") - log.error("404", msg.join("\n")) } + log.error("404", msg.join("\n")) break case "EPUBLISHCONFLICT": @@ -278,7 +279,7 @@ function errorHandler (er) { var os = require("os") // just a line break - console.error("") + if (log.levels[log.level] <= log.levels.error) console.error("") log.error("System", os.type() + " " + os.release()) log.error("command", process.argv .map(JSON.stringify).join(" ")) diff --git a/deps/npm/lib/utils/lifecycle.js b/deps/npm/lib/utils/lifecycle.js index e6ef925b304..1af5bddca71 100644 --- a/deps/npm/lib/utils/lifecycle.js +++ b/deps/npm/lib/utils/lifecycle.js @@ -1,6 +1,6 @@ - exports = module.exports = lifecycle exports.cmd = cmd +exports.makeEnv = makeEnv var log = require("npmlog") , spawn = require("child_process").spawn @@ -161,7 +161,9 @@ function runCmd (note, cmd, pkg, env, stage, wd, unsafe, cb) { var user = unsafe ? null : npm.config.get("user") , group = unsafe ? null : npm.config.get("group") - console.log(note) + if (log.level !== 'silent') { + console.log(note) + } log.verbose("unsafe-perm in lifecycle", unsafe) if (process.platform === "win32") { @@ -313,6 +315,7 @@ function makeEnv (data, prefix, env) { var value = npm.config.get(i) if (value instanceof Stream || Array.isArray(value)) return if (!value) value = "" + else if (typeof value === "number") value = "" + value else if (typeof value !== "string") value = JSON.stringify(value) value = -1 !== value.indexOf("\n") diff --git a/deps/npm/lib/view.js b/deps/npm/lib/view.js index f7ba5a9541c..18484b2bd1a 100644 --- a/deps/npm/lib/view.js +++ b/deps/npm/lib/view.js @@ -58,13 +58,24 @@ function view (args, silent, cb) { // get the data about this package registry.get(name, function (er, data) { if (er) return cb(er) - if (data["dist-tags"].hasOwnProperty(version)) { + if (data["dist-tags"] && data["dist-tags"].hasOwnProperty(version)) { version = data["dist-tags"][version] } + + if (data.time && data.time.unpublished) { + var u = data.time.unpublished + var er = new Error("Unpublished by " + u.name + " on " + u.time) + er.statusCode = 404 + er.code = "E404" + er.pkgid = data._id + return cb(er, data) + } + + var results = [] , error = null - , versions = data.versions - data.versions = Object.keys(data.versions).sort(semver.compareLoose) + , versions = data.versions || {} + data.versions = Object.keys(versions).sort(semver.compareLoose) if (!args.length) args = [""] // remove readme unless we asked for it diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1 index b9d79a83e6c..0f8bef3d71d 100644 --- a/deps/npm/man/man1/npm-README.1 +++ b/deps/npm/man/man1/npm-README.1 @@ -1,12 +1,13 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "March 2014" "" "" +.TH "NPM" "1" "May 2014" "" "" . .SH "NAME" -\fBnpm\fR \-\- node package manager +\fBnpm\fR \-\- node package manager![Build Status \fIhttps://img\.shields\.io/travis/npm/npm/master\.svg)](https://travis\-ci\.org/npm/npm\fR +## SYNOPSIS . -.SH "SYNOPSIS" +.P This is just enough info to get you up and running\. . .P @@ -38,6 +39,18 @@ paths, etc\.) then read on\. .SH "Fancy Install (Unix)" There\'s a pretty robust install script at \fIhttps://www\.npmjs\.org/install\.sh\fR\|\. You can download that and run it\. . +.P +Here\'s an example using curl: +. +.IP "" 4 +. +.nf +curl \-L https://npmjs\.org/install\.sh | sh +. +.fi +. +.IP "" 0 +. .SS "Slightly Fancier" You can set any npm configuration params with that script: . diff --git a/deps/npm/man/man1/npm-adduser.1 b/deps/npm/man/man1/npm-adduser.1 index f37e270c35b..594330a415b 100644 --- a/deps/npm/man/man1/npm-adduser.1 +++ b/deps/npm/man/man1/npm-adduser.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ADDUSER" "1" "March 2014" "" "" +.TH "NPM\-ADDUSER" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-adduser\fR \-\- Add a registry user account diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1 index a8eff0bb6ec..af5468b59dc 100644 --- a/deps/npm/man/man1/npm-bin.1 +++ b/deps/npm/man/man1/npm-bin.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "1" "March 2014" "" "" +.TH "NPM\-BIN" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1 index ed250474307..b3a953bfe64 100644 --- a/deps/npm/man/man1/npm-bugs.1 +++ b/deps/npm/man/man1/npm-bugs.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "1" "March 2014" "" "" +.TH "NPM\-BUGS" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1 index 49703f31f3a..152caf79cca 100644 --- a/deps/npm/man/man1/npm-build.1 +++ b/deps/npm/man/man1/npm-build.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUILD" "1" "March 2014" "" "" +.TH "NPM\-BUILD" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-build\fR \-\- Build a package diff --git a/deps/npm/man/man1/npm-bundle.1 b/deps/npm/man/man1/npm-bundle.1 index 04ef1a38869..5f2f85a3f55 100644 --- a/deps/npm/man/man1/npm-bundle.1 +++ b/deps/npm/man/man1/npm-bundle.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUNDLE" "1" "March 2014" "" "" +.TH "NPM\-BUNDLE" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-bundle\fR \-\- REMOVED diff --git a/deps/npm/man/man1/npm-cache.1 b/deps/npm/man/man1/npm-cache.1 index 98922c4d9d0..0e5b949c2b8 100644 --- a/deps/npm/man/man1/npm-cache.1 +++ b/deps/npm/man/man1/npm-cache.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CACHE" "1" "March 2014" "" "" +.TH "NPM\-CACHE" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-cache\fR \-\- Manipulates packages cache diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1 index decc444d2b2..6d1ec8d972c 100644 --- a/deps/npm/man/man1/npm-completion.1 +++ b/deps/npm/man/man1/npm-completion.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMPLETION" "1" "March 2014" "" "" +.TH "NPM\-COMPLETION" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-completion\fR \-\- Tab Completion for npm diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1 index 95c08c75739..38490724d72 100644 --- a/deps/npm/man/man1/npm-config.1 +++ b/deps/npm/man/man1/npm-config.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "1" "March 2014" "" "" +.TH "NPM\-CONFIG" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration files diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1 index 5a1eef85535..e60192178b0 100644 --- a/deps/npm/man/man1/npm-dedupe.1 +++ b/deps/npm/man/man1/npm-dedupe.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEDUPE" "1" "March 2014" "" "" +.TH "NPM\-DEDUPE" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-dedupe\fR \-\- Reduce duplication diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1 index f4af967e710..e4a19b23bc2 100644 --- a/deps/npm/man/man1/npm-deprecate.1 +++ b/deps/npm/man/man1/npm-deprecate.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "1" "March 2014" "" "" +.TH "NPM\-DEPRECATE" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1 index a6f08de709b..27cbb05c8d7 100644 --- a/deps/npm/man/man1/npm-docs.1 +++ b/deps/npm/man/man1/npm-docs.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "1" "March 2014" "" "" +.TH "NPM\-DOCS" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1 index 0e8a17276a9..678c9128b2c 100644 --- a/deps/npm/man/man1/npm-edit.1 +++ b/deps/npm/man/man1/npm-edit.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "1" "March 2014" "" "" +.TH "NPM\-EDIT" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1 index c69da38862a..2baac8f2fee 100644 --- a/deps/npm/man/man1/npm-explore.1 +++ b/deps/npm/man/man1/npm-explore.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "1" "March 2014" "" "" +.TH "NPM\-EXPLORE" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1 index 0fe386e3892..cf723d2f417 100644 --- a/deps/npm/man/man1/npm-help-search.1 +++ b/deps/npm/man/man1/npm-help-search.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "1" "March 2014" "" "" +.TH "NPM\-HELP\-SEARCH" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search npm help documentation diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1 index 6b4041c54c6..9e6c240fd14 100644 --- a/deps/npm/man/man1/npm-help.1 +++ b/deps/npm/man/man1/npm-help.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP" "1" "March 2014" "" "" +.TH "NPM\-HELP" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-help\fR \-\- Get help on npm diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1 index 87766bbd655..795a8db9b47 100644 --- a/deps/npm/man/man1/npm-init.1 +++ b/deps/npm/man/man1/npm-init.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INIT" "1" "March 2014" "" "" +.TH "NPM\-INIT" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-init\fR \-\- Interactively create a package\.json file diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1 index f5c517082be..d98b55b12d1 100644 --- a/deps/npm/man/man1/npm-install.1 +++ b/deps/npm/man/man1/npm-install.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "1" "March 2014" "" "" +.TH "NPM\-INSTALL" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-install\fR \-\- Install a package @@ -39,7 +39,7 @@ b) a gzipped tarball containing (a) c) a url that resolves to (b) . .IP "\(bu" 4 -d) a \fB@\fR that is published on the registry with (c) +d) a \fB@\fR that is published on the registry (npm help see \fBnpm\-registry\fR) with (c) . .IP "\(bu" 4 e) a \fB@\fR that points to (d) @@ -429,9 +429,6 @@ npm help npmrc npm help registry . .IP "\(bu" 4 -npm help folders -. -.IP "\(bu" 4 npm help tag . .IP "\(bu" 4 diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1 index b4a01677be1..389dd82d53e 100644 --- a/deps/npm/man/man1/npm-link.1 +++ b/deps/npm/man/man1/npm-link.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "1" "March 2014" "" "" +.TH "NPM\-LINK" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1 index 01c3bdadc7c..ddd00f58549 100644 --- a/deps/npm/man/man1/npm-ls.1 +++ b/deps/npm/man/man1/npm-ls.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "1" "March 2014" "" "" +.TH "NPM\-LS" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages @@ -29,7 +29,7 @@ For example, running \fBnpm ls promzard\fR in npm\'s source tree will show: .IP "" 4 . .nf -npm@1.4.6 /path/to/npm +npm@1.4.8 /path/to/npm └─┬ init\-package\-json@0\.0\.4 └── promzard@0\.1\.5 . diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1 index 27ce507e1f4..f0e7ce6d976 100644 --- a/deps/npm/man/man1/npm-outdated.1 +++ b/deps/npm/man/man1/npm-outdated.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "1" "March 2014" "" "" +.TH "NPM\-OUTDATED" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1 index 0dbdec1a6cf..dbb41b7b8a7 100644 --- a/deps/npm/man/man1/npm-owner.1 +++ b/deps/npm/man/man1/npm-owner.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "1" "March 2014" "" "" +.TH "NPM\-OWNER" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1 index a89e05e06bd..c23b617e0af 100644 --- a/deps/npm/man/man1/npm-pack.1 +++ b/deps/npm/man/man1/npm-pack.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "1" "March 2014" "" "" +.TH "NPM\-PACK" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff --git a/deps/npm/man/man1/npm-prefix.1 b/deps/npm/man/man1/npm-prefix.1 index d8c1a6d16df..66849742bf3 100644 --- a/deps/npm/man/man1/npm-prefix.1 +++ b/deps/npm/man/man1/npm-prefix.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "1" "March 2014" "" "" +.TH "NPM\-PREFIX" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1 index aa673dff718..710438d1062 100644 --- a/deps/npm/man/man1/npm-prune.1 +++ b/deps/npm/man/man1/npm-prune.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "1" "March 2014" "" "" +.TH "NPM\-PRUNE" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1 index 379e3b819a8..19271c82a71 100644 --- a/deps/npm/man/man1/npm-publish.1 +++ b/deps/npm/man/man1/npm-publish.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "1" "March 2014" "" "" +.TH "NPM\-PUBLISH" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1 index cfd40ae09ad..7dda41232ee 100644 --- a/deps/npm/man/man1/npm-rebuild.1 +++ b/deps/npm/man/man1/npm-rebuild.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "1" "March 2014" "" "" +.TH "NPM\-REBUILD" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1 index 24331db87de..e79f8826a27 100644 --- a/deps/npm/man/man1/npm-repo.1 +++ b/deps/npm/man/man1/npm-repo.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REPO" "1" "March 2014" "" "" +.TH "NPM\-REPO" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-repo\fR \-\- Open package repository page in the browser diff --git a/deps/npm/man/man1/npm-restart.1 b/deps/npm/man/man1/npm-restart.1 index 45d85c0ad12..d7ebaf7c097 100644 --- a/deps/npm/man/man1/npm-restart.1 +++ b/deps/npm/man/man1/npm-restart.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "1" "March 2014" "" "" +.TH "NPM\-RESTART" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff --git a/deps/npm/man/man1/npm-rm.1 b/deps/npm/man/man1/npm-rm.1 index 1e3d4e6e719..a41689777fb 100644 --- a/deps/npm/man/man1/npm-rm.1 +++ b/deps/npm/man/man1/npm-rm.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RM" "1" "March 2014" "" "" +.TH "NPM\-RM" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-rm\fR \-\- Remove a package diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1 index 11020316903..ec6a2391bb3 100644 --- a/deps/npm/man/man1/npm-root.1 +++ b/deps/npm/man/man1/npm-root.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "1" "March 2014" "" "" +.TH "NPM\-ROOT" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1 index 7ae992c3ef7..b81fa80b873 100644 --- a/deps/npm/man/man1/npm-run-script.1 +++ b/deps/npm/man/man1/npm-run-script.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "1" "March 2014" "" "" +.TH "NPM\-RUN\-SCRIPT" "1" "May 2014" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts @@ -9,12 +9,14 @@ .SH "SYNOPSIS" . .nf -npm run\-script