Skip to content

Commit 1319835

Browse files
isaacsisaacs
committed
Upgrade npm to 1.1.25
1 parent 284816e commit 1319835

File tree

172 files changed

+872
-1906
lines changed

Some content is hidden

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

172 files changed

+872
-1906
lines changed

‎deps/npm/LICENSE

+5
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ and are not covered by this license.
4949
"npm Logo" created by Mathias Pettersson and Brian Hammond,
5050
used with permission.
5151

52+
"Gubblebum Blocky" font
53+
Copyright (c) 2007 by Tjarda Koster, http://jelloween.deviantart.com
54+
included for use in the npm website and documentation,
55+
used with permission.
56+
5257
This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer,
5358
according to the terms of the MIT license.
5459

‎deps/npm/bin/npm-cli.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ if (typeof WScript !== "undefined") {
1515

1616
process.title = "npm"
1717

18-
var log = require("../lib/utils/log.js")
19-
log.waitForConfig()
20-
log.info("ok", "it worked if it ends with")
18+
var log = require("npmlog")
19+
log.pause() // will be unpaused when config is loaded.
20+
log.info("it worked if it ends with", "ok")
2121

2222
var fs = require("graceful-fs")
2323
, path = require("path")
@@ -36,7 +36,7 @@ if (path.basename(process.argv[1]).slice(-1) === "g") {
3636
process.argv.splice(1, 1, "npm", "-g")
3737
}
3838

39-
log.verbose(process.argv, "cli")
39+
log.verbose("cli", process.argv)
4040

4141
var conf = nopt(types, shorthands)
4242
npm.argv = conf.argv.remain
@@ -56,8 +56,8 @@ if (conf.versions) {
5656
return
5757
}
5858

59-
log.info("npm@"+npm.version, "using")
60-
log.info("node@"+process.version, "using")
59+
log.info("using", "npm@%s", npm.version)
60+
log.info("using", "node@%s", process.version)
6161

6262
// make sure that this version of node works with this version of npm.
6363
var semver = require("semver")

‎deps/npm/doc/cli/coding-style.md

+5-16
Original file line numberDiff line numberDiff line change
@@ -129,29 +129,18 @@ Just send the error message back as the first argument to the callback.
129129
Always create a new Error object with your message. Don't just return a
130130
string message to the callback. Stack traces are handy.
131131

132-
Use the `require("./utils/log").er` function. It takes a callback and an
133-
error message, and returns an object that will report the message in the
134-
event of a failure. It's quite handy.
135-
136-
function myThing (args, cb) {
137-
getData(args, function (er, data) {
138-
if (er) return log.er(cb, "Couldn't get data")(er)
139-
doSomethingElse(data, cb)
140-
})
141-
}
142-
function justHasToWork (cb) {
143-
doSomething(log.er(cb, "the doSomething failed."))
144-
}
145-
146132
## Logging
147133

134+
Logging is done using the [npmlog](https://github.com/isaacs/npmlog)
135+
utility.
136+
148137
Please clean up logs when they are no longer helpful. In particular,
149138
logging the same object over and over again is not helpful. Logs should
150139
report what's happening so that it's easier to track down where a fault
151140
occurs.
152141

153-
Use appropriate log levels. The default log() function logs at the
154-
"info" level. See `npm-config(1)` and search for "loglevel".
142+
Use appropriate log levels. See `npm-config(1)` and search for
143+
"loglevel".
155144

156145
## Case, naming, etc.
157146

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

-22
Original file line numberDiff line numberDiff line change
@@ -430,13 +430,6 @@ if one of the two conditions are met:
430430
* the globally installed version is identical to the version that is
431431
being installed locally.
432432

433-
### logfd
434-
435-
* Default: stderr file descriptor
436-
* Type: Number or Stream
437-
438-
The location to write log output.
439-
440433
### loglevel
441434

442435
* Default: "http"
@@ -449,14 +442,6 @@ What level of logs to report. On failure, *all* logs are written to
449442
Any logs of a higher level than the setting are shown.
450443
The default is "http", which shows http, warn, and error output.
451444

452-
### logprefix
453-
454-
* Default: true on Posix, false on Windows
455-
* Type: Boolean
456-
457-
Whether or not to prefix log messages with "npm" and the log level. See
458-
also "color" and "loglevel".
459-
460445
### long
461446

462447
* Default: false
@@ -503,13 +488,6 @@ The url to report npat test results.
503488
A node module to `require()` when npm loads. Useful for programmatic
504489
usage.
505490

506-
### outfd
507-
508-
* Default: standard output file descriptor
509-
* Type: Number or Stream
510-
511-
Where to write "normal" output. This has no effect on log output.
512-
513491
### parseable
514492

515493
* Default: false

‎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].24</p>
22+
<p id="footer">bin &mdash; [email protected].25</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].24</p>
28+
<p id="footer">bugs &mdash; [email protected].25</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].24</p>
31+
<p id="footer">commands &mdash; [email protected].25</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].24</p>
36+
<p id="footer">config &mdash; [email protected].25</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].24</p>
33+
<p id="footer">deprecate &mdash; [email protected].25</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].24</p>
28+
<p id="footer">docs &mdash; [email protected].25</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].24</p>
33+
<p id="footer">edit &mdash; [email protected].25</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].24</p>
27+
<p id="footer">explore &mdash; [email protected].25</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].24</p>
35+
<p id="footer">help-search &mdash; [email protected].25</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].24</p>
38+
<p id="footer">init &mdash; [email protected].25</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].24</p>
28+
<p id="footer">install &mdash; [email protected].25</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].24</p>
42+
<p id="footer">link &mdash; [email protected].25</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].24</p>
35+
<p id="footer">load &mdash; [email protected].25</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].24</p>
62+
<p id="footer">ls &mdash; [email protected].25</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.24</p>
27+
<p>1.1.25</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].24</p>
94+
<p id="footer">npm &mdash; [email protected].25</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].24</p>
22+
<p id="footer">outdated &mdash; [email protected].25</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].24</p>
37+
<p id="footer">owner &mdash; [email protected].25</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].24</p>
28+
<p id="footer">pack &mdash; [email protected].25</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].24</p>
24+
<p id="footer">prefix &mdash; [email protected].25</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].24</p>
26+
<p id="footer">prune &mdash; [email protected].25</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].24</p>
35+
<p id="footer">publish &mdash; [email protected].25</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].24</p>
25+
<p id="footer">rebuild &mdash; [email protected].25</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].24</p>
30+
<p id="footer">restart &mdash; [email protected].25</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].24</p>
24+
<p id="footer">root &mdash; [email protected].25</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].24</p>
32+
<p id="footer">run-script &mdash; [email protected].25</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].24</p>
35+
<p id="footer">search &mdash; [email protected].25</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].24</p>
29+
<p id="footer">shrinkwrap &mdash; [email protected].25</p>
3030
<script>
3131
;(function () {
3232
var wrapper = document.getElementById("wrapper")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>npm can run tests on multiple packages. Just specify multiple packages
2020
in the <code>packages</code> parameter.</p>
2121
</div>
22-
<p id="footer">start &mdash; [email protected].24</p>
22+
<p id="footer">start &mdash; [email protected].25</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>npm can run stop on multiple packages. Just specify multiple packages
2020
in the <code>packages</code> parameter.</p>
2121
</div>
22-
<p id="footer">stop &mdash; [email protected].24</p>
22+
<p id="footer">stop &mdash; [email protected].25</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)