Skip to content

Commit 5666b08

Browse files
npm-cli-botjuanarbol
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 ca6adb1 commit 5666b08

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

0 commit comments

Comments
 (0)