0d68ed547 fix(@angular-devkit/build-angular): localized bundle generation fails in watch mode

Author: Angular Builds

package.json

@@ -7,9 +7,9 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.2",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#50167a36b",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#50167a36b",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#50167a36b",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0d68ed547",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#0d68ed547",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0d68ed547",
     "@babel/core": "7.16.7",
     "@babel/generator": "7.16.7",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.16.7",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#50167a36b",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#0d68ed547",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",

src/builders/browser/index.d.ts

@@ -24,6 +24,11 @@ export declare type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
      */
     outputPath: string;
 };
+/**
+ * Maximum time in milliseconds for single build/rebuild
+ * This accounts for CI variability.
+ */
+export declare const BUILD_TIMEOUT = 30000;
 /**
  * @experimental Direct usage of this function is considered experimental.
  */

src/builders/browser/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildWebpackBrowser = void 0;
+exports.buildWebpackBrowser = exports.BUILD_TIMEOUT = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const build_webpack_1 = require("@angular-devkit/build-webpack");
 const core_1 = require("@angular-devkit/core");
@@ -54,6 +54,11 @@ const configs_1 = require("../../webpack/configs");
 const async_chunks_1 = require("../../webpack/utils/async-chunks");
 const helpers_1 = require("../../webpack/utils/helpers");
 const stats_1 = require("../../webpack/utils/stats");
+/**
+ * Maximum time in milliseconds for single build/rebuild
+ * This accounts for CI variability.
+ */
+exports.BUILD_TIMEOUT = 30000;
 async function initialize(options, context, webpackConfigurationTransform) {
     var _a, _b;
     const originalOutputPath = options.outputPath;

src/utils/i18n-inlining.js

@@ -51,24 +51,10 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
             setLocale: emittedFile.name === 'main' || emittedFile.name === 'vendor',
         };
         originalFiles.push(originalPath);
-        // Remove temporary original file as the content has now been read
-        try {
-            fs.unlinkSync(originalPath);
-        }
-        catch (e) {
-            context.logger.debug(`Unable to delete i18n temporary file [${originalPath}]: ${e.toString()}`);
-        }
         try {
             const originalMapPath = originalPath + '.map';
             action.map = fs.readFileSync(originalMapPath, 'utf8');
             originalFiles.push(originalMapPath);
-            // Remove temporary original map file as the content has now been read
-            try {
-                fs.unlinkSync(originalMapPath);
-            }
-            catch (e) {
-                context.logger.debug(`Unable to delete i18n temporary file [${originalMapPath}]: ${e.toString()}`);
-            }
         }
         catch (err) {
             if (err.code !== 'ENOENT') {

src/utils/i18n-options.js

@@ -177,12 +177,11 @@ async function configureI18nBuild(context, options) {
     if (i18n.shouldInline) {
         const tempPath = fs_1.default.mkdtempSync(path_1.default.join(fs_1.default.realpathSync(os_1.default.tmpdir()), 'angular-cli-i18n-'));
         buildOptions.outputPath = tempPath;
-        // Remove temporary directory used for i18n processing
-        process.on('exit', () => {
-            try {
-                fs_1.default.rmdirSync(tempPath, { recursive: true, maxRetries: 3 });
-            }
-            catch { }
+        process.on('exit', () => deleteTempDirectory(tempPath));
+        process.once('SIGINT', () => {
+            deleteTempDirectory(tempPath);
+            // Needed due to `ora` as otherwise process will not terminate.
+            process.kill(process.pid, 'SIGINT');
         });
     }
     return { buildOptions, i18n };
@@ -202,6 +201,20 @@ function findLocaleDataPath(locale, resolver) {
         return null;
     }
 }
+/** Remove temporary directory used for i18n processing. */
+function deleteTempDirectory(tempPath) {
+    // The below should be removed and replaced with just `rmSync` when support for Node.Js 12 is removed.
+    const { rmSync, rmdirSync } = fs_1.default;
+    try {
+        if (rmSync) {
+            rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
+        }
+        else {
+            rmdirSync(tempPath, { recursive: true, maxRetries: 3 });
+        }
+    }
+    catch { }
+}
 function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedFormats, duplicateTranslation) {
     for (const file of desc.files) {
         const loadResult = loader(path_1.default.join(workspaceRoot, file.path));

uniqueId

@@ -1 +1 @@
-Wed Jan 12 2022 18:48:46 GMT+0000 (Coordinated Universal Time)
+Wed Jan 12 2022 18:49:07 GMT+0000 (Coordinated Universal Time)