@angular-devkit/build-angular 12.1.0-next.3 → 12.1.0

package/src/webpack/utils/stats.js

@@ -6,13 +6,37 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackStatsLogger = exports.createWebpackLoggingCallback = exports.statsHasWarnings = exports.statsHasErrors = exports.statsErrorsToString = exports.statsWarningsToString = exports.IGNORE_WARNINGS = exports.generateBundleStats = exports.formatSize = void 0;
+exports.webpackStatsLogger = exports.createWebpackLoggingCallback = exports.statsHasWarnings = exports.statsHasErrors = exports.statsErrorsToString = exports.statsWarningsToString = exports.generateBundleStats = exports.formatSize = void 0;
 const core_1 = require("@angular-devkit/core");
-const path = require("path");
-const textTable = require("text-table");
+const path = __importStar(require("path"));
+const text_table_1 = __importDefault(require("text-table"));
 const color_1 = require("../../utils/color");
 const stats_1 = require("../configs/stats");
+const async_chunks_1 = require("./async-chunks");
+const helpers_1 = require("./helpers");
 function formatSize(size) {
     if (size <= 0) {
         return '0 bytes';
@@ -30,7 +54,7 @@ function generateBundleStats(info) {
     const size = typeof info.size === 'number' ? info.size : '-';
     const files = (_b = (_a = info.files) === null || _a === void 0 ? void 0 : _a.filter((f) => !f.endsWith('.map')).map((f) => path.basename(f)).join(', ')) !== null && _b !== void 0 ? _b : '';
     const names = ((_c = info.names) === null || _c === void 0 ? void 0 : _c.length) ? info.names.join(', ') : '-';
-    const initial = !!(info.entry || info.initial);
+    const initial = !!info.initial;
     const chunkType = info.chunkType || 'unknown';
     return {
         chunkType,
@@ -103,7 +127,7 @@ function generateBuildStatsTable(data, colors, showTotalSize) {
     if (changedLazyChunksStats.length) {
         bundleInfo.push(['Lazy Chunk Files', 'Names', 'Size'].map(bold), ...changedLazyChunksStats);
     }
-    return textTable(bundleInfo, {
+    return text_table_1.default(bundleInfo, {
         hsep: dim(' | '),
         stringLength: (s) => color_1.removeColor(s).length,
         align: ['l', 'l', 'r'],
@@ -113,6 +137,10 @@ function generateBuildStats(hash, time, colors) {
     const w = (x) => (colors ? color_1.colors.bold.white(x) : x);
     return `Build at: ${w(new Date().toISOString())} - Hash: ${w(hash)} - Time: ${w('' + time)}ms`;
 }
+// We use this cache because we can have multiple builders running in the same process,
+// where each builder has different output path.
+// Ideally, we should create the logging callback as a factory, but that would need a refactoring.
+const runsCache = new Set();
 function statsToString(json, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 statsConfig, bundleState) {
@@ -125,8 +153,11 @@ statsConfig, bundleState) {
     const changedChunksStats = bundleState !== null && bundleState !== void 0 ? bundleState : [];
     let unchangedChunkNumber = 0;
     if (!(bundleState === null || bundleState === void 0 ? void 0 : bundleState.length)) {
+        const isFirstRun = !runsCache.has(json.outputPath || '');
         for (const chunk of json.chunks) {
-            if (!chunk.rendered) {
+            // During first build we want to display unchanged chunks
+            // but unchanged cached chunks are always marked as not rendered.
+            if (!isFirstRun && !chunk.rendered) {
                 continue;
             }
             const assets = (_b = json.assets) === null || _b === void 0 ? void 0 : _b.filter((asset) => { var _a; return (_a = chunk.files) === null || _a === void 0 ? void 0 : _a.includes(asset.name); });
@@ -134,6 +165,7 @@ statsConfig, bundleState) {
             changedChunksStats.push(generateBundleStats({ ...chunk, size: summedSize }));
         }
         unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
+        runsCache.add(json.outputPath || '');
     }
     // Sort chunks by size in descending order
     changedChunksStats.sort((a, b) => {
@@ -172,13 +204,6 @@ statsConfig, bundleState) {
       `));
     }
 }
-exports.IGNORE_WARNINGS = [
-    // Webpack 5+ has no facility to disable this warning.
-    // System.import is used in @angular/core for deprecated string-form lazy routes
-    /System.import\(\) is deprecated and will be removed soon/i,
-    // https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
-    /Failed to parse source map from/,
-];
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function statsWarningsToString(json, statsConfig) {
     const colors = statsConfig.colors;
@@ -255,12 +280,22 @@ function statsHasWarnings(json) {
     return !!(((_a = json.warnings) === null || _a === void 0 ? void 0 : _a.length) || ((_b = json.children) === null || _b === void 0 ? void 0 : _b.some((c) => { var _a; return (_a = c.warnings) === null || _a === void 0 ? void 0 : _a.length; })));
 }
 exports.statsHasWarnings = statsHasWarnings;
-function createWebpackLoggingCallback(verbose, logger) {
+function createWebpackLoggingCallback(options, logger) {
+    const { verbose = false, scripts = [], styles = [] } = options;
+    const extraEntryPoints = [
+        ...helpers_1.normalizeExtraEntryPoints(styles, 'styles'),
+        ...helpers_1.normalizeExtraEntryPoints(scripts, 'scripts'),
+    ];
     return (stats, config) => {
         if (verbose) {
             logger.info(stats.toString(config.stats));
         }
-        webpackStatsLogger(logger, stats.toJson(stats_1.getWebpackStatsConfig(false)), config);
+        const rawStats = stats.toJson(stats_1.getWebpackStatsConfig(false));
+        const webpackStats = {
+            ...rawStats,
+            chunks: async_chunks_1.markAsyncChunksNonInitial(rawStats, extraEntryPoints),
+        };
+        webpackStatsLogger(logger, webpackStats, config);
     };
 }
 exports.createWebpackLoggingCallback = createWebpackLoggingCallback;

package/src/extract-i18n/empty-export-default.js

@@ -1 +0,0 @@
-export default '';