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

Commit 8fc40af

Browse files
othiym23Julien Gilli
authored andcommitted
deps: upgrade npm to 2.8.4
Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: #20311
1 parent 03b4f44 commit 8fc40af

File tree

939 files changed

+42215
-10867
lines changed

Some content is hidden

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

939 files changed

+42215
-10867
lines changed

deps/npm/.mailmap

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
Arlo Breault <arlolra@gmail.com>
21
Alex K. Wolfe <alexkwolfe@gmail.com>
32
Andrew Bradley <cspotcode@gmail.com>
43
Andrew Lunny <alunny@gmail.com>
4+
Arlo Breault <arlolra@gmail.com>
55
Benjamin Coe <bencoe@gmail.com>
66
Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
77
Charlie Robbins <charlie.robbins@gmail.com>
88
Dalmais Maxence <root@ip-10-195-202-5.ec2.internal>
99
David Beitey <david@davidjb.com>
1010
Domenic Denicola <domenic@domenicdenicola.com>
1111
Einar Otto Stangvik <einaros@gmail.com>
12-
Evan Lucas <evan@btc.com> <evanlucas@me.com>
1312
Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
13+
Evan Lucas <evan@btc.com> <evanlucas@me.com>
1414
Faiq Raza <faiqrazarizvi@gmail.com>
1515
Forbes Lindesay <forbes@lindesay.co.uk>
1616
Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
@@ -22,16 +22,20 @@ Jake Verbaten <raynos2@gmail.com>
2222
James Sanders <jimmyjazz14@gmail.com>
2323
Jason Smith <jhs@iriscouch.com>
2424
Jonas Weber <github@jonasw.de>
25+
Julien Meddah <julien.meddah@deveryware.com>
2526
Kris Windham <kriswindham@gmail.com>
2627
Lin Clark <lin.w.clark@gmail.com>
2728
Maciej Małecki <me@mmalecki.com> <maciej.malecki@notimplemented.org>
28-
Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>
29-
Maxim Bogushevich <boga1@mail.ru>
3029
Max Goodman <c@chromakode.com>
30+
Maxim Bogushevich <boga1@mail.ru>
31+
Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>
3132
Nicolas Morel <marsup@gmail.com>
3233
Olivier Melcher <olivier.melcher@gmail.com>
34+
Ra'Shaun Stovall <rashaunstovall@gmail.com>
35+
Rebecca Turner <me@re-becca.org> <turner@mikomi.org>
3336
Ryan Emery <seebees@gmail.com>
3437
Sam Mikes <smikes@cubane.com>
38+
Takaya Kobayashi <jigsaw@live.jp>
3539
Tony <zearin@gonk.net>
3640
Visnu Pitiyanuvath <visnupx@gmail.com>
3741
Will Elwood <w.elwood08@gmail.com>

deps/npm/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
- DEPLOY_VERSION=testing
99
before_install:
1010
- "npm config set spin false"
11-
- "npm install -g npm@~2"
11+
- "npm install -g npm/npm"
1212
- "sudo mkdir -p /var/run/couchdb"
1313
script: "npm run-script test-all"
1414
notifications:

deps/npm/AUTHORS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Chulki Lee <chulki.lee@gmail.com>
201201
dead_horse <dead_horse@qq.com>
202202
Kenan Yildirim <kenan@kenany.me>
203203
Laurie Voss <git@seldo.com>
204-
Rebecca Turner <turner@mikomi.org>
204+
Rebecca Turner <me@re-becca.org>
205205
Hunter Loftis <hunter@hunterloftis.com>
206206
Peter Richardson <github@zoomy.net>
207207
Jussi Kalliokoski <jussi.kalliokoski@gmail.com>
@@ -264,3 +264,10 @@ Oli Evans <oli@zilla.org.uk>
264264
Matt Brennan <mattyb1000@gmail.com>
265265
Jeff Barczewski <jeff.barczewski@gmail.com>
266266
Danny Fritz <dannyfritz@gmail.com>
267+
Takaya Kobayashi <jigsaw@live.jp>
268+
Ra'Shaun Stovall <rashaunstovall@gmail.com>
269+
Julien Meddah <julien.meddah@deveryware.com>
270+
Michiel Sikma <michiel@wedemandhtml.com>
271+
Jakob Krigovsky <jakob.krigovsky@gmail.com>
272+
Charmander <~@charmander.me>
273+
erik wienhold <git@ewie.name>

deps/npm/CHANGELOG.md

Lines changed: 498 additions & 1 deletion
Large diffs are not rendered by default.

deps/npm/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ There's a pretty robust install script at
4040

4141
Here's an example using curl:
4242

43-
curl -L https://npmjs.com/install.sh | sh
43+
curl -L https://www.npmjs.com/install.sh | sh
4444

4545
### Slightly Fancier
4646

@@ -64,11 +64,11 @@ for testing, or running stuff without actually installing npm itself.)
6464

6565
## Windows Install or Upgrade
6666

67-
You can download a zip file from <https://github.com/npm/npm/releases>, and unpack it
68-
in the same folder where node.exe lives.
67+
You can download a zip file from <https://github.com/npm/npm/releases>, and
68+
unpack it in the `node_modules\npm\` folder inside node's installation folder.
6969

70-
The latest version in a zip file is 1.4.12. To upgrade to npm 2, follow the
71-
Windows upgrade instructions in the npm Troubleshooting Guide:
70+
To upgrade to npm 2, follow the Windows upgrade instructions in
71+
the npm Troubleshooting Guide:
7272

7373
<https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows>
7474

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
if not defined npm_config_node_gyp (
2-
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
3-
) else (
4-
%npm_config_node_gyp% %*
5-
)
1+
if not defined npm_config_node_gyp (
2+
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
3+
) else (
4+
%npm_config_node_gyp% %*
5+
)

deps/npm/doc/cli/npm-dist-tag.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ When installing dependencies, a preferred tagged version may be specified:
3333

3434
This also applies to `npm dedupe`.
3535

36-
Publishing a package always sets the "latest" tag to the published version.
36+
Publishing a package sets the "latest" tag to the published version unless the
37+
`--tag` option is used. For example, `npm publish --tag=beta`.
3738

3839
## PURPOSE
3940

deps/npm/doc/cli/npm-install.md

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,51 @@ after packing it up into a tarball (b).
164164

165165
npm install mygithubuser/myproject
166166

167-
To reference a package in a git repo that is not on GitHub, see git
168-
remote urls below.
167+
To reference a package in a generic git repo (not on GitHub), see git remote
168+
urls below.
169+
170+
* `npm install github:<githubname>/<githubrepo>`:
171+
172+
The same as the above, but explicitly marked as a GitHub dependency.
173+
174+
Example:
175+
176+
npm install github:npm/npm
177+
178+
* `npm install gist:[<githubname>/]<gistID>`:
179+
180+
Install the package at `https://gist.github.com/gistID` by attempting to
181+
clone it using `git`. The GitHub username associated with the gist is
182+
optional and will not be saved in `package.json` if `--save` is used.
183+
184+
Example:
185+
186+
npm install gist:101a11beef
187+
188+
* `npm install bitbucket:<bitbucketname>/<bitbucketrepo>`:
189+
190+
Install the package at `https://bitbucket.org/bitbucketname/bitbucketrepo`
191+
by attempting to clone it using `git`.
192+
193+
Example:
194+
195+
npm install bitbucket:mybitbucketuser/myproject
196+
197+
* `npm install gitlab:<gitlabname>/<gitlabrepo>`:
198+
199+
Install the package at `https://gitlab.com/gitlabname/gitlabrepo`
200+
by attempting to clone it using `git`.
201+
202+
Example:
203+
204+
npm install gitlab:mygitlabuser/myproject
169205

170206
* `npm install <git remote url>`:
171207

172208
Install a package by cloning a git remote url. The format of the git
173209
url is:
174210

175-
<protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>]
211+
<protocol>://[<user>[:<password>]@]<hostname><separator><path>[#<commit-ish>]
176212

177213
`<protocol>` is one of `git`, `git+ssh`, `git+http`, or
178214
`git+https`. If no `<commit-ish>` is specified, then `master` is

deps/npm/doc/cli/npm-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For example:
3939

4040
Now, any changes to ~/projects/node-redis will be reflected in
4141
~/projects/node-bloggy/node_modules/node-redis/. Note that the link should
42-
be to the package name, not the directory name for that package.
42+
be to the package name, not the directory name for that package.
4343

4444
You may also shortcut the two steps in one. For example, to do the
4545
above use-case in a shorter way:

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ is an object with a "name" field and optionally "url" and "email", like this:
114114

115115
Or you can shorten that all into a single string, and npm will parse it for you:
116116

117-
"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)
117+
"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)"
118118

119119
Both email and url are optional either way.
120120

@@ -272,11 +272,17 @@ The URL should be a publicly available (perhaps read-only) url that can be hande
272272
directly to a VCS program without any modification. It should not be a url to an
273273
html project page that you put in your browser. It's for computers.
274274

275-
For GitHub repositories you can use the same shortcut syntax you use for `npm
276-
install`:
275+
For GitHub, GitHub gist, Bitbucket, or GitLab repositories you can use the same
276+
shortcut syntax you use for `npm install`:
277277

278278
"repository": "npm/npm"
279279

280+
"repository": "gist:11081aaa281"
281+
282+
"repository": "bitbucket:example/repo"
283+
284+
"repository": "gitlab:another/repo"
285+
280286
## scripts
281287

282288
The "scripts" property is a dictionary containing script commands that are run

0 commit comments

Comments
 (0)