Skip to content

Commit f7f8af8

Browse files
ryry
committed
Merge remote branch 'origin/v0.6'
Conflicts: Makefile lib/_debugger.js
2 parents 4eaf4ce + 73cf8e8 commit f7f8af8

128 files changed

Lines changed: 634 additions & 265 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.

‎Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ test-valgrind: all
4848

4949
test-all: all
5050
python tools/test.py --mode=debug,release
51+
$(MAKE) test-npm
5152

5253
test-all-http1: all
5354
python tools/test.py --mode=debug,release --use-http1
@@ -73,6 +74,12 @@ test-pummel: all
7374
test-internet: all
7475
python tools/test.py internet
7576

77+
test-npm: node
78+
./node deps/npm/test/run.js
79+
80+
test-npm-publish: node
81+
npm_package_config_publishtest=true ./node deps/npm/test/run.js
82+
7683
apidoc_sources = $(wildcard doc/api/*.markdown)
7784
apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
7885

‎deps/npm/html/api/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">bin &mdash; npm@1.1.0-beta-4</p>
22+
<p id="footer">bin &mdash; npm@1.1.0-beta-7</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/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">bugs &mdash; npm@1.1.0-beta-4</p>
28+
<p id="footer">bugs &mdash; npm@1.1.0-beta-7</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/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="../doc/index.html">index(1)</a></li></ul>
3030
</div>
31-
<p id="footer">commands &mdash; npm@1.1.0-beta-4</p>
31+
<p id="footer">commands &mdash; npm@1.1.0-beta-7</p>
3232
<script>
3333
;(function () {
3434
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/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">config &mdash; npm@1.1.0-beta-4</p>
36+
<p id="footer">config &mdash; npm@1.1.0-beta-7</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
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; npm@1.1.0-beta-4</p>
33+
<p id="footer">deprecate &mdash; npm@1.1.0-beta-7</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/api/docs.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">docs &mdash; npm@1.1.0-beta-4</p>
28+
<p id="footer">docs &mdash; npm@1.1.0-beta-7</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
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; npm@1.1.0-beta-4</p>
33+
<p id="footer">edit &mdash; npm@1.1.0-beta-7</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
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; npm@1.1.0-beta-4</p>
27+
<p id="footer">explore &mdash; npm@1.1.0-beta-7</p>
2828
<script>
2929
;(function () {
3030
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
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; npm@1.1.0-beta-4</p>
35+
<p id="footer">help-search &mdash; npm@1.1.0-beta-7</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)