Fix: rimraf version + remove conflicting types (#1475)

* Fix: `rimraf` version + remove conflicting types

* chore: refactor `rimraf` import

* chore: clean up

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",

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",

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}.`);

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}.`);

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": {

tools/test/compileProtos.ts

@@ -17,15 +17,14 @@
 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';
 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);

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);
   });