Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
npm: upgrade to 1.4.6
  • Loading branch information
isaacs committed Mar 19, 2014
1 parent 43a29f5 commit a65c1aa
Show file tree
Hide file tree
Showing 318 changed files with 5,566 additions and 4,042 deletions.
5 changes: 2 additions & 3 deletions deps/npm/Makefile
Expand Up @@ -5,7 +5,6 @@ markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md

html_docdeps = html/dochead.html \
html/docfoot.html \
html/docfoot-script.html \
scripts/doc-build.sh \
package.json

Expand Down Expand Up @@ -190,10 +189,10 @@ doc-publish: doc
done
rsync -vazu --stats --no-implied-dirs --delete \
html/doc/* \
node@npmjs.org:/home/node/npm-www/doc
../npm-www/doc
rsync -vazu --stats --no-implied-dirs --delete \
html/static/style.css \
node@npmjs.org:/home/node/npm-www/static/
../npm-www/static/
#cleanup
rm -rf html/api
for f in html/doc/*.html; do \
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/README.md
Expand Up @@ -36,7 +36,7 @@ paths, etc.) then read on.
## Fancy Install (Unix)

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

### Slightly Fancier

Expand Down
10 changes: 9 additions & 1 deletion deps/npm/doc/cli/npm-install.md
Expand Up @@ -7,7 +7,7 @@ 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]
npm install <name> [--save|--save-dev|--save-optional] [--save-exact]
npm install <name>@<tag>
npm install <name>@<version>
npm install <name>@<version range>
Expand Down Expand Up @@ -91,11 +91,19 @@ after packing it up into a tarball (b).

* `--save-optional`: Package will appear in your `optionalDependencies`.

When using any of the above options to save dependencies to your
package.json, there is an additional, optional flag:

* `--save-exact`: Saved dependencies will be configured with an
exact version rather than using npm's default semver range
operator.

Examples:

npm install sax --save
npm install node-tap --save-dev
npm install dtrace-provider --save-optional
npm install readable-stream --save --save-exact


**Note**: If there is a file or folder named `<name>` in the current
Expand Down
15 changes: 12 additions & 3 deletions deps/npm/doc/cli/npm-publish.md
Expand Up @@ -4,8 +4,8 @@ npm-publish(1) -- Publish a package

## SYNOPSIS

npm publish <tarball>
npm publish <folder>
npm publish <tarball> [--tag <tag>]
npm publish <folder> [--tag <tag>]

## DESCRIPTION

Expand All @@ -18,8 +18,17 @@ Publishes a package to the registry so that it can be installed by name.
A url or file path to a gzipped tar archive containing a single folder
with a package.json file inside.

* `[--tag <tag>]`
Registers the published package with the given tag, such that `npm install
<name>@<tag>` will install this version. By default, `npm publish` updates
and `npm install` installs the `latest` tag.

Fails if the package name and version combination already exists in
the registry. Overwrites when the "--force" flag is set.
the 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
it is removed with npm-unpublish(1).

## SEE ALSO

Expand Down
26 changes: 24 additions & 2 deletions deps/npm/doc/cli/npm-uninstall.md
Expand Up @@ -3,14 +3,36 @@ npm-rm(1) -- Remove a package

## SYNOPSIS

npm rm <name>
npm uninstall <name>
npm uninstall <name> [--save|--save-dev|--save-optional]
npm rm (with any of the previous argument usage)

## DESCRIPTION

This uninstalls a package, completely removing everything npm installed
on its behalf.

Example:

npm uninstall sax

In global mode (ie, with `-g` or `--global` appended to the command),
it uninstalls the current package context as a global package.

`npm uninstall` takes 3 exclusive, optional flags which save or update
the package version in your main package.json:

* `--save`: Package will be removed from your `dependencies`.

* `--save-dev`: Package will be removed from your `devDependencies`.

* `--save-optional`: Package will be removed from your `optionalDependencies`.

Examples:

npm uninstall sax --save
npm uninstall node-tap --save-dev
npm uninstall dtrace-provider --save-optional

## SEE ALSO

* npm-prune(1)
Expand Down
4 changes: 4 additions & 0 deletions deps/npm/doc/cli/npm-unpublish.md
Expand Up @@ -23,6 +23,10 @@ entry and removing the tarball.
If no version is specified, or if all versions are removed then
the root package entry is removed from the registry entirely.

Even if a package version is unpublished, that specific name and
version combination can never be reused. In order to publish the
package again, a new version number must be used.

## SEE ALSO

* npm-deprecate(1)
Expand Down
40 changes: 18 additions & 22 deletions deps/npm/doc/files/package.json.md
Expand Up @@ -360,15 +360,13 @@ an argument to `git checkout`. The default is `master`.

As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-project". For example:

```json
{
"name": "foo",
"version": "0.0.0",
"dependencies": {
"express": "visionmedia/express"
}
}
```
{
"name": "foo",
"version": "0.0.0",
"dependencies": {
"express": "visionmedia/express"
}
}

## devDependencies

Expand All @@ -389,19 +387,17 @@ script to do this, and make the required package a devDependency.

For example:

```json
{ "name": "ethopia-waza",
"description": "a delightfully fruity coffee varietal",
"version": "1.2.3",
"devDependencies": {
"coffee-script": "~1.6.3"
},
"scripts": {
"prepublish": "coffee -o lib/ -c src/waza.coffee"
},
"main": "lib/waza.js"
}
```
{ "name": "ethopia-waza",
"description": "a delightfully fruity coffee varietal",
"version": "1.2.3",
"devDependencies": {
"coffee-script": "~1.6.3"
},
"scripts": {
"prepublish": "coffee -o lib/ -c src/waza.coffee"
},
"main": "lib/waza.js"
}

The `prepublish` script will be run before publishing, so that users
can consume the functionality without requiring them to compile it
Expand Down
21 changes: 16 additions & 5 deletions deps/npm/doc/misc/npm-config.md
Expand Up @@ -60,6 +60,7 @@ The following shorthands are parsed on the command-line:
* `-D`: `--save-dev`
* `-O`: `--save-optional`
* `-B`: `--save-bundle`
* `-E`: `--save-exact`
* `-y`: `--yes`
* `-n`: `--yes false`
* `ll` and `la` commands: `ls --long`
Expand Down Expand Up @@ -620,20 +621,30 @@ bundledDependencies list.

Save installed packages to a package.json file as devDependencies.

When used with the `npm rm` command, it removes it from the devDependencies
hash.
When used with the `npm rm` command, it removes it from the
devDependencies hash.

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

### save-exact

* Default: false
* Type: Boolean

Dependencies saved to package.json using `--save`, `--save-dev` or
`--save-optional` will be configured with an exact version rather than
using npm's default semver range operator.

### save-optional

* Default: false
* Type: Boolean

Save installed packages to a package.json file as optionalDependencies.
Save installed packages to a package.json file as
optionalDependencies.

When used with the `npm rm` command, it removes it from the devDependencies
hash.
When used with the `npm rm` command, it removes it from the
devDependencies hash.

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

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/misc/npm-faq.md
Expand Up @@ -145,7 +145,7 @@ command.)

In those cases, you can do this:

curl https://npmjs.org/install.sh | sh
curl https://www.npmjs.org/install.sh | sh

## What is a `package`?

Expand Down
31 changes: 31 additions & 0 deletions deps/npm/doc/misc/semver.md
Expand Up @@ -60,9 +60,21 @@ The following range styles are supported:
using tilde operators, prerelease versions are supported as well,
but a prerelease of the next significant digit will NOT be
satisfactory, so `1.3.0-beta` will not satisfy `~1.2.3`.
* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` "Compatible with 1.2.3". When
using caret operators, anything from the specified version (including
prerelease) will be supported up to, but not including, the next
major version (or its prereleases). `1.5.1` will satisfy `^1.2.3`,
while `1.2.2` and `2.0.0-beta` will not.
* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` "Compatible with 0.1.3". 0.x.x versions are
special: the first non-zero component indicates potentially breaking changes,
meaning the caret operator matches any version with the same first non-zero
component starting at the specified version.
* `^0.0.2` := `=0.0.2` "Only the version 0.0.2 is considered compatible"
* `~1.2` := `>=1.2.0-0 <1.3.0-0` "Any version starting with 1.2"
* `^1.2` := `>=1.2.0-0 <2.0.0-0` "Any version compatible with 1.2"
* `1.2.x` := `>=1.2.0-0 <1.3.0-0` "Any version starting with 1.2"
* `~1` := `>=1.0.0-0 <2.0.0-0` "Any version starting with 1"
* `^1` := `>=1.0.0-0 <2.0.0-0` "Any version compatible with 1"
* `1.x` := `>=1.0.0-0 <2.0.0-0` "Any version starting with 1"


Expand Down Expand Up @@ -109,3 +121,22 @@ strings that they parse.
range.
* maxSatisfying(versions, range): Return the highest version in the list
that satisfies the range, or null if none of them do.
* gtr(version, range): Return true if version is greater than all the
versions possible in the range.
* ltr(version, range): Return true if version is less than all the
versions possible in the range.
* outside(version, range, hilo): Return true if the version is outside
the bounds of the range in either the high or low direction. The
`hilo` argument must be either the string `'>'` or `'<'`. (This is
the function called by `gtr` and `ltr`.)

Note that, since ranges may be non-contiguous, a version might not be
greater than a range, less than a range, *or* satisfy a range! For
example, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9`
until `2.0.0`, so the version `1.2.10` would not be greater than the
range (because 2.0.1 satisfies, which is higher), nor less than the
range (since 1.2.8 satisfies, which is lower), and it also does not
satisfy the range.

If you want to know if a version satisfies or does not satisfy a
range, use the `satisfies(version, range)` function.
48 changes: 15 additions & 33 deletions deps/npm/html/doc/README.html
Expand Up @@ -3,9 +3,11 @@
<title>README</title>
<meta http-equiv="content-type" value="text/html;utf-8">
<link rel="stylesheet" type="text/css" href="../static/style.css">
<script async=true src="../../static/toc.js"></script>

<body>
<div id="wrapper">

<h1><a href="cli/npm.html">npm</a></h1> <p>node package manager</p>

<h2 id="SYNOPSIS">SYNOPSIS</h2>
Expand Down Expand Up @@ -43,7 +45,7 @@ <h3 id="Other-Sorts-of-Unices">Other Sorts of Unices</h3>
<h2 id="Fancy-Install-Unix">Fancy Install (Unix)</h2>

<p>There&#39;s a pretty robust install script at
<a href="https://npmjs.org/install.sh">https://npmjs.org/install.sh</a>. You can download that and run it.</p>
<a href="https://www.npmjs.org/install.sh">https://www.npmjs.org/install.sh</a>. You can download that and run it.</p>

<h3 id="Slightly-Fancier">Slightly Fancier</h3>

Expand Down Expand Up @@ -242,35 +244,15 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="cli/npm.html">npm(1)</a></li><li><a href="misc/npm-faq.html">npm-faq(7)</a></li><li><a href="cli/npm-help.html">npm-help(1)</a></li><li><a href="misc/npm-index.html">npm-index(7)</a></li></ul>
</div>
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
var els = Array.prototype.slice.call(wrapper.getElementsByTagName("*"), 0)
.filter(function (el) {
return el.parentNode === wrapper
&& el.tagName.match(/H[1-6]/)
&& el.id
})
var l = 2
, toc = document.createElement("ul")
toc.innerHTML = els.map(function (el) {
var i = el.tagName.charAt(1)
, out = ""
while (i > l) {
out += "<ul>"
l ++
}
while (i < l) {
out += "</ul>"
l --
}
out += "<li><a href='#" + el.id + "'>" +
( el.innerText || el.text || el.innerHTML)
+ "</a>"
return out
}).join("\n")
toc.id = "toc"
document.body.appendChild(toc)
})()
</script>

<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.6</p>

0 comments on commit a65c1aa

Please sign in to comment.