From 30a249e7275613e62cb1b72c2c452eeaef977ca7 Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Sun, 20 Jun 2021 14:32:44 +0300 Subject: [PATCH] Remove deprecated rmdirSync usage from internal scripts Backport of #2972 to 15.x.x branch --- benchmark/benchmark.js | 9 ++++----- integrationTests/integration-test.js | 2 +- resources/build-deno.js | 2 +- resources/build-npm.js | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js index 0f83a2efdc..2081610f4f 100644 --- a/benchmark/benchmark.js +++ b/benchmark/benchmark.js @@ -31,17 +31,16 @@ function exec(command, options = {}) { // and returns path to its 'dist' directory. function prepareBenchmarkProjects(revisionList) { const tmpDir = path.join(os.tmpdir(), 'graphql-js-benchmark'); - fs.rmdirSync(tmpDir, { recursive: true, force: true }); + fs.rmSync(tmpDir, { recursive: true, force: true }); fs.mkdirSync(tmpDir); const setupDir = path.join(tmpDir, 'setup'); - fs.rmdirSync(setupDir, { recursive: true, force: true }); fs.mkdirSync(setupDir); return revisionList.map((revision) => { console.log(`🍳 Preparing ${revision}...`); const projectPath = path.join(setupDir, revision); - fs.rmdirSync(projectPath, { recursive: true }); + fs.rmSync(projectPath, { recursive: true, force: true }); fs.mkdirSync(projectPath); fs.writeFileSync( @@ -73,12 +72,12 @@ function prepareBenchmarkProjects(revisionList) { } const repoDir = path.join(tmpDir, hash); - fs.rmdirSync(repoDir, { recursive: true, force: true }); + fs.rmSync(repoDir, { recursive: true, force: true }); fs.mkdirSync(repoDir); exec(`git archive "${hash}" | tar -xC "${repoDir}"`); exec('npm --quiet ci', { cwd: repoDir }); fs.renameSync(buildNPMArchive(repoDir), archivePath); - fs.rmdirSync(repoDir, { recursive: true, force: true }); + fs.rmSync(repoDir, { recursive: true }); return archivePath; } diff --git a/integrationTests/integration-test.js b/integrationTests/integration-test.js index 6f3d40cc88..2f2c90e8fe 100644 --- a/integrationTests/integration-test.js +++ b/integrationTests/integration-test.js @@ -17,7 +17,7 @@ function exec(command, options = {}) { describe('Integration Tests', () => { const tmpDir = path.join(os.tmpdir(), 'graphql-js-integrationTmp'); - fs.rmdirSync(tmpDir, { recursive: true, force: true }); + fs.rmSync(tmpDir, { recursive: true, force: true }); fs.mkdirSync(tmpDir); const distDir = path.resolve('./npmDist'); diff --git a/resources/build-deno.js b/resources/build-deno.js index 1b1685a21a..e6b823f01d 100644 --- a/resources/build-deno.js +++ b/resources/build-deno.js @@ -8,7 +8,7 @@ const babel = require('@babel/core'); const { readdirRecursive, showDirStats } = require('./utils'); if (require.main === module) { - fs.rmdirSync('./denoDist', { recursive: true, force: true }); + fs.rmSync('./denoDist', { recursive: true, force: true }); fs.mkdirSync('./denoDist'); const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ }); diff --git a/resources/build-npm.js b/resources/build-npm.js index e39a2c63df..15ccce6522 100644 --- a/resources/build-npm.js +++ b/resources/build-npm.js @@ -9,7 +9,7 @@ const babel = require('@babel/core'); const { readdirRecursive, showDirStats } = require('./utils'); if (require.main === module) { - fs.rmdirSync('./npmDist', { recursive: true, force: true }); + fs.rmSync('./npmDist', { recursive: true, force: true }); fs.mkdirSync('./npmDist'); const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ });