Skip to content

Commit 679aae2

Browse files
npm-cli-botMylesBorins
authored andcommitted
deps: upgrade npm to 9.3.0
PR-URL: #46193 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 9bcf3ca commit 679aae2

File tree

319 files changed

+11263
-13277
lines changed

Some content is hidden

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

319 files changed

+11263
-13277
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+
15501550

15511551
# Related CI job: node-test-linter
15521552
lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs lint-yaml-build lint-yaml
1553-
@if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" benchmark deps doc lib src test tools ) \
1553+
@if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" --exclude="merge-conflict.json" benchmark deps doc lib src test tools ) \
15541554
&& ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
15551555
exit 0 ; \
15561556
else \

deps/npm/docs/content/commands/npm-access.md

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ npm access grant <read-only|read-write> <scope:team> [<package>]
1616
npm access revoke <scope:team> [<package>]
1717
```
1818
19+
Note: This command is unaware of workspaces.
20+
1921
### Description
2022
2123
Used to set access controls on private packages.

deps/npm/docs/content/commands/npm-adduser.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ npm init --scope=@foo --yes
6767
* Default: "web"
6868
* Type: "legacy" or "web"
6969

70-
What authentication strategy to use with `login`.
70+
What authentication strategy to use with `login`. Note that if an `otp`
71+
config is given, this value will always be set to `legacy`.
7172

7273
### See Also
7374

deps/npm/docs/content/commands/npm-ci.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ de-duplicating. Sets `--install-strategy=nested`.
138138
`--install-strategy=shallow`
139139

140140
Only install direct dependencies in the top level `node_modules`, but hoist
141-
on deeper dependendencies. Sets `--install-strategy=shallow`.
141+
on deeper dependencies. Sets `--install-strategy=shallow`.
142142

143143
#### `omit`
144144

@@ -173,7 +173,7 @@ be resolved using the nearest non-peer dependency specification, even if
173173
doing so will result in some packages receiving a peer dependency outside
174174
the range set in their package's `peerDependencies` object.
175175

176-
When such and override is performed, a warning is printed, explaining the
176+
When such an override is performed, a warning is printed, explaining the
177177
conflict and the packages involved. If `--strict-peer-deps` is set, then
178178
this warning is treated as a failure.
179179

deps/npm/docs/content/commands/npm-dedupe.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ de-duplicating. Sets `--install-strategy=nested`.
109109
`--install-strategy=shallow`
110110

111111
Only install direct dependencies in the top level `node_modules`, but hoist
112-
on deeper dependendencies. Sets `--install-strategy=shallow`.
112+
on deeper dependencies. Sets `--install-strategy=shallow`.
113113

114114
#### `strict-peer-deps`
115115

@@ -126,7 +126,7 @@ be resolved using the nearest non-peer dependency specification, even if
126126
doing so will result in some packages receiving a peer dependency outside
127127
the range set in their package's `peerDependencies` object.
128128
129-
When such and override is performed, a warning is printed, explaining the
129+
When such an override is performed, a warning is printed, explaining the
130130
conflict and the packages involved. If `--strict-peer-deps` is set, then
131131
this warning is treated as a failure.
132132

deps/npm/docs/content/commands/npm-find-dupes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ de-duplicating. Sets `--install-strategy=nested`.
4949
`--install-strategy=shallow`
5050

5151
Only install direct dependencies in the top level `node_modules`, but hoist
52-
on deeper dependendencies. Sets `--install-strategy=shallow`.
52+
on deeper dependencies. Sets `--install-strategy=shallow`.
5353

5454
#### `strict-peer-deps`
5555

@@ -66,7 +66,7 @@ be resolved using the nearest non-peer dependency specification, even if
6666
doing so will result in some packages receiving a peer dependency outside
6767
the range set in their package's `peerDependencies` object.
6868

69-
When such and override is performed, a warning is printed, explaining the
69+
When such an override is performed, a warning is printed, explaining the
7070
conflict and the packages involved. If `--strict-peer-deps` is set, then
7171
this warning is treated as a failure.
7272

deps/npm/docs/content/commands/npm-init.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Create a package.json file
77
### Synopsis
88

99
```bash
10-
npm init <package-spec> (same as `npx <package-spec>)
10+
npm init <package-spec> (same as `npx <package-spec>`)
1111
npm init <@scope> (same as `npx <@scope>/create`)
1212

1313
aliases: create, innit

deps/npm/docs/content/commands/npm-install-ci-test.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ de-duplicating. Sets `--install-strategy=nested`.
8484
`--install-strategy=shallow`
8585

8686
Only install direct dependencies in the top level `node_modules`, but hoist
87-
on deeper dependendencies. Sets `--install-strategy=shallow`.
87+
on deeper dependencies. Sets `--install-strategy=shallow`.
8888

8989
#### `omit`
9090

@@ -119,7 +119,7 @@ be resolved using the nearest non-peer dependency specification, even if
119119
doing so will result in some packages receiving a peer dependency outside
120120
the range set in their package's `peerDependencies` object.
121121

122-
When such and override is performed, a warning is printed, explaining the
122+
When such an override is performed, a warning is printed, explaining the
123123
conflict and the packages involved. If `--strict-peer-deps` is set, then
124124
this warning is treated as a failure.
125125

deps/npm/docs/content/commands/npm-install-test.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ de-duplicating. Sets `--install-strategy=nested`.
8585
`--install-strategy=shallow`
8686

8787
Only install direct dependencies in the top level `node_modules`, but hoist
88-
on deeper dependendencies. Sets `--install-strategy=shallow`.
88+
on deeper dependencies. Sets `--install-strategy=shallow`.
8989

9090
#### `omit`
9191

@@ -120,7 +120,7 @@ be resolved using the nearest non-peer dependency specification, even if
120120
doing so will result in some packages receiving a peer dependency outside
121121
the range set in their package's `peerDependencies` object.
122122

123-
When such and override is performed, a warning is printed, explaining the
123+
When such an override is performed, a warning is printed, explaining the
124124
conflict and the packages involved. If `--strict-peer-deps` is set, then
125125
this warning is treated as a failure.
126126

deps/npm/docs/content/commands/npm-install.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ de-duplicating. Sets `--install-strategy=nested`.
475475
`--install-strategy=shallow`
476476
477477
Only install direct dependencies in the top level `node_modules`, but hoist
478-
on deeper dependendencies. Sets `--install-strategy=shallow`.
478+
on deeper dependencies. Sets `--install-strategy=shallow`.
479479
480480
#### `omit`
481481
@@ -510,7 +510,7 @@ be resolved using the nearest non-peer dependency specification, even if
510510
doing so will result in some packages receiving a peer dependency outside
511511
the range set in their package's `peerDependencies` object.
512512
513-
When such and override is performed, a warning is printed, explaining the
513+
When such an override is performed, a warning is printed, explaining the
514514
conflict and the packages involved. If `--strict-peer-deps` is set, then
515515
this warning is treated as a failure.
516516

deps/npm/docs/content/commands/npm-link.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ de-duplicating. Sets `--install-strategy=nested`.
176176
`--install-strategy=shallow`
177177

178178
Only install direct dependencies in the top level `node_modules`, but hoist
179-
on deeper dependendencies. Sets `--install-strategy=shallow`.
179+
on deeper dependencies. Sets `--install-strategy=shallow`.
180180

181181
#### `strict-peer-deps`
182182

@@ -193,7 +193,7 @@ be resolved using the nearest non-peer dependency specification, even if
193193
doing so will result in some packages receiving a peer dependency outside
194194
the range set in their package's `peerDependencies` object.
195195

196-
When such and override is performed, a warning is printed, explaining the
196+
When such an override is performed, a warning is printed, explaining the
197197
conflict and the packages involved. If `--strict-peer-deps` is set, then
198198
this warning is treated as a failure.
199199

deps/npm/docs/content/commands/npm-login.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ npm init --scope=@foo --yes
7474
* Default: "web"
7575
* Type: "legacy" or "web"
7676

77-
What authentication strategy to use with `login`.
77+
What authentication strategy to use with `login`. Note that if an `otp`
78+
config is given, this value will always be set to `legacy`.
7879

7980
### See Also
8081

deps/npm/docs/content/commands/npm-ls.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ packages will *also* show the paths to the specified packages. For
2727
example, running `npm ls promzard` in npm's source tree will show:
2828

2929
```bash
30-
npm@9.2.0 /path/to/npm
30+
npm@9.3.0 /path/to/npm
3131
3232
3333
```

deps/npm/docs/content/commands/npm-owner.md

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ npm owner ls <package-spec>
1414
alias: author
1515
```
1616

17-
Note: This command is unaware of workspaces.
18-
1917
### Description
2018

2119
Manage ownership of published packages.

deps/npm/docs/content/commands/npm-publish.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ tarball that will be compared with the local files by default.
107107
current level
108108
* Type: null, "restricted", or "public"
109109

110-
If do not want your scoped package to be publicly viewable (and installable)
111-
set `--access=restricted`.
110+
If you do not want your scoped package to be publicly viewable (and
111+
installable) set `--access=restricted`.
112112

113113
Unscoped packages can not be set to `restricted`.
114114

deps/npm/docs/content/commands/npm-root.md

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ description: Display npm root
1010
npm root
1111
```
1212

13+
Note: This command is unaware of workspaces.
14+
1315
### Description
1416

1517
Print the effective `node_modules` folder to standard out.

deps/npm/docs/content/commands/npm-update.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ de-duplicating. Sets `--install-strategy=nested`.
215215
`--install-strategy=shallow`
216216

217217
Only install direct dependencies in the top level `node_modules`, but hoist
218-
on deeper dependendencies. Sets `--install-strategy=shallow`.
218+
on deeper dependencies. Sets `--install-strategy=shallow`.
219219

220220
#### `omit`
221221

@@ -250,7 +250,7 @@ be resolved using the nearest non-peer dependency specification, even if
250250
doing so will result in some packages receiving a peer dependency outside
251251
the range set in their package's `peerDependencies` object.
252252

253-
When such and override is performed, a warning is printed, explaining the
253+
When such an override is performed, a warning is printed, explaining the
254254
conflict and the packages involved. If `--strict-peer-deps` is set, then
255255
this warning is treated as a failure.
256256

deps/npm/docs/content/commands/npm.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ description: javascript package manager
1010
npm
1111
```
1212

13+
Note: This command is unaware of workspaces.
14+
1315
### Version
1416

15-
9.2.0
17+
9.3.0
1618

1719
### Description
1820

@@ -132,7 +134,7 @@ npm is extremely configurable. It reads its configuration options from
132134
in the cli, env, or user config, then that file is parsed instead.
133135
* Defaults:
134136
npm's default configuration options are defined in
135-
lib/utils/config-defs.js. These must not be changed.
137+
`lib/utils/config/definitions.js`. These must not be changed.
136138

137139
See [`config`](/using-npm/config) for much much more information.
138140

deps/npm/docs/content/configuring-npm/install.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ run npm packages globally.
1717
### Overview
1818

1919
- [Checking your version of npm and
20-
Node.js](#checking-your-version-of-npm-and-node-js)
20+
Node.js](#checking-your-version-of-npm-and-nodejs)
2121
- [Using a Node version manager to install Node.js and
22-
npm](#using-a-node-version-manager-to-install-node-js-and-npm)
22+
npm](#using-a-node-version-manager-to-install-nodejs-and-npm)
2323
- [Using a Node installer to install Node.js and
24-
npm](#using-a-node-installer-to-install-node-js-and-npm)
24+
npm](#using-a-node-installer-to-install-nodejs-and-npm)
2525

2626
### Checking your version of npm and Node.js
2727

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ safer to use a registry-provided authentication bearer token stored in the
142142
current level
143143
* Type: null, "restricted", or "public"
144144

145-
If do not want your scoped package to be publicly viewable (and installable)
146-
set `--access=restricted`.
145+
If you do not want your scoped package to be publicly viewable (and
146+
installable) set `--access=restricted`.
147147

148148
Unscoped packages can not be set to `restricted`.
149149

@@ -192,7 +192,8 @@ exit code.
192192
* Default: "web"
193193
* Type: "legacy" or "web"
194194

195-
What authentication strategy to use with `login`.
195+
What authentication strategy to use with `login`. Note that if an `otp`
196+
config is given, this value will always be set to `legacy`.
196197

197198
#### `before`
198199

@@ -1240,7 +1241,7 @@ be resolved using the nearest non-peer dependency specification, even if
12401241
doing so will result in some packages receiving a peer dependency outside
12411242
the range set in their package's `peerDependencies` object.
12421243

1243-
When such and override is performed, a warning is printed, explaining the
1244+
When such an override is performed, a warning is printed, explaining the
12441245
conflict and the packages involved. If `--strict-peer-deps` is set, then
12451246
this warning is treated as a failure.
12461247

@@ -1521,7 +1522,7 @@ Alias for `--include=dev`.
15211522
`--install-strategy=shallow`
15221523

15231524
Only install direct dependencies in the top level `node_modules`, but hoist
1524-
on deeper dependendencies. Sets `--install-strategy=shallow`.
1525+
on deeper dependencies. Sets `--install-strategy=shallow`.
15251526

15261527
#### `init.author.email`
15271528

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Authentication configuration such as auth tokens and certificates are configured
3535
specifically scoped to an individual registry. See
3636
[Auth Related Configuration](/configuring-npm/npmrc#auth-related-configuration)
3737

38-
When the default registry is used in a package-lock or shrinkwrap is has the
38+
When the default registry is used in a package-lock or shrinkwrap it has the
3939
special meaning of "the currently configured registry". If you create a lock
4040
file while using the default registry you can switch to another registry and
4141
npm will install packages from the new registry, but if you create a lock

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ continue reading.
2828

2929
Note that this is only necessary for globally-installed packages. Local
3030
installs are completely contained within a project's `node_modules`
31-
folder. Delete that folder, and everything is gone less a package's
32-
install script is particularly ill-behaved).
31+
folder. Delete that folder, and everything is gone unless a package's
32+
install script is particularly ill-behaved.
3333

3434
This assumes that you installed node and npm in the default place. If
3535
you configured node with a different `--prefix`, or installed npm with a

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ situations. These scripts happen in addition to the `pre<event>`, `post<event>`,
6363
* Runs BEFORE the package is prepared and packed, ONLY on `npm publish`.
6464

6565
**prepack**
66-
* Runs BEFORE a tarball is packed (on "`npm pack`", "`npm publish`", and when installing a git dependencies).
66+
* Runs BEFORE a tarball is packed (on "`npm pack`", "`npm publish`", and when installing a git dependency).
6767
* NOTE: "`npm run pack`" is NOT the same as "`npm pack`". "`npm run pack`" is an arbitrary user defined script name, where as, "`npm pack`" is a CLI defined command.
6868

6969
**postpack**

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

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ <h2 id="table-of-contents">Table of contents</h2>
154154
npm access grant &lt;read-only|read-write&gt; &lt;scope:team&gt; [&lt;package&gt;]
155155
npm access revoke &lt;scope:team&gt; [&lt;package&gt;]
156156
</code></pre>
157+
<p>Note: This command is unaware of workspaces.</p>
157158
<h3 id="description">Description</h3>
158159
<p>Used to set access controls on private packages.</p>
159160
<p>For all of the subcommands, <code>npm access</code> will perform actions on the packages

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ <h4 id="auth-type"><code>auth-type</code></h4>
190190
<li>Default: "web"</li>
191191
<li>Type: "legacy" or "web"</li>
192192
</ul>
193-
<p>What authentication strategy to use with <code>login</code>.</p>
193+
<p>What authentication strategy to use with <code>login</code>. Note that if an <code>otp</code>
194+
config is given, this value will always be set to <code>legacy</code>.</p>
194195
<h3 id="see-also">See Also</h3>
195196
<ul>
196197
<li><a href="../using-npm/registry.html">npm registry</a></li>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ <h4 id="global-style"><code>global-style</code></h4>
256256
<code>--install-strategy=shallow</code></li>
257257
</ul>
258258
<p>Only install direct dependencies in the top level <code>node_modules</code>, but hoist
259-
on deeper dependendencies. Sets <code>--install-strategy=shallow</code>.</p>
259+
on deeper dependencies. Sets <code>--install-strategy=shallow</code>.</p>
260260
<h4 id="omit"><code>omit</code></h4>
261261
<ul>
262262
<li>Default: 'dev' if the <code>NODE_ENV</code> environment variable is set to
@@ -284,7 +284,7 @@ <h4 id="strict-peer-deps"><code>strict-peer-deps</code></h4>
284284
be resolved using the nearest non-peer dependency specification, even if
285285
doing so will result in some packages receiving a peer dependency outside
286286
the range set in their package's <code>peerDependencies</code> object.</p>
287-
<p>When such and override is performed, a warning is printed, explaining the
287+
<p>When such an override is performed, a warning is printed, explaining the
288288
conflict and the packages involved. If <code>--strict-peer-deps</code> is set, then
289289
this warning is treated as a failure.</p>
290290
<h4 id="package-lock"><code>package-lock</code></h4>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ <h4 id="global-style"><code>global-style</code></h4>
225225
<code>--install-strategy=shallow</code></li>
226226
</ul>
227227
<p>Only install direct dependencies in the top level <code>node_modules</code>, but hoist
228-
on deeper dependendencies. Sets <code>--install-strategy=shallow</code>.</p>
228+
on deeper dependencies. Sets <code>--install-strategy=shallow</code>.</p>
229229
<h4 id="strict-peer-deps"><code>strict-peer-deps</code></h4>
230230
<ul>
231231
<li>Default: false</li>
@@ -239,7 +239,7 @@ <h4 id="strict-peer-deps"><code>strict-peer-deps</code></h4>
239239
be resolved using the nearest non-peer dependency specification, even if
240240
doing so will result in some packages receiving a peer dependency outside
241241
the range set in their package's <code>peerDependencies</code> object.</p>
242-
<p>When such and override is performed, a warning is printed, explaining the
242+
<p>When such an override is performed, a warning is printed, explaining the
243243
conflict and the packages involved. If <code>--strict-peer-deps</code> is set, then
244244
this warning is treated as a failure.</p>
245245
<h4 id="package-lock"><code>package-lock</code></h4>

0 commit comments

Comments
 (0)