@nx/angular-rspack 0.0.0-pr-32490-e4fdfa9 → 0.0.0-pr-32868-a65a4a2

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Repos · Fast Builds
 
-An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
+Get to green PRs in half the time. Nx optimizes your builds, scales your CI, and fixes failed PRs. Built for developers and AI agents.
 
 ## Build Angular with Rspack
 

package/README.md__tpl__

@@ -11,7 +11,7 @@
 
 # Nx: Smart Repos · Fast Builds
 
-An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
+Get to green PRs in half the time. Nx optimizes your builds, scales your CI, and fixes failed PRs. Built for developers and AI agents.
 
 ## Build Angular with Rspack
 

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":"AAgBA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,oBAAoB,EAE1B,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,oCAAoC,EAC1C,MAAM,WAAW,CAAC;AAUnB,qBAAa,mBAAoB,YAAW,oBAAoB;;gBAS5D,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW;IAuB3B,KAAK,CAAC,QAAQ,EAAE,QAAQ;YAoQV,gBAAgB;CAgC/B"}
+{"version":3,"file":"angular-rspack-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/angular-rspack-plugin.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,oBAAoB,EAE1B,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,oCAAoC,EAC1C,MAAM,WAAW,CAAC;AAUnB,qBAAa,mBAAoB,YAAW,oBAAoB;;gBAU5D,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW;IAuB3B,KAAK,CAAC,QAAQ,EAAE,QAAQ;YAqSV,gBAAgB;CAkC/B"}

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

@@ -1,5 +1,5 @@
 "use strict";
-var _AngularRspackPlugin__options, _AngularRspackPlugin_i18n, _AngularRspackPlugin_sourceFileCache, _AngularRspackPlugin_javascriptTransformer, _AngularRspackPlugin_angularCompilation;
+var _AngularRspackPlugin__options, _AngularRspackPlugin_i18n, _AngularRspackPlugin_sourceFileCache, _AngularRspackPlugin_javascriptTransformer, _AngularRspackPlugin_angularCompilation, _AngularRspackPlugin_collectedStylesheetAssets;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularRspackPlugin = void 0;
 const tslib_1 = require("tslib");
@@ -23,6 +23,7 @@ class AngularRspackPlugin {
         _AngularRspackPlugin_javascriptTransformer.set(this, void 0);
         // This will be defined in the apply method correctly
         _AngularRspackPlugin_angularCompilation.set(this, void 0);
+        _AngularRspackPlugin_collectedStylesheetAssets.set(this, []);
         tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin__options, options, "f");
         tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin_i18n, i18nOptions, "f");
         tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin_sourceFileCache, new angular_rspack_compiler_1.SourceFileCache(), "f");
@@ -79,6 +80,34 @@ class AngularRspackPlugin {
                 name: PLUGIN_NAME,
                 stage: compiler.rspack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
             }, (assets) => {
+                // Emit collected stylesheet assets
+                if (tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_collectedStylesheetAssets, "f").length > 0) {
+                    const { RawSource } = compiler.rspack.sources;
+                    for (const asset of tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_collectedStylesheetAssets, "f")) {
+                        // Normalize the asset path to ensure correct output location
+                        let assetPath = asset.path;
+                        // Extract just the media/filename part from the path
+                        const mediaMatch = assetPath.match(/media\/[^/]+$/);
+                        if (mediaMatch) {
+                            assetPath = mediaMatch[0];
+                        }
+                        else {
+                            // If not a media path, try to make it relative to the project root
+                            assetPath = assetPath.replace(/^\/+/, '');
+                            // Remove absolute path prefix if present
+                            const projectRootIndex = assetPath.lastIndexOf(tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").root);
+                            if (projectRootIndex >= 0) {
+                                assetPath = assetPath.substring(projectRootIndex + tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").root.length + 1);
+                            }
+                        }
+                        // Create the asset source
+                        const source = new RawSource(asset.text);
+                        // Emit the asset
+                        compilation.emitAsset(assetPath, source);
+                    }
+                    // Clear the collected assets after emission
+                    tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_collectedStylesheetAssets, "f").length = 0;
+                }
                 for (const assetName in assets) {
                     const asset = compilation.getAsset(assetName);
                     if (!asset) {
@@ -113,8 +142,6 @@ class AngularRspackPlugin {
                         name: PLUGIN_NAME,
                         message: error.text || '',
                         file: error.location?.file,
-                        loc: `${error.location?.line}:${error.location?.column}`,
-                        moduleIdentifier: error.location?.file,
                         stack: error.text,
                     });
                 }
@@ -123,9 +150,7 @@ class AngularRspackPlugin {
                         name: PLUGIN_NAME,
                         message: warning.text || '',
                         file: warning.location?.file,
-                        loc: `${warning.location?.line}:${warning.location?.column}`,
                         stack: warning.text,
-                        moduleIdentifier: warning.location?.file,
                     });
                 }
             }
@@ -217,7 +242,7 @@ class AngularRspackPlugin {
                 ? tsConfig
                 : tsConfig.configFile
             : tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").tsConfig;
-        tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin_angularCompilation, await (0, angular_rspack_compiler_1.setupCompilationWithAngularCompilation)({
+        const result = await (0, angular_rspack_compiler_1.setupCompilationWithAngularCompilation)({
             source: {
                 tsconfigPath: tsconfigPath,
             },
@@ -231,8 +256,10 @@ class AngularRspackPlugin {
             hasServer: tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").hasServer,
             includePaths: tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").stylePreprocessorOptions?.includePaths,
             sass: tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").stylePreprocessorOptions?.sass,
-        }, tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_sourceFileCache, "f"), tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_angularCompilation, "f"), modifiedFiles), "f");
+        }, tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_sourceFileCache, "f"), tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_angularCompilation, "f"), modifiedFiles);
+        tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin_angularCompilation, result.angularCompilation, "f");
+        tslib_1.__classPrivateFieldSet(this, _AngularRspackPlugin_collectedStylesheetAssets, result.collectedStylesheetAssets, "f");
     }
 }
 exports.AngularRspackPlugin = AngularRspackPlugin;
-_AngularRspackPlugin__options = new WeakMap(), _AngularRspackPlugin_i18n = new WeakMap(), _AngularRspackPlugin_sourceFileCache = new WeakMap(), _AngularRspackPlugin_javascriptTransformer = new WeakMap(), _AngularRspackPlugin_angularCompilation = new WeakMap();
+_AngularRspackPlugin__options = new WeakMap(), _AngularRspackPlugin_i18n = new WeakMap(), _AngularRspackPlugin_sourceFileCache = new WeakMap(), _AngularRspackPlugin_javascriptTransformer = new WeakMap(), _AngularRspackPlugin_angularCompilation = new WeakMap(), _AngularRspackPlugin_collectedStylesheetAssets = new WeakMap();

package/dist/lib/utils/postcss-cli-resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postcss-cli-resources.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/postcss-cli-resources.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,SAAS,CAAC;AAgBnD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,mEAAmE;IACnE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3C,MAAM,EAAE,OAAO,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACtD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAcD,eAAO,MAAM,OAAO,OAAO,CAAC;AAE5B,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC,EAAE,0BAA0B,GAAG,MAAM,CAyKrE"}
+{"version":3,"file":"postcss-cli-resources.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/postcss-cli-resources.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,SAAS,CAAC;AAgBnD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,mEAAmE;IACnE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3C,MAAM,EAAE,OAAO,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACtD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAcD,eAAO,MAAM,OAAO,OAAO,CAAC;AAE5B,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC,EAAE,0BAA0B,GAAG,MAAM,CAyKrE"}

package/dist/lib/utils/postcss-cli-resources.js

@@ -59,7 +59,7 @@ function default_1(options) {
         if (inputUrl.startsWith('~')) {
             inputUrl = inputUrl.slice(1);
         }
-        const normalizedUrl = inputUrl.replace(/\\/g, '/');
+        const normalizedUrl = path.resolve(context, inputUrl.replace(/\\/g, '/'));
         const parsedUrl = new URL(normalizedUrl, 'file:///');
         const { pathname, hash, search } = parsedUrl;
         const resolver = (file, base) => new Promise((resolve, reject) => {

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;AAgID,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CAsDR;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CA4DR;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,IAQrC,UAAK,EAAE,WAAM,UActB;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,CAoDjB;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,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;AAoKD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CAsDR;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CA4DR;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,IAQrC,UAAK,EAAE,WAAM,UActB;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,CAoDjB;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

@@ -86,7 +86,36 @@ function statsToString(stats, json, statsConfig, budgetFailures) {
         if (!isFirstRun && !chunk.rendered) {
             continue;
         }
-        const assets = json.assets?.filter((asset) => chunk.files?.includes(asset.name));
+        const assets = json.assets?.filter((asset) => {
+            // First try exact match with files array (for non-i18n builds)
+            if (chunk.files?.includes(asset.name)) {
+                return true;
+            }
+            // For i18n builds, chunk.files is often empty but we can match by chunk names
+            // Assets have locale prefixes (e.g., "fr/main.abc123.js")
+            if (!chunk.files?.length && chunk.names?.length) {
+                // Remove locale prefix and hash from asset name to get base name
+                const assetWithoutLocale = asset.name
+                    .replace(/^[a-z]{2}(-[A-Z]{2})?\//, '') // Remove locale prefix
+                    .replace(/\.[a-f0-9]{8,}\./, '.'); // Remove hash (e.g., main.abc123.js -> main.js)
+                // Check if any chunk name matches the base name of the asset
+                return chunk.names.some((chunkName) => {
+                    // Match chunk name to asset base name (e.g., "main" matches "main.js")
+                    return (assetWithoutLocale.startsWith(chunkName + '.') ||
+                        assetWithoutLocale === chunkName);
+                });
+            }
+            // For i18n builds where chunk.files has values but without locale prefix
+            if (chunk.files?.length) {
+                // Check if any chunk file matches the asset name without locale prefix
+                return chunk.files.some((chunkFile) => {
+                    // Remove potential locale prefix from asset name
+                    const assetWithoutLocale = asset.name.replace(/^[a-z]{2}(-[A-Z]{2})?\//, '');
+                    return chunkFile === assetWithoutLocale;
+                });
+            }
+            return false;
+        });
         let rawSize = 0;
         let estimatedTransferSize;
         if (assets) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular-rspack",
-  "version": "0.0.0-pr-32490-e4fdfa9",
+  "version": "0.0.0-pr-32868-a65a4a2",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -46,10 +46,10 @@
   },
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@babel/core": "7.26.10",
+    "@babel/core": "7.28.3",
     "@discoveryjs/json-ext": "0.6.3",
-    "@nx/angular-rspack-compiler": "0.0.0-pr-32490-e4fdfa9",
-    "@nx/devkit": "0.0.0-pr-32490-e4fdfa9",
+    "@nx/angular-rspack-compiler": "0.0.0-pr-32868-a65a4a2",
+    "@nx/devkit": "0.0.0-pr-32868-a65a4a2",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.21",
     "deepmerge": "^4.3.1",
@@ -80,10 +80,10 @@
     "@angular/build": ">=19.0.0 <21.0.0",
     "@angular/localize": ">=19.0.0 <21.0.0",
     "@angular/platform-server": ">=19.0.0 <21.0.0",
-    "zone.js": ">=0.14.0 <0.16.0",
     "@angular/ssr": ">=19.0.0 <21.0.0",
     "@rspack/core": ">=1.3.5 <2.0.0",
-    "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0"
+    "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
+    "zone.js": ">=0.14.0 <0.16.0"
   },
   "peerDependenciesMeta": {
     "tailwindcss": {