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

Commit 429b587

Browse files
tjfontainetjfontaine
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

223 files changed

Lines changed: 749 additions & 444 deletions

File tree

Some content is hidden

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

deps/npm/doc/api/repo.md renamed to deps/npm/doc/api/npm-repo.md

File renamed without changes.

deps/npm/doc/cli/repo.md renamed to deps/npm/doc/cli/npm-repo.md

File renamed without changes.

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

Lines changed: 23 additions & 36 deletions
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‎

Lines changed: 8 additions & 8 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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")

0 commit comments

Comments
 (0)