From f9f8b1328c38718bf621b92338b3d81297525aa6 Mon Sep 17 00:00:00 2001 From: Daniel Bankhead Date: Tue, 18 Jul 2023 15:37:51 -0700 Subject: [PATCH] Fix: `rimraf` version + remove conflicting types (#1475) * Fix: `rimraf` version + remove conflicting types * chore: refactor `rimraf` import * chore: clean up --- package.json | 3 +-- test/showcase-server/package.json | 2 +- test/showcase-server/src/index.ts | 6 +++--- test/system-test/test.clientlibs.ts | 5 ++--- tools/package.json | 5 ++--- tools/test/compileProtos.ts | 5 ++--- tools/test/minify.ts | 5 ++--- 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 5102f9b1b..04f2c62ca 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "@types/object-hash": "^3.0.0", "@types/proxyquire": "^1.3.28", "@types/pumpify": "^1.4.1", - "@types/rimraf": "^3.0.2", "@types/sinon": "^10.0.0", "@types/uglify-js": "^3.17.0", "c8": "^8.0.0", @@ -50,7 +49,7 @@ "protobufjs-cli": "1.1.1", "proxyquire": "^2.0.1", "pumpify": "^2.0.0", - "rimraf": "^3.0.2", + "rimraf": "^5.0.1", "sinon": "^15.0.0", "stream-events": "^1.0.4", "ts-loader": "^8.0.0", diff --git a/test/showcase-server/package.json b/test/showcase-server/package.json index 0568a8651..f8d4dbfe5 100644 --- a/test/showcase-server/package.json +++ b/test/showcase-server/package.json @@ -19,7 +19,7 @@ "dependencies": { "download": "^8.0.0", "execa": "^5.0.0", - "rimraf": "^3.0.0" + "rimraf": "^5.0.1" }, "devDependencies": { "@types/download": "^8.0.1", diff --git a/test/showcase-server/src/index.ts b/test/showcase-server/src/index.ts index c67405814..943c283e0 100644 --- a/test/showcase-server/src/index.ts +++ b/test/showcase-server/src/index.ts @@ -18,11 +18,11 @@ import * as execa from 'execa'; import * as download from 'download'; import * as fs from 'fs'; import * as path from 'path'; -import * as rimraf from 'rimraf'; +import {rimraf} from 'rimraf'; import * as util from 'util'; const mkdir = util.promisify(fs.mkdir); -const rmrf = util.promisify(rimraf); + const timeout = 5000; // wait after the server launches function sleep(timeoutMs: number) { @@ -41,7 +41,7 @@ export class ShowcaseServer { const fallbackServerUrl = `https://github.com/googleapis/gapic-showcase/releases/download/v${showcaseVersion}/${tarballFilename}`; const binaryName = './gapic-showcase'; - await rmrf(testDir); + await rimraf(testDir); await mkdir(testDir); process.chdir(testDir); console.log(`Server will be run from ${testDir}.`); diff --git a/test/system-test/test.clientlibs.ts b/test/system-test/test.clientlibs.ts index 966ccc6b4..9391df900 100644 --- a/test/system-test/test.clientlibs.ts +++ b/test/system-test/test.clientlibs.ts @@ -17,11 +17,10 @@ import * as execa from 'execa'; import * as fs from 'fs'; import * as path from 'path'; -import * as rimraf from 'rimraf'; +import {rimraf} from 'rimraf'; import * as util from 'util'; import {describe, it, before} from 'mocha'; -const rmrf = util.promisify(rimraf); const mkdir = util.promisify(fs.mkdir); const readFile = util.promisify(fs.readFile); const writeFile = util.promisify(fs.writeFile); @@ -198,7 +197,7 @@ describe('Run system tests for some libraries', () => { throw new Error(`npm pack tarball ${toolsTarball} does not exist`); } - await rmrf(testDir); + await rimraf(testDir); await mkdir(testDir); process.chdir(testDir); console.log(`Running tests in ${testDir}.`); diff --git a/tools/package.json b/tools/package.json index c53b23cc6..abe693a75 100644 --- a/tools/package.json +++ b/tools/package.json @@ -28,12 +28,11 @@ "author": "Google API Authors", "license": "Apache-2.0", "dependencies": { - "@types/rimraf": "^3.0.2", "google-proto-files": "^3.0.0", "protobufjs-cli": "1.1.1", + "rimraf": "^5.0.1", "uglify-js": "^3.17.0", - "walkdir": "^0.4.0", - "rimraf": "^3.0.2" + "walkdir": "^0.4.0" }, "repository": "googleapis/gax-nodejs", "devDependencies": { diff --git a/tools/test/compileProtos.ts b/tools/test/compileProtos.ts index 87020b606..89b261a65 100644 --- a/tools/test/compileProtos.ts +++ b/tools/test/compileProtos.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import {describe, it, beforeEach, afterEach} from 'mocha'; import * as fs from 'fs'; -import * as rimraf from 'rimraf'; +import {rimraf} from 'rimraf'; import * as util from 'util'; import * as path from 'path'; import * as protobuf from 'protobufjs'; @@ -25,7 +25,6 @@ import * as compileProtos from '../src/compileProtos'; const readFile = util.promisify(fs.readFile); const mkdir = util.promisify(fs.mkdir); -const rmrf = util.promisify(rimraf); const testDir = path.join(process.cwd(), '.compileProtos-test'); const resultDir = path.join(testDir, 'protos'); @@ -38,7 +37,7 @@ const expectedTSResultFile = path.join(resultDir, 'protos.d.ts'); describe('compileProtos tool', () => { beforeEach(async () => { if (fs.existsSync(testDir)) { - await rmrf(testDir); + await rimraf(testDir); } await mkdir(testDir); await mkdir(resultDir); diff --git a/tools/test/minify.ts b/tools/test/minify.ts index 14d86eebf..19f814b0f 100644 --- a/tools/test/minify.ts +++ b/tools/test/minify.ts @@ -16,19 +16,18 @@ import * as assert from 'assert'; import {describe, it, beforeEach} from 'mocha'; import * as fs from 'fs'; import {promises as fsp} from 'fs'; -import * as rimraf from 'rimraf'; +import {rimraf} from 'rimraf'; import * as path from 'path'; import * as minify from '../src/minify'; import {promisify} from 'util'; -const rmrf = promisify(rimraf); const testDir = path.join(process.cwd(), '.minify-test'); const fixturesDir = path.join(__dirname, '..', 'test', 'fixtures'); describe('minify tool', () => { beforeEach(async () => { if (fs.existsSync(testDir)) { - await rmrf(testDir); + await rimraf(testDir); } await fsp.mkdir(testDir); });