diff --git a/package.json b/package.json index 67471e522..1927e830c 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "react-virtuoso": "1.2.4", "redux": "^4.2.1", "reselect": "~4.1.8", - "rimraf": "^3.0.2", + "rimraf": "~5.0.5", "semver": "^7.5.4" }, "devDependencies": { @@ -130,7 +130,7 @@ "jest": "~29.7.0", "jest-environment-jsdom": "~29.7.0", "jimp": "~0.16.13", - "npm-run-all": "^4.1.5", + "npm-run-all": "~4.1.5", "prettier": "~2.8.8", "puppeteer": "^13.1.2", "rollup": "~2.79.1", diff --git a/src/app/main/app.ts b/src/app/main/app.ts index 98f819cb3..eb2fb236a 100644 --- a/src/app/main/app.ts +++ b/src/app/main/app.ts @@ -1,5 +1,5 @@ import { app, session } from 'electron'; -import rimraf from 'rimraf'; +import { rimraf } from 'rimraf'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore:next-line diff --git a/src/buildAssets.ts b/src/buildAssets.ts index 105fdf62c..32e2bb406 100644 --- a/src/buildAssets.ts +++ b/src/buildAssets.ts @@ -8,7 +8,7 @@ import Jimp from 'jimp'; import puppeteer from 'puppeteer'; import { createElement } from 'react'; import { renderToStaticMarkup } from 'react-dom/server'; -import rimraf from 'rimraf'; +import { rimraf } from 'rimraf'; import type { Server } from './servers/common'; import DmgBackground from './ui/assets/DmgBackground'; @@ -263,7 +263,7 @@ const run = async (): Promise => { await createWindowsAppIcons(); await createLinuxAppIcons(); - await util.promisify(rimraf)('src/public/images/tray'); + await rimraf('src/public/images/tray'); await createMacOSTrayIcons(); await createWindowsTrayIcons(); diff --git a/workspaces/desktop-release-action/package.json b/workspaces/desktop-release-action/package.json index 4c18db0f0..5d9916edf 100644 --- a/workspaces/desktop-release-action/package.json +++ b/workspaces/desktop-release-action/package.json @@ -20,9 +20,9 @@ "eslint-import-resolver-typescript": "~3.6.1", "eslint-plugin-import": "~2.26.0", "eslint-plugin-prettier": "~4.2.1", - "npm-run-all": "^4.1.5", + "npm-run-all": "~4.1.5", "prettier": "~2.8.8", - "rimraf": "^3.0.2", + "rimraf": "~5.0.5", "typescript": "~5.3.3" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index b45f114f6..eaec66ecf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4948,9 +4948,9 @@ __metadata: eslint-plugin-import: "npm:~2.26.0" eslint-plugin-prettier: "npm:~4.2.1" fast-glob: "npm:^3.2.5" - npm-run-all: "npm:^4.1.5" + npm-run-all: "npm:~4.1.5" prettier: "npm:~2.8.8" - rimraf: "npm:^3.0.2" + rimraf: "npm:~5.0.5" semver: "npm:^7.3.5" typescript: "npm:~5.3.3" languageName: unknown @@ -9873,6 +9873,21 @@ __metadata: languageName: node linkType: hard +"glob@npm:^10.3.7": + version: 10.3.10 + resolution: "glob@npm:10.3.10" + dependencies: + foreground-child: "npm:^3.1.0" + jackspeak: "npm:^2.3.5" + minimatch: "npm:^9.0.1" + minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry: "npm:^1.10.1" + bin: + glob: dist/esm/bin.mjs + checksum: 38bdb2c9ce75eb5ed168f309d4ed05b0798f640b637034800a6bf306f39d35409bf278b0eaaffaec07591085d3acb7184a201eae791468f0f617771c2486a6a8 + languageName: node + linkType: hard + "glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -10951,6 +10966,19 @@ __metadata: languageName: node linkType: hard +"jackspeak@npm:^2.3.5": + version: 2.3.6 + resolution: "jackspeak@npm:2.3.6" + dependencies: + "@isaacs/cliui": "npm:^8.0.2" + "@pkgjs/parseargs": "npm:^0.11.0" + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 6e6490d676af8c94a7b5b29b8fd5629f21346911ebe2e32931c2a54210134408171c24cee1a109df2ec19894ad04a429402a8438cbf5cc2794585d35428ace76 + languageName: node + linkType: hard + "jake@npm:^10.8.5": version: 10.8.7 resolution: "jake@npm:10.8.7" @@ -12734,7 +12762,7 @@ __metadata: languageName: node linkType: hard -"npm-run-all@npm:^4.1.5": +"npm-run-all@npm:~4.1.5": version: 4.1.5 resolution: "npm-run-all@npm:4.1.5" dependencies: @@ -14238,6 +14266,17 @@ __metadata: languageName: node linkType: hard +"rimraf@npm:~5.0.5": + version: 5.0.5 + resolution: "rimraf@npm:5.0.5" + dependencies: + glob: "npm:^10.3.7" + bin: + rimraf: dist/esm/bin.mjs + checksum: a612c7184f96258b7d1328c486b12ca7b60aa30e04229a08bbfa7e964486deb1e9a1b52d917809311bdc39a808a4055c0f950c0280fba194ba0a09e6f0d404f6 + languageName: node + linkType: hard + "roarr@npm:^2.15.3": version: 2.15.4 resolution: "roarr@npm:2.15.4" @@ -14325,7 +14364,7 @@ __metadata: jimp: "npm:~0.16.13" jsonwebtoken: "npm:~9.0.2" moment: "npm:^2.29.4" - npm-run-all: "npm:^4.1.5" + npm-run-all: "npm:~4.1.5" prettier: "npm:~2.8.8" puppeteer: "npm:^13.1.2" react: "npm:~18.2.0" @@ -14337,7 +14376,7 @@ __metadata: react-virtuoso: "npm:1.2.4" redux: "npm:^4.2.1" reselect: "npm:~4.1.8" - rimraf: "npm:^3.0.2" + rimraf: "npm:~5.0.5" rollup: "npm:~2.79.1" rollup-plugin-copy: "npm:~3.4.0" semver: "npm:^7.5.4"