Skip to content

Commit c721604

Browse files
isaacsisaacs
committed
npm: Upgrade to 1.1.33
Support for parallel use of the cache folder Retry on registry timeouts or network failures Reduce 'engines' failures to a warning Use new zsh completion if aviailable
1 parent f2a9ed4 commit c721604

File tree

131 files changed

+1538
-244
lines changed

Some content is hidden

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

131 files changed

+1538
-244
lines changed

‎deps/npm/.npmignore

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
*.swp
2-
test/bin
3-
test/output.log
4-
test/packages/*/node_modules
5-
test/packages/npm-test-depends-on-spark/which-spark.log
6-
test/packages/test-package/random-data.txt
7-
test/root
8-
node_modules/ronn
9-
node_modules/.bin
102
npm-debug.log
11-
./npmrc
12-
.gitignore
13-
release/
3+
/test/bin
4+
/test/output.log
5+
/test/packages/*/node_modules
6+
/test/packages/npm-test-depends-on-spark/which-spark.log
7+
/test/packages/test-package/random-data.txt
8+
/test/root
9+
/node_modules/ronn
10+
/node_modules/tap
11+
/node_modules/.bin
12+
/npmrc
13+
/release/
1414

1515
# don't need these in the npm package.
1616
html/*.png

‎deps/npm/doc/cli/config.md

+62
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,27 @@ See also the `strict-ssl` config.
195195

196196
The location of npm's cache directory. See `npm-cache(1)`
197197

198+
### cache-lock-stale
199+
200+
* Default: 60000 (1 minute)
201+
* Type: Number
202+
203+
The number of ms before cache folder lockfiles are considered stale.
204+
205+
### cache-lock-retries
206+
207+
* Default: 10
208+
* Type: Number
209+
210+
Number of times to retry to acquire a lock on cache folder lockfiles.
211+
212+
### cache-lock-wait
213+
214+
* Default: 10000 (10 seconds)
215+
* Type: Number
216+
217+
Number of ms to wait for cache lock files to expire.
218+
198219
### cache-max
199220

200221
* Default: Infinity
@@ -266,6 +287,15 @@ set.
266287

267288
The command to run for `npm edit` or `npm config edit`.
268289

290+
### engine-strict
291+
292+
* Default: false
293+
* Type: Boolean
294+
295+
If set to true, then npm will stubbornly refuse to install (or even
296+
consider installing) any package that claims to not be compatible with
297+
the current Node.js version.
298+
269299
### force
270300

271301
* Default: false
@@ -278,6 +308,38 @@ Makes various commands more forceful.
278308
* skips cache when requesting from the registry.
279309
* prevents checks against clobbering non-npm files.
280310

311+
### fetch-retries
312+
313+
* Default: 2
314+
* Type: Number
315+
316+
The "retries" config for the `retry` module to use when fetching
317+
packages from the registry.
318+
319+
### fetch-retry-factor
320+
321+
* Default: 10
322+
* Type: Number
323+
324+
The "factor" config for the `retry` module to use when fetching
325+
packages.
326+
327+
### fetch-retry-mintimeout
328+
329+
* Default: 10000 (10 seconds)
330+
* Type: Number
331+
332+
The "minTimeout" config for the `retry` module to use when fetching
333+
packages.
334+
335+
### fetch-retry-maxtimeout
336+
337+
* Default: 60000 (1 minute)
338+
* Type: Number
339+
340+
The "maxTimeout" config for the `retry` module to use when fetching
341+
packages.
342+
281343
### git
282344

283345
* Default: `"git"`

‎deps/npm/doc/cli/json.md

+17-2
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ Entries in `optionalDependencies` will override entries of the same name in
453453

454454
## engines
455455

456-
You can specify the version of
457-
node that your stuff works on:
456+
You can specify the version of node that your stuff works on:
458457

459458
{ "engines" : { "node" : ">=0.1.27 <0.1.30" } }
460459

@@ -470,6 +469,22 @@ are capable of properly installing your program. For example:
470469

471470
{ "engines" : { "npm" : "~1.0.20" } }
472471

472+
Note that, unless the user has set the `engine-strict` config flag, this
473+
field is advisory only.
474+
475+
## engineStrict
476+
477+
If you are sure that your module will *definitely not* run properly on
478+
versions of Node/npm other than those specified in the `engines` hash,
479+
then you can set `"engineStrict": true` in your package.json file.
480+
This will override the user's `engine-strict` config setting.
481+
482+
Please do not do this unless you are really very very sure. If your
483+
engines hash is something overly restrictive, you can quite easily and
484+
inadvertently lock yourself into obscurity and prevent your users from
485+
updating to new versions of Node. Consider this choice carefully. If
486+
people abuse it, it will be removed in a future version of npm.
487+
473488
## os
474489

475490
You can specify which operating systems your

‎deps/npm/html/api/bin.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>This function should not be used programmatically. Instead, just refer
2020
to the <code>npm.bin</code> member.</p>
2121
</div>
22-
<p id="footer">bin &mdash; [email protected].32</p>
22+
<p id="footer">bin &mdash; [email protected].33</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/bugs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">bugs &mdash; [email protected].32</p>
28+
<p id="footer">bugs &mdash; [email protected].33</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/commands.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2828

2929
<ul><li><a href="../doc/index.html">index(1)</a></li></ul>
3030
</div>
31-
<p id="footer">commands &mdash; [email protected].32</p>
31+
<p id="footer">commands &mdash; [email protected].33</p>
3232
<script>
3333
;(function () {
3434
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3333

3434
<ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
3535
</div>
36-
<p id="footer">config &mdash; [email protected].32</p>
36+
<p id="footer">config &mdash; [email protected].33</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/deprecate.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3030

3131
<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
3232
</div>
33-
<p id="footer">deprecate &mdash; [email protected].32</p>
33+
<p id="footer">deprecate &mdash; [email protected].33</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/docs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">docs &mdash; [email protected].32</p>
28+
<p id="footer">docs &mdash; [email protected].33</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/edit.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3030
<p>Since this command opens an editor in a new process, be careful about where
3131
and how this is used.</p>
3232
</div>
33-
<p id="footer">edit &mdash; [email protected].32</p>
33+
<p id="footer">edit &mdash; [email protected].33</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/explore.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2424

2525
<p>The first element in the 'args' parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
2626
</div>
27-
<p id="footer">explore &mdash; [email protected].32</p>
27+
<p id="footer">explore &mdash; [email protected].33</p>
2828
<script>
2929
;(function () {
3030
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/help-search.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232

3333
<p>The silent parameter is not neccessary not used, but it may in the future.</p>
3434
</div>
35-
<p id="footer">help-search &mdash; [email protected].32</p>
35+
<p id="footer">help-search &mdash; [email protected].33</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/init.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3535

3636
<p><a href="../doc/json.html">json(1)</a></p>
3737
</div>
38-
<p id="footer">init &mdash; [email protected].32</p>
38+
<p id="footer">init &mdash; [email protected].33</p>
3939
<script>
4040
;(function () {
4141
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/install.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>Finally, 'callback' is a function that will be called when all packages have been
2626
installed or when an error has been encountered.</p>
2727
</div>
28-
<p id="footer">install &mdash; [email protected].32</p>
28+
<p id="footer">install &mdash; [email protected].33</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/link.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3939
<p>Now, any changes to the redis package will be reflected in
4040
the package in the current working directory</p>
4141
</div>
42-
<p id="footer">link &mdash; [email protected].32</p>
42+
<p id="footer">link &mdash; [email protected].33</p>
4343
<script>
4444
;(function () {
4545
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/load.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232

3333
<p>For a list of all the available command-line configs, see <code>npm help config</code></p>
3434
</div>
35-
<p id="footer">load &mdash; [email protected].32</p>
35+
<p id="footer">load &mdash; [email protected].33</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/ls.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h3 id="global">global</h3>
5959
This means that if a submodule a same dependency as a parent module, then the
6060
dependency will only be output once.</p>
6161
</div>
62-
<p id="footer">ls &mdash; [email protected].32</p>
62+
<p id="footer">ls &mdash; [email protected].33</p>
6363
<script>
6464
;(function () {
6565
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/npm.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
2424

2525
<h2 id="VERSION">VERSION</h2>
2626

27-
<p>1.1.32</p>
27+
<p>1.1.33</p>
2828

2929
<h2 id="DESCRIPTION">DESCRIPTION</h2>
3030

@@ -91,7 +91,7 @@ <h2 id="ABBREVS">ABBREVS</h2>
9191

9292
<pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre>
9393
</div>
94-
<p id="footer">npm &mdash; [email protected].32</p>
94+
<p id="footer">npm &mdash; [email protected].33</p>
9595
<script>
9696
;(function () {
9797
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/outdated.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919

2020
<p>If the 'packages' parameter is left out, npm will check all packages.</p>
2121
</div>
22-
<p id="footer">outdated &mdash; [email protected].32</p>
22+
<p id="footer">outdated &mdash; [email protected].33</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/owner.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3434

3535
<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
3636
</div>
37-
<p id="footer">owner &mdash; [email protected].32</p>
37+
<p id="footer">owner &mdash; [email protected].33</p>
3838
<script>
3939
;(function () {
4040
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/pack.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525

2626
<p>If no arguments are supplied, then npm packs the current package folder.</p>
2727
</div>
28-
<p id="footer">pack &mdash; [email protected].32</p>
28+
<p id="footer">pack &mdash; [email protected].33</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/prefix.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2121

2222
<p>This function is not useful programmatically</p>
2323
</div>
24-
<p id="footer">prefix &mdash; [email protected].32</p>
24+
<p id="footer">prefix &mdash; [email protected].33</p>
2525
<script>
2626
;(function () {
2727
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/prune.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2323
<p>Extraneous packages are packages that are not listed on the parent
2424
package's dependencies list.</p>
2525
</div>
26-
<p id="footer">prune &mdash; [email protected].32</p>
26+
<p id="footer">prune &mdash; [email protected].33</p>
2727
<script>
2828
;(function () {
2929
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/publish.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3232

3333
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul>
3434
</div>
35-
<p id="footer">publish &mdash; [email protected].32</p>
35+
<p id="footer">publish &mdash; [email protected].33</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/rebuild.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>
2222

2323
<p>See <code>npm help build</code></p>
2424
</div>
25-
<p id="footer">rebuild &mdash; [email protected].32</p>
25+
<p id="footer">rebuild &mdash; [email protected].33</p>
2626
<script>
2727
;(function () {
2828
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/restart.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2727

2828
<ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
2929
</div>
30-
<p id="footer">restart &mdash; [email protected].32</p>
30+
<p id="footer">restart &mdash; [email protected].33</p>
3131
<script>
3232
;(function () {
3333
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/root.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2121

2222
<p>This function is not useful programmatically.</p>
2323
</div>
24-
<p id="footer">root &mdash; [email protected].32</p>
24+
<p id="footer">root &mdash; [email protected].33</p>
2525
<script>
2626
;(function () {
2727
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/run-script.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2929

3030
<ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../api/test.html">test(3)</a></li><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/restart.html">restart(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
3131
</div>
32-
<p id="footer">run-script &mdash; [email protected].32</p>
32+
<p id="footer">run-script &mdash; [email protected].33</p>
3333
<script>
3434
;(function () {
3535
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/search.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232
and doesn't try to read your mind (it doesn't do any verb tense matching or the
3333
like).</p>
3434
</div>
35-
<p id="footer">search &mdash; [email protected].32</p>
35+
<p id="footer">search &mdash; [email protected].33</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/shrinkwrap.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2626
<p>Finally, 'callback' is a function that will be called when the shrinkwrap has
2727
been saved.</p>
2828
</div>
29-
<p id="footer">shrinkwrap &mdash; [email protected].32</p>
29+
<p id="footer">shrinkwrap &mdash; [email protected].33</p>
3030
<script>
3131
;(function () {
3232
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)