@nx/angular-rspack 24.0.2 → 24.0.3

package/dist/lib/config/config-utils/get-stats-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-stats-options.d.ts","sourceRoot":"","sources":["../../../../src/lib/config/config-utils/get-stats-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,wBAAgB,eAAe,CAAC,OAAO,UAAQ,GAAG,YAAY,CAsC7D"}
+{"version":3,"file":"get-stats-options.d.ts","sourceRoot":"","sources":["../../../../src/lib/config/config-utils/get-stats-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,wBAAgB,eAAe,CAAC,OAAO,UAAQ,GAAG,YAAY,CAoC7D"}

package/dist/lib/config/config-utils/get-stats-options.js

@@ -13,7 +13,6 @@ function getStatsOptions(verbose = false) {
         errors: true,
         assets: true, // required by custom stat output
         cachedAssets: true, // required for bundle size calculators
-        // Needed for markAsyncChunksNonInitial.
         ids: true,
         entrypoints: true,
     };

package/dist/lib/plugins/angular-rspack-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-rspack-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/angular-rspack-plugin.ts"],"names":[],"mappings":"AAoBA,OAAO,EAEL,KAAK,QAAQ,EAEb,KAAK,oBAAoB,EAE1B,MAAM,cAAc,CAAC;AAUtB,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,oCAAoC,EAC1C,MAAM,WAAW,CAAC;AA+CnB,qBAAa,mBAAoB,YAAW,oBAAoB;;IAwB9D,YACE,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW,EA0B1B;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAiYvB;IAED;;;;;;;OAOG;IACH,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,QAgC1C;YA8Ea,gBAAgB;YAyFhB,eAAe;CAyC9B"}
+{"version":3,"file":"angular-rspack-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/angular-rspack-plugin.ts"],"names":[],"mappings":"AAoBA,OAAO,EAEL,KAAK,QAAQ,EAEb,KAAK,oBAAoB,EAE1B,MAAM,cAAc,CAAC;AAUtB,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,oCAAoC,EAC1C,MAAM,WAAW,CAAC;AA+CnB,qBAAa,mBAAoB,YAAW,oBAAoB;;IAwB9D,YACE,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW,EA0B1B;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAmYvB;IAED;;;;;;;OAOG;IACH,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,QAgC1C;YA8Ea,gBAAgB;YAyFhB,eAAe;CAyC9B"}

package/dist/lib/plugins/angular-rspack-plugin.js

@@ -237,6 +237,7 @@ class AngularRspackPlugin {
                             name: PLUGIN_NAME,
                             message: error.text || '',
                             file: error.location?.file,
+                            ...toRspackLocation(error.location),
                             stack: error.text,
                         });
                     }
@@ -245,6 +246,7 @@ class AngularRspackPlugin {
                             name: PLUGIN_NAME,
                             message: warning.text || '',
                             file: warning.location?.file,
+                            ...toRspackLocation(warning.location),
                             stack: warning.text,
                         });
                     }
@@ -557,6 +559,14 @@ _AngularRspackPlugin__options = new WeakMap(), _AngularRspackPlugin_i18n = new W
     }
     tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin_stylesheetMetafileInputs, flattened, "f");
 };
+function toRspackLocation(location) {
+    if (location?.line === undefined) {
+        return {};
+    }
+    // Angular's columns are 0-based, rspack's `loc` columns are 1-based.
+    const column = location.column === undefined ? undefined : location.column + 1;
+    return { loc: { start: { line: location.line, column } } };
+}
 function formatError(error) {
     return error instanceof Error
         ? (error.stack ?? error.message)

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

@@ -7,17 +7,12 @@
  */
 import { BudgetCalculatorResult } from '@angular/build/private';
 import { Configuration, StatsCompilation, Stats, StatsOptions } from '@rspack/core';
-import { NormalizedAngularRspackPluginOptions, NormalizedEntryPoint, ScriptOrStyleEntry } from '../models/angular-rspack-plugin-options';
-export interface RspackLoggingCallback {
-    (stats: Stats, config: Configuration): void;
-}
+import { NormalizedAngularRspackPluginOptions } from '../models/angular-rspack-plugin-options';
 export type RspackStatsOptions = Exclude<Configuration['stats'], string | boolean | undefined>;
-export declare function normalizeExtraEntryPoints(extraEntryPoints: ScriptOrStyleEntry[], defaultBundleName: string): NormalizedEntryPoint[];
 export declare function statsWarningsToString(json: StatsCompilation, statsConfig: RspackStatsOptions): string;
 export declare function statsErrorsToString(json: StatsCompilation, statsConfig: RspackStatsOptions): string;
 export declare function statsHasErrors(json: StatsCompilation): boolean;
 export declare function statsHasWarnings(json: StatsCompilation): boolean;
-export declare function createRspackLoggingCallback(options: NormalizedAngularRspackPluginOptions): (stats: any, config: any) => void;
 export interface BuildEventStats {
     aot: boolean;
     optimization: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/stats.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,sBAAsB,EAGvB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,YAAY,EACb,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oCAAoC,EACpC,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,yCAAyC,CAAC;AAMjD,MAAM,WAAW,qBAAqB;IACpC,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;CAC7C;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,aAAa,CAAC,OAAO,CAAC,EACtB,MAAM,GAAG,OAAO,GAAG,SAAS,CAC7B,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,gBAAgB,EAAE,kBAAkB,EAAE,EACtC,iBAAiB,EAAE,MAAM,GACxB,oBAAoB,EAAE,CAmBxB;AA+KD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CAyDR;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CA+DR;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAI9D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAIhE;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,oCAAoC,qCAsB9C;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,oCAAoC,GAC5C,eAAe,CA2DjB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,YAAY,EACzB,cAAc,CAAC,EAAE,sBAAsB,EAAE,GACxC,IAAI,CAgBN"}
+{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/stats.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,sBAAsB,EAGvB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,YAAY,EACb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,oCAAoC,EAAE,MAAM,yCAAyC,CAAC;AAI/F,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,aAAa,CAAC,OAAO,CAAC,EACtB,MAAM,GAAG,OAAO,GAAG,SAAS,CAC7B,CAAC;AA+KF,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CAuDR;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CA+DR;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAI9D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAIhE;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,oCAAoC,GAC5C,eAAe,CA2DjB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,YAAY,EACzB,cAAc,CAAC,EAAE,sBAAsB,EAAE,GACxC,IAAI,CAgBN"}

package/dist/lib/utils/stats.js

@@ -7,12 +7,10 @@
  * 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");
@@ -21,28 +19,6 @@ 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');
@@ -201,14 +177,12 @@ function statsWarningsToString(json, statsConfig) {
                 }
                 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)) {
+            // rspack 1.3 prefixes an Error warning with its name, e.g. "  ⚠ Error: ".
+            const message = warning.message.replace(/^\s*⚠\s*Error: /, '');
+            if (!/^warning/i.test(message)) {
                 output += y('Warning: ');
             }
-            output += `${warning.message}\n\n`;
+            output += `${message}\n\n`;
         }
     }
     return output ? '\n' + output : output;
@@ -274,25 +248,6 @@ function statsHasErrors(json) {
 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular-rspack",
-  "version": "24.0.2",
+  "version": "24.0.3",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -56,8 +56,8 @@
     "@ampproject/remapping": "2.3.0",
     "@babel/core": "^7.29.6",
     "@discoveryjs/json-ext": "0.6.3",
-    "@nx/angular-rspack-compiler": "24.0.2",
-    "@nx/devkit": "24.0.2",
+    "@nx/angular-rspack-compiler": "24.0.3",
+    "@nx/devkit": "24.0.3",
     "ansi-colors": "4.1.3",
     "autoprefixer": "^10.4.9",
     "deepmerge": "^4.3.1",

package/dist/lib/utils/async-chunks.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.dev/license
- */
-import { StatsChunk, StatsCompilation } from '@rspack/core';
-import { NormalizedEntryPoint } from '../models/angular-rspack-plugin-options';
-/**
- * Webpack stats may incorrectly mark extra entry points `initial` chunks, when
- * they are actually loaded asynchronously and thus not in the main bundle. This
- * function finds extra entry points in Webpack stats and corrects this value
- * whereever necessary. Does not modify {@param webpackStats}.
- */
-export declare function markAsyncChunksNonInitial(webpackStats: StatsCompilation, extraEntryPoints: NormalizedEntryPoint[]): StatsChunk[];
-//# sourceMappingURL=async-chunks.d.ts.map

package/dist/lib/utils/async-chunks.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"async-chunks.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/async-chunks.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAE/E;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,gBAAgB,EAC9B,gBAAgB,EAAE,oBAAoB,EAAE,GACvC,UAAU,EAAE,CAqCd"}

package/dist/lib/utils/async-chunks.js

@@ -1,44 +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.dev/license
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.markAsyncChunksNonInitial = markAsyncChunksNonInitial;
-/**
- * Webpack stats may incorrectly mark extra entry points `initial` chunks, when
- * they are actually loaded asynchronously and thus not in the main bundle. This
- * function finds extra entry points in Webpack stats and corrects this value
- * whereever necessary. Does not modify {@param webpackStats}.
- */
-function markAsyncChunksNonInitial(webpackStats, extraEntryPoints) {
-    const { chunks = [], entrypoints: entryPoints = {} } = webpackStats;
-    // Find all Webpack chunk IDs not injected into the main bundle. We don't have
-    // to worry about transitive dependencies because extra entry points cannot be
-    // depended upon in Webpack, thus any extra entry point with `inject: false`,
-    // **cannot** be loaded in main bundle.
-    const asyncChunkIds = extraEntryPoints
-        .filter((entryPoint) => !entryPoint.inject && entryPoints[entryPoint.bundleName])
-        .flatMap((entryPoint) => entryPoints[entryPoint.bundleName].chunks?.filter((n) => n !== 'runtime'));
-    // Find chunks for each ID.
-    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;
-    });
-    // 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) => {
-        return asyncChunks.find((asyncChunk) => asyncChunk === chunk)
-            ? {
-                ...chunk,
-                initial: false,
-            }
-            : chunk;
-    });
-}