Use correct flags for rmdir/mkdir functions (#2886)

graphql · Jan 18, 2021 · f0502f9 · f0502f9
1 parent 34ddf38
commit f0502f9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js
@@ -31,10 +31,10 @@ function exec(command, options = {}) {
 // and returns path to its 'dist' directory.
 function prepareBenchmarkProjects(revisionList) {
   const tmpDir = path.join(os.tmpdir(), 'graphql-js-benchmark');
-  fs.mkdirSync(tmpDir, { recursive: true });
+  fs.mkdirSync(tmpDir);
 
   const setupDir = path.join(tmpDir, 'setup');
-  fs.rmdirSync(setupDir, { recursive: true });
+  fs.rmdirSync(setupDir, { recursive: true, force: true });
   fs.mkdirSync(setupDir);
 
   return revisionList.map((revision) => {
@@ -72,12 +72,12 @@ function prepareBenchmarkProjects(revisionList) {
     }
 
     const repoDir = path.join(tmpDir, hash);
-    fs.rmdirSync(repoDir, { recursive: true });
+    fs.rmdirSync(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 });
+    fs.rmdirSync(repoDir, { recursive: true, force: true });
     return archivePath;
   }
 

diff --git 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 });
+  fs.rmdirSync(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
@@ -5,10 +5,10 @@ const path = require('path');
 
 const babel = require('@babel/core');
 
-const { rmdirRecursive, readdirRecursive, showDirStats } = require('./utils');
+const { readdirRecursive, showDirStats } = require('./utils');
 
 if (require.main === module) {
-  rmdirRecursive('./denoDist');
+  fs.rmdirSync('./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
@@ -6,10 +6,10 @@ const assert = require('assert');
 
 const babel = require('@babel/core');
 
-const { rmdirRecursive, readdirRecursive, showDirStats } = require('./utils');
+const { readdirRecursive, showDirStats } = require('./utils');
 
 if (require.main === module) {
-  rmdirRecursive('./npmDist');
+  fs.rmdirSync('./npmDist', { recursive: true, force: true });
   fs.mkdirSync('./npmDist');
 
   const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ });

diff --git a/resources/utils.js b/resources/utils.js
@@ -32,20 +32,6 @@ function removeTrailingNewLine(str) {
   return str.split('\n').slice(0, -1).join('\n');
 }
 
-function rmdirRecursive(dirPath) {
-  if (fs.existsSync(dirPath)) {
-    for (const dirent of fs.readdirSync(dirPath, { withFileTypes: true })) {
-      const fullPath = path.join(dirPath, dirent.name);
-      if (dirent.isDirectory()) {
-        rmdirRecursive(fullPath);
-      } else {
-        fs.unlinkSync(fullPath);
-      }
-    }
-    fs.rmdirSync(dirPath);
-  }
-}
-
 function readdirRecursive(dirPath, opts = {}) {
   const { ignoreDir } = opts;
   const result = [];
@@ -116,7 +102,6 @@ function showDirStats(dirPath) {
 module.exports = {
   exec,
   execAsync,
-  rmdirRecursive,
   readdirRecursive,
   showDirStats,
 };