From ac34c384739c9695290a30e676d8948892ba6e71 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 29 Jul 2023 03:48:13 +0000 Subject: [PATCH] Update dependency rimraf to v5 (#768) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Francisco Giordano --- packages/core/package.json | 4 ++-- packages/core/src/cli/cli.test.ts | 3 +-- .../src/cli/validate/build-info-file.test.ts | 5 +---- .../cli/validate/validate-upgrade-safety.test.ts | 5 +---- packages/core/src/impl-store.test.ts | 5 +---- .../src/scripts/migrate-oz-cli-project.test.ts | 4 +--- packages/plugin-defender-hardhat/package.json | 2 +- packages/plugin-hardhat/package.json | 2 +- packages/plugin-truffle/package.json | 2 +- yarn.lock | 16 ++++++++++++++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 5bdf2de6c..0ee1c7731 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -43,7 +43,7 @@ "@types/cbor": "^5.0.0", "@types/debug": "^4.1.5", "@types/mocha": "^7.0.2", - "@types/node": "^10.17.26", + "@types/node": "^16.11.7", "@types/proper-lockfile": "^4.1.1", "@types/rimraf": "^3.0.0", "@types/sinon": "^10.0.13", @@ -51,7 +51,7 @@ "dotenv": "^16.0.0", "fgbg": "^0.1.4", "hardhat": "^2.0.2", - "rimraf": "^3.0.2", + "rimraf": "^5.0.0", "typescript": "^4.0.0" }, "dependencies": { diff --git a/packages/core/src/cli/cli.test.ts b/packages/core/src/cli/cli.test.ts index 451f99a0e..ffe64d97e 100644 --- a/packages/core/src/cli/cli.test.ts +++ b/packages/core/src/cli/cli.test.ts @@ -4,11 +4,10 @@ import { exec } from 'child_process'; import { promises as fs } from 'fs'; import path from 'path'; import os from 'os'; -import rimrafAsync from 'rimraf'; +import { rimraf } from 'rimraf'; import { artifacts } from 'hardhat'; const execAsync = promisify(exec); -const rimraf = promisify(rimrafAsync); const CLI = 'node dist/cli/cli.js'; diff --git a/packages/core/src/cli/validate/build-info-file.test.ts b/packages/core/src/cli/validate/build-info-file.test.ts index 2824edbfd..4cbcfaac3 100644 --- a/packages/core/src/cli/validate/build-info-file.test.ts +++ b/packages/core/src/cli/validate/build-info-file.test.ts @@ -1,14 +1,11 @@ import test, { ExecutionContext } from 'ava'; import { promises as fs } from 'fs'; -import rimrafAsync from 'rimraf'; -import util from 'util'; +import { rimraf } from 'rimraf'; import path from 'path'; import os from 'os'; import { BuildInfoFile, getBuildInfoFiles } from './build-info-file'; -const rimraf = util.promisify(rimrafAsync); - test.beforeEach(async t => { process.chdir(await fs.mkdtemp(path.join(os.tmpdir(), `upgrades-core-test-${t.title.replace(/\s/g, '-')}-`))); }); diff --git a/packages/core/src/cli/validate/validate-upgrade-safety.test.ts b/packages/core/src/cli/validate/validate-upgrade-safety.test.ts index fdf7eda6d..264a5a641 100644 --- a/packages/core/src/cli/validate/validate-upgrade-safety.test.ts +++ b/packages/core/src/cli/validate/validate-upgrade-safety.test.ts @@ -1,8 +1,7 @@ import test from 'ava'; import { promises as fs } from 'fs'; -import rimrafAsync from 'rimraf'; -import util from 'util'; +import { rimraf } from 'rimraf'; import path from 'path'; import os from 'os'; @@ -10,8 +9,6 @@ import { artifacts } from 'hardhat'; import { validateUpgradeSafety } from './validate-upgrade-safety'; import { ReferenceContractNotFound } from './upgradeability-assessment'; -const rimraf = util.promisify(rimrafAsync); - test.before(async () => { process.chdir(await fs.mkdtemp(path.join(os.tmpdir(), 'upgrades-core-test-'))); }); diff --git a/packages/core/src/impl-store.test.ts b/packages/core/src/impl-store.test.ts index e45e9beb7..c3d6fb019 100644 --- a/packages/core/src/impl-store.test.ts +++ b/packages/core/src/impl-store.test.ts @@ -1,8 +1,7 @@ import test from 'ava'; import { promises as fs } from 'fs'; -import rimrafAsync from 'rimraf'; -import util from 'util'; +import { rimraf } from 'rimraf'; import path from 'path'; import os from 'os'; import sinon from 'sinon'; @@ -12,8 +11,6 @@ import { getVersion } from './version'; import { stubProvider } from './stub-provider'; import { ImplDeployment } from './manifest'; -const rimraf = util.promisify(rimrafAsync); - test.before(async () => { process.chdir(await fs.mkdtemp(path.join(os.tmpdir(), 'upgrades-core-test-'))); }); diff --git a/packages/core/src/scripts/migrate-oz-cli-project.test.ts b/packages/core/src/scripts/migrate-oz-cli-project.test.ts index 81fcc4ec6..591883cc5 100644 --- a/packages/core/src/scripts/migrate-oz-cli-project.test.ts +++ b/packages/core/src/scripts/migrate-oz-cli-project.test.ts @@ -1,8 +1,7 @@ import os from 'os'; import test from 'ava'; import path from 'path'; -import util from 'util'; -import rimrafAsync from 'rimraf'; +import { rimraf } from 'rimraf'; import { promises as fs } from 'fs'; import { compare as compareVersions } from 'compare-versions'; import { @@ -13,7 +12,6 @@ import { migrateLegacyProject, } from './migrate-oz-cli-project'; -const rimraf = util.promisify(rimrafAsync); const BASE_PATH = 'src/scripts'; const OPENZEPPELIN_FOLDER = '.openzeppelin'; const PROJECT_FILE = path.join(OPENZEPPELIN_FOLDER, 'project.json'); diff --git a/packages/plugin-defender-hardhat/package.json b/packages/plugin-defender-hardhat/package.json index c9e38643c..4c476d3be 100644 --- a/packages/plugin-defender-hardhat/package.json +++ b/packages/plugin-defender-hardhat/package.json @@ -27,7 +27,7 @@ "hardhat": "^2.0.2", "promisified": "^0.5.0", "proxyquire": "^2.1.3", - "rimraf": "^3.0.2", + "rimraf": "^5.0.0", "sinon": "^15.0.0" }, "dependencies": { diff --git a/packages/plugin-hardhat/package.json b/packages/plugin-hardhat/package.json index 50be667dd..be734650c 100644 --- a/packages/plugin-hardhat/package.json +++ b/packages/plugin-hardhat/package.json @@ -30,7 +30,7 @@ "fgbg": "^0.1.4", "hardhat": "^2.0.2", "promisified": "^0.5.0", - "rimraf": "^3.0.2" + "rimraf": "^5.0.0" }, "dependencies": { "@openzeppelin/defender-base-client": "^1.47.0", diff --git a/packages/plugin-truffle/package.json b/packages/plugin-truffle/package.json index 2bd334c1d..0b3a01217 100644 --- a/packages/plugin-truffle/package.json +++ b/packages/plugin-truffle/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "bn.js": "^5.1.2", - "rimraf": "^3.0.2" + "rimraf": "^5.0.0" }, "dependencies": { "@openzeppelin/upgrades-core": "^1.26.2", diff --git a/yarn.lock b/yarn.lock index 8f0727f86..933efcb05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3124,7 +3124,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== -"@types/node@^10.1.0", "@types/node@^10.17.26": +"@types/node@^10.1.0": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== @@ -3134,6 +3134,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== +"@types/node@^16.11.7": + version "16.18.39" + resolved "https://registry.npmjs.org/@types/node/-/node-16.18.39.tgz#aa39a1a87a40ef6098ee69689a1acb0c1b034832" + integrity sha512-8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -6776,7 +6781,7 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2: +glob@^10.2.2, glob@^10.2.5: version "10.3.3" resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b" integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw== @@ -10843,6 +10848,13 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.1.tgz#0881323ab94ad45fec7c0221f27ea1a142f3f0d0" + integrity sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg== + dependencies: + glob "^10.2.5" + ripemd160-min@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/ripemd160-min/-/ripemd160-min-0.0.6.tgz#a904b77658114474d02503e819dcc55853b67e62"