Skip to content

Commit dd87646

Browse files
authored
fix(deps): remove rimraf in favor of native node rm function (#1626)
* fix(deps): remove rimraf in favor of native node rm function * use fsp.rm instead of rmSync * pin additional deps * move pinned deps to devDeps
1 parent e3cf430 commit dd87646

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

gax/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@
3939
"c8": "^9.0.0",
4040
"codecov": "^3.1.0",
4141
"execa": "^5.0.0",
42+
"glob": "10.4.0",
4243
"google-proto-files": "^4.2.0",
4344
"gts": "^5.0.0",
45+
"jackspeak": "3.4.0",
4446
"linkinator": "^4.0.0",
47+
"lru-cache": "10.3.0",
4548
"long": "^4.0.0",
4649
"mkdirp": "^2.0.0",
4750
"mocha": "^9.0.0",
@@ -50,7 +53,6 @@
5053
"protobufjs-cli": "1.1.2",
5154
"proxyquire": "^2.0.1",
5255
"pumpify": "^2.0.0",
53-
"rimraf": "^5.0.1",
5456
"sinon": "^18.0.0",
5557
"stream-events": "^1.0.4",
5658
"ts-loader": "^8.0.0",

gax/test/showcase-server/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
},
1919
"dependencies": {
2020
"download": "^8.0.0",
21-
"execa": "^5.0.0",
22-
"rimraf": "^5.0.1"
21+
"execa": "^5.0.0"
2322
},
2423
"devDependencies": {
2524
"@types/download": "^8.0.1",
2625
"@types/node": "^14.11.2",
2726
"typescript": "^4.0.3"
27+
},
28+
"engines": {
29+
"node": ">=14"
2830
}
2931
}

gax/test/showcase-server/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import * as execa from 'execa';
1818
import * as download from 'download';
1919
import * as fs from 'fs';
20+
import * as fsp from 'fs/promises';
2021
import * as path from 'path';
21-
import {rimraf} from 'rimraf';
2222
import * as util from 'util';
2323

2424
const mkdir = util.promisify(fs.mkdir);
@@ -41,7 +41,7 @@ export class ShowcaseServer {
4141
const fallbackServerUrl = `https://github.com/googleapis/gapic-showcase/releases/download/v${showcaseVersion}/${tarballFilename}`;
4242
const binaryName = './gapic-showcase';
4343

44-
await rimraf(testDir);
44+
await fsp.rm(testDir, {recursive: true, force: true});
4545
await mkdir(testDir);
4646
process.chdir(testDir);
4747
console.log(`Server will be run from ${testDir}.`);

gax/test/system-test/test.clientlibs.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import * as execa from 'execa';
1818
import * as fs from 'fs';
19+
import * as fsp from 'fs/promises';
1920
import * as path from 'path';
20-
import {rimraf} from 'rimraf';
2121
import * as util from 'util';
2222
import {describe, it, before} from 'mocha';
2323

@@ -189,7 +189,7 @@ describe('Run system tests for some libraries', () => {
189189
throw new Error(`npm pack tarball ${toolsTarball} does not exist`);
190190
}
191191

192-
await rimraf(testDir);
192+
await fsp.rm(testDir, {recursive: true, force: true});
193193
await mkdir(testDir);
194194
process.chdir(testDir);
195195
console.log(`Running tests in ${testDir}.`);

gax/test/unit/grpc.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import * as path from 'path';
2424
import * as proxyquire from 'proxyquire';
2525
import * as sinon from 'sinon';
2626
import {mkdirSync, writeFileSync} from 'fs';
27-
import {sync as rimrafSync} from 'rimraf';
27+
import * as fsp from 'fs/promises';
2828
import {afterEach, describe, it, beforeEach} from 'mocha';
2929

3030
import {protobuf} from '../../src/index';
@@ -683,7 +683,7 @@ dvorak
683683
const [cert, key] = await client._detectClientCertificate();
684684
assert.ok(cert.includes('qwerty'));
685685
assert.ok(key.includes('dvorak'));
686-
rimrafSync(tmpFolder); // Cleanup.
686+
await fsp.rm(tmpFolder, {recursive: true, force: true}); // Cleanup.
687687
});
688688
it('throws if attempted to use mTLS in non-default universe', async () => {
689689
// Pretend that "tmp-secure-context" in the current folder is the
@@ -702,7 +702,7 @@ dvorak
702702
client.createStub(DummyStub, {universeDomain: 'example.com'}),
703703
/configured universe domain/
704704
);
705-
rimrafSync(tmpFolder); // Cleanup.
705+
await fsp.rm(tmpFolder, {recursive: true, force: true}); // Cleanup.
706706
});
707707
});
708708
});

tools/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"google-gax": "^4.3.2",
3434
"google-proto-files": "^4.2.0",
3535
"protobufjs-cli": "1.1.2",
36-
"rimraf": "^5.0.1",
3736
"uglify-js": "^3.17.0",
3837
"walk-up-path": "^3.0.1",
3938
"walkdir": "^0.4.0"

tools/test/compileProtos.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import * as assert from 'assert';
1818
import {describe, it, beforeEach, afterEach} from 'mocha';
1919
import * as fs from 'fs';
2020
import * as fsp from 'fs/promises';
21-
import {rimraf} from 'rimraf';
2221
import {ncp} from 'ncp';
2322
import * as util from 'util';
2423
import * as path from 'path';
@@ -42,7 +41,7 @@ const expectedCommonJSResultFile = path.join(resultDir, 'protos.cjs');
4241
describe('compileProtos tool', () => {
4342
beforeEach(async () => {
4443
if (fs.existsSync(testDir)) {
45-
await rimraf(testDir);
44+
await fsp.rm(testDir, {recursive: true, force: true});
4645
}
4746
await mkdir(testDir);
4847
await mkdir(resultDir);

tools/test/minify.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import * as assert from 'assert';
1616
import {describe, it, beforeEach} from 'mocha';
1717
import * as fs from 'fs';
1818
import {promises as fsp} from 'fs';
19-
import {rimraf} from 'rimraf';
2019
import * as path from 'path';
2120
import * as minify from '../src/minify';
2221

@@ -26,7 +25,7 @@ const fixturesDir = path.join(__dirname, '..', 'test', 'fixtures');
2625
describe('minify tool', () => {
2726
beforeEach(async () => {
2827
if (fs.existsSync(testDir)) {
29-
await rimraf(testDir);
28+
await fsp.rm(testDir, {recursive: true, force: true});
3029
}
3130
await fsp.mkdir(testDir);
3231
});

0 commit comments

Comments
 (0)