Skip to content
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
5 changes: 3 additions & 2 deletions lib/modules/datasource/nuget/v3.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isNonEmptyString } from '@sindresorhus/is';
import extract from 'extract-zip';
import AdmZip from 'adm-zip';
import semver from 'semver';
import upath from 'upath';
import { XmlDocument } from 'xmldoc';
Expand Down Expand Up @@ -307,7 +307,8 @@ export class NugetV3Api {
try {
const writeStream = fs.createCacheWriteStream(nupkgFile);
await fs.pipeline(readStream, writeStream);
await extract(nupkgFile, { dir: nupkgContentsDir });
const zip = new AdmZip(nupkgFile);
zip.extractAllTo(nupkgContentsDir);
const nuspecFile = upath.join(nupkgContentsDir, `${packageName}.nuspec`);
const nuspec = new XmlDocument(
await fs.readCacheFile(nuspecFile, 'utf8'),
Expand Down
7 changes: 3 additions & 4 deletions lib/modules/manager/terraform/lockfile/hash.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import crypto from 'node:crypto';
import extract from 'extract-zip';
import AdmZip from 'adm-zip';
import upath from 'upath';
import { logger } from '../../../../logger/index.ts';
import {
Expand Down Expand Up @@ -86,9 +86,8 @@ export class TerraformProviderHash {
zipFilePath: string,
extractPath: string,
): Promise<string> {
await extract(zipFilePath, {
dir: extractPath,
});
const zip = new AdmZip(zipFilePath);
zip.extractAllTo(extractPath);
const hash = await this.hashOfDir(extractPath);
// delete extracted files
await fs.rmCache(extractPath);
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
"@sindresorhus/is": "8.1.0",
"@yarnpkg/core": "4.8.0",
"@yarnpkg/parsers": "3.0.3",
"adm-zip": "0.5.17",
"ae-cvss-calculator": "1.0.12",
"agentkeepalive": "4.6.0",
"async-mutex": "0.5.0",
Expand All @@ -208,7 +209,6 @@
"emojibase": "17.0.0",
"emojibase-regex": "17.0.0",
"execa": "8.0.1",
"extract-zip": "2.0.1",
"find-packages": "10.0.4",
"find-up": "8.0.0",
"fs-extra": "11.3.5",
Expand Down Expand Up @@ -281,6 +281,7 @@
"@openpgp/web-stream-tools": "0.3.1",
"@semantic-release/exec": "7.1.0",
"@smithy/util-stream": "4.6.4",
"@types/adm-zip": "0.5.8",
"@types/aws4": "1.11.6",
"@types/breejs__later": "4.1.5",
"@types/bunyan": "1.8.11",
Expand Down
64 changes: 13 additions & 51 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading