refactor(@angular-devkit/build-angular): refactor NodeJsAsyncHost to use FS promises

Author: alan-agius4

packages/angular/cli/utilities/package-tree.ts

@@ -9,11 +9,8 @@
 import * as fs from 'fs';
 import { dirname, join } from 'path';
 import * as resolve from 'resolve';
-import { promisify } from 'util';
 import { NgAddSaveDepedency } from './package-metadata';
 
-const readFile = promisify(fs.readFile);
-
 interface PackageJson {
   name: string;
   version: string;
@@ -47,7 +44,7 @@ export interface PackageTreeNode {
 
 export async function readPackageJson(packageJsonPath: string): Promise<PackageJson | undefined> {
   try {
-    return JSON.parse((await readFile(packageJsonPath)).toString());
+    return JSON.parse((await fs.promises.readFile(packageJsonPath)).toString());
   } catch {
     return undefined;
   }

packages/angular_devkit/build_angular/src/app-shell/index.ts

@@ -18,7 +18,6 @@ import { BrowserBuilderOutput } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ServerBuilderOutput } from '../server';
 import { normalizeOptimization } from '../utils';
-import { readFile, writeFile } from '../utils/fs';
 import { InlineCriticalCssProcessor } from '../utils/index-file/inline-critical-css';
 import { augmentAppWithServiceWorker } from '../utils/service-worker';
 import { Spinner } from '../utils/spinner';
@@ -68,7 +67,7 @@ async function _renderUniversal(
   for (const outputPath of browserResult.outputPaths) {
     const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
     const browserIndexOutputPath = path.join(outputPath, 'index.html');
-    const indexHtml = await readFile(browserIndexOutputPath, 'utf8');
+    const indexHtml = await fs.promises.readFile(browserIndexOutputPath, 'utf8');
     const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult, localeDirectory);
 
     const {
@@ -115,7 +114,7 @@ async function _renderUniversal(
       }
     }
 
-    await writeFile(outputIndexPath, html);
+    await fs.promises.writeFile(outputIndexPath, html);
 
     if (browserOptions.serviceWorker) {
       await augmentAppWithServiceWorker(

packages/angular_devkit/build_angular/src/browser/index.ts

@@ -30,7 +30,6 @@ import { findCachePath } from '../utils/cache-path';
 import { colors } from '../utils/color';
 import { copyAssets } from '../utils/copy-assets';
 import { cachingDisabled } from '../utils/environment-options';
-import { mkdir, writeFile } from '../utils/fs';
 import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
 import { I18nOptions } from '../utils/i18n-options';
 import { FileInfo } from '../utils/index-file/augment-index-html';
@@ -702,8 +701,8 @@ export function buildWebpackBrowser(
                       }
 
                       const indexOutput = path.join(outputPath, getIndexOutputFile(options.index));
-                      await mkdir(path.dirname(indexOutput), { recursive: true });
-                      await writeFile(indexOutput, content);
+                      await fs.promises.mkdir(path.dirname(indexOutput), { recursive: true });
+                      await fs.promises.writeFile(indexOutput, content);
                     } catch (error) {
                       spinner.fail('Index html generation failed.');
 

packages/angular_devkit/build_angular/src/utils/fs.ts

@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import * as fs from 'fs';
 import { join } from 'path';
-import { readFile } from '../fs';
 import { NormalizedOptimizationOptions } from '../normalize-optimization';
 import { stripBom } from '../strip-bom';
 import { CrossOriginValue, FileInfo, augmentIndexHtml } from './augment-index-html';
@@ -94,11 +94,11 @@ export class IndexHtmlGenerator {
   }
 
   async readAsset(path: string): Promise<string> {
-    return readFile(path, 'utf-8');
+    return fs.promises.readFile(path, 'utf-8');
   }
 
   protected async readIndex(path: string): Promise<string> {
-    return readFile(path, 'utf-8');
+    return fs.promises.readFile(path, 'utf-8');
   }
 }
 

packages/angular_devkit/build_angular/src/utils/index-file/index-html-generator.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { readFile } from '../fs';
+import * as fs from 'fs';
 
 const Critters: typeof import('critters').default = require('critters');
 
@@ -46,7 +46,7 @@ class CrittersExtended extends Critters {
   protected readFile(path: string): Promise<string> {
     const readAsset = this.optionsExtended.readAsset;
 
-    return readAsset ? readAsset(path) : readFile(path, 'utf-8');
+    return readAsset ? readAsset(path) : fs.promises.readFile(path, 'utf-8');
   }
 }
 

packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css.ts

@@ -7,12 +7,12 @@
  */
 
 import * as cacache from 'cacache';
+import * as fs from 'fs';
 import * as https from 'https';
 import * as proxyAgent from 'https-proxy-agent';
 import { URL } from 'url';
 import { findCachePath } from '../cache-path';
 import { cachingDisabled } from '../environment-options';
-import { readFile } from '../fs';
 import { htmlRewritingStream } from './html-rewriting-stream';
 
 const cacheFontsPath: string | undefined = cachingDisabled ? undefined : findCachePath('angular-build-fonts');
@@ -97,7 +97,7 @@ export class InlineFontsProcessor {
     if (cacheFontsPath) {
       const entry = await cacache.get.info(cacheFontsPath, key);
       if (entry) {
-        return readFile(entry.path, 'utf8');
+        return fs.promises.readFile(entry.path, 'utf8');
       }
     }