Skip to content

Commit 1d5b6f2

Browse files
committed
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
Conflicts: ChangeLog Makefile deps/npm/AUTHORS deps/npm/html/api/bin.html deps/npm/html/api/bugs.html deps/npm/html/api/commands.html deps/npm/html/api/config.html deps/npm/html/api/deprecate.html deps/npm/html/api/docs.html deps/npm/html/api/edit.html deps/npm/html/api/explore.html deps/npm/html/api/help-search.html deps/npm/html/api/init.html deps/npm/html/api/install.html deps/npm/html/api/link.html deps/npm/html/api/load.html deps/npm/html/api/ls.html deps/npm/html/api/npm.html deps/npm/html/api/outdated.html deps/npm/html/api/owner.html deps/npm/html/api/pack.html deps/npm/html/api/prefix.html deps/npm/html/api/prune.html deps/npm/html/api/publish.html deps/npm/html/api/rebuild.html deps/npm/html/api/restart.html deps/npm/html/api/root.html deps/npm/html/api/run-script.html deps/npm/html/api/search.html deps/npm/html/api/shrinkwrap.html deps/npm/html/api/start.html deps/npm/html/api/stop.html deps/npm/html/api/submodule.html deps/npm/html/api/tag.html deps/npm/html/api/test.html deps/npm/html/api/uninstall.html deps/npm/html/api/unpublish.html deps/npm/html/api/update.html deps/npm/html/api/version.html deps/npm/html/api/view.html deps/npm/html/api/whoami.html deps/npm/html/doc/README.html deps/npm/html/doc/adduser.html deps/npm/html/doc/bin.html deps/npm/html/doc/bugs.html deps/npm/html/doc/build.html deps/npm/html/doc/bundle.html deps/npm/html/doc/cache.html deps/npm/html/doc/changelog.html deps/npm/html/doc/coding-style.html deps/npm/html/doc/completion.html deps/npm/html/doc/config.html deps/npm/html/doc/deprecate.html deps/npm/html/doc/developers.html deps/npm/html/doc/disputes.html deps/npm/html/doc/docs.html deps/npm/html/doc/edit.html deps/npm/html/doc/explore.html deps/npm/html/doc/faq.html deps/npm/html/doc/folders.html deps/npm/html/doc/help-search.html deps/npm/html/doc/help.html deps/npm/html/doc/index.html deps/npm/html/doc/init.html deps/npm/html/doc/install.html deps/npm/html/doc/json.html deps/npm/html/doc/link.html deps/npm/html/doc/list.html deps/npm/html/doc/npm.html deps/npm/html/doc/outdated.html deps/npm/html/doc/owner.html deps/npm/html/doc/pack.html deps/npm/html/doc/prefix.html deps/npm/html/doc/prune.html deps/npm/html/doc/publish.html deps/npm/html/doc/rebuild.html deps/npm/html/doc/registry.html deps/npm/html/doc/removing-npm.html deps/npm/html/doc/restart.html deps/npm/html/doc/root.html deps/npm/html/doc/run-script.html deps/npm/html/doc/scripts.html deps/npm/html/doc/search.html deps/npm/html/doc/semver.html deps/npm/html/doc/shrinkwrap.html deps/npm/html/doc/star.html deps/npm/html/doc/start.html deps/npm/html/doc/stop.html deps/npm/html/doc/submodule.html deps/npm/html/doc/tag.html deps/npm/html/doc/test.html deps/npm/html/doc/uninstall.html deps/npm/html/doc/unpublish.html deps/npm/html/doc/update.html deps/npm/html/doc/version.html deps/npm/html/doc/view.html deps/npm/html/doc/whoami.html deps/npm/lib/install.js deps/npm/lib/ls.js deps/npm/man/man1/npm.1 deps/npm/man/man1/shrinkwrap.1 deps/npm/man/man3/npm.3 deps/npm/man/man3/shrinkwrap.3 deps/npm/node_modules/request/main.js deps/npm/node_modules/request/package.json deps/npm/package.json deps/uv/src/unix/core.c deps/v8/src/conversions-inl.h deps/v8/src/elements.cc deps/v8/src/version.cc doc/about/index.html doc/api/assert.markdown doc/api/child_process.markdown doc/api/cluster.markdown doc/api/crypto.markdown doc/api/debugger.markdown doc/api/dgram.markdown doc/api/dns.markdown doc/api/documentation.markdown doc/api/events.markdown doc/api/fs.markdown doc/api/globals.markdown doc/api/http.markdown doc/api/https.markdown doc/api/modules.markdown doc/api/net.markdown doc/api/os.markdown doc/api/path.markdown doc/api/process.markdown doc/api/querystring.markdown doc/api/readline.markdown doc/api/stdio.markdown doc/api/stream.markdown doc/api/timers.markdown doc/api/tls.markdown doc/api/tty.markdown doc/api/url.markdown doc/api/util.markdown doc/api/vm.markdown doc/api/zlib.markdown doc/api_assets/style.css doc/community/index.html doc/index.html doc/logos/index.html doc/template.html src/node_version.h tools/doc/html.js tools/gyp/test/mac/app-bundle/empty.c
2 parents 4053c01 + 5ca5ec3 commit 1d5b6f2

262 files changed

Lines changed: 1540 additions & 503 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: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,46 @@
133133
* Bug fixes
134134

135135

136+
2012.03.02 Version 0.6.12 (stable), 48a2d34cfe6b7e1c9d15202a4ef5e3c82d1fba35
137+
138+
* Upgrade V8 to 3.6.6.24
139+
140+
* dtrace ustack helper improvements (Dave Pacheco)
141+
142+
* API Documentation refactor (isaacs)
143+
144+
* #2827 net: fix race write() before and after connect() (koichik)
145+
146+
* #2554 #2567 throw if fs args for 'start' or 'end' are strings (AJ ONeal)
147+
148+
* punycode: Update to v1.0.0 (Mathias Bynens)
149+
150+
* Make a fat binary for the OS X pkg (isaacs)
151+
152+
* Fix hang on accessing process.stdin (isaacs)
153+
154+
* repl: make tab completion work on non-objects (Nathan Rajlich)
155+
156+
* Fix fs.watch on OS X (Ben Noordhuis)
157+
158+
* Fix #2515 nested setTimeouts cause premature process exit (Ben Noordhuis)
159+
160+
* windows: fix time conversion in stat (Igor Zinkovsky)
161+
162+
* windows: fs: handle EOF in read (Brandon Philips)
163+
164+
* windows: avoid IOCP short-circuit on non-ifs lsps (Igor Zinkovsky)
165+
166+
* Upgrade npm to 1.1.4 (isaacs)
167+
- windows fixes
168+
- Bundle nested bundleDependencies properly
169+
- install: support --save with url install targets
170+
- shrinkwrap: behave properly with url-installed modules
171+
- support installing uncompressed tars or single file modules from urls etc.
172+
- don't run make clean on rebuild
173+
- support HTTPS-over-HTTP proxy tunneling
174+
175+
136176
2012.02.17 Version 0.6.11 (stable), 1eb1fe32250fc88cb5b0a97cddf3e02be02e3f4a
137177

138178
* http: allow multiple WebSocket RFC6455 headers (Einar Otto Stangvik)

deps/npm/AUTHORS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@ Paul Vorbach <paul@vorb.de>
5454
George Ornbo <george@shapeshed.com>
5555
Tim Oxley <secoif@gmail.com>
5656
Tyler Green <tyler.green2@gmail.com>
57+
atomizer <danila.gerasimov@gmail.com>
58+
Rod Vagg <rod@vagg.org>
59+
Christian Howe <coderarity@gmail.com>
60+
Andrew Lunny <alunny@gmail.com>
61+
Henrik Hodne <dvyjones@binaryhex.com>

deps/npm/Makefile

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,50 @@ npm-changelog(1) -- Changes
33

44
## HISTORY
55

6+
### 1.1.3, 1.1.4
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

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

Lines changed: 11 additions & 0 deletions
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

Lines changed: 13 additions & 0 deletions
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

Lines changed: 14 additions & 0 deletions
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

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.2</p>
22+
<p id="footer">bin &mdash; npm@1.1.4</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.2</p>
28+
<p id="footer">bugs &mdash; npm@1.1.4</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)