94c753c1a fix(@angular-devkit/build-angular): limit the amount of CPUs used by workers

Author: Angular Builds

package.json

@@ -1,20 +1,20 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.901.0-next.0+21.111e9cc",
+  "version": "0.901.0-next.0+22.94c753c",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#111e9cc38",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#111e9cc38",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#111e9cc38",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#111e9cc38",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#94c753c1a",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#94c753c1a",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#94c753c1a",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#94c753c1a",
     "@babel/core": "7.8.4",
     "@babel/preset-env": "7.8.4",
     "@babel/template": "7.8.3",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#111e9cc38",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#94c753c1a",
     "ajv": "6.12.0",
     "autoprefixer": "9.7.4",
     "babel-loader": "8.0.6",

src/angular-cli-files/models/webpack-configs/common.js

@@ -11,7 +11,6 @@ const build_optimizer_1 = require("@angular-devkit/build-optimizer");
 const core_1 = require("@angular-devkit/core");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const fs_1 = require("fs");
-const os_1 = require("os");
 const path = require("path");
 const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
@@ -331,14 +330,9 @@ function getCommonConfig(wco) {
             // Name mangling is handled within the browser builder
             mangle: environment_options_1.allowMangle && buildOptions.platform !== 'server' && !differentialLoadingMode,
         };
-        // Use up to 7 CPUs for Terser workers, but no more.
-        // Some environments, like CircleCI, report a large number of CPUs but trying to use them
-        // Will cause `Error: Call retries were exceeded` errors.
-        // https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
-        const maxCpus = Math.min(os_1.cpus().length, 7);
         extraMinimizers.push(new TerserPlugin({
             sourceMap: scriptsSourceMap,
-            parallel: maxCpus,
+            parallel: utils_1.maxWorkers,
             cache: !environment_options_1.cachingDisabled && cache_path_1.findCachePath('terser-webpack'),
             extractComments: false,
             chunkFilter: (chunk) => !globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
@@ -348,7 +342,7 @@ function getCommonConfig(wco) {
         // They are shared between ES2015 & ES5 outputs so must support ES5.
         new TerserPlugin({
             sourceMap: scriptsSourceMap,
-            parallel: maxCpus,
+            parallel: utils_1.maxWorkers,
             cache: !environment_options_1.cachingDisabled && cache_path_1.findCachePath('terser-webpack'),
             extractComments: false,
             chunkFilter: (chunk) => globalScriptsByBundleName.some(s => s.bundleName === chunk.name),

src/utils/action-executor.js

@@ -12,6 +12,7 @@ const os = require("os");
 const path = require("path");
 const v8 = require("v8");
 const action_cache_1 = require("./action-cache");
+const workers_1 = require("./workers");
 const hasThreadSupport = (() => {
     try {
         require('worker_threads');
@@ -49,6 +50,7 @@ class BundleActionExecutor {
         return (this.largeWorker = new jest_worker_1.default(workerFile, {
             exposedMethods: ['process', 'inlineLocales'],
             setupArgs: [[...serialize(this.workerOptions)]],
+            numWorkers: workers_1.maxWorkers,
         }));
     }
     ensureSmall() {

src/utils/index.d.ts

@@ -15,3 +15,4 @@ export * from './normalize-source-maps';
 export * from './normalize-optimization';
 export * from './normalize-builder-schema';
 export * from './url';
+export * from './workers';

src/utils/index.js

@@ -20,3 +20,4 @@ __export(require("./normalize-source-maps"));
 __export(require("./normalize-optimization"));
 __export(require("./normalize-builder-schema"));
 __export(require("./url"));
+__export(require("./workers"));

src/utils/workers.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/**
+ * Use CPU count -1 with limit to 7 for workers not to clog the system.
+ * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
+ * This cause `Error: Call retries were exceeded` errors when trying to use them.
+ *
+ * See:
+ *
+ * https://github.com/nodejs/node/issues/28762
+ *
+ * https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
+ *
+ * https://github.com/angular/angular-cli/issues/16860#issuecomment-588828079
+ *
+ */
+export declare const maxWorkers: number;

src/utils/workers.js

@@ -0,0 +1,25 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = require("os");
+/**
+ * Use CPU count -1 with limit to 7 for workers not to clog the system.
+ * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
+ * This cause `Error: Call retries were exceeded` errors when trying to use them.
+ *
+ * See:
+ *
+ * https://github.com/nodejs/node/issues/28762
+ *
+ * https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
+ *
+ * https://github.com/angular/angular-cli/issues/16860#issuecomment-588828079
+ *
+ */
+exports.maxWorkers = Math.max(Math.min(os_1.cpus().length, 8) - 1, 1);

uniqueId

@@ -1 +1 @@
-Tue Feb 25 2020 19:04:22 GMT+0000 (Coordinated Universal Time)
+Tue Feb 25 2020 19:08:31 GMT+0000 (Coordinated Universal Time)