Skip to content

Commit 8738b89

Browse files
npm-cli-botaduh95
authored andcommitted
deps: upgrade npm to 10.5.2
PR-URL: #52458 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
1 parent 61e1ac0 commit 8738b89

89 files changed

Lines changed: 3333 additions & 2609 deletions

File tree

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/commands/npm-audit.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The `sig` is generated using the following template: `${package.name}@${package.
9090

9191
Keys response:
9292

93-
-`expires`: null or a simplified extended [ISO 8601 format](https://en.wikipedia.org/wiki/ISO_8601"): `YYYY-MM-DDTHH:mm:ss.sssZ`
93+
-`expires`: null or a simplified extended [ISO 8601 format](https://en.wikipedia.org/wiki/ISO_8601): `YYYY-MM-DDTHH:mm:ss.sssZ`
9494
-`keydid`: sha256 fingerprint of the public key
9595
-`keytype`: only `ecdsa-sha2-nistp256` is currently supported by the npm CLI
9696
-`scheme`: only `ecdsa-sha2-nistp256` is currently supported by the npm CLI

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

Lines changed: 1 addition & 1 deletion
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@10.5.1 /path/to/npm
30+
npm@10.5.2 /path/to/npm
3131
└─┬ init-package-json@0.0.4
3232
└── promzard@0.1.5
3333
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Note: This command is unaware of workspaces.
1414

1515
### Version
1616

17-
10.5.1
17+
10.5.2
1818

1919
### Description
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ <h3 id="audit-signatures">Audit Signatures</h3>
209209
</code></pre>
210210
<p>Keys response:</p>
211211
<ul>
212-
<li><code>expires</code>: null or a simplified extended <ahref="https://en.wikipedia.org/wiki/ISO_8601%22">ISO 8601 format</a>: <code>YYYY-MM-DDTHH:mm:ss.sssZ</code></li>
212+
<li><code>expires</code>: null or a simplified extended <ahref="https://en.wikipedia.org/wiki/ISO_8601">ISO 8601 format</a>: <code>YYYY-MM-DDTHH:mm:ss.sssZ</code></li>
213213
<li><code>keydid</code>: sha256 fingerprint of the public key</li>
214214
<li><code>keytype</code>: only <code>ecdsa-sha2-nistp256</code> is currently supported by the npm CLI</li>
215215
<li><code>scheme</code>: only <code>ecdsa-sha2-nistp256</code> is currently supported by the npm CLI</li>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ <h3 id="description">Description</h3>
160160
the results to only the paths to the packages named. Note that nested
161161
packages will <em>also</em> show the paths to the specified packages. For
162162
example, running <code>npm ls promzard</code> in npm's source tree will show:</p>
163-
<pre><codeclass="language-bash">npm@10.5.1 /path/to/npm
163+
<pre><codeclass="language-bash">npm@10.5.2 /path/to/npm
164164
└─┬ init-package-json@0.0.4
165165
└── promzard@0.1.5
166166
</code></pre>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <h2 id="table-of-contents">Table of contents</h2>
150150
</code></pre>
151151
<p>Note: This command is unaware of workspaces.</p>
152152
<h3id="version">Version</h3>
153-
<p>10.5.1</p>
153+
<p>10.5.2</p>
154154
<h3id="description">Description</h3>
155155
<p>npm is the package manager for the Node JavaScript platform. It puts
156156
modules in place so that node can find them, and manages dependency

‎deps/npm/lib/base-command.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const{ relative }=require('path')
44

55
const{ definitions }=require('@npmcli/config/lib/definitions')
6-
constgetWorkspaces=require('./workspaces/get-workspaces.js')
76
const{aliases: cmdAliases}=require('./utils/cmd-list')
87
constlog=require('./utils/log-shim.js')
98

@@ -170,6 +169,7 @@ class BaseCommand {
170169
constrelativeFrom=prefixInsideCwd ? this.npm.localPrefix : process.cwd()
171170

172171
constfilters=this.npm.config.get('workspace')
172+
constgetWorkspaces=require('./workspaces/get-workspaces.js')
173173
constws=awaitgetWorkspaces(filters,{
174174
path: this.npm.localPrefix,
175175
includeWorkspaceRoot,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const log = require('../utils/log-shim')
55
constotplease=require('../utils/otplease.js')
66
constpkgJson=require('@npmcli/package-json')
77
constBaseCommand=require('../base-command.js')
8+
const{ redact }=require('@npmcli/redact')
89

910
constreadJson=async(path)=>{
1011
try{
@@ -119,7 +120,7 @@ class Owner extends BaseCommand {
119120
this.npm.output(maintainers.map(m=>`${m.name} <${m.email}>`).join('\n'))
120121
}
121122
}catch(err){
122-
log.error('owner ls',"Couldn't get owner data",npmFetch.cleanUrl(pkg))
123+
log.error('owner ls',"Couldn't get owner data",redact(pkg))
123124
throwerr
124125
}
125126
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const{cleanUrl}=require('npm-registry-fetch')
1+
const{redact}=require('@npmcli/redact')
22
constlog=require('../utils/log-shim')
33
constpingUtil=require('../utils/ping.js')
44
constBaseCommand=require('../base-command.js')
@@ -9,7 +9,7 @@ class Ping extends BaseCommand {
99
staticname='ping'
1010

1111
asyncexec(args){
12-
constcleanRegistry=cleanUrl(this.npm.config.get('registry'))
12+
constcleanRegistry=redact(this.npm.config.get('registry'))
1313
log.notice('PING',cleanRegistry)
1414
conststart=Date.now()
1515
constdetails=awaitpingUtil({ ...this.npm.flatOptions})

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,12 @@ class Publish extends BaseCommand {
220220
})
221221
}
222222
if(manifest.publishConfig){
223-
flatten(manifest.publishConfig,opts)
223+
constcliFlags=this.npm.config.data.get('cli').raw
224+
// Filter out properties set in CLI flags to prioritize them over
225+
// corresponding `publishConfig` settings
226+
constfilteredPublishConfig=Object.fromEntries(
227+
Object.entries(manifest.publishConfig).filter(([key])=>!(keyincliFlags)))
228+
flatten(filteredPublishConfig,opts)
224229
}
225230
returnmanifest
226231
}

0 commit comments

Comments
 (0)