build: use native Node.js functions to create and remove directories

clydin · alan-agius4 · commit 3b517c5c627d · 2021-06-03T19:51:37.000+02:00
With the removal of support for Node.js v10, native Node.js functionality can be used to recursively create and remove directories within the dev infrastructure.
diff --git a/scripts/build-schema.ts b/scripts/build-schema.ts
@@ -11,24 +11,6 @@ import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
 
-function _mkdirp(p: string) {
-  // Create parent folder if necessary.
-  if (!fs.existsSync(path.dirname(p))) {
-    _mkdirp(path.dirname(p));
-  }
-  if (!fs.existsSync(p)) {
-    fs.mkdirSync(p);
-  }
-}
-
-function _rimraf(p: string) {
-  glob.sync(path.join(p, '**/*'), { dot: true, nodir: true }).forEach((p) => fs.unlinkSync(p));
-  glob
-    .sync(path.join(p, '**/*'), { dot: true })
-    .sort((a, b) => b.length - a.length)
-    .forEach((p) => fs.rmdirSync(p));
-}
-
 export default async function (argv: {}, logger: logging.Logger) {
   const allJsonFiles = glob.sync('packages/**/*.json', {
     ignore: ['**/node_modules/**', '**/files/**', '**/*-files/**', '**/package.json'],
@@ -37,7 +19,7 @@ export default async function (argv: {}, logger: logging.Logger) {
 
   const quicktypeRunner = require('../tools/quicktype_runner');
   logger.info('Removing dist-schema/...');
-  _rimraf(dist);
+  fs.rmdirSync(dist, { recursive: true, maxRetries: 3 });
 
   logger.info('Generating JSON Schema....');
 
@@ -65,7 +47,7 @@ export default async function (argv: {}, logger: logging.Logger) {
     const tsContent = await quicktypeRunner.generate(fileName);
     const tsPath = path.join(dist, fileName.replace(/\.json$/, '.ts'));
 
-    _mkdirp(path.dirname(tsPath));
+    fs.mkdirSync(path.dirname(tsPath), { recursive: true });
     fs.writeFileSync(tsPath, tsContent, 'utf-8');
   }
 
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -11,7 +11,6 @@ import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
-import * as rimraf from 'rimraf';
 import { packages } from '../lib/packages';
 import buildSchema from './build-schema';
 
@@ -37,16 +36,6 @@ function _gitIgnoreMatch(p: string): boolean {
   return gitIgnore.some((line) => minimatch(p, line));
 }
 
-function _mkdirp(p: string) {
-  // Create parent folder if necessary.
-  if (!fs.existsSync(path.dirname(p))) {
-    _mkdirp(path.dirname(p));
-  }
-  if (!fs.existsSync(p)) {
-    fs.mkdirSync(p);
-  }
-}
-
 function _recursiveFileList(p: string): string[] {
   if (!fs.statSync(p).isDirectory()) {
     return [];
@@ -98,7 +87,7 @@ function _tar(out: string, dir: string) {
 function _copy(from: string, to: string) {
   // Create parent folder if necessary.
   if (!fs.existsSync(path.dirname(to))) {
-    _mkdirp(path.dirname(to));
+    fs.mkdirSync(path.dirname(to), { recursive: true });
   }
 
   // Error out if destination already exists.
@@ -135,7 +124,7 @@ function _rm(p: string) {
 function _clean(logger: logging.Logger) {
   logger.info('Cleaning...');
   logger.info('  Removing dist/...');
-  rimraf.sync(path.join(__dirname, '../dist'));
+  fs.rmdirSync(path.join(__dirname, '../dist'), { recursive: true, maxRetries: 3 });
 }
 
 function _sortPackages() {
@@ -203,7 +192,7 @@ export default async function (
     packageLogger.info(packageName);
     const pkg = packages[packageName];
     _recursiveCopy(pkg.build, pkg.dist, logger);
-    rimraf.sync(pkg.build);
+    fs.rmdirSync(pkg.build, { recursive: true, maxRetries: 3 });
   }
 
   logger.info('Merging bazel-bin/ with dist/');
@@ -215,7 +204,7 @@ export default async function (
     if (fs.existsSync(bazelBinPath)) {
       packageLogger.info(packageName);
       _recursiveCopy(bazelBinPath, pkg.dist, logger);
-      rimraf.sync(bazelBinPath);
+      fs.rmdirSync(bazelBinPath, { recursive: true, maxRetries: 3 });
     }
   }
 
