From 55543d3c45777e2867b86109454e1686e9956c5f Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 12 Feb 2014 18:16:32 -0800 Subject: [PATCH] npm: Upgrade to v1.4.0 - Removes 'npm publish -f' - Documentation - Bug-fixes - Update license etc to refer to npm, Inc. rather than @isaacs personally --- deps/npm/CONTRIBUTING.md | 5 + deps/npm/LICENSE | 4 +- deps/npm/README.md | 2 +- deps/npm/doc/cli/npm-install.md | 6 +- deps/npm/doc/cli/npm-ls.md | 6 + deps/npm/doc/cli/npm-outdated.md | 37 ++ deps/npm/doc/cli/npm.md | 4 +- deps/npm/doc/files/package.json.md | 2 +- deps/npm/doc/misc/npm-coding-style.md | 2 +- deps/npm/doc/misc/npm-config.md | 4 +- deps/npm/doc/misc/npm-faq.md | 6 +- deps/npm/doc/misc/npm-registry.md | 2 +- deps/npm/html/doc/README.html | 4 +- deps/npm/html/doc/api/npm-bin.html | 2 +- deps/npm/html/doc/api/npm-bugs.html | 2 +- deps/npm/html/doc/api/npm-commands.html | 2 +- deps/npm/html/doc/api/npm-config.html | 2 +- deps/npm/html/doc/api/npm-deprecate.html | 2 +- deps/npm/html/doc/api/npm-docs.html | 2 +- deps/npm/html/doc/api/npm-edit.html | 2 +- deps/npm/html/doc/api/npm-explore.html | 2 +- deps/npm/html/doc/api/npm-help-search.html | 2 +- deps/npm/html/doc/api/npm-init.html | 2 +- deps/npm/html/doc/api/npm-install.html | 2 +- deps/npm/html/doc/api/npm-link.html | 2 +- deps/npm/html/doc/api/npm-load.html | 2 +- deps/npm/html/doc/api/npm-ls.html | 2 +- deps/npm/html/doc/api/npm-outdated.html | 2 +- deps/npm/html/doc/api/npm-owner.html | 2 +- deps/npm/html/doc/api/npm-pack.html | 2 +- deps/npm/html/doc/api/npm-prefix.html | 2 +- deps/npm/html/doc/api/npm-prune.html | 2 +- deps/npm/html/doc/api/npm-publish.html | 2 +- deps/npm/html/doc/api/npm-rebuild.html | 2 +- deps/npm/html/doc/api/npm-repo.html | 2 +- deps/npm/html/doc/api/npm-restart.html | 2 +- deps/npm/html/doc/api/npm-root.html | 2 +- deps/npm/html/doc/api/npm-run-script.html | 2 +- deps/npm/html/doc/api/npm-search.html | 2 +- deps/npm/html/doc/api/npm-shrinkwrap.html | 2 +- deps/npm/html/doc/api/npm-start.html | 2 +- deps/npm/html/doc/api/npm-stop.html | 2 +- deps/npm/html/doc/api/npm-submodule.html | 2 +- deps/npm/html/doc/api/npm-tag.html | 2 +- deps/npm/html/doc/api/npm-test.html | 2 +- deps/npm/html/doc/api/npm-uninstall.html | 2 +- deps/npm/html/doc/api/npm-unpublish.html | 2 +- deps/npm/html/doc/api/npm-update.html | 2 +- deps/npm/html/doc/api/npm-version.html | 2 +- deps/npm/html/doc/api/npm-view.html | 2 +- deps/npm/html/doc/api/npm-whoami.html | 2 +- deps/npm/html/doc/api/npm.html | 4 +- deps/npm/html/doc/cli/npm-adduser.html | 2 +- deps/npm/html/doc/cli/npm-bin.html | 2 +- deps/npm/html/doc/cli/npm-bugs.html | 2 +- deps/npm/html/doc/cli/npm-build.html | 2 +- deps/npm/html/doc/cli/npm-bundle.html | 2 +- deps/npm/html/doc/cli/npm-cache.html | 2 +- deps/npm/html/doc/cli/npm-completion.html | 2 +- deps/npm/html/doc/cli/npm-config.html | 2 +- deps/npm/html/doc/cli/npm-dedupe.html | 2 +- deps/npm/html/doc/cli/npm-deprecate.html | 2 +- deps/npm/html/doc/cli/npm-docs.html | 2 +- deps/npm/html/doc/cli/npm-edit.html | 2 +- deps/npm/html/doc/cli/npm-explore.html | 2 +- deps/npm/html/doc/cli/npm-help-search.html | 2 +- deps/npm/html/doc/cli/npm-help.html | 2 +- deps/npm/html/doc/cli/npm-init.html | 2 +- deps/npm/html/doc/cli/npm-install.html | 8 +- deps/npm/html/doc/cli/npm-link.html | 2 +- deps/npm/html/doc/cli/npm-ls.html | 10 +- deps/npm/html/doc/cli/npm-outdated.html | 35 +- deps/npm/html/doc/cli/npm-owner.html | 2 +- deps/npm/html/doc/cli/npm-pack.html | 2 +- deps/npm/html/doc/cli/npm-prefix.html | 2 +- deps/npm/html/doc/cli/npm-prune.html | 2 +- deps/npm/html/doc/cli/npm-publish.html | 2 +- deps/npm/html/doc/cli/npm-rebuild.html | 2 +- deps/npm/html/doc/cli/npm-repo.html | 2 +- deps/npm/html/doc/cli/npm-restart.html | 2 +- deps/npm/html/doc/cli/npm-rm.html | 2 +- deps/npm/html/doc/cli/npm-root.html | 2 +- deps/npm/html/doc/cli/npm-run-script.html | 2 +- deps/npm/html/doc/cli/npm-search.html | 2 +- deps/npm/html/doc/cli/npm-shrinkwrap.html | 2 +- deps/npm/html/doc/cli/npm-star.html | 2 +- deps/npm/html/doc/cli/npm-stars.html | 2 +- deps/npm/html/doc/cli/npm-start.html | 2 +- deps/npm/html/doc/cli/npm-stop.html | 2 +- deps/npm/html/doc/cli/npm-submodule.html | 2 +- deps/npm/html/doc/cli/npm-tag.html | 2 +- deps/npm/html/doc/cli/npm-test.html | 2 +- deps/npm/html/doc/cli/npm-uninstall.html | 2 +- deps/npm/html/doc/cli/npm-unpublish.html | 2 +- deps/npm/html/doc/cli/npm-update.html | 2 +- deps/npm/html/doc/cli/npm-version.html | 2 +- deps/npm/html/doc/cli/npm-view.html | 2 +- deps/npm/html/doc/cli/npm-whoami.html | 2 +- deps/npm/html/doc/cli/npm.html | 8 +- deps/npm/html/doc/files/npm-folders.html | 2 +- deps/npm/html/doc/files/npm-global.html | 2 +- deps/npm/html/doc/files/npm-json.html | 4 +- deps/npm/html/doc/files/npmrc.html | 2 +- deps/npm/html/doc/files/package.json.html | 4 +- deps/npm/html/doc/index.html | 2 +- deps/npm/html/doc/misc/npm-coding-style.html | 4 +- deps/npm/html/doc/misc/npm-config.html | 6 +- deps/npm/html/doc/misc/npm-developers.html | 2 +- deps/npm/html/doc/misc/npm-disputes.html | 2 +- deps/npm/html/doc/misc/npm-faq.html | 8 +- deps/npm/html/doc/misc/npm-index.html | 2 +- deps/npm/html/doc/misc/npm-registry.html | 4 +- deps/npm/html/doc/misc/npm-scripts.html | 2 +- deps/npm/html/doc/misc/removing-npm.html | 2 +- deps/npm/html/doc/misc/semver.html | 2 +- deps/npm/html/index.html | 4 +- deps/npm/lib/cache.js | 29 +- deps/npm/lib/install.js | 153 +------ deps/npm/lib/outdated.js | 12 +- deps/npm/lib/repo.js | 2 +- deps/npm/lib/utils/error-handler.js | 2 +- deps/npm/man/man1/npm-README.1 | 2 +- deps/npm/man/man1/npm-install.1 | 6 +- deps/npm/man/man1/npm-ls.1 | 12 +- deps/npm/man/man1/npm-outdated.1 | 65 +++ deps/npm/man/man1/npm.1 | 6 +- deps/npm/man/man3/npm.3 | 2 +- deps/npm/man/man5/npm-json.5 | 2 +- deps/npm/man/man5/package.json.5 | 2 +- deps/npm/man/man7/npm-coding-style.7 | 2 +- deps/npm/man/man7/npm-config.7 | 4 +- deps/npm/man/man7/npm-faq.7 | 6 +- deps/npm/man/man7/npm-registry.7 | 2 +- .../node_modules/npm-install-checks/LICENSE | 234 ++++++++++ .../node_modules/npm-install-checks/README.md | 25 ++ .../node_modules/npm-install-checks/index.js | 146 +++++++ .../npm-install-checks/package.json | 43 ++ .../npm-install-checks/test/check-engine.js | 35 ++ .../npm-install-checks/test/check-git.js | 31 ++ .../npm-install-checks/test/check-platform.js | 44 ++ .../node_modules/npm-registry-client/index.js | 17 - .../npm-registry-client/lib/publish.js | 20 +- .../npm-registry-client/lib/request.js | 65 +-- .../node_modules/couch-login/.npmignore | 4 - .../node_modules/couch-login/LICENSE | 15 - .../node_modules/couch-login/README.md | 278 ------------ .../node_modules/couch-login/couch-login.js | 399 ------------------ .../node_modules/couch-login/package.json | 33 -- .../node_modules/couch-login/test/00-setup.js | 100 ----- .../node_modules/couch-login/test/basic.js | 298 ------------- .../test/fixtures/_replicator.couch | Bin 4194 -> 0 bytes .../couch-login/test/fixtures/couch.ini | 25 -- .../couch-login/test/fixtures/registry.couch | Bin 24674 -> 0 bytes .../node_modules/couch-login/test/registry.js | 252 ----------- .../couch-login/test/reset-then-signup.js | 112 ----- .../couch-login/test/zz-teardown.js | 23 - .../npm-registry-client/package.json | 11 +- .../node_modules/read-package-json/.npmignore | 13 + .../normalize-package-data/lib/fixer.js | 63 +-- .../normalize-package-data/lib/safe_format.js | 9 + .../lib/warning_messages.json | 28 ++ .../normalize-package-data/package.json | 10 +- .../normalize-package-data/test/normalize.js | 55 ++- .../normalize-package-data/test/typo.js | 75 ++-- .../read-package-json/package.json | 12 +- deps/npm/package.json | 20 +- .../packages/npm-test-blerg3/package.json | 2 +- .../test/packages/npm-test-peer-deps/README | 1 - .../packages/npm-test-peer-deps/npm-ls.json | 17 - .../packages/npm-test-peer-deps/package.json | 11 - .../test/packages/npm-test-peer-deps/test.js | 36 -- deps/npm/test/run.js | 35 -- deps/npm/test/tap/outdated-notarget.js | 47 +++ deps/npm/test/tap/peer-deps.js | 57 +++ .../tap/peer-deps/desired-ls-results.json | 17 + deps/npm/test/tap/peer-deps/package.json | 8 + 176 files changed, 1261 insertions(+), 2139 deletions(-) create mode 100644 deps/npm/CONTRIBUTING.md create mode 100644 deps/npm/node_modules/npm-install-checks/LICENSE create mode 100644 deps/npm/node_modules/npm-install-checks/README.md create mode 100644 deps/npm/node_modules/npm-install-checks/index.js create mode 100644 deps/npm/node_modules/npm-install-checks/package.json create mode 100644 deps/npm/node_modules/npm-install-checks/test/check-engine.js create mode 100644 deps/npm/node_modules/npm-install-checks/test/check-git.js create mode 100644 deps/npm/node_modules/npm-install-checks/test/check-platform.js delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/.npmignore delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/LICENSE delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/README.md delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/couch-login.js delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/package.json delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/00-setup.js delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/basic.js delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/_replicator.couch delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/couch.ini delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/registry.couch delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/registry.js delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/reset-then-signup.js delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/couch-login/test/zz-teardown.js create mode 100644 deps/npm/node_modules/read-package-json/.npmignore create mode 100644 deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/safe_format.js create mode 100644 deps/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/warning_messages.json delete mode 100644 deps/npm/test/packages/npm-test-peer-deps/README delete mode 100644 deps/npm/test/packages/npm-test-peer-deps/npm-ls.json delete mode 100644 deps/npm/test/packages/npm-test-peer-deps/package.json delete mode 100644 deps/npm/test/packages/npm-test-peer-deps/test.js create mode 100644 deps/npm/test/tap/outdated-notarget.js create mode 100644 deps/npm/test/tap/peer-deps.js create mode 100644 deps/npm/test/tap/peer-deps/desired-ls-results.json create mode 100644 deps/npm/test/tap/peer-deps/package.json diff --git a/deps/npm/CONTRIBUTING.md b/deps/npm/CONTRIBUTING.md new file mode 100644 index 000000000..7a60ed2a2 --- /dev/null +++ b/deps/npm/CONTRIBUTING.md @@ -0,0 +1,5 @@ +## Before you submit a new issue + +* Check if there's a simple solution in the [Troubleshooting](https://github.com/npm/npm/wiki/Troubleshooting) wiki. +* [Search for similar issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues). +* Ensure your new issue conforms to the [Contributing Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines). diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index 764bb8718..2c0baba40 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) Isaac Z. Schlueter +Copyright (c) npm, Inc. and Contributors All rights reserved. npm is released under the Artistic License 2.0. @@ -214,7 +214,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------- -"Node.js" and "node" trademark Joyent, Inc. npm is not officially +"Node.js" and "node" trademark Joyent, Inc. npm is not officially part of the Node.js project, and is neither owned by nor officially affiliated with Joyent, Inc. diff --git a/deps/npm/README.md b/deps/npm/README.md index d01f7a288..e2f0f79b5 100644 --- a/deps/npm/README.md +++ b/deps/npm/README.md @@ -220,7 +220,7 @@ If this concerns you, inspect the source before using packages. When you find issues, please report them: * web: - + * email: diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md index 618ebab0f..f9d2104cd 100644 --- a/deps/npm/doc/cli/npm-install.md +++ b/deps/npm/doc/cli/npm-install.md @@ -146,9 +146,9 @@ after packing it up into a tarball (b). Examples: - git+ssh://git@github.com:isaacs/npm.git#v1.0.27 - git+https://isaacs@github.com/isaacs/npm.git - git://github.com/isaacs/npm.git#v1.0.27 + git+ssh://git@github.com:npm/npm.git#v1.0.27 + git+https://isaacs@github.com/npm/npm.git + git://github.com/npm/npm.git#v1.0.27 You may combine multiple arguments, and even multiple types of arguments. For example: diff --git a/deps/npm/doc/cli/npm-ls.md b/deps/npm/doc/cli/npm-ls.md index d80a2cc27..21f54264c 100644 --- a/deps/npm/doc/cli/npm-ls.md +++ b/deps/npm/doc/cli/npm-ls.md @@ -61,6 +61,12 @@ Show parseable output instead of tree view. List packages in the global install prefix instead of in the current project. +### depth + +* Type: Int + +Max display depth of the dependency tree. + ## SEE ALSO * npm-config(1) diff --git a/deps/npm/doc/cli/npm-outdated.md b/deps/npm/doc/cli/npm-outdated.md index 4d5835378..aa2a7d5dd 100644 --- a/deps/npm/doc/cli/npm-outdated.md +++ b/deps/npm/doc/cli/npm-outdated.md @@ -14,6 +14,43 @@ The resulting field 'wanted' shows the latest version according to the version specified in the package.json, the field 'latest' the very latest version of the package. +## CONFIGURATION + +### json + +* Default: false +* Type: Boolean + +Show information in JSON format. + +### long + +* Default: false +* Type: Boolean + +Show extended information. + +### parseable + +* Default: false +* Type: Boolean + +Show parseable output instead of tree view. + +### global + +* Default: false +* Type: Boolean + +Check packages in the global install prefix instead of in the current +project. + +### depth + +* Type: Int + +Max depth for checking dependency tree. + ## SEE ALSO * npm-update(1) diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md index 0f9b30b22..903aa1079 100644 --- a/deps/npm/doc/cli/npm.md +++ b/deps/npm/doc/cli/npm.md @@ -114,7 +114,7 @@ easily by doing `npm view npm contributors`. If you would like to contribute, but don't know what to work on, check the issues list or ask on the mailing list. -* +* * ## BUGS @@ -122,7 +122,7 @@ the issues list or ask on the mailing list. When you find issues, please report them: * web: - + * email: diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 8e6f97de8..09f0bec70 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -257,7 +257,7 @@ Do it like this: "repository" : { "type" : "git" - , "url" : "http://github.com/isaacs/npm.git" + , "url" : "http://github.com/npm/npm.git" } "repository" : diff --git a/deps/npm/doc/misc/npm-coding-style.md b/deps/npm/doc/misc/npm-coding-style.md index e9333d0ec..b6a4a620f 100644 --- a/deps/npm/doc/misc/npm-coding-style.md +++ b/deps/npm/doc/misc/npm-coding-style.md @@ -133,7 +133,7 @@ string message to the callback. Stack traces are handy. ## Logging -Logging is done using the [npmlog](https://github.com/isaacs/npmlog) +Logging is done using the [npmlog](https://github.com/npm/npmlog) utility. Please clean up logs when they are no longer helpful. In particular, diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index 485d4ca45..2df31f3a7 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -401,7 +401,7 @@ The value `npm init` should use by default for the package author's homepage. ### init.license -* Default: "BSD-2-Clause" +* Default: "ISC" * Type: String The value `npm init` should use by default for the package license. @@ -466,7 +466,7 @@ The default is "http", which shows http, warn, and error output. * Type: Stream This is the stream that is passed to the -[npmlog](https://github.com/isaacs/npmlog) module at run time. +[npmlog](https://github.com/npm/npmlog) module at run time. It cannot be set from the command line, but if you are using npm programmatically, you may wish to send logs to somewhere other than diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md index d27c7e735..c2288389c 100644 --- a/deps/npm/doc/misc/npm-faq.md +++ b/deps/npm/doc/misc/npm-faq.md @@ -315,12 +315,12 @@ in a web browser. This will also tell you if you are just unable to access the internet for some reason. If the registry IS down, let me know by emailing or posting -an issue at . We'll have +an issue at . We'll have someone kick it or something. ## Why no namespaces? -Please see this discussion: +Please see this discussion: tl;dr - It doesn't actually make things better, and can make them worse. @@ -338,7 +338,7 @@ There is not sufficient need to impose namespace rules on everyone. Post an issue on the github project: -* +* ## Why does npm hate me? diff --git a/deps/npm/doc/misc/npm-registry.md b/deps/npm/doc/misc/npm-registry.md index 514bce2f8..a8c4b0200 100644 --- a/deps/npm/doc/misc/npm-registry.md +++ b/deps/npm/doc/misc/npm-registry.md @@ -14,7 +14,7 @@ account information. The official public npm registry is at . It is powered by a CouchDB database at . The code for the couchapp is -available at . npm user accounts +available at . npm user accounts are CouchDB users, stored in the database. diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 7bfa82592..d457ec95e 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -226,7 +226,7 @@ process for published modules.

When you find issues, please report them:

Be sure to include all of the output from the npm command that didn't work @@ -239,7 +239,7 @@ will no doubt tell you to put the output in a gist or email.

- +