Skip to content

Commit

Permalink
npm: Upgrade to 1.2.24
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacs committed Jun 3, 2013
1 parent ba0ed00 commit 71091f7
Show file tree
Hide file tree
Showing 656 changed files with 41,227 additions and 20,121 deletions.
7 changes: 7 additions & 0 deletions deps/npm/.tern-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"libs": [
],
"plugins": {
"node": {}
}
}
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/bugs.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ config param.

### browser

* Default: OS X: `"open"`, others: `"google-chrome"`
* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
* Type: String

The browser that is called by the `npm bugs` command to open websites.
Expand Down
10 changes: 9 additions & 1 deletion deps/npm/doc/cli/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ ostensibly Unix systems.

### browser

* Default: OS X: `"open"`, others: `"google-chrome"`
* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
* Type: String

The browser that is called by the `npm docs` command to open websites.
Expand Down Expand Up @@ -721,6 +721,14 @@ character to indicate reverse sort.

The shell to run for the `npm explore` command.

### shrinkwrap

* Default: true
* Type: Boolean

If set to false, then ignore `npm-shrinkwrap.json` files when
installing.

### sign-git-tag

* Default: false
Expand Down
32 changes: 28 additions & 4 deletions deps/npm/doc/cli/developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,34 @@ more info.
## Keeping files *out* of your package

Use a `.npmignore` file to keep stuff out of your package. If there's
no .npmignore file, but there *is* a .gitignore file, then npm will
ignore the stuff matched by the .gitignore file. If you *want* to
include something that is excluded by your .gitignore file, you can
create an empty .npmignore file to override it.
no `.npmignore` file, but there *is* a `.gitignore` file, then npm will
ignore the stuff matched by the `.gitignore` file. If you *want* to
include something that is excluded by your `.gitignore` file, you can
create an empty `.npmignore` file to override it.

By default, the following paths and files are ignored, so there's no
need to add them to `.npmignore` explicitly:

* `.*.swp`
* `._*`
* `.DS_Store`
* `.git`
* `.hg`
* `.lock-wscript`
* `.svn`
* `.wafpickle-*`
* `CVS`
* `npm-debug.log`

Additionally, everything in `node_modules` is ignored, except for
bundled dependencies. npm automatically handles this for you, so don't
bother adding `node_modules` to `.npmignore`.

The following paths and files are never ignored, so adding them to
`.npmignore` is pointless:

* `package.json`
* `README.*`

## Link Packages

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ config param.

### browser

* Default: OS X: `"open"`, others: `"google-chrome"`
* Default: OS X: `"open"`, Windows: `"start"`, Others: `"xdg-open"`
* Type: String

The browser that is called by the `npm docs` command to open websites.
Expand Down
15 changes: 11 additions & 4 deletions deps/npm/doc/cli/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,18 @@ an argument to `git checkout`. The default is `master`.

## How do I install node with npm?

You don't. Try one of these:
You don't. Try one of these node version managers:

* <https://github.com/isaacs/nave>
* <https://github.com/visionmedia/n>
* <https://github.com/creationix/nvm>
Unix:

* <http://github.com/isaacs/nave>
* <http://github.com/visionmedia/n>
* <http://github.com/creationix/nvm>

Windows:

* <http://github.com/marcelklehr/nodist>
* <https://github.com/hakobera/nvmw>

## How can I use npm for development?

Expand Down
20 changes: 10 additions & 10 deletions deps/npm/doc/cli/folders.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,33 +157,33 @@ In this case, we might expect a folder structure like this:
+-- node_modules
+-- blerg (1.2.5) <---[A]
+-- bar (1.2.3) <---[B]
| +-- node_modules
| | `-- baz (2.0.2) <---[C]
| | `-- node_modules
| | `-- quux (3.2.0)
| `-- asdf (2.3.4)
| `-- node_modules
| +-- baz (2.0.2) <---[C]
| | `-- node_modules
| | `-- quux (3.2.0)
| `-- asdf (2.3.4)
`-- baz (1.2.3) <---[D]
`-- node_modules
`-- quux (3.2.0) <---[E]

Since foo depends directly on [email protected] and [email protected], those are
Since foo depends directly on `[email protected]` and `[email protected]`, those are
installed in foo's `node_modules` folder.

Even though the latest copy of blerg is 1.3.7, foo has a specific
dependency on version 1.2.5. So, that gets installed at [A]. Since the
parent installation of blerg satisfie's bar's dependency on [email protected],
parent installation of blerg satisfies bar's dependency on `[email protected]`,
it does not install another copy under [B].

Bar [B] also has dependencies on baz and asdf, so those are installed in
bar's `node_modules` folder. Because it depends on `[email protected]`, it cannot
re-use the `[email protected]` installed in the parent `node_modules` folder [D],
and must install its own copy [C].

Underneath bar, the `baz->quux->bar` dependency creates a cycle.
However, because `bar` is already in `quux`'s ancestry [B], it does not
Underneath bar, the `baz -> quux -> bar` dependency creates a cycle.
However, because bar is already in quux's ancestry [B], it does not
unpack another copy of bar into that folder.

Underneath `foo->baz` [D], quux's [E] folder tree is empty, because its
Underneath `foo -> baz` [D], quux's [E] folder tree is empty, because its
dependency on bar is satisfied by the parent folder copy installed at [B].

For a graphical breakdown of what is installed where, use `npm ls`.
Expand Down
3 changes: 3 additions & 0 deletions deps/npm/doc/cli/link.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ symbolic link from `prefix/package-name` to the current folder.
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.

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

Expand Down
Loading

0 comments on commit 71091f7

Please sign in to comment.