Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: pacote@13.6.2 #5315

Merged
merged 1 commit into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions node_modules/pacote/lib/bin.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@ const run = conf => {
case 'tarball':
if (!conf._[2] || conf._[2] === '-') {
return pacote.tarball.stream(conf._[1], stream => {
stream.pipe(conf.testStdout ||
/* istanbul ignore next */ process.stdout)
stream.pipe(
conf.testStdout ||
/* istanbul ignore next */
process.stdout
)
// make sure it resolves something falsey
return stream.promise().then(() => {})
return stream.promise().then(() => {
return false
})
}, conf)
} else {
return pacote.tarball.file(conf._[1], conf._[2], conf)
Expand Down
6 changes: 5 additions & 1 deletion node_modules/pacote/lib/fetcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ class FetcherBase {
cstream.on('error', err => stream.emit('error', err))
stream.pipe(cstream)

// eslint-disable-next-line promise/catch-or-return
cstream.promise().catch(() => {}).then(() => middleStream.end())
return middleStream
}
Expand All @@ -269,7 +270,10 @@ class FetcherBase {
}

// override the types getter
get types () {}
get types () {
return false
}

[_assertType] () {
if (this.types && !this.types.includes(this.spec.type)) {
throw new TypeError(`Wrong spec type (${
Expand Down
17 changes: 8 additions & 9 deletions node_modules/pacote/lib/git.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class GitFetcher extends Fetcher {
tarballOk = tarballOk &&
h && resolved === repoUrl(h, { noCommittish: false }) && h.tarball

return cacache.tmp.withTmp(this.cache, o, tmp => {
return cacache.tmp.withTmp(this.cache, o, async tmp => {
// if we're resolved, and have a tarball url, shell out to RemoteFetcher
if (tarballOk) {
const nameat = this.spec.name ? `${this.spec.name}@` : ''
Expand All @@ -259,16 +259,15 @@ class GitFetcher extends Fetcher {
})
}

return (
const sha = await (
h ? this[_cloneHosted](ref, tmp)
: this[_cloneRepo](this.spec.fetchSpec, ref, tmp)
).then(sha => {
this.resolvedSha = sha
if (!this.resolved) {
this[_addGitSha](sha)
}
})
.then(() => handler(tmp))
)
this.resolvedSha = sha
if (!this.resolved) {
await this[_addGitSha](sha)
}
return handler(tmp)
})
}

Expand Down
1 change: 1 addition & 0 deletions node_modules/pacote/lib/remote.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class RemoteFetcher extends Fetcher {
algorithms: [this.pickIntegrityAlgorithm()],
}

// eslint-disable-next-line promise/always-return
fetch(this.resolved, fetchOpts).then(res => {
res.body.on('error',
/* istanbul ignore next - exceedingly rare and hard to simulate */
Expand Down
2 changes: 1 addition & 1 deletion node_modules/pacote/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pacote",
"version": "13.6.1",
"version": "13.6.2",
"description": "JavaScript package downloader",
"author": "GitHub Inc.",
"bin": {
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"npmlog": "^6.0.2",
"opener": "^1.5.2",
"p-map": "^4.0.0",
"pacote": "^13.6.1",
"pacote": "^13.6.2",
"parse-conflict-json": "^2.0.2",
"proc-log": "^2.0.1",
"qrcode-terminal": "^0.12.0",
Expand Down Expand Up @@ -5598,9 +5598,9 @@
}
},
"node_modules/pacote": {
"version": "13.6.1",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-13.6.1.tgz",
"integrity": "sha512-L+2BI1ougAPsFjXRyBhcKmfT016NscRFLv6Pz5EiNf1CCFJFU0pSKKQwsZTyAQB+sTuUL4TyFyp6J1Ork3dOqw==",
"version": "13.6.2",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-13.6.2.tgz",
"integrity": "sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==",
"inBundle": true,
"dependencies": {
"@npmcli/git": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"npmlog": "^6.0.2",
"opener": "^1.5.2",
"p-map": "^4.0.0",
"pacote": "^13.6.1",
"pacote": "^13.6.2",
"parse-conflict-json": "^2.0.2",
"proc-log": "^2.0.1",
"qrcode-terminal": "^0.12.0",
Expand Down