@angular-devkit/build-angular 12.0.0 → 12.0.4

package/src/webpack/utils/async-chunks.js

@@ -22,24 +22,24 @@ function markAsyncChunksNonInitial(webpackStats, extraEntryPoints) {
     // **cannot** be loaded in main bundle.
     const asyncChunkIds = extraEntryPoints
         .filter((entryPoint) => !entryPoint.inject)
-        .flatMap((entryPoint) => entryPoints[entryPoint.bundleName].chunks);
+        .flatMap((entryPoint) => { var _a; return (_a = entryPoints[entryPoint.bundleName].chunks) === null || _a === void 0 ? void 0 : _a.filter((n) => n !== 'runtime'); });
     // Find chunks for each ID.
-    const asyncChunks = asyncChunkIds
-        .map((chunkId) => {
+    const asyncChunks = asyncChunkIds.map((chunkId) => {
         const chunk = chunks.find((chunk) => chunk.id === chunkId);
         if (!chunk) {
             throw new Error(`Failed to find chunk (${chunkId}) in set:\n${JSON.stringify(chunks)}`);
         }
         return chunk;
-    })
-        // All Webpack chunks are dependent on `runtime`, which is never an async
-        // entry point, simply ignore this one.
-        .filter((chunk) => { var _a; return !!((_a = chunk.names) === null || _a === void 0 ? void 0 : _a.includes('runtime')); });
+    });
     // A chunk is considered `initial` only if Webpack already belives it to be initial
     // and the application developer did not mark it async via an extra entry point.
-    return chunks.map((chunk) => ({
-        ...chunk,
-        initial: chunk.initial && !asyncChunks.find((asyncChunk) => asyncChunk === chunk),
-    }));
+    return chunks.map((chunk) => {
+        return asyncChunks.find((asyncChunk) => asyncChunk === chunk)
+            ? {
+                ...chunk,
+                initial: false,
+            }
+            : chunk;
+    });
 }
 exports.markAsyncChunksNonInitial = markAsyncChunksNonInitial;

package/src/webpack/utils/stats.d.ts

@@ -8,6 +8,7 @@
 import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
 import { logging } from '@angular-devkit/core';
 import { Configuration, StatsCompilation } from 'webpack';
+import { Schema as BrowserBuilderOptions } from '../../browser/schema';
 export declare function formatSize(size: number): string;
 export declare type BundleStatsData = [files: string, names: string, size: number | string];
 export declare type ChunkType = 'modern' | 'legacy' | 'unknown';
@@ -20,7 +21,6 @@ export declare function generateBundleStats(info: {
     size?: number;
     files?: string[];
     names?: string[];
-    entry?: boolean;
     initial?: boolean;
     rendered?: boolean;
     chunkType?: ChunkType;
@@ -30,5 +30,5 @@ export declare function statsWarningsToString(json: StatsCompilation, statsConfi
 export declare function statsErrorsToString(json: StatsCompilation, statsConfig: any): string;
 export declare function statsHasErrors(json: StatsCompilation): boolean;
 export declare function statsHasWarnings(json: StatsCompilation): boolean;
-export declare function createWebpackLoggingCallback(verbose: boolean, logger: logging.LoggerApi): WebpackLoggingCallback;
+export declare function createWebpackLoggingCallback(options: BrowserBuilderOptions, logger: logging.LoggerApi): WebpackLoggingCallback;
 export declare function webpackStatsLogger(logger: logging.LoggerApi, json: StatsCompilation, config: Configuration, bundleStats?: BundleStats[]): void;

package/src/webpack/utils/stats.js

@@ -12,6 +12,9 @@ const core_1 = require("@angular-devkit/core");
 const path = require("path");
 const textTable = 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';
@@ -29,7 +32,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,
@@ -254,18 +257,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({
-            errors: true,
-            warnings: true,
-            builtAt: true,
-            assets: true,
-            chunks: true,
-        }), 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/utils/workers.d.ts

@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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;

package/src/utils/workers.js

@@ -1,26 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC 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 });
-exports.maxWorkers = void 0;
-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);

package/src/webpack/plugins/optimize-css-webpack-plugin.d.ts

@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-import { Compiler } from 'webpack';
-export interface OptimizeCssWebpackPluginOptions {
-    sourceMap: boolean;
-    test: (file: string) => boolean;
-}
-export declare class OptimizeCssWebpackPlugin {
-    private readonly _options;
-    constructor(options: Partial<OptimizeCssWebpackPluginOptions>);
-    apply(compiler: Compiler): void;
-}

package/src/webpack/plugins/optimize-css-webpack-plugin.js

@@ -1,106 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC 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 });
-exports.OptimizeCssWebpackPlugin = void 0;
-const cssNano = require("cssnano");
-const webpack_1 = require("webpack");
-const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
-const PLUGIN_NAME = 'optimize-css-webpack-plugin';
-function hook(compiler, action) {
-    compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-        compilation.hooks.processAssets.tapPromise({
-            name: PLUGIN_NAME,
-            stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
-        }, (assets) => action(compilation, Object.keys(assets)));
-    });
-}
-class OptimizeCssWebpackPlugin {
-    constructor(options) {
-        this._options = {
-            sourceMap: false,
-            test: (file) => file.endsWith('.css'),
-            ...options,
-        };
-    }
-    apply(compiler) {
-        hook(compiler, (compilation, assetsURI) => {
-            const files = [...compilation.additionalChunkAssets, ...assetsURI];
-            const actions = files
-                .filter((file) => this._options.test(file))
-                .map(async (file) => {
-                const asset = compilation.assets[file];
-                if (!asset) {
-                    return;
-                }
-                let content;
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                let map;
-                if (this._options.sourceMap && asset.sourceAndMap) {
-                    const sourceAndMap = asset.sourceAndMap({});
-                    content = sourceAndMap.source;
-                    map = sourceAndMap.map;
-                }
-                else {
-                    content = asset.source();
-                }
-                if (typeof content !== 'string') {
-                    content = content.toString();
-                }
-                if (content.length === 0) {
-                    return;
-                }
-                const cssNanoOptions = {
-                    preset: [
-                        'default',
-                        {
-                            // Disable SVG optimizations, as this can cause optimizations which are not compatible in all browsers.
-                            svgo: false,
-                            // Disable `calc` optimizations, due to several issues. #16910, #16875, #17890
-                            calc: false,
-                            // Disable CSS rules sorted due to several issues #20693, https://github.com/ionic-team/ionic-framework/issues/23266 and https://github.com/cssnano/cssnano/issues/1054
-                            cssDeclarationSorter: false,
-                        },
-                    ],
-                };
-                const postCssOptions = {
-                    from: file,
-                    map: map && { annotation: false, prev: map },
-                };
-                try {
-                    const output = await new Promise((resolve, reject) => {
-                        // @types/cssnano are not up to date with version 5.
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        cssNano(cssNanoOptions)
-                            .process(content, postCssOptions)
-                            .then(resolve)
-                            .catch((err) => reject(err));
-                    });
-                    for (const { text } of output.warnings()) {
-                        webpack_diagnostics_1.addWarning(compilation, text);
-                    }
-                    let newSource;
-                    if (output.map) {
-                        newSource = new webpack_1.sources.SourceMapSource(output.css, file, output.map.toString(), content, map);
-                    }
-                    else {
-                        newSource = new webpack_1.sources.RawSource(output.css);
-                    }
-                    compilation.assets[file] = newSource;
-                }
-                catch (error) {
-                    webpack_diagnostics_1.addError(compilation, error.message);
-                    return;
-                }
-            });
-            // eslint-disable-next-line @typescript-eslint/no-empty-function
-            return Promise.all(actions).then(() => { });
-        });
-    }
-}
-exports.OptimizeCssWebpackPlugin = OptimizeCssWebpackPlugin;