Skip to content

Commit 9440565

Browse files
ruyadornoruyadorno
committed
deps: upgrade npm to 7.10.0
PR-URL: #38254 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 4268fae commit 9440565

File tree

183 files changed

+2850
-2306
lines changed

Some content is hidden

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

183 files changed

+2850
-2306
lines changed

‎deps/npm/CHANGELOG.md

+33
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
## v7.10.0 (2021-04-15)
2+
3+
### FEATURES
4+
5+
* [`f9b639eb6`](https://github.com/npm/cli/commit/f9b639eb6c504ded6cdd59e83e26a392bfe81e5d)
6+
[#3052](https://github.com/npm/cli/issues/3052)
7+
feat(bugs): fall back to email if provided
8+
([@Yash-Singh1](https://github.com/Yash-Singh1))
9+
* [`8c9e24778`](https://github.com/npm/cli/commit/8c9e24778db867cb3148bc247c7e321639aa9f58)
10+
[#3055](https://github.com/npm/cli/issues/3055)
11+
feat(version): add workspace support
12+
([@wraithgar](https://github.com/wraithgar))
13+
14+
### DEPENDENCIES
15+
16+
* [`f1e6743a6`](https://github.com/npm/cli/commit/f1e6743a6e8e32ddad6d1964eb05d17e6c50a456)
17+
`libnpmversion@1.2.0`
18+
* feat(retrieve-tag): retrieve unannotated git tags
19+
* fix(retrieve-tag): use semver to look for semver
20+
* [`3b476a24c`](https://github.com/npm/cli/commit/3b476a24cf0b2823fdf92505b84bddde4fcc8b14)
21+
`@npmcl/git@2.0.8`
22+
* fix(git): do not use shell when calling git
23+
* [`dfcd0c1e2`](https://github.com/npm/cli/commit/dfcd0c1e2331c1f4b6573466b50505772eddaf22)
24+
[#3069](https://github.com/npm/cli/issues/3069)
25+
`tap@15.0.2`
26+
27+
### DOCUMENTATION
28+
29+
* [`90b61eda9`](https://github.com/npm/cli/commit/90b61eda9b41af108ed69fc0c43a522a92745047)
30+
[#3053](https://github.com/npm/cli/issues/3053)
31+
fix(contributing.md): explicitely outline dep updates
32+
([@darcyclarke](https://github.com/darcyclarke))
33+
134
## v7.9.0 (2021-04-08)
235

336
### FEATURES

‎deps/npm/CONTRIBUTING.md

+4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ We've set up an automated [benchmark](https://github.com/npm/benchmarks) integra
5151

5252
You can learn more about this tool, including how to run & configure it manually, [here](https://github.com/npm/benchmarks)
5353

54+
## Dependency Updates
55+
56+
It should be noted that our team does not accept third-party dependency updates/PRs. We have a [release process](https://github.com/npm/cli/wiki/Release-Process) that includes checks to ensure dependencies are staying up-to-date & will ship security patches for CVEs as they occur. If you submit a PR trying to update our dependencies we will close it with or without a reference to these contribution guidelines.
57+
5458
## Reporting Bugs
5559

5660
When submitting a new bug report, please first [search](https://github.com/npm/cli/issues) for an existing or similar report & then use one of our existing [issue templates](https://github.com/npm/cli/issues/new/choose) if you believe you've come across a unique problem. Duplicate issues, or issues that don't use one of our templates may get closed without a response.

‎deps/npm/docs/content/commands/npm-bugs.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ aliases: issues
1515
### Description
1616
1717
This command tries to guess at the likely location of a package's bug
18-
tracker URL, and then tries to open it using the `--browser` config param.
19-
If no package name is provided, it will search for a `package.json` in the
20-
current folder and use the `name` property.
18+
tracker URL or the `mailto` URL of the support email, and then tries to
19+
open it using the `--browser` config param. If no package name is provided, it
20+
will search for a `package.json` in the current folder and use the `name` property.
2121
2222
### Configuration
2323

‎deps/npm/docs/content/commands/npm-version.md

+50-33
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,56 @@ npm version [<newversion> | major | minor | patch | premajor | preminor | prepat
1414
'npm ls' to inspect current package/dependency versions
1515
```
1616
17+
### Configuration
18+
19+
#### `allow-same-version`
20+
21+
* Default: `false`
22+
* Type: Boolean
23+
24+
Prevents throwing an error when `npm version` is used to set the new version
25+
to the same value as the current version.
26+
27+
#### `git-tag-version`
28+
29+
* Default: `true`
30+
* Type: Boolean
31+
32+
Commit and tag the version change.
33+
34+
#### `commit-hooks`
35+
36+
* Default: `true`
37+
* Type: Boolean
38+
39+
Run git commit hooks when committing the version change.
40+
41+
#### `sign-git-tag`
42+
43+
* Default: `false`
44+
* Type: Boolean
45+
46+
Pass the `-s` flag to git to sign the tag.
47+
48+
Note that you must have a default GPG key set up in your git config for this to work properly.
49+
50+
#### workspaces
51+
52+
* Default: `false`
53+
* Type: Boolean
54+
55+
Enables workspaces context and includes workspaces in reported output
56+
when getting versions. When setting a new version *only the workspaces
57+
will be changed*.
58+
59+
#### workspace
60+
61+
* Default: []
62+
* Type: Array
63+
64+
Enables workspaces context and limits results to only those specified by
65+
this config item.
66+
1767
### Description
1868
1969
Run this in a package directory to bump the version and write the new
@@ -87,39 +137,6 @@ This runs all your tests and proceeds only if they pass. Then runs your `build`
87137
adds everything in the `dist` directory to the commit. After the commit, it pushes the new commit
88138
and tag up to the server, and deletes the `build/temp` directory.
89139
90-
### Configuration
91-
92-
#### `allow-same-version`
93-
94-
* Default: `false`
95-
* Type: Boolean
96-
97-
Prevents throwing an error when `npm version` is used to set the new version
98-
to the same value as the current version.
99-
100-
#### `git-tag-version`
101-
102-
* Default: `true`
103-
* Type: Boolean
104-
105-
Commit and tag the version change.
106-
107-
#### `commit-hooks`
108-
109-
* Default: `true`
110-
* Type: Boolean
111-
112-
Run git commit hooks when committing the version change.
113-
114-
#### `sign-git-tag`
115-
116-
* Default: `false`
117-
* Type: Boolean
118-
119-
Pass the `-s` flag to git to sign the tag.
120-
121-
Note that you must have a default GPG key set up in your git config for this to work properly.
122-
123140
### See Also
124141
125142
* [npm init](/commands/npm-init)

‎deps/npm/docs/output/commands/npm-bugs.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ <h2 id="table-of-contents">Table of contents</h2>
151151
</code></pre>
152152
<h3 id="description">Description</h3>
153153
<p>This command tries to guess at the likely location of a package’s bug
154-
tracker URL, and then tries to open it using the <code>--browser</code> config param.
155-
If no package name is provided, it will search for a <code>package.json</code> in the
156-
current folder and use the <code>name</code> property.</p>
154+
tracker URL or the <code>mailto</code> URL of the support email, and then tries to
155+
open it using the <code>--browser</code> config param. If no package name is provided, it
156+
will search for a <code>package.json</code> in the current folder and use the <code>name</code> property.</p>
157157
<h3 id="configuration">Configuration</h3>
158158
<h4 id="browser">browser</h4>
159159
<ul>

‎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>npm@7.9.0 /path/to/npm
162+
<pre lang="bash"><code>npm@7.10.0 /path/to/npm
163163
└─┬ init-package-json@0.0.4
164164
└── promzard@0.1.5
165165
</code></pre>

‎deps/npm/docs/output/commands/npm-version.html

+43-28
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ <h1 id="npm-version">npm-version</h1>
141141

142142
<section id="table_of_contents">
143143
<h2 id="table-of-contents">Table of contents</h2>
144-
<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#description">Description</a></li><li><a href="#configuration">Configuration</a></li><ul><li><a href="#allow-same-version"><code>allow-same-version</code></a></li><li><a href="#git-tag-version"><code>git-tag-version</code></a></li><li><a href="#commit-hooks"><code>commit-hooks</code></a></li><li><a href="#sign-git-tag"><code>sign-git-tag</code></a></li></ul><li><a href="#see-also">See Also</a></li></ul></div>
144+
<div id="_table_of_contents"><ul><li><a href="#synopsis">Synopsis</a></li><li><a href="#configuration">Configuration</a></li><ul><li><a href="#allow-same-version"><code>allow-same-version</code></a></li><li><a href="#git-tag-version"><code>git-tag-version</code></a></li><li><a href="#commit-hooks"><code>commit-hooks</code></a></li><li><a href="#sign-git-tag"><code>sign-git-tag</code></a></li><li><a href="#workspaces">workspaces</a></li><li><a href="#workspace">workspace</a></li></ul><li><a href="#description">Description</a></li><li><a href="#see-also">See Also</a></li></ul></div>
145145
</section>
146146

147147
<div id="_content"><h3 id="synopsis">Synopsis</h3>
@@ -151,6 +151,48 @@ <h2 id="table-of-contents">Table of contents</h2>
151151
'npm view &lt;pkg&gt; version' to view a package's published version
152152
'npm ls' to inspect current package/dependency versions
153153
</code></pre>
154+
<h3 id="configuration">Configuration</h3>
155+
<h4 id="allow-same-version"><code>allow-same-version</code></h4>
156+
<ul>
157+
<li>Default: <code>false</code></li>
158+
<li>Type: Boolean</li>
159+
</ul>
160+
<p>Prevents throwing an error when <code>npm version</code> is used to set the new version
161+
to the same value as the current version.</p>
162+
<h4 id="git-tag-version"><code>git-tag-version</code></h4>
163+
<ul>
164+
<li>Default: <code>true</code></li>
165+
<li>Type: Boolean</li>
166+
</ul>
167+
<p>Commit and tag the version change.</p>
168+
<h4 id="commit-hooks"><code>commit-hooks</code></h4>
169+
<ul>
170+
<li>Default: <code>true</code></li>
171+
<li>Type: Boolean</li>
172+
</ul>
173+
<p>Run git commit hooks when committing the version change.</p>
174+
<h4 id="sign-git-tag"><code>sign-git-tag</code></h4>
175+
<ul>
176+
<li>Default: <code>false</code></li>
177+
<li>Type: Boolean</li>
178+
</ul>
179+
<p>Pass the <code>-s</code> flag to git to sign the tag.</p>
180+
<p>Note that you must have a default GPG key set up in your git config for this to work properly.</p>
181+
<h4 id="workspaces">workspaces</h4>
182+
<ul>
183+
<li>Default: <code>false</code></li>
184+
<li>Type: Boolean</li>
185+
</ul>
186+
<p>Enables workspaces context and includes workspaces in reported output
187+
when getting versions. When setting a new version <em>only the workspaces
188+
will be changed</em>.</p>
189+
<h4 id="workspace">workspace</h4>
190+
<ul>
191+
<li>Default: []</li>
192+
<li>Type: Array</li>
193+
</ul>
194+
<p>Enables workspaces context and limits results to only those specified by
195+
this config item.</p>
154196
<h3 id="description">Description</h3>
155197
<p>Run this in a package directory to bump the version and write the new
156198
data back to <code>package.json</code>, <code>package-lock.json</code>, and, if present, <code>npm-shrinkwrap.json</code>.</p>
@@ -210,33 +252,6 @@ <h3 id="description">Description</h3>
210252
<p>This runs all your tests and proceeds only if they pass. Then runs your <code>build</code> script, and
211253
adds everything in the <code>dist</code> directory to the commit. After the commit, it pushes the new commit
212254
and tag up to the server, and deletes the <code>build/temp</code> directory.</p>
213-
<h3 id="configuration">Configuration</h3>
214-
<h4 id="allow-same-version"><code>allow-same-version</code></h4>
215-
<ul>
216-
<li>Default: <code>false</code></li>
217-
<li>Type: Boolean</li>
218-
</ul>
219-
<p>Prevents throwing an error when <code>npm version</code> is used to set the new version
220-
to the same value as the current version.</p>
221-
<h4 id="git-tag-version"><code>git-tag-version</code></h4>
222-
<ul>
223-
<li>Default: <code>true</code></li>
224-
<li>Type: Boolean</li>
225-
</ul>
226-
<p>Commit and tag the version change.</p>
227-
<h4 id="commit-hooks"><code>commit-hooks</code></h4>
228-
<ul>
229-
<li>Default: <code>true</code></li>
230-
<li>Type: Boolean</li>
231-
</ul>
232-
<p>Run git commit hooks when committing the version change.</p>
233-
<h4 id="sign-git-tag"><code>sign-git-tag</code></h4>
234-
<ul>
235-
<li>Default: <code>false</code></li>
236-
<li>Type: Boolean</li>
237-
</ul>
238-
<p>Pass the <code>-s</code> flag to git to sign the tag.</p>
239-
<p>Note that you must have a default GPG key set up in your git config for this to work properly.</p>
240255
<h3 id="see-also">See Also</h3>
241256
<ul>
242257
<li><a href="../commands/npm-init.html">npm init</a></li>

‎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.9.0</p>
151+
<p>7.10.0</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/lib/base-command.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const ConfigDefinitions = require('./utils/config/definitions.js')
44

55
class BaseCommand {
66
constructor (npm) {
7+
this.wrapWidth = 80
78
this.npm = npm
89
}
910

@@ -27,15 +28,30 @@ class BaseCommand {
2728
usage = `${usage}${this.constructor.usage.map(u => `npm ${this.constructor.name} ${u}`).join('\n')}`
2829

2930
if (this.constructor.params)
30-
// TODO word wrap this along params boundaries
31-
usage = `${usage}\n\nOptions:\n[${this.constructor.params.map(p => ConfigDefinitions[p].usage).join('] [')}]`
31+
usage = `${usage}\n\nOptions:\n${this.wrappedParams}`
3232

3333
// Mostly this just appends aliases, this could be more clear
3434
usage = usageUtil(this.constructor.name, usage)
3535
usage = `${usage}\n\nRun "npm help ${this.constructor.name}" for more info`
3636
return usage
3737
}
3838

39+
get wrappedParams () {
40+
let results = ''
41+
let line = ''
42+
43+
for (const param of this.constructor.params) {
44+
const usage = `[${ConfigDefinitions[param].usage}]`
45+
if (line.length && (line.length + usage.length) > this.wrapWidth) {
46+
results = [results, line].filter(Boolean).join('\n')
47+
line = ''
48+
}
49+
line = [line, usage].filter(Boolean).join(' ')
50+
}
51+
results = [results, line].filter(Boolean).join('\n')
52+
return results
53+
}
54+
3955
usageError (msg) {
4056
if (!msg) {
4157
return Object.assign(new Error(`\nUsage: ${this.usage}`), {

‎deps/npm/lib/bugs.js

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ class Bugs extends BaseCommand {
4343

4444
if (typeof mani.bugs === 'object' && mani.bugs.url)
4545
return mani.bugs.url
46+
47+
if (typeof mani.bugs === 'object' && mani.bugs.email)
48+
return `mailto:${mani.bugs.email}`
4649
}
4750

4851
// try to get it from the repo, if possible

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

+1
Original file line numberDiff line numberDiff line change
@@ -1389,6 +1389,7 @@ define('prefix', {
13891389

13901390
define('preid', {
13911391
default: '',
1392+
hint: 'prerelease-id',
13921393
type: String,
13931394
description: `
13941395
The "prerelease identifier" to use as a prefix for the "prerelease" part

0 commit comments

Comments
 (0)