Skip to content

Commit 9920ae6

Browse files
committed
Merge branch 'v0.10'
Conflicts: ChangeLog lib/events.js lib/tls.js src/node_constants.cc src/node_crypto.cc src/node_crypto.h src/node_version.h
2 parents 2f86275 + a7dd0e5 commit 9920ae6

274 files changed

Lines changed: 4491 additions & 18153 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.

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,11 @@
618618
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
619619

620620

621+
2014.05.01, Version 0.10.28 (Stable)
622+
623+
* npm: upgrade to v1.4.9
624+
625+
621626
2014.05.01, Version 0.10.27 (Stable), cb7911f78ae96ef7a540df992cc1359ba9636e86
622627

623628
* npm: upgrade to v1.4.8

common.gypi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
'variables': {
3-
'werror': '', # Turn off -Werror in V8 build.
4-
'visibility%': 'hidden', # V8's visibility setting
5-
'target_arch%': 'ia32', # set v8's target architecture
6-
'host_arch%': 'ia32', # set v8's host architecture
7-
'want_separate_host_toolset': 0, # V8 should not build target and host
8-
'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
9-
'component%': 'static_library', # NB. these names match with what V8 expects
10-
'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way
3+
'werror': '', # Turn off -Werror in V8 build.
4+
'visibility%': 'hidden', # V8's visibility setting
5+
'target_arch%': 'ia32', # set v8's target architecture
6+
'host_arch%': 'ia32', # set v8's host architecture
7+
'want_separate_host_toolset%': 0, # V8 should not build target and host
8+
'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
9+
'component%': 'static_library', # NB. these names match with what V8 expects
10+
'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way
1111
'gcc_version%': 'unknown',
1212
'clang%': 0,
1313
'python%': 'python',

configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,9 @@ def configure_node(o):
456456
o['variables']['host_arch'] = host_arch
457457
o['variables']['target_arch'] = target_arch
458458

459+
if target_arch != host_arch and not options.without_snapshot:
460+
o['variables']['want_separate_host_toolset'] = 1
461+
459462
if target_arch == 'arm':
460463
configure_arm(o)
461464

deps/npm/doc/cli/npm-run-script.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ npm-run-script(1) -- Run arbitrary package scripts
33

44
## SYNOPSIS
55

6-
npm run-script [<pkg>] <command>
6+
npm run-script [<pkg>] [command]
77

88
## DESCRIPTION
99

1010
This runs an arbitrary command from a package's `"scripts"` object.
1111
If no package name is provided, it will search for a `package.json`
12-
in the current folder and use its `"scripts"` object.
12+
in the current folder and use its `"scripts"` object. If no `"command"`
13+
is provided, it will list the available top level scripts.
1314

1415
It is used by the test, start, restart, and stop commands, but can be
1516
called directly, as well.

deps/npm/html/doc/README.html

Lines changed: 56 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -10,153 +10,97 @@
1010
<div id="wrapper">
1111

1212
<h1><a href="cli/npm.html">npm</a></h1> <p>node package manager</p>
13-
14-
<p><a href="https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm">![Build Status</a>
15-
## SYNOPSIS</p>
16-
13+
<p><a href="https://travis-ci.org/npm/npm"><img src="https://img.shields.io/travis/npm/npm/master.svg" alt="Build Status"></a></p>
14+
<h2 id="synopsis">SYNOPSIS</h2>
1715
<p>This is just enough info to get you up and running.</p>
18-
1916
<p>Much more info available via <code>npm help</code> once it&#39;s installed.</p>
20-
21-
<h2 id="IMPORTANT">IMPORTANT</h2>
22-
17+
<h2 id="important">IMPORTANT</h2>
2318
<p><strong>You need node v0.8 or higher to run this program.</strong></p>
24-
2519
<p>To install an old <strong>and unsupported</strong> version of npm that works on node 0.3
2620
and prior, clone the git repo and dig through the old tags and branches.</p>
27-
28-
<h2 id="Super-Easy-Install">Super Easy Install</h2>
29-
21+
<h2 id="super-easy-install">Super Easy Install</h2>
3022
<p>npm comes with node now.</p>
31-
32-
<h3 id="Windows-Computers">Windows Computers</h3>
33-
23+
<h3 id="windows-computers">Windows Computers</h3>
3424
<p>Get the MSI. npm is in it.</p>
35-
36-
<h3 id="Apple-Macintosh-Computers">Apple Macintosh Computers</h3>
37-
25+
<h3 id="apple-macintosh-computers">Apple Macintosh Computers</h3>
3826
<p>Get the pkg. npm is in it.</p>
39-
40-
<h3 id="Other-Sorts-of-Unices">Other Sorts of Unices</h3>
41-
27+
<h3 id="other-sorts-of-unices">Other Sorts of Unices</h3>
4228
<p>Run <code>make install</code>. npm will be installed with node.</p>
43-
4429
<p>If you want a more fancy pants install (a different version, customized
4530
paths, etc.) then read on.</p>
46-
47-
<h2 id="Fancy-Install-Unix">Fancy Install (Unix)</h2>
48-
31+
<h2 id="fancy-install-unix-">Fancy Install (Unix)</h2>
4932
<p>There&#39;s a pretty robust install script at
5033
<a href="https://www.npmjs.org/install.sh">https://www.npmjs.org/install.sh</a>. You can download that and run it.</p>
51-
5234
<p>Here&#39;s an example using curl:</p>
53-
54-
<pre><code>curl -L https://npmjs.org/install.sh | sh</code></pre>
55-
56-
<h3 id="Slightly-Fancier">Slightly Fancier</h3>
57-
35+
<pre><code>curl -L https://npmjs.org/install.sh | sh
36+
</code></pre><h3 id="slightly-fancier">Slightly Fancier</h3>
5837
<p>You can set any npm configuration params with that script:</p>
59-
60-
<pre><code>npm_config_prefix=/some/path sh install.sh</code></pre>
61-
62-
<p>Or, you can run it in uber-debuggery mode:</p>
63-
64-
<pre><code>npm_debug=1 sh install.sh</code></pre>
65-
66-
<h3 id="Even-Fancier">Even Fancier</h3>
67-
38+
<pre><code>npm_config_prefix=/some/path sh install.sh
39+
</code></pre><p>Or, you can run it in uber-debuggery mode:</p>
40+
<pre><code>npm_debug=1 sh install.sh
41+
</code></pre><h3 id="even-fancier">Even Fancier</h3>
6842
<p>Get the code with git. Use <code>make</code> to build the docs and do other stuff.
6943
If you plan on hacking on npm, <code>make link</code> is your friend.</p>
70-
7144
<p>If you&#39;ve got the npm source code, you can also semi-permanently set
7245
arbitrary config keys using the <code>./configure --key=val ...</code>, and then
7346
run npm commands by doing <code>node cli.js &lt;cmd&gt; &lt;args&gt;</code>. (This is helpful
7447
for testing, or running stuff without actually installing npm itself.)</p>
75-
76-
<h2 id="Fancy-Windows-Install">Fancy Windows Install</h2>
77-
48+
<h2 id="fancy-windows-install">Fancy Windows Install</h2>
7849
<p>You can download a zip file from <a href="https://npmjs.org/dist/">https://npmjs.org/dist/</a>, and unpack it
7950
in the same folder where node.exe lives.</p>
80-
8151
<p>If that&#39;s not fancy enough for you, then you can fetch the code with
8252
git, and mess with it directly.</p>
83-
84-
<h2 id="Installing-on-Cygwin">Installing on Cygwin</h2>
85-
53+
<h2 id="installing-on-cygwin">Installing on Cygwin</h2>
8654
<p>No.</p>
87-
88-
<h2 id="Permissions-when-Using-npm-to-Install-Other-Stuff">Permissions when Using npm to Install Other Stuff</h2>
89-
55+
<h2 id="permissions-when-using-npm-to-install-other-stuff">Permissions when Using npm to Install Other Stuff</h2>
9056
<p><strong>tl;dr</strong></p>
91-
92-
<ul><li>Use <code>sudo</code> for greater safety. Or don&#39;t, if you prefer not to.</li><li>npm will downgrade permissions if it&#39;s root before running any build
93-
scripts that package authors specified.</li></ul>
94-
95-
<h3 id="More-details">More details...</h3>
96-
57+
<ul>
58+
<li>Use <code>sudo</code> for greater safety. Or don&#39;t, if you prefer not to.</li>
59+
<li>npm will downgrade permissions if it&#39;s root before running any build
60+
scripts that package authors specified.</li>
61+
</ul>
62+
<h3 id="more-details-">More details...</h3>
9763
<p>As of version 0.3, it is recommended to run npm as root.
9864
This allows npm to change the user identifier to the <code>nobody</code> user prior
9965
to running any package build or test commands.</p>
100-
10166
<p>If you are not the root user, or if you are on a platform that does not
10267
support uid switching, then npm will not attempt to change the userid.</p>
103-
10468
<p>If you would like to ensure that npm <strong>always</strong> runs scripts as the
10569
&quot;nobody&quot; user, and have it fail if it cannot downgrade permissions, then
10670
set the following configuration param:</p>
107-
108-
<pre><code>npm config set unsafe-perm false</code></pre>
109-
110-
<p>This will prevent running in unsafe mode, even as non-root users.</p>
111-
112-
<h2 id="Uninstalling">Uninstalling</h2>
113-
71+
<pre><code>npm config set unsafe-perm false
72+
</code></pre><p>This will prevent running in unsafe mode, even as non-root users.</p>
73+
<h2 id="uninstalling">Uninstalling</h2>
11474
<p>So sad to see you go.</p>
115-
116-
<pre><code>sudo npm uninstall npm -g</code></pre>
117-
118-
<p>Or, if that fails,</p>
119-
120-
<pre><code>sudo make uninstall</code></pre>
121-
122-
<h2 id="More-Severe-Uninstalling">More Severe Uninstalling</h2>
123-
75+
<pre><code>sudo npm uninstall npm -g
76+
</code></pre><p>Or, if that fails,</p>
77+
<pre><code>sudo make uninstall
78+
</code></pre><h2 id="more-severe-uninstalling">More Severe Uninstalling</h2>
12479
<p>Usually, the above instructions are sufficient. That will remove
12580
npm, but leave behind anything you&#39;ve installed.</p>
126-
12781
<p>If you would like to remove all the packages that you have installed,
12882
then you can use the <code>npm ls</code> command to find them, and then <code>npm rm</code> to
12983
remove them.</p>
130-
13184
<p>To remove cruft left behind by npm 0.x, you can use the included
13285
<code>clean-old.sh</code> script file. You can run it conveniently like this:</p>
133-
134-
<pre><code>npm explore npm -g -- sh scripts/clean-old.sh</code></pre>
135-
136-
<p>npm uses two configuration files, one for per-user configs, and another
86+
<pre><code>npm explore npm -g -- sh scripts/clean-old.sh
87+
</code></pre><p>npm uses two configuration files, one for per-user configs, and another
13788
for global (every-user) configs. You can view them by doing:</p>
138-
13989
<pre><code>npm config get userconfig # defaults to ~/.npmrc
140-
npm config get globalconfig # defaults to /usr/local/etc/npmrc</code></pre>
141-
142-
<p>Uninstalling npm does not remove configuration files by default. You
90+
npm config get globalconfig # defaults to /usr/local/etc/npmrc
91+
</code></pre><p>Uninstalling npm does not remove configuration files by default. You
14392
must remove them yourself manually if you want them gone. Note that
14493
this means that future npm installs will not remember the settings that
14594
you have chosen.</p>
146-
147-
<h2 id="Using-npm-Programmatically">Using npm Programmatically</h2>
148-
95+
<h2 id="using-npm-programmatically">Using npm Programmatically</h2>
14996
<p>If you would like to use npm programmatically, you can do that.
15097
It&#39;s not very well documented, but it <em>is</em> rather simple.</p>
151-
15298
<p>Most of the time, unless you actually want to do all the things that
15399
npm does, you should try using one of npm&#39;s dependencies rather than
154100
using npm itself, if possible.</p>
155-
156101
<p>Eventually, npm will be just a thin cli wrapper around the modules
157102
that it depends on, but for now, there are some things that you must
158103
use npm itself to do.</p>
159-
160104
<pre><code>var npm = require(&quot;npm&quot;)
161105
npm.load(myConfigObject, function (er) {
162106
if (er) return handlError(er)
@@ -165,90 +109,72 @@ <h2 id="Using-npm-Programmatically">Using npm Programmatically</h2>
165109
// command succeeded, and data might have some info
166110
})
167111
npm.on(&quot;log&quot;, function (message) { .... })
168-
})</code></pre>
169-
170-
<p>The <code>load</code> function takes an object hash of the command-line configs.
112+
})
113+
</code></pre><p>The <code>load</code> function takes an object hash of the command-line configs.
171114
The various <code>npm.commands.&lt;cmd&gt;</code> functions take an <strong>array</strong> of
172115
positional argument <strong>strings</strong>. The last argument to any
173116
<code>npm.commands.&lt;cmd&gt;</code> function is a callback. Some commands take other
174117
optional arguments. Read the source.</p>
175-
176118
<p>You cannot set configs individually for any single npm function at this
177119
time. Since <code>npm</code> is a singleton, any call to <code>npm.config.set</code> will
178120
change the value for <em>all</em> npm commands in that process.</p>
179-
180121
<p>See <code>./bin/npm-cli.js</code> for an example of pulling config values off of the
181122
command line arguments using nopt. You may also want to check out <code>npm
182123
help config</code> to learn about all the options you can set there.</p>
183-
184-
<h2 id="More-Docs">More Docs</h2>
185-
124+
<h2 id="more-docs">More Docs</h2>
186125
<p>Check out the <a href="https://www.npmjs.org/doc/">docs</a>,
187126
especially the <a href="https://www.npmjs.org/doc/faq.html">faq</a>.</p>
188-
189127
<p>You can use the <code>npm help</code> command to read any of them.</p>
190-
191128
<p>If you&#39;re a developer, and you want to use npm to publish your program,
192129
you should <a href="https://www.npmjs.org/doc/developers.html">read this</a></p>
193-
194-
<h2 id="Legal-Stuff">Legal Stuff</h2>
195-
130+
<h2 id="legal-stuff">Legal Stuff</h2>
196131
<p>&quot;npm&quot; and &quot;The npm Registry&quot; are owned by npm, Inc.
197132
All rights reserved. See the included LICENSE file for more details.</p>
198-
199133
<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
200-
201134
<p>Modules published on the npm registry are not officially endorsed by
202135
npm, Inc. or the Node.js project.</p>
203-
204136
<p>Data published to the npm registry is not part of npm itself, and is
205137
the sole property of the publisher. While every effort is made to
206138
ensure accountability, there is absolutely no guarantee, warrantee, or
207139
assertion expressed or implied as to the quality, fitness for a
208140
specific purpose, or lack of malice in any given npm package.</p>
209-
210141
<p>If you have a complaint about a package in the public npm registry,
211142
and cannot <a href="https://www.npmjs.org/doc/misc/npm-disputes.html">resolve it with the package
212143
owner</a>, please email
213-
<a href="mailto:support@npmjs.com">support@npmjs.com</a> and explain the situation.</p>
214-
144+
<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#115;&#117;&#x70;&#112;&#x6f;&#x72;&#x74;&#x40;&#110;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#111;&#109;">&#115;&#117;&#x70;&#112;&#x6f;&#x72;&#x74;&#x40;&#110;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#111;&#109;</a> and explain the situation.</p>
215145
<p>Any data published to The npm Registry (including user account
216146
information) may be removed or modified at the sole discretion of the
217147
npm server administrators.</p>
218-
219-
<h3 id="In-plainer-english">In plainer english</h3>
220-
148+
<h3 id="in-plainer-english">In plainer english</h3>
221149
<p>npm is the property of npm, Inc.</p>
222-
223150
<p>If you publish something, it&#39;s yours, and you are solely accountable
224151
for it.</p>
225-
226152
<p>If other people publish something, it&#39;s theirs.</p>
227-
228153
<p>Users can publish Bad Stuff. It will be removed promptly if reported.
229154
But there is no vetting process for published modules, and you use
230155
them at your own risk. Please inspect the source.</p>
231-
232156
<p>If you publish Bad Stuff, we may delete it from the registry, or even
233157
ban your account in extreme cases. So don&#39;t do that.</p>
234-
235-
<h2 id="BUGS">BUGS</h2>
236-
158+
<h2 id="bugs">BUGS</h2>
237159
<p>When you find issues, please report them:</p>
238-
239-
<ul><li>web:
240-
<a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a></li><li>email:
241-
<a href="mailto:npm-@googlegroups.com">npm-@googlegroups.com</a></li></ul>
242-
160+
<ul>
161+
<li>web:
162+
<a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a></li>
163+
<li>email:
164+
<a href="&#109;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#x6e;&#x70;&#109;&#45;&#64;&#103;&#x6f;&#111;&#x67;&#x6c;&#101;&#x67;&#114;&#x6f;&#117;&#x70;&#115;&#x2e;&#99;&#111;&#109;">&#x6e;&#x70;&#109;&#45;&#64;&#103;&#x6f;&#111;&#x67;&#x6c;&#101;&#x67;&#114;&#x6f;&#117;&#x70;&#115;&#x2e;&#99;&#111;&#109;</a></li>
165+
</ul>
243166
<p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
244167
as expected. The <code>npm-debug.log</code> file is also helpful to provide.</p>
245-
246168
<p>You can also look for isaacs in #node.js on irc://irc.freenode.net. He
247169
will no doubt tell you to put the output in a gist or email.</p>
170+
<h2 id="see-also">SEE ALSO</h2>
171+
<ul>
172+
<li><a href="cli/npm.html">npm(1)</a></li>
173+
<li><a href="misc/npm-faq.html">npm-faq(7)</a></li>
174+
<li><a href="cli/npm-help.html">npm-help(1)</a></li>
175+
<li><a href="misc/npm-index.html">npm-index(7)</a></li>
176+
</ul>
248177

249-
<h2 id="SEE-ALSO">SEE ALSO</h2>
250-
251-
<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>
252178
</div>
253179

254180
<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
@@ -260,5 +186,5 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
260186
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
261187
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
262188
</table>
263-
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.9</p>
189+
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.10</p>
264190

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@
1010
<div id="wrapper">
1111

1212
<h1><a href="../api/npm-bin.html">npm-bin</a></h1> <p>Display npm bin folder</p>
13-
14-
<h2 id="SYNOPSIS">SYNOPSIS</h2>
15-
16-
<pre><code>npm.commands.bin(args, cb)</code></pre>
17-
18-
<h2 id="DESCRIPTION">DESCRIPTION</h2>
19-
13+
<h2 id="synopsis">SYNOPSIS</h2>
14+
<pre><code>npm.commands.bin(args, cb)
15+
</code></pre><h2 id="description">DESCRIPTION</h2>
2016
<p>Print the folder where npm will install executables.</p>
21-
2217
<p>This function should not be used programmatically. Instead, just refer
2318
to the <code>npm.bin</code> member.</p>
19+
2420
</div>
2521

2622
<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
@@ -32,5 +28,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3228
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
3329
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
3430
</table>
35-
<p id="footer">npm-bin &mdash; npm@1.4.9</p>
31+
<p id="footer">npm-bin &mdash; npm@1.4.10</p>
3632

0 commit comments

Comments
 (0)