Skip to content

Commit 71091f7

Browse files
committed
npm: Upgrade to 1.2.24
1 parent ba0ed00 commit 71091f7

File tree

656 files changed

+41227
-20121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

656 files changed

+41227
-20121
lines changed

deps/npm/.tern-project

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"libs": [
3+
],
4+
"plugins": {
5+
"node": {}
6+
}
7+
}

deps/npm/doc/cli/bugs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ config param.
1515

1616
### browser
1717

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

2121
The browser that is called by the `npm bugs` command to open websites.

deps/npm/doc/cli/config.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ ostensibly Unix systems.
185185

186186
### browser
187187

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

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

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

724+
### shrinkwrap
725+
726+
* Default: true
727+
* Type: Boolean
728+
729+
If set to false, then ignore `npm-shrinkwrap.json` files when
730+
installing.
731+
724732
### sign-git-tag
725733

726734
* Default: false

deps/npm/doc/cli/developers.md

+28-4
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,34 @@ more info.
9797
## Keeping files *out* of your package
9898

9999
Use a `.npmignore` file to keep stuff out of your package. If there's
100-
no .npmignore file, but there *is* a .gitignore file, then npm will
101-
ignore the stuff matched by the .gitignore file. If you *want* to
102-
include something that is excluded by your .gitignore file, you can
103-
create an empty .npmignore file to override it.
100+
no `.npmignore` file, but there *is* a `.gitignore` file, then npm will
101+
ignore the stuff matched by the `.gitignore` file. If you *want* to
102+
include something that is excluded by your `.gitignore` file, you can
103+
create an empty `.npmignore` file to override it.
104+
105+
By default, the following paths and files are ignored, so there's no
106+
need to add them to `.npmignore` explicitly:
107+
108+
* `.*.swp`
109+
* `._*`
110+
* `.DS_Store`
111+
* `.git`
112+
* `.hg`
113+
* `.lock-wscript`
114+
* `.svn`
115+
* `.wafpickle-*`
116+
* `CVS`
117+
* `npm-debug.log`
118+
119+
Additionally, everything in `node_modules` is ignored, except for
120+
bundled dependencies. npm automatically handles this for you, so don't
121+
bother adding `node_modules` to `.npmignore`.
122+
123+
The following paths and files are never ignored, so adding them to
124+
`.npmignore` is pointless:
125+
126+
* `package.json`
127+
* `README.*`
104128

105129
## Link Packages
106130

deps/npm/doc/cli/docs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ config param.
1616

1717
### browser
1818

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

2222
The browser that is called by the `npm docs` command to open websites.

deps/npm/doc/cli/faq.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,18 @@ an argument to `git checkout`. The default is `master`.
221221

222222
## How do I install node with npm?
223223

224-
You don't. Try one of these:
224+
You don't. Try one of these node version managers:
225225

226-
* <https://github.com/isaacs/nave>
227-
* <https://github.com/visionmedia/n>
228-
* <https://github.com/creationix/nvm>
226+
Unix:
227+
228+
* <http://github.com/isaacs/nave>
229+
* <http://github.com/visionmedia/n>
230+
* <http://github.com/creationix/nvm>
231+
232+
Windows:
233+
234+
* <http://github.com/marcelklehr/nodist>
235+
* <https://github.com/hakobera/nvmw>
229236

230237
## How can I use npm for development?
231238

deps/npm/doc/cli/folders.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -157,33 +157,33 @@ In this case, we might expect a folder structure like this:
157157
+-- node_modules
158158
+-- blerg (1.2.5) <---[A]
159159
+-- bar (1.2.3) <---[B]
160-
| +-- node_modules
161-
| | `-- baz (2.0.2) <---[C]
162-
| | `-- node_modules
163-
| | `-- quux (3.2.0)
164-
| `-- asdf (2.3.4)
160+
| `-- node_modules
161+
| +-- baz (2.0.2) <---[C]
162+
| | `-- node_modules
163+
| | `-- quux (3.2.0)
164+
| `-- asdf (2.3.4)
165165
`-- baz (1.2.3) <---[D]
166166
`-- node_modules
167167
`-- quux (3.2.0) <---[E]
168168

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

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

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

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

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

189189
For a graphical breakdown of what is installed where, use `npm ls`.

deps/npm/doc/cli/link.md

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ symbolic link from `prefix/package-name` to the current folder.
1616
Next, in some other location, `npm link package-name` will create a
1717
symlink from the local `node_modules` folder to the global symlink.
1818

19+
Note that `package-name` is taken from `package.json` ,
20+
not from directory name.
21+
1922
When creating tarballs for `npm publish`, the linked packages are
2023
"snapshotted" to their current state by resolving the symbolic links.
2124

0 commit comments

Comments
 (0)