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

Commit 429b587

Browse files
committed
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: deps/uv/ChangeLog deps/uv/build.mk deps/uv/src/version.c deps/uv/test/test-ipc.c deps/v8/src/objects.cc src/node.cc src/node_os.cc
2 parents ec57ecc + 1b74892 commit 429b587

File tree

223 files changed

+749
-444
lines changed

Some content is hidden

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

223 files changed

+749
-444
lines changed
File renamed without changes.
File renamed without changes.

deps/npm/doc/files/package.json.md

+23-36
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,6 @@ file. It must be actual JSON, not just a JavaScript object literal.
99
A lot of the behavior described in this document is affected by the config
1010
settings described in `npm-config(7)`.
1111

12-
## DEFAULT VALUES
13-
14-
npm will default some values based on package contents.
15-
16-
* `"scripts": {"start": "node server.js"}`
17-
18-
If there is a `server.js` file in the root of your package, then npm
19-
will default the `start` command to `node server.js`.
20-
21-
* `"scripts":{"preinstall": "node-waf clean || true; node-waf configure build"}`
22-
23-
If there is a `wscript` file in the root of your package, npm will
24-
default the `preinstall` command to compile using node-waf.
25-
26-
* `"scripts":{"preinstall": "node-gyp rebuild"}`
27-
28-
If there is a `binding.gyp` file in the root of your package, npm will
29-
default the `preinstall` command to compile using node-gyp.
30-
31-
* `"contributors": [...]`
32-
33-
If there is an `AUTHORS` file in the root of your package, npm will
34-
treat each line as a `Name <email> (url)` format, where email and url
35-
are optional. Lines which start with a `#` or are blank, will be
36-
ignored.
37-
3812
## name
3913

4014
The *most* important things in your package.json are the name and version fields.
@@ -122,16 +96,8 @@ You can check [the full list of SPDX license IDs](https://spdx.org/licenses/).
12296
Ideally you should pick one that is
12397
[OSI](http://opensource.org/licenses/alphabetical) approved.
12498

125-
If you have more complex licensing terms, or you want to provide more detail
126-
in your package.json file, you can use the more verbose plural form, like this:
127-
128-
"licenses" : [
129-
{ "type" : "MyLicense"
130-
, "url" : "http://github.com/owner/project/path/to/license"
131-
}
132-
]
133-
134-
It's also a good idea to include a license file at the top level in your package.
99+
It's also a good idea to include a LICENSE file at the top level in
100+
your package.
135101

136102
## people fields: author, contributors
137103

@@ -575,6 +541,27 @@ Any config values can be overridden, but of course only "tag" and
575541
See `npm-config(7)` to see the list of config options that can be
576542
overridden.
577543

544+
## DEFAULT VALUES
545+
546+
npm will default some values based on package contents.
547+
548+
* `"scripts": {"start": "node server.js"}`
549+
550+
If there is a `server.js` file in the root of your package, then npm
551+
will default the `start` command to `node server.js`.
552+
553+
* `"scripts":{"preinstall": "node-gyp rebuild"}`
554+
555+
If there is a `binding.gyp` file in the root of your package, npm will
556+
default the `preinstall` command to compile using node-gyp.
557+
558+
* `"contributors": [...]`
559+
560+
If there is an `AUTHORS` file in the root of your package, npm will
561+
treat each line as a `Name <email> (url)` format, where email and url
562+
are optional. Lines which start with a `#` or are blank, will be
563+
ignored.
564+
578565
## SEE ALSO
579566

580567
* semver(7)

deps/npm/doc/misc/npm-index.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ Publish a package
115115

116116
Rebuild a package
117117

118+
## npm-repo(1)
119+
120+
Open package repository page in the browser
121+
118122
## npm-restart(1)
119123

120124
Start a package
@@ -191,10 +195,6 @@ View registry info
191195

192196
Display npm username
193197

194-
## repo(1)
195-
196-
Open package repository page in the browser
197-
198198
# API Documentation
199199

200200
## npm(3)
@@ -285,6 +285,10 @@ Publish a package
285285

286286
Rebuild a package
287287

288+
## npm-repo(3)
289+
290+
Open package repository page in the browser
291+
288292
## npm-restart(3)
289293

290294
Start a package
@@ -349,10 +353,6 @@ View registry info
349353

350354
Display npm username
351355

352-
## repo(3)
353-
354-
Open package repository page in the browser
355-
356356
# Files
357357

358358
## npm-folders(5)

deps/npm/html/doc/README.html

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

240240
<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>
241241
</div>
242-
<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].22</p>
242+
<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].23</p>
243243
<script>
244244
;(function () {
245245
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-bin &mdash; [email protected].22</p>
22+
<p id="footer">npm-bin &mdash; [email protected].23</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-bugs &mdash; [email protected].22</p>
28+
<p id="footer">npm-bugs &mdash; [email protected].23</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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="../misc/npm-index.html">npm-index(7)</a></li></ul>
3030
</div>
31-
<p id="footer">npm-commands &mdash; [email protected].22</p>
31+
<p id="footer">npm-commands &mdash; [email protected].23</p>
3232
<script>
3333
;(function () {
3434
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-config &mdash; [email protected].22</p>
36+
<p id="footer">npm-config &mdash; [email protected].23</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-deprecate.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="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul>
3434
</div>
35-
<p id="footer">npm-deprecate &mdash; [email protected].22</p>
35+
<p id="footer">npm-deprecate &mdash; [email protected].23</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-docs &mdash; [email protected].22</p>
28+
<p id="footer">npm-docs &mdash; [email protected].23</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-edit &mdash; [email protected].22</p>
33+
<p id="footer">npm-edit &mdash; [email protected].23</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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 &#39;args&#39; 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">npm-explore &mdash; [email protected].22</p>
27+
<p id="footer">npm-explore &mdash; [email protected].23</p>
2828
<script>
2929
;(function () {
3030
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-help-search &mdash; [email protected].22</p>
35+
<p id="footer">npm-help-search &mdash; [email protected].23</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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="../files/package.json.html">package.json(5)</a></p>
3737
</div>
38-
<p id="footer">npm-init &mdash; [email protected].22</p>
38+
<p id="footer">npm-init &mdash; [email protected].23</p>
3939
<script>
4040
;(function () {
4141
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-install.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>Finally, &#39;callback&#39; 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">npm-install &mdash; [email protected].22</p>
28+
<p id="footer">npm-install &mdash; [email protected].23</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-link &mdash; [email protected].22</p>
42+
<p id="footer">npm-link &mdash; [email protected].23</p>
4343
<script>
4444
;(function () {
4545
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-load &mdash; [email protected].22</p>
35+
<p id="footer">npm-load &mdash; [email protected].23</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-ls &mdash; [email protected].22</p>
62+
<p id="footer">npm-ls &mdash; [email protected].23</p>
6363
<script>
6464
;(function () {
6565
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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 &#39;packages&#39; parameter is left out, npm will check all packages.</p>
2121
</div>
22-
<p id="footer">npm-outdated &mdash; [email protected].22</p>
22+
<p id="footer">npm-outdated &mdash; [email protected].23</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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/npm-publish.html">npm-publish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul>
3636
</div>
37-
<p id="footer">npm-owner &mdash; [email protected].22</p>
37+
<p id="footer">npm-owner &mdash; [email protected].23</p>
3838
<script>
3939
;(function () {
4040
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-pack &mdash; [email protected].22</p>
28+
<p id="footer">npm-pack &mdash; [email protected].23</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-prefix &mdash; [email protected].22</p>
24+
<p id="footer">npm-prefix &mdash; [email protected].23</p>
2525
<script>
2626
;(function () {
2727
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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&#39;s dependencies list.</p>
2525
</div>
26-
<p id="footer">npm-prune &mdash; [email protected].22</p>
26+
<p id="footer">npm-prune &mdash; [email protected].23</p>
2727
<script>
2828
;(function () {
2929
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../api/npm-owner.html">npm-owner(3)</a></li></ul>
3434
</div>
35-
<p id="footer">npm-publish &mdash; [email protected].22</p>
35+
<p id="footer">npm-publish &mdash; [email protected].23</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-rebuild &mdash; [email protected].22</p>
25+
<p id="footer">npm-rebuild &mdash; [email protected].23</p>
2626
<script>
2727
;(function () {
2828
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-repo.html

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<!doctype html>
2+
<html>
3+
<title>npm-repo</title>
4+
<meta http-equiv="content-type" value="text/html;utf-8">
5+
<link rel="stylesheet" type="text/css" href="../../static/style.css">
6+
7+
<body>
8+
<div id="wrapper">
9+
<h1><a href="../api/npm-repo.html">npm-repo</a></h1> <p>Open package repository page in the browser</p>
10+
11+
<h2 id="SYNOPSIS">SYNOPSIS</h2>
12+
13+
<pre><code>npm.commands.repo(package, callback)</code></pre>
14+
15+
<h2 id="DESCRIPTION">DESCRIPTION</h2>
16+
17+
<p>This command tries to guess at the likely location of a package&#39;s
18+
repository URL, and then tries to open it using the <code>--browser</code>
19+
config param.</p>
20+
21+
<p>Like other commands, the first parameter is an array. This command only
22+
uses the first element, which is expected to be a package name with an
23+
optional version number.</p>
24+
25+
<p>This command will launch a browser, so this command may not be the most
26+
friendly for programmatic use.</p>
27+
</div>
28+
<p id="footer">npm-repo &mdash; [email protected]</p>
29+
<script>
30+
;(function () {
31+
var wrapper = document.getElementById("wrapper")
32+
var els = Array.prototype.slice.call(wrapper.getElementsByTagName("*"), 0)
33+
.filter(function (el) {
34+
return el.parentNode === wrapper
35+
&& el.tagName.match(/H[1-6]/)
36+
&& el.id
37+
})
38+
var l = 2
39+
, toc = document.createElement("ul")
40+
toc.innerHTML = els.map(function (el) {
41+
var i = el.tagName.charAt(1)
42+
, out = ""
43+
while (i > l) {
44+
out += "<ul>"
45+
l ++
46+
}
47+
while (i < l) {
48+
out += "</ul>"
49+
l --
50+
}
51+
out += "<li><a href='#" + el.id + "'>" +
52+
( el.innerText || el.text || el.innerHTML)
53+
+ "</a>"
54+
return out
55+
}).join("\n")
56+
toc.id = "toc"
57+
document.body.appendChild(toc)
58+
})()
59+
</script>

deps/npm/html/doc/api/npm-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/npm-start.html">npm-start(3)</a></li><li><a href="../api/npm-stop.html">npm-stop(3)</a></li></ul>
2929
</div>
30-
<p id="footer">npm-restart &mdash; [email protected].22</p>
30+
<p id="footer">npm-restart &mdash; [email protected].23</p>
3131
<script>
3232
;(function () {
3333
var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-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">npm-root &mdash; [email protected].22</p>
24+
<p id="footer">npm-root &mdash; [email protected].23</p>
2525
<script>
2626
;(function () {
2727
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)