From 911b0fddd3483ac58c3a5cec17f4f1b0e533521a Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 15 Jun 2012 10:00:30 -0700 Subject: [PATCH] Upgrade npm to 1.1.26 --- deps/npm/bin/read-package-json.js | 2 +- deps/npm/doc/cli/install.md | 2 +- deps/npm/html/api/bin.html | 2 +- deps/npm/html/api/bugs.html | 2 +- deps/npm/html/api/commands.html | 2 +- deps/npm/html/api/config.html | 2 +- deps/npm/html/api/deprecate.html | 2 +- deps/npm/html/api/docs.html | 2 +- deps/npm/html/api/edit.html | 2 +- deps/npm/html/api/explore.html | 2 +- deps/npm/html/api/help-search.html | 2 +- deps/npm/html/api/init.html | 2 +- deps/npm/html/api/install.html | 2 +- deps/npm/html/api/link.html | 2 +- deps/npm/html/api/load.html | 2 +- deps/npm/html/api/ls.html | 2 +- deps/npm/html/api/npm.html | 4 +- deps/npm/html/api/outdated.html | 2 +- deps/npm/html/api/owner.html | 2 +- deps/npm/html/api/pack.html | 2 +- deps/npm/html/api/prefix.html | 2 +- deps/npm/html/api/prune.html | 2 +- deps/npm/html/api/publish.html | 2 +- deps/npm/html/api/rebuild.html | 2 +- deps/npm/html/api/restart.html | 2 +- deps/npm/html/api/root.html | 2 +- deps/npm/html/api/run-script.html | 2 +- deps/npm/html/api/search.html | 2 +- deps/npm/html/api/shrinkwrap.html | 2 +- deps/npm/html/api/start.html | 2 +- deps/npm/html/api/stop.html | 2 +- deps/npm/html/api/submodule.html | 2 +- deps/npm/html/api/tag.html | 2 +- deps/npm/html/api/test.html | 2 +- deps/npm/html/api/uninstall.html | 2 +- deps/npm/html/api/unpublish.html | 2 +- deps/npm/html/api/update.html | 2 +- deps/npm/html/api/version.html | 2 +- deps/npm/html/api/view.html | 2 +- deps/npm/html/api/whoami.html | 2 +- deps/npm/html/doc/README.html | 2 +- deps/npm/html/doc/adduser.html | 2 +- deps/npm/html/doc/bin.html | 2 +- deps/npm/html/doc/bugs.html | 2 +- deps/npm/html/doc/build.html | 2 +- deps/npm/html/doc/bundle.html | 2 +- deps/npm/html/doc/cache.html | 2 +- deps/npm/html/doc/changelog.html | 2 +- deps/npm/html/doc/coding-style.html | 2 +- deps/npm/html/doc/completion.html | 2 +- deps/npm/html/doc/config.html | 2 +- deps/npm/html/doc/deprecate.html | 2 +- deps/npm/html/doc/developers.html | 2 +- deps/npm/html/doc/disputes.html | 2 +- deps/npm/html/doc/docs.html | 2 +- deps/npm/html/doc/edit.html | 2 +- deps/npm/html/doc/explore.html | 2 +- deps/npm/html/doc/faq.html | 2 +- deps/npm/html/doc/folders.html | 2 +- deps/npm/html/doc/help-search.html | 2 +- deps/npm/html/doc/help.html | 2 +- deps/npm/html/doc/index.html | 2 +- deps/npm/html/doc/init.html | 2 +- deps/npm/html/doc/install.html | 4 +- deps/npm/html/doc/json.html | 2 +- deps/npm/html/doc/link.html | 2 +- deps/npm/html/doc/list.html | 2 +- deps/npm/html/doc/npm.html | 4 +- deps/npm/html/doc/outdated.html | 2 +- deps/npm/html/doc/owner.html | 2 +- deps/npm/html/doc/pack.html | 2 +- deps/npm/html/doc/prefix.html | 2 +- deps/npm/html/doc/prune.html | 2 +- deps/npm/html/doc/publish.html | 2 +- deps/npm/html/doc/rebuild.html | 2 +- deps/npm/html/doc/registry.html | 2 +- deps/npm/html/doc/removing-npm.html | 2 +- deps/npm/html/doc/restart.html | 2 +- deps/npm/html/doc/root.html | 2 +- deps/npm/html/doc/run-script.html | 2 +- deps/npm/html/doc/scripts.html | 2 +- deps/npm/html/doc/search.html | 2 +- deps/npm/html/doc/semver.html | 2 +- deps/npm/html/doc/shrinkwrap.html | 2 +- deps/npm/html/doc/star.html | 2 +- deps/npm/html/doc/start.html | 2 +- deps/npm/html/doc/stop.html | 2 +- deps/npm/html/doc/submodule.html | 2 +- deps/npm/html/doc/tag.html | 2 +- deps/npm/html/doc/test.html | 2 +- deps/npm/html/doc/uninstall.html | 2 +- deps/npm/html/doc/unpublish.html | 2 +- deps/npm/html/doc/update.html | 2 +- deps/npm/html/doc/version.html | 2 +- deps/npm/html/doc/view.html | 2 +- deps/npm/html/doc/whoami.html | 2 +- deps/npm/lib/build.js | 2 +- deps/npm/lib/cache.js | 3 +- deps/npm/lib/init.js | 39 +- deps/npm/lib/install.js | 17 +- deps/npm/lib/link.js | 9 +- deps/npm/lib/ls.js | 6 +- deps/npm/lib/outdated.js | 9 +- deps/npm/lib/owner.js | 2 +- deps/npm/lib/pack.js | 3 +- deps/npm/lib/prune.js | 4 +- deps/npm/lib/publish.js | 76 +-- deps/npm/lib/rebuild.js | 4 +- deps/npm/lib/run-script.js | 4 +- deps/npm/lib/submodule.js | 1 - deps/npm/lib/unbuild.js | 4 +- deps/npm/lib/uninstall.js | 2 +- deps/npm/lib/unpublish.js | 2 +- deps/npm/lib/utils/cmd-shim.js | 3 +- .../lib/utils/completion/file-completion.js | 19 +- .../lib/utils/completion/installed-deep.js | 6 +- .../lib/utils/completion/installed-shallow.js | 2 +- deps/npm/lib/utils/find.js | 53 -- deps/npm/lib/utils/lifecycle.js | 1 - deps/npm/lib/utils/link.js | 6 +- deps/npm/lib/utils/load-package-defaults.js | 75 --- deps/npm/lib/utils/read-json.js | 570 ------------------ deps/npm/lib/utils/relativize.js | 81 --- deps/npm/lib/utils/tar.js | 3 +- deps/npm/lib/version.js | 18 +- deps/npm/lib/view.js | 6 - deps/npm/man/man1/install.1 | 2 +- deps/npm/man/man1/npm.1 | 2 +- deps/npm/man/man3/npm.3 | 2 +- .../node_modules => }/glob/.npmignore | 0 .../node_modules => }/glob/.travis.yml | 0 .../{node-gyp/node_modules => }/glob/LICENCE | 0 .../node_modules => }/glob/README.md | 0 .../{node-gyp/node_modules => }/glob/glob.js | 2 +- deps/npm/node_modules/glob/package.json | 35 ++ deps/npm/node_modules/lru-cache/AUTHORS | 5 + deps/npm/node_modules/lru-cache/README.md | 16 +- .../node_modules/lru-cache/lib/lru-cache.js | 84 ++- deps/npm/node_modules/lru-cache/package.json | 68 ++- deps/npm/node_modules/minimatch/minimatch.js | 76 ++- deps/npm/node_modules/minimatch/package.json | 12 +- deps/npm/node_modules/node-gyp/README.md | 13 +- .../npm/node_modules/node-gyp/bin/node-gyp.js | 108 +--- .../node_modules/node-gyp/legacy/common.gypi | 4 + deps/npm/node_modules/node-gyp/lib/build.js | 24 +- deps/npm/node_modules/node-gyp/lib/clean.js | 3 +- .../node_modules/node-gyp/lib/configure.js | 37 +- deps/npm/node_modules/node-gyp/lib/install.js | 79 +-- deps/npm/node_modules/node-gyp/lib/list.js | 8 +- .../npm/node_modules/node-gyp/lib/node-gyp.js | 64 +- deps/npm/node_modules/node-gyp/lib/rebuild.js | 4 +- deps/npm/node_modules/node-gyp/lib/remove.js | 10 +- .../node_modules/node-gyp/lib/util/mkdirp.js | 29 - .../node-gyp/node_modules/ansi/.npmignore | 1 - .../node-gyp/node_modules/ansi/README.md | 89 --- .../node_modules/ansi/examples/imgcat.js | 46 -- .../node_modules/ansi/examples/yoshi.png | Bin 1341 -> 0 bytes .../node-gyp/node_modules/ansi/lib/ansi.js | 291 --------- .../node-gyp/node_modules/ansi/nodejs.png | Bin 30997 -> 0 bytes .../node-gyp/node_modules/ansi/package.json | 48 -- .../node-gyp/node_modules/ansi/server.js | 51 -- .../node-gyp/node_modules/glob/examples/g.js | 9 - .../node_modules/glob/examples/usr-local.js | 9 - .../node-gyp/node_modules/glob/package.json | 43 -- .../node_modules/glob/test/00-setup.js | 61 -- .../node_modules/glob/test/bash-comparison.js | 119 ---- .../node_modules/glob/test/cwd-test.js | 55 -- .../node_modules/glob/test/pause-resume.js | 98 --- .../node_modules/glob/test/root-nomount.js | 39 -- .../node-gyp/node_modules/glob/test/root.js | 43 -- .../node_modules/glob/test/zz-cleanup.js | 11 - deps/npm/node_modules/node-gyp/package.json | 26 +- .../npm-registry-client/lib/get.js | 2 +- .../npm-registry-client/package.json | 13 +- .../npm/node_modules/read-installed/README.md | 16 + .../node_modules/read-installed/package.json | 32 + .../read-installed}/read-installed.js | 67 +- .../node_modules/read-package-json/README.md | 162 +++++ .../read-package-json/package.json | 38 ++ .../read-package-json/read-json.js | 511 ++++++++++++++++ deps/npm/package.json | 16 +- .../lib/node_modules/foo | 1 + 182 files changed, 1427 insertions(+), 2385 deletions(-) delete mode 100644 deps/npm/lib/utils/find.js delete mode 100644 deps/npm/lib/utils/load-package-defaults.js delete mode 100644 deps/npm/lib/utils/read-json.js delete mode 100644 deps/npm/lib/utils/relativize.js rename deps/npm/node_modules/{node-gyp/node_modules => }/glob/.npmignore (100%) rename deps/npm/node_modules/{node-gyp/node_modules => }/glob/.travis.yml (100%) rename deps/npm/node_modules/{node-gyp/node_modules => }/glob/LICENCE (100%) rename deps/npm/node_modules/{node-gyp/node_modules => }/glob/README.md (100%) rename deps/npm/node_modules/{node-gyp/node_modules => }/glob/glob.js (99%) create mode 100644 deps/npm/node_modules/glob/package.json create mode 100644 deps/npm/node_modules/lru-cache/AUTHORS delete mode 100644 deps/npm/node_modules/node-gyp/lib/util/mkdirp.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/.npmignore delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/README.md delete mode 100755 deps/npm/node_modules/node-gyp/node_modules/ansi/examples/imgcat.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/examples/yoshi.png delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/lib/ansi.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/nodejs.png delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/package.json delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/ansi/server.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/examples/g.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/examples/usr-local.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/package.json delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/00-setup.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/bash-comparison.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/cwd-test.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/pause-resume.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/root-nomount.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/root.js delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/test/zz-cleanup.js create mode 100644 deps/npm/node_modules/read-installed/README.md create mode 100644 deps/npm/node_modules/read-installed/package.json rename deps/npm/{lib/utils => node_modules/read-installed}/read-installed.js (86%) create mode 100644 deps/npm/node_modules/read-package-json/README.md create mode 100644 deps/npm/node_modules/read-package-json/package.json create mode 100644 deps/npm/node_modules/read-package-json/read-json.js create mode 100644 deps/npm/test/packages/npm-test-ignore-nested-nm/lib/node_modules/foo diff --git a/deps/npm/bin/read-package-json.js b/deps/npm/bin/read-package-json.js index 8c95d86e8b1631..3e5a0c77f254b4 100755 --- a/deps/npm/bin/read-package-json.js +++ b/deps/npm/bin/read-package-json.js @@ -6,7 +6,7 @@ if (argv.length < 3) { var fs = require("fs") , file = argv[2] - , readJson = require("../lib/utils/read-json") + , readJson = require("read-package-json") readJson(file, function (er, data) { if (er) throw er diff --git a/deps/npm/doc/cli/install.md b/deps/npm/doc/cli/install.md index cfa95e722971d0..1d2f6eca8f878a 100644 --- a/deps/npm/doc/cli/install.md +++ b/deps/npm/doc/cli/install.md @@ -160,7 +160,7 @@ local copy exists on disk. npm install sax --force The `--global` argument will cause npm to install the package globally -rather than locally. See `npm-global(1)`. +rather than locally. See `npm-folders(1)`. The `--link` argument will cause npm to link global installs into the local space in some cases. diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index cca295eab58cc6..fe25d03561e939 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@

DESCRIPTION

This function should not be used programmatically. Instead, just refer to the npm.bin member.

- +