Skip to content

Commit

Permalink
deps: upgrade npm to 2.0.0
Browse files Browse the repository at this point in the history
tjfontaine committed Sep 25, 2014
1 parent b26dd4e commit 9fad895
Showing 556 changed files with 13,934 additions and 10,691 deletions.
8 changes: 7 additions & 1 deletion deps/npm/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
language: node_js
script: "npm run-script tap"
node_js:
- "0.11"
- "0.10"
env:
- DEPLOY_VERSION=testing
before_install:
- "npm config set spin false"
- "npm install -g npm@^2"
- "sudo mkdir -p /var/run/couchdb"
script: "npm run-script tap"
256 changes: 250 additions & 6 deletions deps/npm/CHANGELOG.md

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions deps/npm/Makefile
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ dev: install
link: uninstall
node cli.js link -f

clean: markedclean ronnclean doc-clean uninstall
clean: markedclean marked-manclean doc-clean uninstall
rm -rf npmrc
node cli.js cache clean

@@ -84,19 +84,19 @@ doc: $(mandocs) $(htmldocs)
markedclean:
rm -rf node_modules/marked node_modules/.bin/marked .building_marked

ronnclean:
rm -rf node_modules/ronn node_modules/.bin/ronn .building_ronn
marked-manclean:
rm -rf node_modules/marked-man node_modules/.bin/marked-man .building_marked-man

docclean: doc-clean
doc-clean:
rm -rf \
.building_marked \
.building_ronn \
.building_marked-man \
html/doc \
html/api \
man

# use `npm install ronn` for this to work.
# use `npm install marked-man` for this to work.
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json
@[ -d man/man1 ] || mkdir -p man/man1
scripts/doc-build.sh $< $@
@@ -161,10 +161,10 @@ marked: node_modules/.bin/marked
node_modules/.bin/marked:
node cli.js install marked --no-global

ronn: node_modules/.bin/ronn
marked-man: node_modules/.bin/marked-man

node_modules/.bin/ronn:
node cli.js install ronn --no-global
node_modules/.bin/marked-man:
node cli.js install marked-man --no-global

doc: man

6 changes: 3 additions & 3 deletions deps/npm/README.md
Original file line number Diff line number Diff line change
@@ -16,15 +16,15 @@ and prior, clone the git repo and dig through the old tags and branches.

## Super Easy Install

npm comes with node now.
npm comes with [node](http://nodejs.org/download/) now.

### Windows Computers

Get the MSI. npm is in it.
[Get the MSI](http://nodejs.org/download/). npm is in it.

### Apple Macintosh Computers

Get the pkg. npm is in it.
[Get the pkg](http://nodejs.org/download/). npm is in it.

### Other Sorts of Unices

13 changes: 1 addition & 12 deletions deps/npm/bin/npm-cli.js
Original file line number Diff line number Diff line change
@@ -19,8 +19,7 @@ var log = require("npmlog")
log.pause() // will be unpaused when config is loaded.
log.info("it worked if it ends with", "ok")

var fs = require("graceful-fs")
, path = require("path")
var path = require("path")
, npm = require("../lib/npm.js")
, npmconf = require("npmconf")
, errorHandler = require("../lib/utils/error-handler.js")
@@ -58,16 +57,6 @@ if (conf.versions) {
log.info("using", "npm@%s", npm.version)
log.info("using", "node@%s", process.version)

// make sure that this version of node works with this version of npm.
var semver = require("semver")
, nodeVer = process.version
, reqVer = npm.nodeVersionRequired
if (reqVer && !semver.satisfies(nodeVer, reqVer)) {
return errorHandler(new Error(
"npm doesn't work with node " + nodeVer
+ "\nRequired: node@" + reqVer), true)
}

process.on("uncaughtException", errorHandler)

if (conf.usage && npm.command !== "help") {
27 changes: 22 additions & 5 deletions deps/npm/doc/cli/npm-adduser.md
Original file line number Diff line number Diff line change
@@ -3,30 +3,47 @@ npm-adduser(1) -- Add a registry user account

## SYNOPSIS

npm adduser
npm adduser [--registry=url] [--scope=@orgname]

## DESCRIPTION

Create or verify a user named `<username>` in the npm registry, and
save the credentials to the `.npmrc` file.
Create or verify a user named `<username>` in the specified registry, and
save the credentials to the `.npmrc` file. If no registry is specified,
the default registry will be used (see `npm-config(7)`).

The username, password, and email are read in from prompts.

You may use this command to change your email address, but not username
or password.

To reset your password, go to <https://npmjs.org/forgot>
To reset your password, go to <https://www.npmjs.org/forgot>

You may use this command multiple times with the same user account to
authorize on a new machine.

`npm login` is an alias to `adduser` and behaves exactly the same way.

## CONFIGURATION

### registry

Default: http://registry.npmjs.org/

The base URL of the npm package registry.
The base URL of the npm package registry. If `scope` is also specified,
this registry will only be used for packages with that scope. See `npm-scope(7)`.

### scope

Default: none

If specified, the user and login credentials given will be associated
with the specified scope. See `npm-scope(7)`. You can use both at the same time,
e.g.

npm adduser --registry=http://myregistry.example.com --scope=@myco

This will set a registry for the given scope and login or create a user for
that registry at the same time.

## SEE ALSO

45 changes: 35 additions & 10 deletions deps/npm/doc/cli/npm-install.md
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ npm-install(1) -- Install a package
npm install <tarball file>
npm install <tarball url>
npm install <folder>
npm install <name> [--save|--save-dev|--save-optional] [--save-exact]
npm install <name>@<tag>
npm install <name>@<version>
npm install <name>@<version range>
npm install [@<scope>/]<name> [--save|--save-dev|--save-optional] [--save-exact]
npm install [@<scope>/]<name>@<tag>
npm install [@<scope>/]<name>@<version>
npm install [@<scope>/]<name>@<version range>
npm i (with any of the previous argument usage)

## DESCRIPTION
@@ -70,7 +70,7 @@ after packing it up into a tarball (b).

npm install https://github.com/indexzero/forever/tarball/v0.5.6

* `npm install <name> [--save|--save-dev|--save-optional]`:
* `npm install [@<scope>/]<name> [--save|--save-dev|--save-optional]`:

Do a `<name>@<tag>` install, where `<tag>` is the "tag" config. (See
`npm-config(7)`.)
@@ -98,9 +98,19 @@ after packing it up into a tarball (b).
exact version rather than using npm's default semver range
operator.

`<scope>` is optional. The package will be downloaded from the registry
associated with the specified scope. If no registry is associated with
the given scope the default registry is assumed. See `npm-scope(7)`.

Note: if you do not include the @-symbol on your scope name, npm will
interpret this as a GitHub repository instead, see below. Scopes names
must also be followed by a slash.

Examples:

npm install sax --save
npm install githubname/reponame
npm install @myorg/privatepackage
npm install node-tap --save-dev
npm install dtrace-provider --save-optional
npm install readable-stream --save --save-exact
@@ -110,7 +120,7 @@ after packing it up into a tarball (b).
working directory, then it will try to install that, and only try to
fetch the package by name if it is not valid.

* `npm install <name>@<tag>`:
* `npm install [@<scope>/]<name>@<tag>`:

Install the version of the package that is referenced by the specified tag.
If the tag does not exist in the registry data for that package, then this
@@ -119,17 +129,19 @@ after packing it up into a tarball (b).
Example:

npm install sax@latest
npm install @myorg/mypackage@latest

* `npm install <name>@<version>`:
* `npm install [@<scope>/]<name>@<version>`:

Install the specified version of the package. This will fail if the version
has not been published to the registry.
Install the specified version of the package. This will fail if the
version has not been published to the registry.

Example:

npm install [email protected]
npm install @myorg/[email protected]

* `npm install <name>@<version range>`:
* `npm install [@<scope>/]<name>@<version range>`:

Install a version of the package matching the specified version range. This
will follow the same rules for resolving dependencies described in `package.json(5)`.
@@ -140,6 +152,19 @@ after packing it up into a tarball (b).
Example:

npm install sax@">=0.1.0 <0.2.0"
npm install @myorg/privatepackage@">=0.1.0 <0.2.0"

* `npm install <githubname>/<githubrepo>`:

Install the package at `https://github.com/githubname/githubrepo" by
attempting to clone it using `git`.

Example:

npm install mygithubuser/myproject

To reference a package in a git repo that is not on GitHub, see git
remote urls below.

* `npm install <git remote url>`:

18 changes: 13 additions & 5 deletions deps/npm/doc/cli/npm-link.md
Original file line number Diff line number Diff line change
@@ -4,28 +4,31 @@ npm-link(1) -- Symlink a package folder
## SYNOPSIS

npm link (in package folder)
npm link <pkgname>
npm link [@<scope>/]<pkgname>
npm ln (with any of the previous argument usage)

## DESCRIPTION

Package linking is a two-step process.

First, `npm link` in a package folder will create a globally-installed
symbolic link from `prefix/package-name` to the current folder.
symbolic link from `prefix/package-name` to the current folder (see
`npm-config(7)` for the value of `prefix`).

Next, in some other location, `npm link package-name` will create a
symlink from the local `node_modules` folder to the global symlink.

Note that `package-name` is taken from `package.json`,
not from directory name.

The package name can be optionally prefixed with a scope. See `npm-scope(7)`.
The scope must by preceded by an @-symbol and followed by a slash.

When creating tarballs for `npm publish`, the linked packages are
"snapshotted" to their current state by resolving the symbolic links.

This is
handy for installing your own stuff, so that you can work on it and test it
iteratively without having to continually rebuild.
This is handy for installing your own stuff, so that you can work on it and
test it iteratively without having to continually rebuild.

For example:

@@ -51,6 +54,11 @@ The second line is the equivalent of doing:
That is, it first creates a global link, and then links the global
installation target into your project's `node_modules` folder.

If your linked package is scoped (see `npm-scope(7)`) your link command must
include that scope, e.g.

npm link @myorg/privatepackage

## SEE ALSO

* npm-developers(7)
8 changes: 4 additions & 4 deletions deps/npm/doc/cli/npm-ls.md
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ npm-ls(1) -- List installed packages

## SYNOPSIS

npm list [<pkg> ...]
npm ls [<pkg> ...]
npm la [<pkg> ...]
npm ll [<pkg> ...]
npm list [[@<scope>/]<pkg> ...]
npm ls [[@<scope>/]<pkg> ...]
npm la [[@<scope>/]<pkg> ...]
npm ll [[@<scope>/]<pkg> ...]

## DESCRIPTION

8 changes: 6 additions & 2 deletions deps/npm/doc/cli/npm-prefix.md
Original file line number Diff line number Diff line change
@@ -3,11 +3,15 @@ npm-prefix(1) -- Display prefix

## SYNOPSIS

npm prefix
npm prefix [-g]

## DESCRIPTION

Print the prefix to standard out.
Print the local prefix to standard out. This is the closest parent directory
to contain a package.json file unless `-g` is also specified.

If `-g` is specified, this will be the value of the global prefix. See
`npm-config(7)` for more detail.

## SEE ALSO

6 changes: 5 additions & 1 deletion deps/npm/doc/cli/npm-publish.md
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@ npm-publish(1) -- Publish a package

Publishes a package to the registry so that it can be installed by name.

By default npm will publish to the public registry. This can be overridden by
specifying a different default registry or using a `npm-scope(7)` in the name
(see `package.json(5)`).

* `<folder>`:
A folder containing a package.json file

@@ -24,7 +28,7 @@ Publishes a package to the registry so that it can be installed by name.
and `npm install` installs the `latest` tag.

Fails if the package name and version combination already exists in
the registry.
the specified registry.

Once a package is published with a given name and version, that
specific name and version combination can never be used again, even if
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-restart.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ npm-restart(1) -- Start a package

## SYNOPSIS

npm restart <name>
npm restart [-- <args>]

## DESCRIPTION

4 changes: 2 additions & 2 deletions deps/npm/doc/cli/npm-run-script.md
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@ npm-run-script(1) -- Run arbitrary package scripts

## SYNOPSIS

npm run-script [<pkg>] [command]
npm run [<pkg>] [command]
npm run-script [command] [-- <args>]
npm run [command] [-- <args>]

## DESCRIPTION

2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-start.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ npm-start(1) -- Start a package

## SYNOPSIS

npm start <name>
npm start [-- <args>]

## DESCRIPTION

2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-stop.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ npm-stop(1) -- Stop a package

## SYNOPSIS

npm stop <name>
npm stop [-- <args>]

## DESCRIPTION

Loading

0 comments on commit 9fad895

Please sign in to comment.