@nx/angular-rspack 20.9.0 → 21.0.0

package/dist/lib/utils/stats.js

@@ -0,0 +1,312 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeExtraEntryPoints = normalizeExtraEntryPoints;
+exports.statsWarningsToString = statsWarningsToString;
+exports.statsErrorsToString = statsErrorsToString;
+exports.statsHasErrors = statsHasErrors;
+exports.statsHasWarnings = statsHasWarnings;
+exports.createRspackLoggingCallback = createRspackLoggingCallback;
+exports.generateBuildEventStats = generateBuildEventStats;
+exports.rspackStatsLogger = rspackStatsLogger;
+const tslib_1 = require("tslib");
+const private_1 = require("@angular/build/private");
+const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
+const path = tslib_1.__importStar(require("node:path"));
+const normalize_options_1 = require("../models/normalize-options");
+const color_1 = require("./color");
+const async_chunks_1 = require("./async-chunks");
+const get_stats_options_1 = require("../config/config-utils/get-stats-options");
+function normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName) {
+    return extraEntryPoints.map((entry) => {
+        if (typeof entry === 'string') {
+            return { input: entry, inject: true, bundleName: defaultBundleName };
+        }
+        const { inject = true, ...newEntry } = entry;
+        let bundleName;
+        if (entry.bundleName) {
+            bundleName = entry.bundleName;
+        }
+        else if (!inject) {
+            // Lazy entry points use the file name as bundle name.
+            bundleName = path.parse(entry.input).name;
+        }
+        else {
+            bundleName = defaultBundleName;
+        }
+        return { ...newEntry, inject, bundleName };
+    });
+}
+function getBuildDuration(rspackStats) {
+    (0, node_assert_1.default)(rspackStats.builtAt, 'buildAt cannot be undefined');
+    (0, node_assert_1.default)(rspackStats.time, 'time cannot be undefined');
+    return Date.now() - rspackStats.builtAt + rspackStats.time;
+}
+function generateBundleStats(info) {
+    const rawSize = typeof info.rawSize === 'number' ? info.rawSize : '-';
+    const estimatedTransferSize = typeof info.estimatedTransferSize === 'number'
+        ? info.estimatedTransferSize
+        : '-';
+    const files = info.files
+        ?.filter((f) => !f.endsWith('.map'))
+        .map((f) => path.basename(f))
+        .join(', ') ?? '';
+    const names = info.names?.length ? info.names.join(', ') : '-';
+    const initial = !!info.initial;
+    return {
+        initial,
+        stats: [files, names, rawSize, estimatedTransferSize],
+    };
+}
+// 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(stats, json, statsConfig, budgetFailures) {
+    if (!json.chunks?.length) {
+        return '';
+    }
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const colors = statsConfig.colors;
+    const rs = (x) => (colors ? color_1.colors.reset(x) : x);
+    const w = (x) => (colors ? color_1.colors.bold.white(x) : x);
+    const changedChunksStats = [];
+    let unchangedChunkNumber = 0;
+    let hasEstimatedTransferSizes = false;
+    const isFirstRun = !runsCache.has(json.outputPath || '');
+    for (const chunk of json.chunks) {
+        // 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 = json.assets?.filter((asset) => chunk.files?.includes(asset.name));
+        let rawSize = 0;
+        let estimatedTransferSize;
+        if (assets) {
+            for (const asset of assets) {
+                if (asset.name.endsWith('.map')) {
+                    continue;
+                }
+                rawSize += asset.size;
+                const assetInfo = stats.compilation.getAsset(asset.name)?.info;
+                if (assetInfo) {
+                    if (typeof assetInfo.estimatedTransferSize === 'number') {
+                        if (estimatedTransferSize === undefined) {
+                            estimatedTransferSize = 0;
+                            hasEstimatedTransferSizes = true;
+                        }
+                        estimatedTransferSize += assetInfo.estimatedTransferSize;
+                    }
+                }
+            }
+        }
+        changedChunksStats.push(generateBundleStats({ ...chunk, rawSize, estimatedTransferSize }));
+    }
+    unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
+    runsCache.add(json.outputPath || '');
+    const statsTable = (0, private_1.generateBuildStatsTable)(changedChunksStats, colors, unchangedChunkNumber === 0, hasEstimatedTransferSizes, budgetFailures);
+    // In some cases we do things outside of rspack context
+    // Such us index generation, service worker augmentation etc...
+    // This will correct the time and include these.
+    const time = getBuildDuration(json);
+    return rs(`\n${statsTable}\n\n` +
+        (unchangedChunkNumber > 0
+            ? `${unchangedChunkNumber} unchanged chunks\n\n`
+            : '') +
+        `Build at: ${w(new Date().toISOString())} - Hash: ${w(json.hash || '')} - Time: ${w('' + time)}ms`);
+}
+function statsWarningsToString(json, statsConfig) {
+    const colors = statsConfig.colors;
+    const c = (x) => (colors ? color_1.colors.reset.cyan(x) : x);
+    const y = (x) => (colors ? color_1.colors.reset.yellow(x) : x);
+    const yb = (x) => (colors ? color_1.colors.reset.yellowBright(x) : x);
+    const warnings = json.warnings ? [...json.warnings] : [];
+    if (json.children) {
+        warnings.push(...json.children
+            .map((c) => c.warnings ?? [])
+            .reduce((a, b) => [...a, ...b], []));
+    }
+    let output = '';
+    for (const warning of warnings) {
+        if (typeof warning === 'string') {
+            output += yb(`Warning: ${warning}\n\n`);
+        }
+        else {
+            let file = warning.file || warning.moduleName;
+            // Clean up warning paths
+            // Ex: ./src/app/styles.scss.rspack[javascript/auto]!=!./node_modules/css-loader/dist/cjs.js....
+            // to ./src/app/styles.scss.rspack
+            if (file && !statsConfig.errorDetails) {
+                const rpsackPathIndex = file.indexOf('.rspack[');
+                if (rpsackPathIndex !== -1) {
+                    file = file.substring(0, rpsackPathIndex);
+                }
+                const rspackLoadersIndex = file.indexOf('!=!');
+                if (rspackLoadersIndex !== -1) {
+                    file = file.substring(0, rspackLoadersIndex);
+                }
+            }
+            if (file) {
+                output += c(file);
+                if (warning.loc) {
+                    output += ':' + yb(warning.loc);
+                }
+                output += ' - ';
+            }
+            if (!/^error/i.test(warning.message)) {
+                const errorIndex = warning.message.indexOf('Error: ');
+                warning.message = warning.message.substring(errorIndex + 7);
+            }
+            if (!/^warning/i.test(warning.message)) {
+                output += y('Warning: ');
+            }
+            output += `${warning.message}\n\n`;
+        }
+    }
+    return output ? '\n' + output : output;
+}
+function statsErrorsToString(json, statsConfig) {
+    const colors = statsConfig.colors;
+    const c = (x) => (colors ? color_1.colors.reset.cyan(x) : x);
+    const yb = (x) => (colors ? color_1.colors.reset.yellowBright(x) : x);
+    const r = (x) => (colors ? color_1.colors.reset.redBright(x) : x);
+    const errors = json.errors ? [...json.errors] : [];
+    if (json.children) {
+        errors.push(...json.children
+            .map((c) => c?.errors || [])
+            .reduce((a, b) => [...a, ...b], []));
+    }
+    let output = '';
+    for (const error of errors) {
+        if (typeof error === 'string') {
+            output += r(`Error: ${error}\n\n`);
+        }
+        else {
+            let file = error.file || error.moduleName;
+            // Clean up error paths
+            // Ex: ./src/app/styles.scss.rspack[javascript/auto]!=!./node_modules/css-loader/dist/cjs.js....
+            // to ./src/app/styles.scss.rspack
+            if (file && !statsConfig.errorDetails) {
+                const rspackPathIndex = file.indexOf('.rspack[');
+                if (rspackPathIndex !== -1) {
+                    file = file.substring(0, rspackPathIndex);
+                }
+                const rspackLoadersIndex = file.indexOf('!=!');
+                if (rspackLoadersIndex !== -1) {
+                    file = file.substring(0, rspackLoadersIndex);
+                }
+            }
+            if (file) {
+                output += c(file);
+                if (error.loc) {
+                    output += ':' + yb(error.loc);
+                }
+                output += ' - ';
+            }
+            // In most cases rspack will add stack traces to error messages.
+            // This below cleans up the error from stacks.
+            // See: https://github.com/webpack/webpack/issues/15980
+            const index = error.message.search(/[\n\s]+at /);
+            const message = statsConfig.errorStack || index === -1
+                ? error.message
+                : error.message.substring(0, index);
+            if (!/^error/i.test(message)) {
+                output += r('Error: ');
+            }
+            output += `${message}\n\n`;
+        }
+    }
+    return output ? '\n' + output : output;
+}
+function statsHasErrors(json) {
+    return !!(json.errors?.length || json.children?.some((c) => c.errors?.length));
+}
+function statsHasWarnings(json) {
+    return !!(json.warnings?.length || json.children?.some((c) => c.warnings?.length));
+}
+function createRspackLoggingCallback(options) {
+    const { verbose = false, scripts = [], styles = [] } = options;
+    const extraEntryPoints = [
+        ...normalizeExtraEntryPoints(styles, 'styles'),
+        ...normalizeExtraEntryPoints(scripts, 'scripts'),
+    ];
+    return (stats, config) => {
+        if (verbose && config.stats !== false) {
+            const statsOptions = config.stats === true ? undefined : config.stats;
+            console.info(stats.toString(statsOptions));
+        }
+        const rawStats = stats.toJson((0, get_stats_options_1.getStatsOptions)(false));
+        const rspackStats = {
+            ...rawStats,
+            chunks: (0, async_chunks_1.markAsyncChunksNonInitial)(rawStats, extraEntryPoints),
+        };
+        rspackStatsLogger(rspackStats, config);
+    };
+}
+function generateBuildEventStats(rspackStats, options) {
+    const { chunks = [], assets = [] } = rspackStats;
+    let jsSizeInBytes = 0;
+    let cssSizeInBytes = 0;
+    let initialChunksCount = 0;
+    let ngComponentCount = 0;
+    let changedChunksCount = 0;
+    const allChunksCount = chunks.length;
+    const isFirstRun = !runsCache.has(rspackStats.outputPath || '');
+    const chunkFiles = new Set();
+    for (const chunk of chunks) {
+        if (!isFirstRun && chunk.rendered) {
+            changedChunksCount++;
+        }
+        if (chunk.initial) {
+            initialChunksCount++;
+        }
+        for (const file of chunk.files ?? []) {
+            chunkFiles.add(file);
+        }
+    }
+    for (const asset of assets) {
+        if (asset.name.endsWith('.map') || !chunkFiles.has(asset.name)) {
+            continue;
+        }
+        if (asset.name.endsWith('.js')) {
+            jsSizeInBytes += asset.size;
+            ngComponentCount += asset.info.ngComponentCount ?? 0;
+        }
+        else if (asset.name.endsWith('.css')) {
+            cssSizeInBytes += asset.size;
+        }
+    }
+    return {
+        optimization: (0, normalize_options_1.normalizeOptimization)(options.optimization).scripts,
+        aot: options.aot,
+        allChunksCount,
+        lazyChunksCount: allChunksCount - initialChunksCount,
+        initialChunksCount,
+        changedChunksCount,
+        durationInMs: getBuildDuration(rspackStats),
+        cssSizeInBytes,
+        jsSizeInBytes,
+        ngComponentCount,
+    };
+}
+function rspackStatsLogger(stats, statOptions, budgetFailures) {
+    const json = stats.toJson();
+    console.log(statsToString(stats, json, statOptions, budgetFailures));
+    if (typeof stats !== 'object') {
+        throw new Error('Invalid Rspack stats configuration.');
+    }
+    if (statsHasWarnings(json)) {
+        console.warn(statsWarningsToString(json, statOptions));
+    }
+    if (statsHasErrors(json)) {
+        console.log('Stats has errors');
+        console.error(statsErrorsToString(json, statOptions));
+    }
+}

package/dist/lib/utils/tty.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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.dev/license
+ */
+export declare function isTTY(): boolean;
+//# sourceMappingURL=tty.d.ts.map

package/dist/lib/utils/tty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tty.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/tty.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,wBAAgB,KAAK,IAAI,OAAO,CAQ/B"}

package/dist/lib/utils/tty.js

@@ -0,0 +1,22 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTTY = isTTY;
+function _isTruthy(value) {
+    // Returns true if value is a string that is anything but 0 or false.
+    return (value !== undefined && value !== '0' && value.toUpperCase() !== 'FALSE');
+}
+function isTTY() {
+    // If we force TTY, we always return true.
+    const force = process.env['NG_FORCE_TTY'];
+    if (force !== undefined) {
+        return _isTruthy(force);
+    }
+    return !!process.stdout.isTTY && !_isTruthy(process.env['CI']);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular-rspack",
-  "version": "20.9.0",
+  "version": "21.0.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -50,7 +50,9 @@
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
     "@babel/core": "7.26.10",
+    "@discoveryjs/json-ext": "0.6.3",
     "@nx/devkit": "21.0.0",
+    "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.21",
     "deepmerge": "^4.3.1",
     "express": "4.21.1",
@@ -59,6 +61,8 @@
     "less-loader": "^12.2.0",
     "license-webpack-plugin": "^4.0.2",
     "loader-utils": "3.3.1",
+    "open": "10.1.0",
+    "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
     "piscina": "4.9.2",
     "postcss": "8.5.3",
@@ -70,7 +74,7 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^6.0.1",
     "ws": "^8.18.0",
-    "@nx/angular-rspack-compiler": "20.9.0"
+    "@nx/angular-rspack-compiler": "21.0.0"
   },
   "devDependencies": {
     "@code-pushup/models": "^0.63.0",

package/dist/lib/models/unsupported-options.d.ts

@@ -1,39 +0,0 @@
-export type BudgetEntry = {
-    type: 'all' | 'allScript' | 'any' | 'anyScript' | 'anyComponentStyle' | 'bundle' | 'initial';
-    name?: string;
-    baseline?: string;
-    maximumWarning?: string;
-    maximumError?: string;
-    minimumWarning?: string;
-    minimumError?: string;
-    warning?: string;
-    error?: string;
-};
-export interface DevServerUnsupportedOptions {
-    open?: boolean;
-    hmr?: boolean;
-    inspect?: string | boolean;
-    prebundle?: boolean | {
-        exclude: string[];
-    };
-}
-export interface PluginUnsupportedOptions {
-    security?: {
-        autoCsp?: boolean | {
-            unsafeEval?: boolean;
-        };
-    };
-    clearScreen?: boolean;
-    verbose?: boolean;
-    progress?: boolean;
-    watch?: boolean;
-    poll?: number;
-    statsJson?: boolean;
-    budgets?: BudgetEntry[];
-    allowedCommonJsDependencies?: string[];
-    appShell?: boolean;
-    outputMode?: 'static' | 'server';
-}
-export declare const TOP_LEVEL_OPTIONS_PENDING_SUPPORT: string[];
-export declare const DEV_SERVER_OPTIONS_PENDING_SUPPORT: string[];
-//# sourceMappingURL=unsupported-options.d.ts.map

package/dist/lib/models/unsupported-options.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"unsupported-options.d.ts","sourceRoot":"","sources":["../../../src/lib/models/unsupported-options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EACA,KAAK,GACL,WAAW,GACX,KAAK,GACL,WAAW,GACX,mBAAmB,GACnB,QAAQ,GACR,SAAS,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EACN,OAAO,GACP;QACE,OAAO,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;CACP;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EACJ,OAAO,GACP;YACE,UAAU,CAAC,EAAE,OAAO,CAAC;SACtB,CAAC;KACP,CAAC;IACF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,2BAA2B,CAAC,EAAE,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAClC;AAED,eAAO,MAAM,iCAAiC,UAY7C,CAAC;AAEF,eAAO,MAAM,kCAAkC,UAK9C,CAAC"}

package/dist/lib/models/unsupported-options.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEV_SERVER_OPTIONS_PENDING_SUPPORT = exports.TOP_LEVEL_OPTIONS_PENDING_SUPPORT = void 0;
-exports.TOP_LEVEL_OPTIONS_PENDING_SUPPORT = [
-    'security',
-    'clearScreen',
-    'verbose',
-    'progress',
-    'watch',
-    'poll',
-    'statsJson',
-    'budgets',
-    'allowedCommonJsDependencies',
-    'appShell',
-    'outputMode',
-];
-exports.DEV_SERVER_OPTIONS_PENDING_SUPPORT = [
-    'open',
-    'hmr',
-    'inspect',
-    'prebundle',
-];