@nx/angular-rspack 24.0.0-beta.2 → 24.0.0-beta.4

package/dist/lib/plugins/loaders/angular-partial-transform.loader.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loader;
-const promises_1 = require("node:fs/promises");
 const angular_rspack_compiler_1 = require("@nx/angular-rspack-compiler");
 const models_1 = require("../../models");
 const inline_source_map_1 = require("./inline-source-map");
@@ -82,13 +81,12 @@ function loader(content, inputMap) {
         }
         // A mismatched entry means the chained map changed since the entry was
         // produced. The transformer's persistent cache is keyed on the file
-        // bytes only, so `transformFile` would return the same stale output;
-        // hand it the current file data instead, which always runs the worker
-        // and re-reads the changed map file. A cold process has no entry to
-        // compare against, so a stale persistent entry can still be served
-        // there, matching the esbuild application builder's behavior.
+        // bytes only, so `transformFile` would return the same stale output. A
+        // cold process has no entry to compare against, so a stale persistent
+        // entry can still be served there, matching the esbuild application
+        // builder's behavior.
         const transformed = cachedTransform !== undefined
-            ? (0, promises_1.readFile)(request, 'utf8').then((data) => javascriptTransformer.transformData(request, data, false, false))
+            ? javascriptTransformer.transformFileUncached(request, false, false)
             : javascriptTransformer.transformFile(request, false, false);
         transformed.then((contents) => {
             const text = Buffer.from(contents).toString('utf8');

package/dist/lib/plugins/loaders/engine-manifest.d.ts

@@ -9,10 +9,13 @@ export interface EngineWiringOptions {
     baseHref: string;
     locale: string | undefined;
     inlineCriticalCss: boolean;
+    /**
+     * Whether the installed `@angular/ssr` (>= 22.2) inlines critical CSS from
+     * plans compiled at build time instead of from the browser stylesheets.
+     */
+    usesCriticalCssPlans: boolean;
     /** Path from the server output directory to the browser output. */
     browserOutputRelativePath: string;
-    /** File name of the emitted index html within the browser output. */
-    indexOutputName: string | undefined;
     supportedLocales: Record<string, string>;
     allowedHosts: string[];
     /**

package/dist/lib/plugins/loaders/engine-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-manifest.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/loaders/engine-manifest.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,4BAA4B,wCACF,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,8DAA8D;IAC9D,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mEAAmE;IACnE,yBAAyB,EAAE,MAAM,CAAC;IAClC,qEAAqE;IACrE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,mBAAmB,GAChC,MAAM,CAmER"}
+{"version":3,"file":"engine-manifest.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/loaders/engine-manifest.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,4BAA4B,wCACF,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,8DAA8D;IAC9D,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mEAAmE;IACnE,yBAAyB,EAAE,MAAM,CAAC;IAClC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,mBAAmB,GAChC,MAAM,CA4ER"}

package/dist/lib/plugins/loaders/engine-manifest.js

@@ -34,19 +34,24 @@ function generateEngineManifestSource(engineWiring) {
     ɵgetOrCreateAngularServerApp as __ngRspackGetOrCreateAngularServerApp,
     ɵdestroyAngularServerApp as __ngRspackDestroyAngularServerApp,
   } from '@angular/ssr';
-  import { createBrowserOutputServerAssets as __ngRspackCreateServerAssets } from ${serverAssetsRequest};
+  import {
+    createServerAssets as __ngRspackCreateServerAssets,
+    readCriticalCss as __ngRspackReadCriticalCss,
+  } from ${serverAssetsRequest};
   import { join as __ngRspackJoinPath } from 'node:path';
   // MANIFESTS added by @nx/angular-rspack: an application engine cannot
   // construct without them.
   __ngRspackSetAngularAppManifest({
     bootstrap: () => Promise.resolve(__ngRspackMainServerDefault),
-    inlineCriticalCss: ${JSON.stringify(engineWiring.inlineCriticalCss)},
+    ${engineWiring.usesCriticalCssPlans
+        ? '...__ngRspackReadCriticalCss(__dirname),'
+        : `inlineCriticalCss: ${JSON.stringify(engineWiring.inlineCriticalCss)},`}
     baseHref: ${JSON.stringify(engineWiring.baseHref)},
     locale: ${JSON.stringify(engineWiring.locale)},
     assets: __ngRspackCreateServerAssets(
+      __dirname,
       __ngRspackJoinPath(__dirname, ${JSON.stringify(engineWiring.browserOutputRelativePath)}),
-      ${JSON.stringify(engineWiring.indexOutputName)},
-      ${JSON.stringify(engineWiring.inlineCriticalCss)}
+      ${JSON.stringify(!engineWiring.usesCriticalCssPlans && engineWiring.inlineCriticalCss)}
     ),
   });
   __ngRspackSetAngularAppEngineManifest({

package/dist/lib/plugins/ng-rspack.d.ts

@@ -2,12 +2,14 @@ import { Compiler, RspackPluginInstance } from '@rspack/core';
 import type { I18nOptions, NormalizedAngularRspackPluginOptions } from '../models';
 import { AngularRspackPlugin } from './angular-rspack-plugin';
 import { type SharedLicenseInputs } from './extract-licenses-plugin';
+import { type SharedServerRenderingInputs } from './index-html-plugin';
 export declare class NgRspackPlugin implements RspackPluginInstance {
     readonly pluginOptions: NormalizedAngularRspackPluginOptions;
     readonly isPlatformServer: boolean;
     readonly i18n: I18nOptions;
     private readonly sharedLicenseInputs;
     private readonly sharedAngularPlugin;
+    private readonly serverRenderingInputs;
     constructor(pluginOptions: NormalizedAngularRspackPluginOptions, extraOptions: {
         platform: 'browser' | 'server';
         i18nOptions: I18nOptions;
@@ -25,6 +27,11 @@ export declare class NgRspackPlugin implements RspackPluginInstance {
          * own compilation.
          */
         sharedAngularPlugin?: AngularRspackPlugin;
+        /**
+         * Filled by the browser compiler of an SSR build for the server
+         * compiler.
+         */
+        serverRenderingInputs?: SharedServerRenderingInputs;
     });
     apply(compiler: Compiler): void;
 }

package/dist/lib/plugins/ng-rspack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ng-rspack.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/ng-rspack.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAGR,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EACV,WAAW,EACX,oCAAoC,EACrC,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAC;AAMnC,qBAAa,cAAe,YAAW,oBAAoB;IACzD,QAAQ,CAAC,aAAa,EAAE,oCAAoC,CAAC;IAC7D,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IAEtE,YACE,aAAa,EAAE,oCAAoC,EACnD,YAAY,EAAE;QACZ,QAAQ,EAAE,SAAS,GAAG,QAAQ,CAAC;QAC/B,WAAW,EAAE,WAAW,CAAC;QACzB;;;;WAIG;QACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C;;;;;;WAMG;QACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;KAC3C,EAOF;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QA2MvB;CACF"}
+{"version":3,"file":"ng-rspack.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/ng-rspack.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAGR,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EACV,WAAW,EACX,oCAAoC,EACrC,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,cAAe,YAAW,oBAAoB;IACzD,QAAQ,CAAC,aAAa,EAAE,oCAAoC,CAAC;IAC7D,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAExB;IAEd,YACE,aAAa,EAAE,oCAAoC,EACnD,YAAY,EAAE;QACZ,QAAQ,EAAE,SAAS,GAAG,QAAQ,CAAC;QAC/B,WAAW,EAAE,WAAW,CAAC;QACzB;;;;WAIG;QACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C;;;;;;WAMG;QACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C;;;WAGG;QACH,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;KACrD,EAQF;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QA4MvB;CACF"}

package/dist/lib/plugins/ng-rspack.js

@@ -21,6 +21,7 @@ class NgRspackPlugin {
         this.isPlatformServer = extraOptions.platform === 'server';
         this.sharedLicenseInputs = extraOptions.sharedLicenseInputs;
         this.sharedAngularPlugin = extraOptions.sharedAngularPlugin;
+        this.serverRenderingInputs = extraOptions.serverRenderingInputs;
     }
     apply(compiler) {
         const root = this.pluginOptions.root;
@@ -147,6 +148,7 @@ class NgRspackPlugin {
                 chunksIntegrity: this.pluginOptions.subresourceIntegrity
                     ? new Map()
                     : undefined,
+                serverRenderingInputs: this.serverRenderingInputs,
             }).apply(compiler);
         }
         if (this.pluginOptions.devServer.open &&

package/dist/lib/plugins/prerender-plugin.d.ts

@@ -1,8 +1,9 @@
 import { type Compiler, RspackPluginInstance } from '@rspack/core';
 import { type I18nOptions, NormalizedAngularRspackPluginOptions } from '../models';
+import { type SharedServerRenderingInputs } from './index-html-plugin';
 export declare class PrerenderPlugin implements RspackPluginInstance {
     #private;
-    constructor(options: NormalizedAngularRspackPluginOptions, i18nOptions?: I18nOptions);
+    constructor(options: NormalizedAngularRspackPluginOptions, i18nOptions?: I18nOptions, serverRenderingInputs?: SharedServerRenderingInputs);
     apply(compiler: Compiler): void;
 }
 //# sourceMappingURL=prerender-plugin.d.ts.map

package/dist/lib/plugins/prerender-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prerender-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/prerender-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAOhF,OAAO,EACL,KAAK,WAAW,EAEhB,oCAAoC,EACrC,MAAM,WAAW,CAAC;AAenB,qBAAa,eAAgB,YAAW,oBAAoB;;IAI1D,YACE,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW,EAI1B;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAuBvB;CAqRF"}
+{"version":3,"file":"prerender-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/prerender-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAOhF,OAAO,EACL,KAAK,WAAW,EAEhB,oCAAoC,EACrC,MAAM,WAAW,CAAC;AAYnB,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,qBAAqB,CAAC;AAQ7B,qBAAa,eAAgB,YAAW,oBAAoB;;IAK1D,YACE,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW,EACzB,qBAAqB,CAAC,EAAE,2BAA2B,EAKpD;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAoCvB;CAmTF"}

package/dist/lib/plugins/prerender-plugin.js

@@ -1,5 +1,5 @@
 "use strict";
-var _PrerenderPlugin_instances, _PrerenderPlugin__options, _PrerenderPlugin_i18n, _PrerenderPlugin_writePrerenderedRoutesManifest, _PrerenderPlugin_prerenderAppShell, _PrerenderPlugin_prerenderSSGUniversal, _PrerenderPlugin_getRoutes, _PrerenderPlugin_normalizePrerenderOptions, _PrerenderPlugin_resolveZonePackage;
+var _PrerenderPlugin_instances, _PrerenderPlugin__options, _PrerenderPlugin_i18n, _PrerenderPlugin_serverRenderingInputs, _PrerenderPlugin_writePrerenderedRoutesManifest, _PrerenderPlugin_prerenderAppShell, _PrerenderPlugin_prerenderSSGUniversal, _PrerenderPlugin_getRoutes, _PrerenderPlugin_normalizePrerenderOptions, _PrerenderPlugin_createRenderWorkerPool, _PrerenderPlugin_getDocumentRenderOptions, _PrerenderPlugin_resolveZonePackage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrerenderPlugin = void 0;
 const tslib_1 = require("tslib");
@@ -15,28 +15,37 @@ const max_workers_1 = require("../utils/max-workers");
 const i18n_1 = require("../utils/i18n");
 const rspack_diagnostics_1 = require("../utils/rspack-diagnostics");
 const misc_helpers_1 = require("../utils/misc-helpers");
+const index_html_plugin_1 = require("./index-html-plugin");
 class RoutesSet extends Set {
     add(value) {
         return super.add(value.charAt(0) === '/' ? value.slice(1) : value);
     }
 }
 class PrerenderPlugin {
-    constructor(options, i18nOptions) {
+    constructor(options, i18nOptions, serverRenderingInputs) {
         _PrerenderPlugin_instances.add(this);
         _PrerenderPlugin__options.set(this, void 0);
         _PrerenderPlugin_i18n.set(this, void 0);
+        _PrerenderPlugin_serverRenderingInputs.set(this, void 0);
         tslib_1.__classPrivateFieldSet(this, _PrerenderPlugin__options, options, "f");
         tslib_1.__classPrivateFieldSet(this, _PrerenderPlugin_i18n, i18nOptions, "f");
+        tslib_1.__classPrivateFieldSet(this, _PrerenderPlugin_serverRenderingInputs, serverRenderingInputs, "f");
     }
     apply(compiler) {
         compiler.hooks.afterEmit.tapAsync('Angular Rspack', async (compilation, callback) => {
+            const inputs = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_serverRenderingInputs, "f")?.current;
+            if (!inputs) {
+                (0, rspack_diagnostics_1.addError)(compilation, 'Could not prerender because the browser build did not generate the index html.');
+                callback();
+                return;
+            }
             const prerenderedRoutes = new Set();
             if (tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").appShell) {
-                await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderAppShell).call(this, compilation);
+                await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderAppShell).call(this, compilation, inputs);
                 prerenderedRoutes.add('/');
             }
             if (tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").prerender) {
-                for (const route of await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderSSGUniversal).call(this, compilation)) {
+                for (const route of await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderSSGUniversal).call(this, compilation, inputs)) {
                     // RoutesSet stores routes without the leading slash; the manifest
                     // keys carry it, matching the esbuild application builder.
                     prerenderedRoutes.add(`/${route}`);
@@ -48,7 +57,7 @@ class PrerenderPlugin {
     }
 }
 exports.PrerenderPlugin = PrerenderPlugin;
-_PrerenderPlugin__options = new WeakMap(), _PrerenderPlugin_i18n = new WeakMap(), _PrerenderPlugin_instances = new WeakSet(), _PrerenderPlugin_writePrerenderedRoutesManifest = 
+_PrerenderPlugin__options = new WeakMap(), _PrerenderPlugin_i18n = new WeakMap(), _PrerenderPlugin_serverRenderingInputs = new WeakMap(), _PrerenderPlugin_instances = new WeakSet(), _PrerenderPlugin_writePrerenderedRoutesManifest = 
 /**
  * Overwrites the empty `prerendered-routes.json` emitted at the output root
  * by the browser compiler with the routes that were prerendered.
@@ -63,17 +72,10 @@ async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prer
         (0, misc_helpers_1.assertIsError)(error);
         (0, rspack_diagnostics_1.addError)(compilation, error.message);
     }
-}, _PrerenderPlugin_prerenderAppShell = async function _PrerenderPlugin_prerenderAppShell(compilation) {
+}, _PrerenderPlugin_prerenderAppShell = async function _PrerenderPlugin_prerenderAppShell(compilation, inputs) {
     // Users can specify a different base html file e.g. "src/home.html"
     const indexFile = (0, get_index_output_file_1.getIndexOutputFile)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").index);
-    const worker = new worker_pool_1.WorkerPool({
-        filename: require.resolve('./tools/render-worker'),
-        maxThreads: (0, max_workers_1.maxWorkers)(),
-        workerData: {
-            zonePackage: tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_resolveZonePackage).call(this, devkit_1.workspaceRoot),
-        },
-        recordTiming: false,
-    });
+    const worker = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_createRenderWorkerPool).call(this, inputs);
     try {
         const outputPaths = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_i18n, "f")
             ? (0, i18n_1.ensureOutputPaths)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").outputPath.browser, tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_i18n, "f"))
@@ -91,7 +93,9 @@ async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prer
             }
             try {
                 const options = {
+                    ...tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_getDocumentRenderOptions).call(this, inputs, locale),
                     indexFile,
+                    emitsOriginalIndex: (0, index_html_plugin_1.emitsServerIndexAsOriginal)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").index),
                     deployUrl: tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").deployUrl || '',
                     inlineCriticalCss: !!tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").optimization.styles.inlineCritical,
                     minifyCss: !!tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").optimization.styles.minify,
@@ -125,17 +129,10 @@ async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prer
     finally {
         void worker.destroy();
     }
-}, _PrerenderPlugin_prerenderSSGUniversal = async function _PrerenderPlugin_prerenderSSGUniversal(compilation) {
+}, _PrerenderPlugin_prerenderSSGUniversal = async function _PrerenderPlugin_prerenderSSGUniversal(compilation, inputs) {
     // Users can specify a different base html file e.g. "src/home.html"
     const indexFile = (0, get_index_output_file_1.getIndexOutputFile)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").index);
-    const worker = new worker_pool_1.WorkerPool({
-        filename: require.resolve('./tools/render-worker'),
-        maxThreads: (0, max_workers_1.maxWorkers)(),
-        workerData: {
-            zonePackage: tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_resolveZonePackage).call(this, devkit_1.workspaceRoot),
-        },
-        recordTiming: false,
-    });
+    const worker = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_createRenderWorkerPool).call(this, inputs);
     let routes;
     try {
         const outputPaths = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_i18n, "f")
@@ -154,9 +151,13 @@ async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prer
             }
             routes ??= await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_getRoutes).call(this, indexFile, normalizedOutputPath, serverBundlePath, devkit_1.workspaceRoot);
             try {
+                const documentRenderOptions = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_getDocumentRenderOptions).call(this, inputs, locale);
+                const emitsOriginalIndex = (0, index_html_plugin_1.emitsServerIndexAsOriginal)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").index);
                 const results = (await Promise.all(routes.map((route) => {
                     const options = {
+                        ...documentRenderOptions,
                         indexFile,
+                        emitsOriginalIndex,
                         deployUrl: tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").deployUrl || '',
                         inlineCriticalCss: !!tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").optimization.styles.inlineCritical,
                         minifyCss: !!tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").optimization.styles.minify,
@@ -232,6 +233,22 @@ async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prer
         };
     }
     return tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").prerender;
+}, _PrerenderPlugin_createRenderWorkerPool = function _PrerenderPlugin_createRenderWorkerPool(inputs) {
+    return new worker_pool_1.WorkerPool({
+        filename: require.resolve('./tools/render-worker'),
+        maxThreads: (0, max_workers_1.maxWorkers)(),
+        workerData: {
+            zonePackage: tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_resolveZonePackage).call(this, devkit_1.workspaceRoot),
+            criticalCssPlans: inputs.criticalCssPlans,
+        },
+        recordTiming: false,
+    });
+}, _PrerenderPlugin_getDocumentRenderOptions = function _PrerenderPlugin_getDocumentRenderOptions(inputs, locale) {
+    const indexHtml = inputs.indexHtml.get(locale);
+    if (!indexHtml) {
+        throw new Error(`Could not find the index html generated for the "${locale}" locale.`);
+    }
+    return { document: indexHtml.server, nonce: indexHtml.nonce };
 }, _PrerenderPlugin_resolveZonePackage = function _PrerenderPlugin_resolveZonePackage(workspaceRoot) {
     if (tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").zoneless)
         return false;

package/dist/lib/plugins/server-assets-plugin.d.ts

@@ -0,0 +1,13 @@
+import type { Compiler, RspackPluginInstance } from '@rspack/core';
+import type { SharedServerRenderingInputs } from './index-html-plugin';
+/**
+ * Emits the files the application engine reads from the server output (see
+ * `createServerAssets` and `readCriticalCss`).
+ */
+export declare class ServerAssetsPlugin implements RspackPluginInstance {
+    private readonly serverRenderingInputs;
+    private readonly usesCriticalCssPlans;
+    constructor(serverRenderingInputs: SharedServerRenderingInputs, usesCriticalCssPlans: boolean);
+    apply(compiler: Compiler): void;
+}
+//# sourceMappingURL=server-assets-plugin.d.ts.map

package/dist/lib/plugins/server-assets-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-assets-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/server-assets-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAMnE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAIvE;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,oBAAoB;IAE3D,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IAFvC,YACmB,qBAAqB,EAAE,2BAA2B,EAClD,oBAAoB,EAAE,OAAO,EAC5C;IAEJ,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAqCvB;CACF"}

package/dist/lib/plugins/server-assets-plugin.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServerAssetsPlugin = void 0;
+const server_assets_1 = require("../ssr/server-assets");
+const PLUGIN_NAME = 'ServerAssetsPlugin';
+/**
+ * Emits the files the application engine reads from the server output (see
+ * `createServerAssets` and `readCriticalCss`).
+ */
+class ServerAssetsPlugin {
+    constructor(serverRenderingInputs, usesCriticalCssPlans) {
+        this.serverRenderingInputs = serverRenderingInputs;
+        this.usesCriticalCssPlans = usesCriticalCssPlans;
+    }
+    apply(compiler) {
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.processAssets.tap({
+                name: PLUGIN_NAME,
+                stage: compiler.rspack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+            }, () => {
+                const inputs = this.serverRenderingInputs.current;
+                // The engine is only wired up without locale inlining.
+                const indexHtml = inputs?.indexHtml.get('');
+                if (!indexHtml) {
+                    return;
+                }
+                const { RawSource } = compiler.rspack.sources;
+                compilation.emitAsset(server_assets_1.INDEX_SERVER_HTML, new RawSource(indexHtml.server));
+                compilation.emitAsset(server_assets_1.INDEX_CSR_HTML, new RawSource(indexHtml.csr));
+                if (this.usesCriticalCssPlans) {
+                    compilation.emitAsset(server_assets_1.CRITICAL_CSS_FILE, new RawSource(JSON.stringify({
+                        criticalCssPlans: inputs.criticalCssPlans?.length
+                            ? inputs.criticalCssPlans
+                            : undefined,
+                        nonce: indexHtml.nonce,
+                    })));
+                }
+            });
+        });
+    }
+}
+exports.ServerAssetsPlugin = ServerAssetsPlugin;

package/dist/lib/plugins/tools/render-worker.d.ts

@@ -5,8 +5,19 @@
  * 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 { type CriticalCssPlan } from '../../utils/beasties';
 export interface RenderOptions {
+    /** The server index html the route renders into. */
+    document: string;
+    /** The `ngCspNonce` attribute value of the document. */
+    nonce: string | undefined;
+    /** The browser index file name, which prerendering "/" replaces. */
     indexFile: string;
+    /**
+     * Whether the build emits `index.original.html`, which prerendering "/"
+     * must then not replace with the browser index.
+     */
+    emitsOriginalIndex: boolean;
     deployUrl: string;
     inlineCriticalCss: boolean;
     minifyCss: boolean;
@@ -14,6 +25,18 @@ export interface RenderOptions {
     serverBundlePath: string;
     route: string;
 }
+export interface RenderWorkerData {
+    /**
+     * The zone.js package loaded during worker initialization, or `false` for
+     * zoneless applications.
+     */
+    zonePackage: string | false;
+    /**
+     * Set when critical CSS is inlined from compiled plans, which
+     * `@angular/build` >= 22.2 does.
+     */
+    criticalCssPlans: CriticalCssPlan[] | undefined;
+}
 export interface RenderResult {
     errors?: string[];
     warnings?: string[];
@@ -21,7 +44,7 @@ export interface RenderResult {
 /**
  * Renders each route in routes and writes them to <outputPath>/<route>/index.html.
  */
-declare function render({ indexFile, deployUrl, minifyCss, outputPath, serverBundlePath, route, inlineCriticalCss, }: RenderOptions): Promise<RenderResult>;
+declare function render({ document, nonce, indexFile, emitsOriginalIndex, deployUrl, minifyCss, outputPath, serverBundlePath, route, inlineCriticalCss, }: RenderOptions): Promise<RenderResult>;
 /**
  * The default export will be the promise returned by the initialize function.
  * This is awaited by piscina prior to using the Worker.

package/dist/lib/plugins/tools/render-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-worker.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/tools/render-worker.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAaH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAqCD;;GAEG;AACH,iBAAe,MAAM,CAAC,EACpB,SAAS,EACT,SAAS,EACT,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,KAAK,EACL,iBAAiB,GAClB,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAsGvC;AAuBD;;;GAGG"}
+{"version":3,"file":"render-worker.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/tools/render-worker.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAYH,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,wDAAwD;IACxD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC;IAC5B;;;OAGG;IACH,gBAAgB,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;CACjD;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAiHD;;GAEG;AACH,iBAAe,MAAM,CAAC,EACpB,QAAQ,EACR,KAAK,EACL,SAAS,EACT,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,KAAK,EACL,iBAAiB,GAClB,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAgGvC;AAuBD;;;GAGG"}

package/dist/lib/plugins/tools/render-worker.js

@@ -12,15 +12,51 @@ const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
 const fs = tslib_1.__importStar(require("node:fs"));
 const path = tslib_1.__importStar(require("node:path"));
 const node_worker_threads_1 = require("node:worker_threads");
+const beasties_1 = require("../../utils/beasties");
+// The declarations are those of the installed @angular/build, which no
+// longer export the processor, so its presence is checked at runtime.
+function hasInlineCriticalCssProcessor(angularBuildPrivate) {
+    return 'InlineCriticalCssProcessor' in angularBuildPrivate;
+}
+async function processCriticalCss(html, outputPath, deployUrl, minify) {
+    const angularBuildPrivate = await import('@angular/build/private');
+    (0, node_assert_1.default)(hasInlineCriticalCssProcessor(angularBuildPrivate), 'The installed "@angular/build" requires compiled critical CSS plans.');
+    const { InlineCriticalCssProcessor } = angularBuildPrivate;
+    return new InlineCriticalCssProcessor({ deployUrl, minify }).process(html, {
+        outputPath,
+    });
+}
+const { zonePackage, criticalCssPlans } = node_worker_threads_1.workerData;
+let criticalCssProcessor;
+/** The warnings of the processor's current run. */
+let criticalCssWarnings = [];
 /**
- * The fully resolved path to the zone.js package that will be loaded during worker initialization.
- * This is passed as workerData when setting up the worker via the `piscina` package.
+ * Inlines critical CSS the way `@angular/ssr` >= 22.2 does when rendering,
+ * from the plans `@angular/build` compiled.
  */
-const { zonePackage } = node_worker_threads_1.workerData;
+async function inlineCriticalCssFromPlans(html, plans, nonce) {
+    criticalCssProcessor ??= (await (0, beasties_1.loadAngularBuildBeasties)('runtime')).createProcessor(plans, {
+        preload: 'media-script',
+        preloadFonts: true,
+        inlineFonts: true,
+        noscriptFallback: true,
+        cache: true,
+        logger: { warn: (message) => criticalCssWarnings.push(message) },
+    });
+    const warnings = (criticalCssWarnings = []);
+    try {
+        return { content: criticalCssProcessor.process(html, { nonce }), warnings };
+    }
+    catch (error) {
+        // Like @angular/ssr, a failure leaves the page without critical CSS.
+        warnings.push(`An error occurred while inlining critical CSS: ${error instanceof Error ? error.message : error}`);
+        return { content: html, warnings };
+    }
+}
 /**
  * Renders each route in routes and writes them to <outputPath>/<route>/index.html.
  */
-async function render({ indexFile, deployUrl, minifyCss, outputPath, serverBundlePath, route, inlineCriticalCss, }) {
+async function render({ document, nonce, indexFile, emitsOriginalIndex, deployUrl, minifyCss, outputPath, serverBundlePath, route, inlineCriticalCss, }) {
     const result = {};
     const browserIndexOutputPath = path.join(outputPath, indexFile);
     const outputFolderPath = path.join(outputPath, route);
@@ -30,11 +66,6 @@ async function render({ indexFile, deployUrl, minifyCss, outputPath, serverBundl
     const { ɵSERVER_CONTEXT, AppServerModule, renderModule, renderApplication, default: defaultExport, __ngRspackMainServerBootstrap, } = require(serverBundlePath);
     const bootstrapAppFn = defaultExport ?? __ngRspackMainServerBootstrap;
     (0, node_assert_1.default)(ɵSERVER_CONTEXT, `ɵSERVER_CONTEXT was not exported from: ${serverBundlePath}.`);
-    const indexBaseName = fs.existsSync(path.join(outputPath, 'index.original.html'))
-        ? 'index.original.html'
-        : indexFile;
-    const browserIndexInputPath = path.join(outputPath, indexBaseName);
-    const document = await fs.promises.readFile(browserIndexInputPath, 'utf8');
     const platformProviders = [
         {
             provide: ɵSERVER_CONTEXT,
@@ -61,21 +92,19 @@ async function render({ indexFile, deployUrl, minifyCss, outputPath, serverBundl
             extraProviders: platformProviders,
         });
     }
-    if (inlineCriticalCss) {
-        const { InlineCriticalCssProcessor } = await import('@angular/build/private');
-        const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
-            deployUrl: deployUrl,
-            minify: minifyCss,
-        });
-        const { content, warnings, errors } = await inlineCriticalCssProcessor.process(html, {
-            outputPath,
-        });
+    if (inlineCriticalCss && criticalCssPlans) {
+        const { content, warnings } = await inlineCriticalCssFromPlans(html, criticalCssPlans, nonce);
+        result.warnings = warnings;
+        html = content;
+    }
+    else if (inlineCriticalCss) {
+        const { content, warnings, errors } = await processCriticalCss(html, outputPath, deployUrl, minifyCss);
         result.errors = errors;
         result.warnings = warnings;
         html = content;
     }
     // This case happens when we are prerendering "/".
-    if (browserIndexOutputPath === outputIndexPath) {
+    if (browserIndexOutputPath === outputIndexPath && !emitsOriginalIndex) {
         const browserIndexOutputPathOriginal = path.join(outputPath, 'index.original.html');
         fs.renameSync(browserIndexOutputPath, browserIndexOutputPathOriginal);
     }

package/dist/lib/ssr/server-assets.d.ts

@@ -1,24 +1,40 @@
+/** The document server rendering renders into, in the server output. */
+export declare const INDEX_SERVER_HTML = "index.server.html";
+/** The document served for client-rendered routes, in the server output. */
+export declare const INDEX_CSR_HTML = "index.csr.html";
+/**
+ * The app manifest's critical CSS fields for `@angular/ssr` >= 22.2, in the
+ * server output.
+ */
+export declare const CRITICAL_CSS_FILE = "critical-css.json";
 interface ServerAsset {
     text: () => Promise<string>;
 }
 /**
- * Builds the `assets` table of the Angular app manifest from the browser
- * output that sits next to the server bundle. The esbuild application
- * builder inlines these assets into the server output at build time; here
- * only the directory listing and file stats are read when the server process
- * starts and contents are read lazily, so a restarted process always serves
- * the current build output and rebuilds never have to invalidate the SSR
- * entry module (whose injected code would otherwise embed stale index
- * contents under output hashing).
+ * Builds the `assets` table of the Angular app manifest from the build
+ * output. The esbuild application builder inlines these assets into the
+ * server output at build time; here only directory listings and file stats
+ * are read when the server process starts and contents are read lazily, so a
+ * restarted process always serves the current build output and rebuilds never
+ * have to invalidate the SSR entry module (whose injected code would
+ * otherwise embed stale index contents under output hashing).
  *
- * The table maps the emitted index html to the `index.server.html` and
- * `index.csr.html` names the `@angular/ssr` render path looks up. Top-level
- * stylesheets are included only when critical CSS inlining is enabled: the
- * inliner, which fetches them by file name, is their only consumer.
+ * The index documents come from the server output. Top-level stylesheets of
+ * the browser output are included only when `inlineCriticalCss` is set: the
+ * inliner of `@angular/ssr` < 22.2, which fetches them by file name, is their
+ * only consumer.
  *
  * This module is bundled into the user's server bundle, so it must only
  * import node builtins.
  */
-export declare function createBrowserOutputServerAssets(browserOutputPath: string, indexOutputName: string | undefined, inlineCriticalCss: boolean): Record<string, ServerAsset>;
+export declare function createServerAssets(serverOutputPath: string, browserOutputPath: string, inlineCriticalCss: boolean): Record<string, ServerAsset>;
+/**
+ * Reads the `criticalCssPlans` and `nonce` app manifest fields, which
+ * `@angular/ssr` >= 22.2 inlines critical CSS with.
+ */
+export declare function readCriticalCss(serverOutputPath: string): {
+    criticalCssPlans?: unknown[];
+    nonce?: string;
+};
 export {};
 //# sourceMappingURL=server-assets.d.ts.map

package/dist/lib/ssr/server-assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-assets.d.ts","sourceRoot":"","sources":["../../../src/lib/ssr/server-assets.ts"],"names":[],"mappings":"AAIA,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,+BAA+B,CAC7C,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,iBAAiB,EAAE,OAAO,GACzB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAoC7B"}
+{"version":3,"file":"server-assets.d.ts","sourceRoot":"","sources":["../../../src/lib/ssr/server-assets.ts"],"names":[],"mappings":"AAIA,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,4EAA4E;AAC5E,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C;;;GAGG;AACH,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAErD,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAChC,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,EACzB,iBAAiB,EAAE,OAAO,GACzB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA4B7B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,MAAM,GAAG;IACzD,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA"}