diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 6fa63fdc3..1a75ade8c 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -22,6 +22,7 @@ Component,Origin,Licence,Copyright @types/js-yaml,dev,MIT,Bart van der Schoor @types/node,dev,MIT,Copyright Microsoft Corporation @types/retry,dev,MIT,Copyright Stan Goldmann and BendingBender. +@types/rimraf,dev,MIT,Copyright Carlos Ballesteros Velasco and contributors @types/semver,dev,MIT,Copyright Microsoft Corporation @types/ssh2,dev,MIT,Copyright Microsoft Corporation @types/ssh2-streams,dev,MIT,Copyright Microsoft Corporation diff --git a/package.json b/package.json index 81ceb5b52..11856987f 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "jszip": "^3.10.1", "ora": "5.4.1", "proxy-agent": "^6.4.0", - "rimraf": "^6.0.1", + "rimraf": "^3.0.2", "semver": "^7.5.3", "simple-git": "3.16.0", "ssh2": "^1.15.0", @@ -124,6 +124,7 @@ "@types/jest": "29.5.3", "@types/js-yaml": "^4.0.5", "@types/node": "14.18.34", + "@types/rimraf": "^3.0.2", "@types/semver": "^7.3.12", "@types/ssh2": "1.11.6", "@types/ssh2-streams": "0.1.9", diff --git a/src/commands/dsyms/utils.ts b/src/commands/dsyms/utils.ts index a9f72f1ab..04ea49a71 100644 --- a/src/commands/dsyms/utils.ts +++ b/src/commands/dsyms/utils.ts @@ -2,7 +2,7 @@ import {promises} from 'fs' import {tmpdir} from 'os' import path from 'path' -import {rimraf} from 'rimraf' +import rimraf from 'rimraf' import {buildPath, execute} from '../../helpers/utils' @@ -25,9 +25,8 @@ export const createUniqueTmpDirectory = async (): Promise => { return directoryPath } -export const deleteDirectory = async (directoryPath: string): Promise => { - await rimraf(directoryPath) -} +export const deleteDirectory = async (directoryPath: string): Promise => + new Promise((resolve, reject) => rimraf(directoryPath, () => resolve())) export const zipDirectoryToArchive = async (directoryPath: string, archivePath: string) => { const cwd = path.dirname(directoryPath) diff --git a/yarn.lock b/yarn.lock index 3d023dc8e..8d2af65e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1910,6 +1910,7 @@ __metadata: "@types/js-yaml": ^4.0.5 "@types/node": 14.18.34 "@types/retry": 0.12.0 + "@types/rimraf": ^3.0.2 "@types/semver": ^7.3.12 "@types/ssh2": 1.11.6 "@types/ssh2-streams": 0.1.9 @@ -1955,7 +1956,7 @@ __metadata: prettier: 2.0.5 proxy: ^2.1.1 proxy-agent: ^6.4.0 - rimraf: ^6.0.1 + rimraf: ^3.0.2 semver: ^7.5.3 simple-git: 3.16.0 ssh2: ^1.15.0 @@ -3468,6 +3469,16 @@ __metadata: languageName: node linkType: hard +"@types/glob@npm:*": + version: 8.1.0 + resolution: "@types/glob@npm:8.1.0" + dependencies: + "@types/minimatch": ^5.1.2 + "@types/node": "*" + checksum: 9101f3a9061e40137190f70626aa0e202369b5ec4012c3fabe6f5d229cce04772db9a94fa5a0eb39655e2e4ad105c38afbb4af56a56c0996a8c7d4fc72350e3d + languageName: node + linkType: hard + "@types/glob@npm:7.1.1": version: 7.1.1 resolution: "@types/glob@npm:7.1.1" @@ -3571,7 +3582,7 @@ __metadata: languageName: node linkType: hard -"@types/minimatch@npm:*": +"@types/minimatch@npm:*, @types/minimatch@npm:^5.1.2": version: 5.1.2 resolution: "@types/minimatch@npm:5.1.2" checksum: 0391a282860c7cb6fe262c12b99564732401bdaa5e395bee9ca323c312c1a0f45efbf34dce974682036e857db59a5c9b1da522f3d6055aeead7097264c8705a8 @@ -3613,6 +3624,16 @@ __metadata: languageName: node linkType: hard +"@types/rimraf@npm:^3.0.2": + version: 3.0.2 + resolution: "@types/rimraf@npm:3.0.2" + dependencies: + "@types/glob": "*" + "@types/node": "*" + checksum: b47fa302f46434cba704d20465861ad250df79467d3d289f9d6490d3aeeb41e8cb32dd80bd1a8fd833d1e185ac719fbf9be12e05ad9ce9be094d8ee8f1405347 + languageName: node + linkType: hard + "@types/semver@npm:^7.3.12": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" @@ -6446,22 +6467,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^11.0.0": - version: 11.0.0 - resolution: "glob@npm:11.0.0" - dependencies: - foreground-child: ^3.1.0 - jackspeak: ^4.0.1 - minimatch: ^10.0.0 - minipass: ^7.1.2 - package-json-from-dist: ^1.0.0 - path-scurry: ^2.0.0 - bin: - glob: dist/esm/bin.mjs - checksum: 8a2dd914d5776987be5244624d9491bbcaf19f2387e06783737003ff696ebfd2264190c47014f8709c1c02d8bc892f17660cf986c587b107e194c0a3151ab333 - languageName: node - linkType: hard - "glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.2.0": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -7279,19 +7284,6 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^4.0.1": - version: 4.0.1 - resolution: "jackspeak@npm:4.0.1" - dependencies: - "@isaacs/cliui": ^8.0.2 - "@pkgjs/parseargs": ^0.11.0 - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 7989d19eddeff0631ef653df413e26290db77dc3791438bd12b56bed1c0b24d5d535fdfec13cf35775cd5b47f8ee57d36fd0bceaf2df672b1f523533fd4184cc - languageName: node - linkType: hard - "jest-changed-files@npm:^29.7.0": version: 29.7.0 resolution: "jest-changed-files@npm:29.7.0" @@ -8170,13 +8162,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^11.0.0": - version: 11.0.0 - resolution: "lru-cache@npm:11.0.0" - checksum: c29385f9369b1a566e1db9eda9a4b12f6507de906e5720ca12844dd775b7139c42b8e5837e7d5162bcc292ce4d3eecfa74ec2856c6afcc0caa2e3c9ea3a17f27 - languageName: node - linkType: hard - "lru-cache@npm:^5.1.1": version: 5.1.1 resolution: "lru-cache@npm:5.1.1" @@ -8307,15 +8292,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^10.0.0": - version: 10.0.1 - resolution: "minimatch@npm:10.0.1" - dependencies: - brace-expansion: ^2.0.1 - checksum: f5b63c2f30606091a057c5f679b067f84a2cd0ffbd2dbc9143bda850afd353c7be81949ff11ae0c86988f07390eeca64efd7143ee05a0dab37f6c6b38a2ebb6c - languageName: node - linkType: hard - "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" @@ -8415,13 +8391,6 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^7.1.2": - version: 7.1.2 - resolution: "minipass@npm:7.1.2" - checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3 - languageName: node - linkType: hard - "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -8943,13 +8912,6 @@ __metadata: languageName: node linkType: hard -"package-json-from-dist@npm:^1.0.0": - version: 1.0.0 - resolution: "package-json-from-dist@npm:1.0.0" - checksum: ac706ec856a5a03f5261e4e48fa974f24feb044d51f84f8332e2af0af04fbdbdd5bbbfb9cbbe354190409bc8307c83a9e38c6672c3c8855f709afb0006a009ea - languageName: node - linkType: hard - "pako@npm:~1.0.2": version: 1.0.11 resolution: "pako@npm:1.0.11" @@ -9016,16 +8978,6 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^2.0.0": - version: 2.0.0 - resolution: "path-scurry@npm:2.0.0" - dependencies: - lru-cache: ^11.0.0 - minipass: ^7.1.2 - checksum: 9953ce3857f7e0796b187a7066eede63864b7e1dfc14bf0484249801a5ab9afb90d9a58fc533ebb1b552d23767df8aa6a2c6c62caf3f8a65f6ce336a97bbb484 - languageName: node - linkType: hard - "path-to-regexp@npm:^0.1.2": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -9602,18 +9554,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^6.0.1": - version: 6.0.1 - resolution: "rimraf@npm:6.0.1" - dependencies: - glob: ^11.0.0 - package-json-from-dist: ^1.0.0 - bin: - rimraf: dist/esm/bin.mjs - checksum: 8ba5b84131c1344e9417cb7e8c05d8368bb73cbe5dd4c1d5eb49fc0b558209781658d18c450460e30607d0b7865bb067482839a2f343b186b07ae87715837e66 - languageName: node - linkType: hard - "run-async@npm:^2.4.0": version: 2.4.1 resolution: "run-async@npm:2.4.1"