Skip to content

Commit 38c2d57

Browse files
Remove deprecated rmdirSync usage from internal scripts (#3191)
Backport of #2972 to 15.x.x branch
1 parent b5dfb4c commit 38c2d57

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

benchmark/benchmark.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@ function exec(command, options = {}) {
3131
// and returns path to its 'dist' directory.
3232
function prepareBenchmarkProjects(revisionList) {
3333
const tmpDir = path.join(os.tmpdir(), 'graphql-js-benchmark');
34-
fs.rmdirSync(tmpDir, { recursive: true, force: true });
34+
fs.rmSync(tmpDir, { recursive: true, force: true });
3535
fs.mkdirSync(tmpDir);
3636

3737
const setupDir = path.join(tmpDir, 'setup');
38-
fs.rmdirSync(setupDir, { recursive: true, force: true });
3938
fs.mkdirSync(setupDir);
4039

4140
return revisionList.map((revision) => {
4241
console.log(`🍳 Preparing ${revision}...`);
4342
const projectPath = path.join(setupDir, revision);
44-
fs.rmdirSync(projectPath, { recursive: true });
43+
fs.rmSync(projectPath, { recursive: true, force: true });
4544
fs.mkdirSync(projectPath);
4645

4746
fs.writeFileSync(
@@ -73,12 +72,12 @@ function prepareBenchmarkProjects(revisionList) {
7372
}
7473

7574
const repoDir = path.join(tmpDir, hash);
76-
fs.rmdirSync(repoDir, { recursive: true, force: true });
75+
fs.rmSync(repoDir, { recursive: true, force: true });
7776
fs.mkdirSync(repoDir);
7877
exec(`git archive "${hash}" | tar -xC "${repoDir}"`);
7978
exec('npm --quiet ci', { cwd: repoDir });
8079
fs.renameSync(buildNPMArchive(repoDir), archivePath);
81-
fs.rmdirSync(repoDir, { recursive: true, force: true });
80+
fs.rmSync(repoDir, { recursive: true });
8281
return archivePath;
8382
}
8483

integrationTests/integration-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function exec(command, options = {}) {
1717

1818
describe('Integration Tests', () => {
1919
const tmpDir = path.join(os.tmpdir(), 'graphql-js-integrationTmp');
20-
fs.rmdirSync(tmpDir, { recursive: true, force: true });
20+
fs.rmSync(tmpDir, { recursive: true, force: true });
2121
fs.mkdirSync(tmpDir);
2222

2323
const distDir = path.resolve('./npmDist');

resources/build-deno.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const babel = require('@babel/core');
88
const { readdirRecursive, showDirStats } = require('./utils');
99

1010
if (require.main === module) {
11-
fs.rmdirSync('./denoDist', { recursive: true, force: true });
11+
fs.rmSync('./denoDist', { recursive: true, force: true });
1212
fs.mkdirSync('./denoDist');
1313

1414
const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ });

resources/build-npm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const babel = require('@babel/core');
99
const { readdirRecursive, showDirStats } = require('./utils');
1010

1111
if (require.main === module) {
12-
fs.rmdirSync('./npmDist', { recursive: true, force: true });
12+
fs.rmSync('./npmDist', { recursive: true, force: true });
1313
fs.mkdirSync('./npmDist');
1414

1515
const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ });

0 commit comments

Comments
 (0)