Skip to content

Commit 0541271

Browse files
isaacsisaacs
committed
Upgrade npm to 1.1.3
* Update request to support HTTPS-over-HTTP proxy tunneling * Throw on undefined envs in config settings * Update which to 1.0.5 * Fix windows UNC busyloop in findPrefix * Bundle nested bundleDependencies properly * Alias adduser to add-user * Doc updates (Christian Howe, Henrik Hodne, Andrew Lunny) * ignore logfd/outfd streams in makeEnv() (Rod Vagg) * shrinkwrap: Behave properly with url-installed deps * install: Support --save with url install targets * Support installing naked tars or single-file modules from urls etc. * init: Don't add engines section * Don't run make clean on rebuild * Added missing unicode replacement (atomizer)
1 parent edea94c commit 0541271

File tree

220 files changed

+1183
-375
lines changed

Some content is hidden

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

220 files changed

+1183
-375
lines changed

‎deps/npm/AUTHORS

+5
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@ Paul Vorbach <[email protected]>
5454
George Ornbo <[email protected]>
5555
Tim Oxley <[email protected]>
5656
Tyler Green <[email protected]>
57+
atomizer <[email protected]>
58+
Rod Vagg <[email protected]>
59+
Christian Howe <[email protected]>
60+
Andrew Lunny <[email protected]>
61+
Henrik Hodne <[email protected]>

‎deps/npm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ doc-publish: doc
123123
rsync -vazu --stats --no-implied-dirs --delete html/api/ npmjs.org:/var/www/npmjs.org/public/api
124124

125125
zip-publish: release
126-
scp release/*.zip npmjs.org:/var/www/npmjs.org/public/dist/
126+
scp release/* npmjs.org:/var/www/npmjs.org/public/dist/
127127

128128
release:
129129
@bash scripts/release.sh

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

+44
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,50 @@ npm-changelog(1) -- Changes
33

44
## HISTORY
55

6+
### 1.1.3
7+
8+
* Update request to support HTTPS-over-HTTP proxy tunneling
9+
* Throw on undefined envs in config settings
10+
* Update which to 1.0.5
11+
* Fix windows UNC busyloop in findPrefix
12+
* Bundle nested bundleDependencies properly
13+
* Alias adduser to add-user
14+
* Doc updates (Christian Howe, Henrik Hodne, Andrew Lunny)
15+
* ignore logfd/outfd streams in makeEnv() (Rod Vagg)
16+
* shrinkwrap: Behave properly with url-installed deps
17+
* install: Support --save with url install targets
18+
* Support installing naked tars or single-file modules from urls etc.
19+
* init: Don't add engines section
20+
* Don't run make clean on rebuild
21+
* Added missing unicode replacement (atomizer)
22+
23+
### 1.1.2
24+
25+
Dave Pacheco (2):
26+
add "npm shrinkwrap"
27+
28+
Martin Cooper (1):
29+
Fix #1753 Make a copy of the cached objects we'll modify.
30+
31+
Tim Oxley (1):
32+
correctly remove readme from default npm view command.
33+
34+
Tyler Green (1):
35+
fix #2187 set terminal columns to Infinity if 0
36+
37+
isaacs (19):
38+
update minimatch
39+
update request
40+
Experimental: single-file modules
41+
Fix #2172 Don't remove global mans uninstalling local pkgs
42+
Add --versions flag to show the version of node as well
43+
Support --json flag for ls output
44+
update request to 2.9.151
45+
46+
### 1.1
47+
* Replace system tar dependency with a JS tar
48+
* Continue to refine
49+
650
### 1.0
751
* Greatly simplified folder structure
852
* Install locally (bundle by default)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Don't use them except in four situations:
5959
* `for (;;)` loops. They're actually required.
6060
* null loops like: `while (something) ;` (But you'd better have a good
6161
reason for doing that.)
62-
* case "foo": doSomething(); break
63-
* In front of a leading ( or [ at the start of the line.
62+
* `case "foo": doSomething(); break`
63+
* In front of a leading `(` or `[` at the start of the line.
6464
This prevents the expression from being interpreted
6565
as a function call or property access, respectively.
6666

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

+11
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,23 @@ A package is:
2727
* d) a `<name>@<version>` that is published on the registry with (c)
2828
* e) a `<name>@<tag>` that points to (d)
2929
* f) a `<name>` that has a "latest" tag satisfying (e)
30+
* g) a `git` url that, when cloned, results in (a).
3031

3132
Even if you never publish your package, you can still get a lot of
3233
benefits of using npm if you just want to write a node program (a), and
3334
perhaps if you also want to be able to easily install it elsewhere
3435
after packing it up into a tarball (b).
3536

37+
Git urls can be of the form:
38+
39+
git://github.com/user/project.git#commit-ish
40+
git+ssh://user@hostname:project.git#commit-ish
41+
git+http://user@hostname/project/blah.git#commit-ish
42+
git+https://user@hostname/project/blah.git#commit-ish
43+
44+
The `commit-ish` can be any tag, sha, or branch which can be supplied as
45+
an argument to `git checkout`. The default is `master`.
46+
3647
## The package.json File
3748

3849
You need to have a `package.json` file in the root of your project to do

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

+13
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ is a semver compatible version identifier.
332332
* `""` (just an empty string) Same as `*`
333333
* `version1 - version2` Same as `>=version1 <=version2`.
334334
* `range1 || range2` Passes if either range1 or range2 are satisfied.
335+
* `git...` See 'Git URLs as Dependencies' below
335336

336337
For example, these are all valid:
337338

@@ -387,6 +388,18 @@ of a version range.
387388
This tarball will be downloaded and installed locally to your package at
388389
install time.
389390

391+
### Git URLs as Dependencies
392+
393+
Git urls can be of the form:
394+
395+
git://github.com/user/project.git#commit-ish
396+
git+ssh://user@hostname:project.git#commit-ish
397+
git+http://user@hostname/project/blah.git#commit-ish
398+
git+https://user@hostname/project/blah.git#commit-ish
399+
400+
The `commit-ish` can be any tag, sha, or branch which can be supplied as
401+
an argument to `git checkout`. The default is `master`.
402+
390403
## devDependencies
391404

392405
If someone is planning on downloading and using your module in their

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

+14
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,20 @@ Package scripts run in an environment where many pieces of information are
6262
made available regarding the setup of npm and the current state of the
6363
process.
6464

65+
66+
### path
67+
68+
If you depend on modules that define executable scripts, like test suites,
69+
then those executables will be added to the `PATH` for executing the scripts.
70+
So, if your package.json has this:
71+
72+
{ "name" : "foo"
73+
, "dependencies" : { "bar" : "0.1.x" }
74+
, "scripts": { "start" : "bar ./test" } }
75+
76+
then you could run `npm start` to execute the `bar` script, which is exported
77+
into the `node_modules/.bin` directory on `npm install`.
78+
6579
### package.json vars
6680

6781
The package.json fields are tacked onto the `npm_package_` prefix. So, for

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

0 commit comments

Comments
 (0)