Skip to content

Commit 55c3f80

Browse files
othiym23Myles Borins
othiym23
authored and
Myles Borins
committed
deps: upgrade npm in LTS to 2.15.1
PR-URL: npm#5 Reviewed-By: Myles Borins <[email protected]>
1 parent 040263e commit 55c3f80

File tree

264 files changed

+3778
-1380
lines changed

Some content is hidden

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

264 files changed

+3778
-1380
lines changed

‎deps/npm/.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ npm-debug.log
77
/test/packages/npm-test-depends-on-spark/which-spark.log
88
/test/packages/test-package/random-data.txt
99
/test/root
10+
/test/npm_cache
1011
node_modules/marked
1112
node_modules/ronn
1213
node_modules/tap

‎deps/npm/.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ before_install:
1313
- "npm config set spin false"
1414
- "npm install -g npm/npm#2.x"
1515
- "mkdir -p /var/run/couchdb"
16-
script: "npm run-script test-all"
16+
script: "npm test"
1717
notifications:
1818
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

‎deps/npm/AUTHORS

+8
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,11 @@ Vedat Mahir YILMAZ <[email protected]>
344344
Jan Schär <[email protected]>
345345
Xcat Liu <[email protected]>
346346
Neil Kistner <[email protected]>
347+
Hutson Betts <[email protected]>
348+
Sergey Simonchik <[email protected]>
349+
Lewis Cowper <[email protected]>
350+
Arturo Coronel <[email protected]>
351+
Scott Plumlee <[email protected]>
352+
gnerkus <[email protected]>
353+
Robert Ludwig <[email protected]>
354+
Adam Byrne <[email protected]>

‎deps/npm/CHANGELOG.md

+166
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,169 @@
1+
### v2.15.1 (2016-03-17):
2+
3+
It's another one of those releases again! Docs and tests, it turns out, have a
4+
pretty easy time getting into LTS releases, and boring is exactly how LTS should
5+
be. 💁
6+
7+
#### DOCS
8+
9+
* [`981c89c`](https://github.com/npm/npm/commit/981c89c8e398ca22ab6bf466123b25728ef6f543)
10+
[#11820](https://github.com/npm/npm/pull/11820)
11+
The basic explanation for how `npm link` works was a bit confusing, and
12+
somewhat incorrect. It should be clearer now.
13+
([@rhgb](https://github.com/rhgb))
14+
* [`35b2b45`](https://github.com/npm/npm/commit/35b2b45f181dcbfb297f53b577dc1f26efcf3aba)
15+
[#11787](https://github.com/npm/npm/pull/11787)
16+
The `verison` alias for `npm version` no longer shows up in the command list
17+
when you do `npm -h`.
18+
([@doug-wade](https://github.com/doug-wade))
19+
* [`1c9d00f`](https://github.com/npm/npm/commit/1c9d00f788298a81a8a7293d7dcf430f01bdd7fd)
20+
[#11786](https://github.com/npm/npm/pull/11786)
21+
Add a comment to the `npm-scope.md` docs about `npm@>=2` being required in
22+
order to use scoped packaged.
23+
([@doug-wade](https://github.com/doug-wade))
24+
* [`7d64fb1`](https://github.com/npm/npm/commit/7d64fb1452d360aa736f31c85d6776ce570b2365)
25+
[#11762](https://github.com/npm/npm/pull/11762)
26+
Roll back patch that previously advised people to use `--depth Infinity`
27+
instead of `--depth 9999`. Just keep using `--depth 9999`.
28+
([@GriffinSchneider](https://github.com/GriffinSchneider))
29+
30+
#### TESTS
31+
32+
* [`98a9ee4`](https://github.com/npm/npm/commit/98a9ee4773f83994b8eb63c0ff75a9283408ba1a)
33+
[#11912](https://github.com/npm/npm/pull/11912)
34+
Did you know npm can install itself? `npm install -g npm` is the way to
35+
upgrade! Turns out that one of the tests that verified this functionality got
36+
rewritten as part of our recent push for better tests, and in the process
37+
omitted a detail about *how* the test ran. We're testing that corner case
38+
again, now, by moving the install folder to `/tmp`, where the original legacy
39+
test ran.
40+
([@iarna](https://github.com/iarna))
41+
42+
### v2.15.0 (2016-03-10):
43+
44+
#### WHY IS THIS SEMVER-MINOR I THOUGHT THIS WAS LTS
45+
46+
A brief note about LTS this week!
47+
48+
npm, as you may know if you're using this `2.x` branch, has an LTS process for
49+
releases. We also try and play nice with [Node.js' own LTS release
50+
process](https://github.com/nodejs/LTS#lts-plan). That means we generally try to
51+
avoid things like minor version bumps on our `2.x` branch (which is also tagged
52+
`lts` in the `dist-tag`s).
53+
54+
That said, we had a minor-bump update recently for `[email protected]` which added a
55+
`maxsockets` option to allow users to configure the number of concurrent sockets
56+
that npm would keep open at a time -- a setting that has the potential to help a
57+
bunch for people with fussy routers or internet connections that aren't very
58+
happy with Node.js applications' usual concurrency storm. This change was done
59+
to `npm-registry-client`, which we don't have a parallel LTS-tracking branch
60+
for.
61+
62+
After talking it over, we ended up deciding that this was a reasonable enough
63+
addition to LTS, even though it's *technically* a `semver-minor` bump, taking
64+
into account both its potential for bugfixing (specially on `2.x`!) and the
65+
general hassle it would be to maintain another branch for `npm-registry-client`.
66+
67+
68+
* [`6dd61e7`](https://github.com/npm/npm/commit/6dd61e781c145480dc255a3e6a748729868443fd)
69+
Expose `maxsockets` config setting from new `npm-registry-client`.
70+
([@misterbyrne](https://github.com/misterbyrne))
71+
* [`8a021c3`](https://github.com/npm/npm/commit/8a021c35184e665bd1f3f70ae2f478af812ab614)
72+
`[email protected]`:
73+
Adds support for configuring the max number of concurrent sockets, defaulting
74+
to `50`.
75+
([@iarna](https://github.com/iarna))
76+
77+
#### DOC PATCH IS HERE TOO
78+
79+
* [`0ae9f74`](https://github.com/npm/npm/commit/0ae9f740001a1bdf5920bc464cf9e284d5d139f0)
80+
[#11748](https://github.com/npm/npm/pull/11748)
81+
Add command aliases as a separate section in documentation for npm
82+
subcommands.
83+
([@watilde](https://github.com/watilde))
84+
85+
#### DEP UPDATES
86+
87+
* [`bfc3888`](https://github.com/npm/npm/commit/bfc38887f832f701c16b7ee410c4e0220a90399f)
88+
`[email protected]`
89+
([@jbnicolai](https://github.com/jbnicolai))
90+
* [`d5f4d51`](https://github.com/npm/npm/commit/d5f4d51a1b7ea78d7431c7ed4fed30200b2622f8)
91+
`[email protected]`: Fixes Android generator
92+
([@bnoordhuis](https://github.com/bnoordhuis))
93+
* [`4119df8`](https://github.com/npm/npm/commit/4119df8aecd2ae57b0492ad8c9a480d900833008)
94+
`[email protected]`: Some path-related fixes for Windows.
95+
([@isaacs](https://github.com/isaacs))
96+
97+
### v2.14.22 (2016-03-03):
98+
99+
This week is all documentation improvements. In case you hadn't noticed, we
100+
*love* doc patches. We love them so much, we give socks away if you submit
101+
documentation PRs!
102+
103+
These folks are all getting socks if they ask for them. The socks are
104+
super-sweet. Do you have yours yet? 👣
105+
106+
* [`3f3c7d0`](https://github.com/npm/npm/commit/3f3c7d080f052a5db91ff6091f8b1b13f26b53d6)
107+
[#11441](https://github.com/npm/npm/pull/11441)
108+
Add a link to the [Contribution
109+
Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines) to the
110+
main npm docs.
111+
([@watilde](https://github.com/watilde))
112+
* [`9f87bb1`](https://github.com/npm/npm/commit/9f87bb1934acb33b678c17b7827165b17c071a82)
113+
[#11441](https://github.com/npm/npm/pull/11441)
114+
Remove Google Group email from npm docs about contributing.
115+
([@watilde](https://github.com/watilde))
116+
* [`93eaab3`](https://github.com/npm/npm/commit/93eaab3ee5ad16c7d90d1a4b38a95403fcf3f0f6)
117+
[#11474](https://github.com/npm/npm/pull/11474)
118+
Fix an invalid JSON error overlooked in
119+
[#11196](https://github.com/npm/npm/pull/11196).
120+
([@robludwig](https://github.com/robludwig))
121+
* [`a407ca2`](https://github.com/npm/npm/commit/a407ca2bcf6a05117e55cf2ab69376e09094995e)
122+
[#11483](https://github.com/npm/npm/pull/11483)
123+
Add more details and an example to the documentation for bundledDependencies.
124+
([@gnerkus](https://github.com/gnerkus))
125+
* [`2c851a2`](https://github.com/npm/npm/commit/2c851a231afd874baa77c42ea5ba539c454ac79c)
126+
[#11490](https://github.com/npm/npm/pull/11490)
127+
Document the `--registry` flag for `npm search`.
128+
([@plumlee](https://github.com/plumlee))
129+
130+
### v2.14.21 (2016-02-25):
131+
132+
Good news, everyone! There's a new LTS release with a few shinies here and there!
133+
134+
#### USE THIS ONE INSTEAD
135+
136+
We had some cases where the versions of npm and node used in some scripting situations were different than the ideal, or what folks actually expected. These should be particularly helpful to our Windows friends! <3
137+
138+
* [`02813c5`](https://github.com/npm/npm/commit/02813c55782a9def23f7f1e614edc38c6c88aed3) [#9253](https://github.com/npm/npm/issues/9253) Fix a bug where, when running lifecycle scripts, if the Node.js binary you ran `npm` with wasn't in your `PATH`, `npm` wouldn't use it to run your scripts. ([@segrey](https://github.com/segrey) and [@narqo](https://github.com/narqo))
139+
* [`a985dd5`](https://github.com/npm/npm/commit/a985dd50e06ee51ba5544577f977c7440c227ba2) [#11526](https://github.com/npm/npm/pull/11526) Prefer locally installed npm in Git Bash -- previous behavior was to use the global one. This was done previously for other shells, but not for Git Bash. ([@destroyerofbuilds](https://github.com/destroyerofbuilds))
140+
141+
#### SOCKS FOR THE SOCK GOD
142+
143+
* [`f961092`](https://github.com/npm/npm/commit/f9610920079d8b88ae464b30007a92c594bd85a8)
144+
[#11636.](https://github.com/npm/npm/issues/11636.)
145+
Document the `--save-bundle` option for `npm install`.
146+
([@datyayu](https://github.com/datyayu))
147+
* [`7c908b6`](https://github.com/npm/npm/commit/7c908b618f7123f0a3b860c71eb779e33df35964)
148+
[#11644](https://github.com/npm/npm/pull/11644)
149+
Add documentation for the `test` directory for packages.
150+
([@lewiscowper](https://github.com/lewiscowper))
151+
152+
#### INTERNAL TEST IMPROVEMENTS
153+
154+
The npm CLI team's time recently has been sunk into npm's many years of tech debt. Specifically, we've been working on improving the test suite. This isn't user visible, but in future should mean a more stable, easier to contribute to npm. Ordinarily we don't report these kinds of changes in the change log, but I thought I might share this week as this chunk is bigger than usual.
155+
156+
These patches were previously released for `npm@3`, and then ported back to `npm@2` LTS.
157+
158+
* [`437c537`](https://github.com/npm/npm/commit/437c537e2be5923c6d2c2753154564ba13db8fd9) [#11613](https://github.com/npm/npm/pull/11613) Fix up one of the tests after rebasing the legacy test rewrite to `npm@2`. ([@zkat](https://github.com/zkat))
159+
* [`55abd0c`](https://github.com/npm/npm/commit/55abd0cc20e87a144d33ce2d459f65e7506da576) [#11613](https://github.com/npm/npm/pull/11613) Test that the `package.json` `files` section and `.npmignore` do what they're supposed to. ([@zkat](https://github.com/zkat))
160+
* [`a2b99b6`](https://github.com/npm/npm/commit/a2b99b6273ada14b2121ebc0acb7933e630edd9d) [#11613](https://github.com/npm/npm/pull/11613) Test that npm's distribution binary is complete and can be installed and used. ([@iarna](https://github.com/iarna))
161+
* [`8a8c36c`](https://github.com/npm/npm/commit/8a8c36ce51166006022e5c5d4f8655bbc458d651) [#11613](https://github.com/npm/npm/pull/11613) Test that environment variables are properly passed into scripts.
162+
([@iarna](https://github.com/zkat))
163+
* [`a95b550`](https://github.com/npm/npm/commit/a95b5507616bd51e83d7eab5f2337b1aff6480b1) [#11613](https://github.com/npm/npm/pull/11613) Test that we don't leak auth info into the environment. ([@iarna](https://github.com/iarna))
164+
* [`a1c1c52`](https://github.com/npm/npm/commit/a1c1c52efeab24f6dba154d054f85d9efc833486) [#11613](https://github.com/npm/npm/pull/11613) Remove all the relatively cryptic legacy tests and creates new tap tests that check the same functionality. The *legacy* tests were tests that were originally a shell script that was ported to javascript early in `npm`'s history. ([@iarna](https:\\github.com/iarna) and [@zkat](https://github.com/zkat))
165+
* [`9d89581`](https://github.com/npm/npm/commit/9d895811d3ee70c2e672f3d8fa06574495b5b488) [#11613](https://github.com/npm/npm/pull/11613) `[email protected]`: Add a package that provides a tool to generate fixtures from folders and, relatedly, a module that an create and tear down filesystem fixtures easily. ([@iarna](https://github.com/iarna))
166+
1167
### v2.14.20 (2016-02-18):
2168

3169
Hope y'all are having a nice week! As usual, it's a fairly limited release. The

‎deps/npm/bin/npm

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ fi
1515
NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
1616

1717
case `uname` in
18+
*MINGW*)
19+
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
20+
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
21+
if [ -f "$NPM_PREFIX_NPM_CLI_JS" ]; then
22+
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
23+
fi
24+
;;
1825
*CYGWIN*)
1926
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
2027
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"

‎deps/npm/doc/cli/npm-adduser.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ npm-adduser(1) -- Add a registry user account
55

66
npm adduser [--registry=url] [--scope=@orgname] [--always-auth]
77

8+
aliases: login, add-user
9+
810
## DESCRIPTION
911

1012
Create or verify a user named `<username>` in the specified registry, and
@@ -57,9 +59,11 @@ registries. Can be used with `--registry` and / or `--scope`, e.g.
5759
npm adduser --registry=http://private-registry.example.com --always-auth
5860

5961
This will ensure that all requests to that registry (including for tarballs)
60-
include an authorization header. See `always-auth` in `npm-config(7)` for more
61-
details on always-auth. Registry-specific configuration of `always-auth` takes
62-
precedence over any global configuration.
62+
include an authorization header. This setting may be necessary for use with
63+
private registries where metadata and package tarballs are stored on hosts with
64+
different hostnames. See `always-auth` in `npm-config(7)` for more details on
65+
always-auth. Registry-specific configuration of `always-auth` takes precedence
66+
over any global configuration.
6367

6468
## SEE ALSO
6569

‎deps/npm/doc/cli/npm-bugs.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ npm-bugs(1) -- Bugs for a package in a web browser maybe
66
npm bugs <pkgname>
77
npm bugs (with no args in a package dir)
88

9+
aliases: issues
10+
911
## DESCRIPTION
1012

1113
This command tries to guess at the likely location of a package's

‎deps/npm/doc/cli/npm-config.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ npm-config(1) -- Manage the npm configuration files
1212
npm get <key>
1313
npm set <key> <value> [--global]
1414

15+
aliases: c
16+
1517
## DESCRIPTION
1618

1719
npm gets its config settings from the command line, environment

‎deps/npm/doc/cli/npm-dedupe.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ npm-dedupe(1) -- Reduce duplication
66
npm dedupe [package names...]
77
npm ddp [package names...]
88

9+
aliases: find-dupes, ddp
10+
911
## DESCRIPTION
1012

1113
Searches the local package tree and attempts to simplify the overall

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ npm-dist-tag(1) -- Modify package distribution tags
77
npm dist-tag rm <pkg> <tag>
88
npm dist-tag ls [<pkg>]
99

10+
aliases: dist-tags
11+
1012
## DESCRIPTION
1113

1214
Add, remove, and enumerate distribution tags on a package:

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ npm-install(1) -- Install a package
77
npm install <tarball file>
88
npm install <tarball url>
99
npm install <folder>
10-
npm install [@<scope>/]<name> [--save|--save-dev|--save-optional] [--save-exact]
10+
npm install [@<scope>/]<name> [--save|--save-dev|--save-optional] [--save-exact] [--save-bundle]
1111
npm install [@<scope>/]<name>@<tag>
1212
npm install [@<scope>/]<name>@<version>
1313
npm install [@<scope>/]<name>@<version range>
@@ -95,15 +95,13 @@ after packing it up into a tarball (b).
9595
* `--save-optional`: Package will appear in your `optionalDependencies`.
9696

9797
When using any of the above options to save dependencies to your
98-
package.json, there is an additional, optional flag:
98+
package.json, there are two additional, optional flags:
9999

100100
* `--save-exact`: Saved dependencies will be configured with an
101101
exact version rather than using npm's default semver range
102102
operator.
103103

104-
`<scope>` is optional. The package will be downloaded from the registry
105-
associated with the specified scope. If no registry is associated with
106-
the given scope the default registry is assumed. See `npm-scope(7)`.
104+
* `-B, --save-bundle`: Saved dependencies will also be added to your `bundleDependencies` list.
107105

108106
Note: if you do not include the @-symbol on your scope name, npm will
109107
interpret this as a GitHub repository instead, see below. Scopes names
@@ -117,6 +115,7 @@ after packing it up into a tarball (b).
117115
npm install node-tap --save-dev
118116
npm install dtrace-provider --save-optional
119117
npm install readable-stream --save --save-exact
118+
npm install ansi-regex --save --save-bundle
120119

121120

122121
**Note**: If there is a file or folder named `<name>` in the current

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ npm-link(1) -- Symlink a package folder
1111

1212
Package linking is a two-step process.
1313

14-
First, `npm link` in a package folder will create a globally-installed
15-
symbolic link from `prefix/package-name` to the current folder (see
16-
`npm-config(7)` for the value of `prefix`).
14+
First, `npm link` in a package folder will create a symlink in the global folder
15+
`{prefix}/lib/node_modules/<package>` that links to the package where the `npm
16+
link` command was executed. (see `npm-config(7)` for the value of `prefix`).
1717

1818
Next, in some other location, `npm link package-name` will create a
19-
symlink from the local `node_modules` folder to the global symlink.
19+
symbolic link from globally-installed `package-name` to `node_modules/`
20+
of the current folder.
2021

2122
Note that `package-name` is taken from `package.json`,
2223
not from directory name.
@@ -39,7 +40,7 @@ For example:
3940

4041
Now, any changes to ~/projects/node-redis will be reflected in
4142
~/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.
43+
be to the package name, not the directory name for that package.
4344

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

‎deps/npm/doc/cli/npm-owner.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ npm-owner(1) -- Manage package owners
77
npm owner add <user> <package name>
88
npm owner rm <user> <package name>
99

10+
aliases: author
11+
1012
## DESCRIPTION
1113

1214
Manage ownership of published packages.

‎deps/npm/doc/cli/npm-search.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ npm-search(1) -- Search for packages
33

44
## SYNOPSIS
55

6-
npm search [--long] [search terms ...]
7-
npm s [search terms ...]
8-
npm se [search terms ...]
6+
npm search [-l|--long] [search terms ...]
7+
8+
aliases: s, se, find
99

1010
## DESCRIPTION
1111

@@ -27,6 +27,15 @@ lines. When disabled (default) search results are truncated to fit
2727
neatly on a single line. Modules with extremely long names will
2828
fall on multiple lines.
2929

30+
### registry
31+
32+
* Default: https://registry.npmjs.org/
33+
* Type : url
34+
35+
Search the specified registry for modules. If you have configured npm to point to a different default registry,
36+
such as your internal private module repository, `npm search` will default to that registry when searching.
37+
Pass a different registry url such as the default above in order to override this setting.
38+
3039
## SEE ALSO
3140

3241
* npm-registry(7)

‎deps/npm/doc/cli/npm-test.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ npm-test(1) -- Test a package
44
## SYNOPSIS
55

66
npm test [-- <args>]
7-
npm tst [-- <args>]
7+
8+
aliases: t, tst
89

910
## DESCRIPTION
1011

0 commit comments

Comments
 (0)