Skip to content

Commit b1590bb

Browse files
npm-cli-botruyadorno
authored andcommitted
deps: upgrade npm to 8.17.0
PR-URL: #44205 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Ruy Adorno <ruyadorno@google.com>
1 parent 4d26cb9 commit b1590bb

81 files changed

Lines changed: 1667 additions & 712 deletions

Some content is hidden

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

‎deps/npm/docs/content/using-npm/dependency-selectors.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ arb.loadActual((tree) => {
165165
## See Also
166166

167167
*[npm query](/commands/npm-query)
168-
*[@npmcli/arborist](https://npm.im/@npmcli/arborist]
168+
*[@npmcli/arborist](https://npm.im/@npmcli/arborist)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ <h3 id="description">Description</h3>
166166
the results to only the paths to the packages named. Note that nested
167167
packages will <em>also</em> show the paths to the specified packages. For
168168
example, running <code>npm ls promzard</code> in npm's source tree will show:</p>
169-
<prelang="bash"><code>npm@8.16.0 /path/to/npm
169+
<prelang="bash"><code>npm@8.17.0 /path/to/npm
170170
└─┬ init-package-json@0.0.4
171171
└── promzard@0.1.5
172172
</code></pre>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ <h2 id="table-of-contents">Table of contents</h2>
149149
<!-- raw HTML omitted -->
150150
<!-- raw HTML omitted -->
151151
<h3id="version">Version</h3>
152-
<p>8.16.0</p>
152+
<p>8.17.0</p>
153153
<h3id="description">Description</h3>
154154
<p>npm is the package manager for the Node JavaScript platform. It puts
155155
modules in place so that node can find them, and manages dependency

‎deps/npm/docs/output/using-npm/dependency-selectors.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ <h3 id="programmatic-usage">Programmatic Usage</h3>
282282
<h2id="see-also">See Also</h2>
283283
<ul>
284284
<li><ahref="../commands/npm-query.html">npm query</a></li>
285-
<li>[@npmcli/arborist](<ahref="https://npm.im/@npmcli/arborist%5D">https://npm.im/@npmcli/arborist]</a></li>
285+
<li><ahref="https://npm.im/@npmcli/arborist">@npmcli/arborist</a></li>
286286
</ul>
287287
</div>
288288

‎deps/npm/lib/commands/exec.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class Exec extends BaseCommand {
3434

3535
constargs=[..._args]
3636
constcall=this.npm.config.get('call')
37+
letglobalPath
3738
const{
3839
flatOptions,
3940
localBin,
@@ -44,6 +45,12 @@ class Exec extends BaseCommand {
4445
constscriptShell=this.npm.config.get('script-shell')||undefined
4546
constpackages=this.npm.config.get('package')
4647
constyes=this.npm.config.get('yes')
48+
// --prefix sets both of these to the same thing, meaning the global prefix
49+
// is invalid (i.e. no lib/node_modules). This is not a trivial thing to
50+
// untangle and fix so we work around it here.
51+
if(this.npm.localPrefix!==this.npm.globalPrefix){
52+
globalPath=path.resolve(globalDir,'..')
53+
}
4754

4855
if(call&&_args.length){
4956
throwthis.usageError()
@@ -59,7 +66,7 @@ class Exec extends BaseCommand {
5966
localBin,
6067
locationMsg,
6168
globalBin,
62-
globalPath: path.resolve(globalDir,'..'),
69+
globalPath,
6370
output,
6471
packages,
6572
path: localPrefix,

‎deps/npm/lib/commands/query.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class Query extends BaseCommand {
5858
constopts={
5959
...this.npm.flatOptions,
6060
path: where,
61+
forceActual: true,
6162
}
6263
constarb=newArborist(opts)
6364
consttree=awaitarb.loadActual(opts)

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

Lines changed: 1 addition & 1 deletion
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
.RS2
2828
.nf
29-
npm@8\.16\.0 /path/to/npm
29+
npm@8\.17\.0 /path/to/npm
3030
└─┬ init\-package\-json@0\.0\.4
3131
└── promzard@0\.1\.5
3232
.fi

‎deps/npm/man/man1/npm.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.SS Synopsis
55
.SS Version
66
.P
7-
8\.16\.0
7+
8\.17\.0
88
.SS Description
99
.P
1010
npm is the package manager for the Node JavaScript platform\. It puts

‎deps/npm/man/man7/dependency-selectors.7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,6 @@ arb\.loadActual((tree) => {
240240
.IP\(bu2
241241
npm help query
242242
.IP\(bu2
243-
[@npmcli/arborist](https://npm\.im/@npmcli/arborist]
243+
@npmcli/arborist\fIhttps://npm\.im/@npmcli/arborist\fR
244244

245245
.RE

‎deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js‎

Lines changed: 20 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)