Skip to content

Commit f2cef54

Browse files
committed
deps: upgrade npm to 7.7.6
PR-URL: #37968 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent b0226b3 commit f2cef54

File tree

25 files changed

+131
-31
lines changed

25 files changed

+131
-31
lines changed

deps/npm/AUTHORS

+2
Original file line numberDiff line numberDiff line change
@@ -768,3 +768,5 @@ kbayrhammer <[email protected]>
768768
James Chen-Smith <[email protected]>
769769
Yash Singh <[email protected]>
770770
Danielle Church <[email protected]>
771+
Seth Thomas <[email protected]>
772+

deps/npm/CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
## v7.7.6 (2021-03-29)
2+
3+
### BUG FIXES
4+
5+
* [`9dd2ed518`](https://github.com/npm/cli/commit/9dd2ed5189b6f283094664e9e192cf1598ec3f79)
6+
fix empty newline printed to stderr
7+
([@ruyadorno](https://github.com/ruyadorno))
8+
* [`9d391462a`](https://github.com/npm/cli/commit/9d391462a25f637219501e2430ef1f7b89710816)
9+
[#2973](https://github.com/npm/cli/issues/2973)
10+
fix spelling in workspaces.md file
11+
([@sethomas](https://github.com/sethomas))
12+
* [`4b100249a`](https://github.com/npm/cli/commit/4b100249a6cad67e002186816e64817313b636c7)
13+
[#2979](https://github.com/npm/cli/issues/2979)
14+
change 'maxsockets' default value back to 15
15+
([@wallrat](https://github.com/wallrat))
16+
17+
### DEPENDENCIES
18+
19+
* [`a28f89572`](https://github.com/npm/cli/commit/a28f89572a708cced69cc938f877eaa969dbad9e)
20+
21+
* fix reading `script-shell` config on `npm version` lifecycle scripts
22+
* [`03734c29e`](https://github.com/npm/cli/commit/03734c29e00191d17f164d1c0e75d9f228268842)
23+
24+
* fix packaging `bundledDependencies`
25+
* [`80ce2a019`](https://github.com/npm/cli/commit/80ce2a019526632b01b70e1c75c42608dc160332)
26+
27+
* fix error auditing package documents with missing dependencies
28+
129
## v7.7.5 (2021-03-25)
230

331
### BUG FIXES

deps/npm/docs/content/using-npm/config.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ Show extended information in `npm ls` and `npm search`.
795795

796796
#### `maxsockets`
797797

798-
* Default: Infinity
798+
* Default: 15
799799
* Type: Number
800800

801801
The maximum number of connections to use per origin (protocol/host/port

deps/npm/docs/content/using-npm/workspaces.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ nested workspaces to be consumed elsewhere.
9090

9191
### Running commands in the context of workspaces
9292

93-
You man use the `workspace` configuration option to run commands in the context
93+
You can use the `workspace` configuration option to run commands in the context
9494
of a configured workspace.
9595

9696
Following is a quick example on how to use the `npm run` command in the context

deps/npm/docs/output/commands/npm-ls.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h3 id="description">Description</h3>
159159
the results to only the paths to the packages named. Note that nested
160160
packages will <em>also</em> show the paths to the specified packages. For
161161
example, running <code>npm ls promzard</code> in npm’s source tree will show:</p>
162-
<pre lang="bash"><code>[email protected].5 /path/to/npm
162+
<pre lang="bash"><code>[email protected].6 /path/to/npm
163163
164164
165165
</code></pre>

deps/npm/docs/output/commands/npm.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ <h2 id="table-of-contents">Table of contents</h2>
148148
<pre lang="bash"><code>npm &lt;command&gt; [args]
149149
</code></pre>
150150
<h3 id="version">Version</h3>
151-
<p>7.7.5</p>
151+
<p>7.7.6</p>
152152
<h3 id="description">Description</h3>
153153
<p>npm is the package manager for the Node JavaScript platform. It puts
154154
modules in place so that node can find them, and manages dependency

deps/npm/docs/output/using-npm/config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ <h4 id="long"><code>long</code></h4>
811811
<p>Show extended information in <code>npm ls</code> and <code>npm search</code>.</p>
812812
<h4 id="maxsockets"><code>maxsockets</code></h4>
813813
<ul>
814-
<li>Default: Infinity</li>
814+
<li>Default: 15</li>
815815
<li>Type: Number</li>
816816
</ul>
817817
<p>The maximum number of connections to use per origin (protocol/host/port

deps/npm/docs/output/using-npm/workspaces.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ <h3 id="using-workspaces">Using workspaces</h3>
207207
in such a way that is also easy to <a href="../commands/npm-publish.html">publish</a> these
208208
nested workspaces to be consumed elsewhere.</p>
209209
<h3 id="running-commands-in-the-context-of-workspaces">Running commands in the context of workspaces</h3>
210-
<p>You man use the <code>workspace</code> configuration option to run commands in the context
210+
<p>You can use the <code>workspace</code> configuration option to run commands in the context
211211
of a configured workspace.</p>
212212
<p>Following is a quick example on how to use the <code>npm run</code> command in the context
213213
of nested workspaces. For a project containing multiple workspaces, e.g:</p>

deps/npm/lib/cli.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,14 @@ module.exports = (process) => {
6161
impl(npm.argv, errorHandler)
6262
else {
6363
try {
64-
// I don't know why this is needed but we get a cb() not called if we
65-
// omit it
66-
npm.log.level = 'silent'
6764
if (cmd) {
6865
const didYouMean = require('./utils/did-you-mean.js')
6966
const suggestions = await didYouMean(npm, npm.localPrefix, cmd)
7067
npm.output(`Unknown command: "${cmd}"${suggestions}\n\nTo see a list of supported npm commands, run:\n npm help`)
7168
} else
7269
npm.output(npm.usage)
7370
process.exitCode = 1
71+
return errorHandler()
7472
} catch (err) {
7573
errorHandler(err)
7674
}

deps/npm/lib/utils/config/definitions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ define('long', {
11541154
})
11551155

11561156
define('maxsockets', {
1157-
default: Infinity,
1157+
default: 15,
11581158
type: Number,
11591159
description: `
11601160
The maximum number of connections to use per origin (protocol/host/port

deps/npm/man/man1/npm-ls.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ example, running \fBnpm ls promzard\fP in npm's source tree will show:
2626
.P
2727
.RS 2
2828
.nf
29-
npm@7\.7\.5 /path/to/npm
29+
npm@7\.7\.6 /path/to/npm
3030
└─┬ init\-package\-json@0\.0\.4
3131
└── promzard@0\.1\.5
3232
.fi

deps/npm/man/man1/npm.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ npm <command> [args]
1010
.RE
1111
.SS Version
1212
.P
13-
7\.7\.5
13+
7\.7\.6
1414
.SS Description
1515
.P
1616
npm is the package manager for the Node JavaScript platform\. It puts

deps/npm/man/man7/config.7

+1-1
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ Show extended information in \fBnpm ls\fP and \fBnpm search\fP\|\.
10651065
.SS \fBmaxsockets\fP
10661066
.RS 0
10671067
.IP \(bu 2
1068-
Default: Infinity
1068+
Default: 15
10691069
.IP \(bu 2
10701070
Type: Number
10711071

deps/npm/man/man7/workspaces.7

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ in such a way that is also easy to npm help publish these
9292
nested workspaces to be consumed elsewhere\.
9393
.SS Running commands in the context of workspaces
9494
.P
95-
You man use the \fBworkspace\fP configuration option to run commands in the context
95+
You can use the \fBworkspace\fP configuration option to run commands in the context
9696
of a configured workspace\.
9797
.P
9898
Following is a quick example on how to use the \fBnpm run\fP command in the context

deps/npm/node_modules/@npmcli/metavuln-calculator/lib/get-dep-spec.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/node_modules/@npmcli/metavuln-calculator/package.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/node_modules/libnpmversion/README.md

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/node_modules/libnpmversion/lib/index.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/node_modules/libnpmversion/package.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/node_modules/npm-packlist/index.js

+8-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/node_modules/npm-packlist/package.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deps/npm/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "7.7.5",
2+
"version": "7.7.6",
33
"name": "npm",
44
"description": "a package manager for JavaScript",
55
"keywords": [
@@ -74,7 +74,7 @@
7474
"libnpmpublish": "^4.0.0",
7575
"libnpmsearch": "^3.1.0",
7676
"libnpmteam": "^2.0.2",
77-
"libnpmversion": "^1.0.12",
77+
"libnpmversion": "^1.1.0",
7878
"make-fetch-happen": "^8.0.14",
7979
"minipass": "^3.1.3",
8080
"minipass-pipeline": "^1.2.4",
@@ -180,12 +180,12 @@
180180
"devDependencies": {
181181
"@mdx-js/mdx": "^1.6.22",
182182
"cmark-gfm": "^0.8.5",
183-
"eslint": "^7.22.0",
183+
"eslint": "^7.23.0",
184184
"eslint-plugin-import": "^2.22.1",
185185
"eslint-plugin-node": "^11.1.0",
186186
"eslint-plugin-promise": "^4.3.1",
187187
"eslint-plugin-standard": "^5.0.0",
188-
"jsdom": "^16.5.1",
188+
"jsdom": "^16.5.2",
189189
"licensee": "^8.1.0",
190190
"marked-man": "^0.7.0",
191191
"require-inject": "^1.4.4",

deps/npm/tap-snapshots/smoke-tests-index.js-TAP.test.js

+37
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,43 @@
55
* Make sure to inspect the output below. Do not ignore changes!
66
*/
77
'use strict'
8+
exports[`smoke-tests/index.js TAP npm (no args) > should have expected no args output 1`] = `
9+
npm <command>
10+
11+
Usage:
12+
13+
npm install install all the dependencies in your project
14+
npm install <foo> add the <foo> dependency to your project
15+
npm test run this project's tests
16+
npm run <foo> run the script named <foo>
17+
npm <command> -h quick help on <command>
18+
npm -l display usage info for all commands
19+
npm help <term> search for help on <term>
20+
npm help npm more involved overview
21+
22+
All commands:
23+
24+
access, adduser, audit, bin, bugs, cache, ci, completion,
25+
config, dedupe, deprecate, diff, dist-tag, docs, doctor,
26+
edit, exec, explain, explore, find-dupes, fund, get, help,
27+
hook, init, install, install-ci-test, install-test, link,
28+
ll, login, logout, ls, org, outdated, owner, pack, ping,
29+
prefix, profile, prune, publish, rebuild, repo, restart,
30+
root, run-script, search, set, set-script, shrinkwrap, star,
31+
stars, start, stop, team, test, token, uninstall, unpublish,
32+
unstar, update, version, view, whoami
33+
34+
Specify configs in the ini-formatted file:
35+
{CWD}/smoke-tests/index/.npmrc
36+
or on the command line via: npm <command> --key=value
37+
38+
More configuration info: npm help config
39+
Configuration fields: npm help 7 config
40+
41+
npm {CWD}
42+
43+
`
44+
845
exports[`smoke-tests/index.js TAP npm diff > should have expected diff output 1`] = `
946
diff --git a/package.json b/package.json
1047
index v1.0.4..v1.1.1 100644

deps/npm/tap-snapshots/test-lib-utils-config-describe-all.js-TAP.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ Show extended information in \`npm ls\` and \`npm search\`.
674674
675675
#### \`maxsockets\`
676676
677-
* Default: Infinity
677+
* Default: 15
678678
* Type: Number
679679
680680
The maximum number of connections to use per origin (protocol/host/port

deps/npm/test/lib/cli.js

+25-4
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,37 @@ t.test('gracefully handles error printing usage', t => {
172172
t.teardown(() => {
173173
npmock.output = output
174174
errorHandlerCb = null
175+
errorHandlerCalled = null
175176
})
176177
const proc = {
177-
argv: ['node', 'npm', 'asdf'],
178+
argv: ['node', 'npm'],
178179
on: () => {},
179180
}
180181
npmock.argv = []
181-
npmock.output = (msg) => {
182-
throw new Error('test exception')
182+
errorHandlerCb = () => {
183+
t.match(errorHandlerCalled, [], 'should call errorHandler with no args')
184+
t.end()
185+
}
186+
cli(proc)
187+
})
188+
189+
t.test('handles output error', t => {
190+
const { output } = npmock
191+
t.teardown(() => {
192+
npmock.output = output
193+
errorHandlerCb = null
194+
errorHandlerCalled = null
195+
})
196+
const proc = {
197+
argv: ['node', 'npm'],
198+
on: () => {},
199+
}
200+
npmock.argv = []
201+
npmock.output = () => {
202+
throw new Error('ERR')
183203
}
184204
errorHandlerCb = () => {
185-
t.match(errorHandlerCalled, /test exception/)
205+
t.match(errorHandlerCalled, /ERR/, 'should call errorHandler with error')
186206
t.end()
187207
}
188208
cli(proc)
@@ -191,6 +211,7 @@ t.test('gracefully handles error printing usage', t => {
191211
t.test('load error calls error handler', t => {
192212
t.teardown(() => {
193213
errorHandlerCb = null
214+
errorHandlerCalled = null
194215
LOAD_ERROR = null
195216
})
196217

0 commit comments

Comments
 (0)