Skip to content

Commit 4bcda63

Browse files
iarnaFishrock123
authored andcommitted
deps: upgrade npm to 3.10.10
PR-URL: #9847 Reviewed-By: Jeremiah Senkpiel <[email protected]>
1 parent 64854f6 commit 4bcda63

File tree

151 files changed

+264
-195
lines changed

Some content is hidden

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

151 files changed

+264
-195
lines changed

deps/npm/.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ html/*.png
3030
/test/tap/builtin-config
3131

3232
.nyc_output
33+
34+
npm-shrinkwrap.json

deps/npm/.travis.yml

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,42 @@ language: node_js
77
matrix:
88
include:
99
# LTS is our most important target
10-
- node_js: "4"
10+
- node_js: "6"
1111
# DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
1212
# only gather coverage info for LTS
1313
env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
14-
# next LTS and master is next most important
15-
- node_js: "6"
16-
env: DEPLOY_VERSION=testing
17-
# still in LTS maintenance until fall 2016 (also still in wide use)
18-
- node_js: "0.10"
19-
env: DEPLOY_VERSION=testing
20-
# will be unsupported as soon as 6 becomes LTS and 7 released
21-
- node_js: "5"
14+
script:
15+
- "node . run tap-cover -- \"test/tap/*.js\""
16+
- "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/slow/*.js\" \"test/broken-under-*/*.js\""
17+
# previous LTS is next most important
18+
- node_js: "4"
2219
env: DEPLOY_VERSION=testing
23-
# technically in LTS / distros, unbeloved
24-
- node_js: "0.12"
20+
# then master
21+
- node_js: "7"
2522
env: DEPLOY_VERSION=testing
2623
before_install:
27-
- "node . install -g ."
2824
# required by test/tap/registry.js
2925
- "mkdir -p /var/run/couchdb"
3026
notifications:
3127
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
28+
cache:
29+
directories:
30+
- $HOME/.npm
31+
- node_modules/.bin
32+
- node_modules/deep-equal
33+
- node_modules/marked
34+
- node_modules/marked-man
35+
- node_modules/npm-registry-couchapp
36+
- node_modules/npm-registry-mock
37+
- node_modules/require-inject
38+
- node_modules/sprintf-js
39+
- node_modules/standard
40+
- node_modules/tacks
41+
- node_modules/tap
42+
install:
43+
- "node . prune"
44+
- "node . rebuild --depth=0"
45+
- "node . install --ignore-scripts"
46+
- "make -j4 doc"
47+
script:
48+
- "node . run tap -- \"test/tap/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc/*.js\""

deps/npm/CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
### v3.10.10 (2016-11-04)
2+
3+
See the discussion on [#14042](https://github.com/npm/npm/issues/14042) for
4+
more context on this release, which is intended to address a serious regression
5+
in shrinkwrap behavior in the version of the CLI currently bundled with Node.js
6+
6 LTS "Boron". You should never install this version directly; instead update
7+
to `npm@4`, which has everything in this release and more.
8+
9+
#### REGRESSION FIX
10+
11+
* [`9aebe98`](https://github.com/npm/npm/commit/9aebe982114ea2107f46baa1dcb11713b4aaad04)
12+
[#14117](https://github.com/npm/npm/pull/14117)
13+
Fixes a bug where installing a shrinkwrapped package would fail if the
14+
platform failed to install an optional dependency included in the shrinkwrap.
15+
([@watilde](https://github.com/watilde))
16+
17+
#### UPDATE SUPPORT MATRIX
18+
19+
With the advent of the second official Node.js LTS release, Node 6.x
20+
'Boron', the Node.js project has now officially dropped versions 0.10
21+
and 0.12 out of the maintenance phase of LTS. (Also, Node 5 was never
22+
part of LTS, and will see no further support now that Node 7 has been
23+
released.) As a small team with limited resources, the npm CLI team is
24+
following suit and dropping those versions of Node from its CI test
25+
matrix.
26+
27+
* [`c82ecfd`](https://github.com/npm/npm/commit/c82ecfdbe0b5f318a175714a8753efe4dfd3e4b3)
28+
[#14503](https://github.com/npm/npm/pull/14503)
29+
Node 6 is LTS; 5.x, 0.10, and 0.12 are unsupported.
30+
([@othiym23](https://github.com/othiym23))
31+
132
### v3.10.9 (2016-10-06)
233

334
Hi everyone! This is the last of our monthly releases. We're going to give

deps/npm/appveyor.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
environment:
22
matrix:
33
# LTS is our most important target
4-
- nodejs_version: "4"
5-
# next LTS and master is next most important
64
- nodejs_version: "6"
7-
# still in LTS maintenance until fall 2016
8-
# (also still in wide use)
9-
- nodejs_version: "0.10"
10-
# will be unsupported as soon as 6 becomes LTS and 7 released
5+
# previous LTS is next most important
6+
- nodejs_version: "4"
7+
# then master
118
- nodejs_version: "5"
12-
# technically in LTS / distros, unbeloved
13-
- nodejs_version: "0.12"
149
COVERALLS_REPO_TOKEN:
1510
secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ
1611
platform:
@@ -26,7 +21,7 @@ install:
2621
test_script:
2722
- node --version
2823
- npm --version
29-
- npm test
24+
- npm run test -- --reporter=classic
3025
notifications:
3126
- provider: Slack
3227
incoming_webhook:

deps/npm/html/doc/README.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,5 @@ <h2 id="see-also">SEE ALSO</h2>
126126
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
127127
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
128128
</table>
129-
<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].9</p>
129+
<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].10</p>
130130

deps/npm/html/doc/cli/npm-access.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ <h2 id="see-also">SEE ALSO</h2>
8484
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
8585
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
8686
</table>
87-
<p id="footer">npm-access &mdash; [email protected].9</p>
87+
<p id="footer">npm-access &mdash; [email protected].10</p>
8888

deps/npm/html/doc/cli/npm-adduser.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ <h2 id="see-also">SEE ALSO</h2>
7272
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
7373
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
7474
</table>
75-
<p id="footer">npm-adduser &mdash; [email protected].9</p>
75+
<p id="footer">npm-adduser &mdash; [email protected].10</p>
7676

deps/npm/html/doc/cli/npm-bin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
3535
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
3636
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
3737
</table>
38-
<p id="footer">npm-bin &mdash; [email protected].9</p>
38+
<p id="footer">npm-bin &mdash; [email protected].10</p>
3939

deps/npm/html/doc/cli/npm-bugs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ <h2 id="see-also">SEE ALSO</h2>
5555
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
5656
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
5757
</table>
58-
<p id="footer">npm-bugs &mdash; [email protected].9</p>
58+
<p id="footer">npm-bugs &mdash; [email protected].10</p>
5959

deps/npm/html/doc/cli/npm-build.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ <h2 id="description">DESCRIPTION</h2>
4040
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
4141
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
4242
</table>
43-
<p id="footer">npm-build &mdash; [email protected].9</p>
43+
<p id="footer">npm-build &mdash; [email protected].10</p>
4444

0 commit comments

Comments
 (0)