@nx/angular-rspack 24.0.1 → 24.0.3

package/dist/lib/config/config-utils/browser-config.d.ts

@@ -4,5 +4,6 @@ import type { HashFormat, I18nOptions, NormalizedAngularRspackPluginOptions } fr
 import type { AngularRspackPlugin } from '../../plugins/angular-rspack-plugin';
 import type { SharedLicenseInputs } from '../../plugins/extract-licenses-plugin';
 import type { SharedServerRenderingInputs } from '../../plugins/index-html-plugin';
-export declare function getBrowserConfig(normalizedOptions: NormalizedAngularRspackPluginOptions, i18n: I18nOptions, hashFormat: HashFormat, defaultConfig: Configuration, swcTranspilationTransform: SwcTranspilationTransform, sharedLicenseInputs?: SharedLicenseInputs, sharedAngularPlugin?: AngularRspackPlugin, serverRenderingInputs?: SharedServerRenderingInputs): Promise<Configuration>;
+import type { SsrReloadServer } from '../../plugins/server/ssr-reload-server';
+export declare function getBrowserConfig(normalizedOptions: NormalizedAngularRspackPluginOptions, i18n: I18nOptions, hashFormat: HashFormat, defaultConfig: Configuration, swcTranspilationTransform: SwcTranspilationTransform, sharedLicenseInputs?: SharedLicenseInputs, sharedAngularPlugin?: AngularRspackPlugin, serverRenderingInputs?: SharedServerRenderingInputs, ssrReloadServer?: SsrReloadServer): Promise<Configuration>;
 //# sourceMappingURL=browser-config.d.ts.map

package/dist/lib/config/config-utils/browser-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-config.d.ts","sourceRoot":"","sources":["../../../../src/lib/config/config-utils/browser-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,oCAAoC,EACrC,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAQnF,wBAAsB,gBAAgB,CACpC,iBAAiB,EAAE,oCAAoC,EACvD,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,yBAAyB,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,qBAAqB,CAAC,EAAE,2BAA2B,GAClD,OAAO,CAAC,aAAa,CAAC,CAiFxB"}
+{"version":3,"file":"browser-config.d.ts","sourceRoot":"","sources":["../../../../src/lib/config/config-utils/browser-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,oCAAoC,EACrC,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAQ9E,wBAAsB,gBAAgB,CACpC,iBAAiB,EAAE,oCAAoC,EACvD,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,yBAAyB,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,qBAAqB,CAAC,EAAE,2BAA2B,EACnD,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,aAAa,CAAC,CAkFxB"}

package/dist/lib/config/config-utils/browser-config.js

@@ -10,7 +10,7 @@ const optimization_config_1 = require("./optimization-config");
 const swc_transpilation_1 = require("./swc-transpilation");
 const path_1 = require("path");
 const hmr_accept_loader_1 = require("../../plugins/loaders/hmr-accept-loader");
-async function getBrowserConfig(normalizedOptions, i18n, hashFormat, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs) {
+async function getBrowserConfig(normalizedOptions, i18n, hashFormat, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs, ssrReloadServer) {
     const isDevServer = (0, rspack_serve_env_1.isServeMode)();
     const isProduction = process.env['NODE_ENV'] === 'production';
     const { root } = normalizedOptions;
@@ -78,6 +78,7 @@ async function getBrowserConfig(normalizedOptions, i18n, hashFormat, defaultConf
                 platform: 'browser',
                 sharedLicenseInputs,
                 sharedAngularPlugin,
+                ssrReloadServer,
                 serverRenderingInputs,
             }),
         ],

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/config/config-utils/server-config.d.ts

@@ -4,5 +4,6 @@ import type { I18nOptions, NormalizedAngularRspackPluginOptions } from '../../mo
 import type { AngularRspackPlugin } from '../../plugins/angular-rspack-plugin';
 import type { SharedLicenseInputs } from '../../plugins/extract-licenses-plugin';
 import type { SharedServerRenderingInputs } from '../../plugins/index-html-plugin';
-export declare function getServerConfig(normalizedOptions: NormalizedAngularRspackPluginOptions, i18n: I18nOptions, defaultConfig: Configuration, swcTranspilationTransform: SwcTranspilationTransform, sharedLicenseInputs?: SharedLicenseInputs, sharedAngularPlugin?: AngularRspackPlugin, serverRenderingInputs?: SharedServerRenderingInputs): Promise<Configuration>;
+import type { SsrReloadServer } from '../../plugins/server/ssr-reload-server';
+export declare function getServerConfig(normalizedOptions: NormalizedAngularRspackPluginOptions, i18n: I18nOptions, defaultConfig: Configuration, swcTranspilationTransform: SwcTranspilationTransform, sharedLicenseInputs?: SharedLicenseInputs, sharedAngularPlugin?: AngularRspackPlugin, serverRenderingInputs?: SharedServerRenderingInputs, ssrReloadServer?: SsrReloadServer): Promise<Configuration>;
 //# sourceMappingURL=server-config.d.ts.map

package/dist/lib/config/config-utils/server-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-config.d.ts","sourceRoot":"","sources":["../../../../src/lib/config/config-utils/server-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,WAAW,EACX,oCAAoC,EAErC,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAQjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAYnF,wBAAsB,eAAe,CACnC,iBAAiB,EAAE,oCAAoC,EACvD,IAAI,EAAE,WAAW,EACjB,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,yBAAyB,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,qBAAqB,CAAC,EAAE,2BAA2B,GAClD,OAAO,CAAC,aAAa,CAAC,CAsKxB"}
+{"version":3,"file":"server-config.d.ts","sourceRoot":"","sources":["../../../../src/lib/config/config-utils/server-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,WAAW,EACX,oCAAoC,EAErC,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAQjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAY9E,wBAAsB,eAAe,CACnC,iBAAiB,EAAE,oCAAoC,EACvD,IAAI,EAAE,WAAW,EACjB,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,yBAAyB,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,qBAAqB,CAAC,EAAE,2BAA2B,EACnD,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,aAAa,CAAC,CAuKxB"}

package/dist/lib/config/config-utils/server-config.js

@@ -13,7 +13,7 @@ const dev_server_config_utils_1 = require("./dev-server-config-utils");
 const optimization_config_1 = require("./optimization-config");
 const swc_transpilation_1 = require("./swc-transpilation");
 const rspack_serve_env_1 = require("../../utils/rspack-serve-env");
-async function getServerConfig(normalizedOptions, i18n, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs) {
+async function getServerConfig(normalizedOptions, i18n, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs, ssrReloadServer) {
     const isDevServer = (0, rspack_serve_env_1.isServeMode)();
     const { root } = normalizedOptions;
     const angularSSRInstalled = (0, misc_helpers_1.isPackageInstalled)(root, '@angular/ssr');
@@ -151,6 +151,7 @@ async function getServerConfig(normalizedOptions, i18n, defaultConfig, swcTransp
                 platform: 'server',
                 sharedLicenseInputs,
                 sharedAngularPlugin,
+                ssrReloadServer,
             }),
             ...(normalizedOptions.prerender ||
                 (normalizedOptions.appShell && !isDevServer)

package/dist/lib/config/create-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-config.d.ts","sourceRoot":"","sources":["../../../src/lib/config/create-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAoB5D,wBAAsB,YAAY,CAChC,cAAc,EAAE;IACd,OAAO,EAAE,0BAA0B,CAAC;IACpC,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAChD,EACD,cAAc,GAAE,MAAM,CACpB,MAAM,EACN;IACE,OAAO,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAC7C,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAChD,CACG,EACN,YAAY,SAAgB,GAC3B,OAAO,CAAC,aAAa,EAAE,CAAC,CAY1B;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,0BAA0B,EACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC7C,OAAO,CAAC,aAAa,EAAE,CAAC,CA4E1B"}
+{"version":3,"file":"create-config.d.ts","sourceRoot":"","sources":["../../../src/lib/config/create-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAqB5D,wBAAsB,YAAY,CAChC,cAAc,EAAE;IACd,OAAO,EAAE,0BAA0B,CAAC;IACpC,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAChD,EACD,cAAc,GAAE,MAAM,CACpB,MAAM,EACN;IACE,OAAO,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAC7C,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAChD,CACG,EACN,YAAY,SAAgB,GAC3B,OAAO,CAAC,aAAa,EAAE,CAAC,CAY1B;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,0BAA0B,EACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC7C,OAAO,CAAC,aAAa,EAAE,CAAC,CAsF1B"}

package/dist/lib/config/create-config.js

@@ -12,6 +12,7 @@ const user_defined_config_helpers_1 = require("./config-utils/user-defined-confi
 const assert_supported_rspack_version_1 = require("../utils/assert-supported-rspack-version");
 const rspack_serve_env_1 = require("../utils/rspack-serve-env");
 const angular_rspack_plugin_1 = require("../plugins/angular-rspack-plugin");
+const ssr_reload_server_1 = require("../plugins/server/ssr-reload-server");
 async function createConfig(defaultOptions, configurations = {}, configEnvVar = 'NGRS_CONFIG') {
     const configurationMode = process.env[configEnvVar] ?? ((0, rspack_serve_env_1.isServeMode)() ? 'development' : 'production');
     const configurationModes = (0, user_defined_config_helpers_1.parseConfigurationMode)(configurationMode);
@@ -45,13 +46,19 @@ async function _createConfig(options, rspackConfigOverrides) {
     // The browser compiler generates the documents and critical CSS plans the
     // server compiler renders with.
     const serverRenderingInputs = normalizedOptions.hasServer ? {} : undefined;
+    const ssrReloadServer = (0, rspack_serve_env_1.isServeMode)() &&
+        normalizedOptions.hasServer &&
+        typeof normalizedOptions.ssr === 'object' &&
+        normalizedOptions.ssr.entry !== undefined
+        ? new ssr_reload_server_1.SsrReloadServer()
+        : undefined;
     const configs = [];
     if (normalizedOptions.hasServer) {
-        const serverConfig = await (0, server_config_1.getServerConfig)(normalizedOptions, i18n, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs);
+        const serverConfig = await (0, server_config_1.getServerConfig)(normalizedOptions, i18n, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs, ssrReloadServer);
         const mergedConfig = (0, webpack_merge_1.merge)(serverConfig, rspackConfigOverrides ?? {});
         configs.push(mergedConfig);
     }
-    const browserConfig = await (0, browser_config_1.getBrowserConfig)(normalizedOptions, i18n, hashFormat, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs);
+    const browserConfig = await (0, browser_config_1.getBrowserConfig)(normalizedOptions, i18n, hashFormat, defaultConfig, swcTranspilationTransform, sharedLicenseInputs, sharedAngularPlugin, serverRenderingInputs, ssrReloadServer);
     const mergedConfig = (0, webpack_merge_1.merge)(browserConfig, rspackConfigOverrides ?? {});
     configs.unshift(mergedConfig);
     return configs;

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,QA4XvB;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

@@ -99,11 +99,16 @@ class AngularRspackPlugin {
         });
         let currentWatchingModifiedFiles = new Set();
         let watchRunInitialized = false;
-        // Register compilation hook once - adds modified files to dependencies
         compiler.hooks.compilation.tap(PLUGIN_NAME + '_fileDeps', (compilation) => {
             currentWatchingModifiedFiles.forEach((file) => {
                 compilation.fileDependencies.add(file);
             });
+            if (tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin__options, "f").hasServer) {
+                // Server-only sources must invalidate the browser-owned Angular compilation.
+                for (const file of tslib_1.__classPrivateFieldGet(this, _AngularRspackPlugin_sourceFileCache, "f").referencedFiles ?? []) {
+                    compilation.fileDependencies.add((0, node_path_1.normalize)(file));
+                }
+            }
         });
         compiler.hooks.watchRun.tapAsync(PLUGIN_NAME, async (compiler, callback) => {
             if (!watchRunInitialized) {
@@ -232,6 +237,7 @@ class AngularRspackPlugin {
                             name: PLUGIN_NAME,
                             message: error.text || '',
                             file: error.location?.file,
+                            ...toRspackLocation(error.location),
                             stack: error.text,
                         });
                     }
@@ -240,6 +246,7 @@ class AngularRspackPlugin {
                             name: PLUGIN_NAME,
                             message: warning.text || '',
                             file: warning.location?.file,
+                            ...toRspackLocation(warning.location),
                             stack: warning.text,
                         });
                     }
@@ -552,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/plugins/angular-ssr-dev-server.d.ts

@@ -1,8 +1,11 @@
-import { Compiler, RspackPluginInstance } from '@rspack/core';
-import { NormalizedAngularRspackPluginOptions } from '../models';
+import type { Compiler, RspackPluginInstance } from '@rspack/core';
+import type { NormalizedAngularRspackPluginOptions } from '../models';
+import type { SsrReloadServer } from './server/ssr-reload-server';
 export declare class AngularSsrDevServer implements RspackPluginInstance {
     #private;
-    constructor(options: NormalizedAngularRspackPluginOptions);
+    private readonly options;
+    private readonly reloadServer?;
+    constructor(options: NormalizedAngularRspackPluginOptions, reloadServer?: SsrReloadServer);
     apply(compiler: Compiler): void;
 }
 //# sourceMappingURL=angular-ssr-dev-server.d.ts.map

package/dist/lib/plugins/angular-ssr-dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-ssr-dev-server.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/angular-ssr-dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,oBAAoB,EAErB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,oCAAoC,EAAE,MAAM,WAAW,CAAC;AAQjE,qBAAa,mBAAoB,YAAW,oBAAoB;;IAK9D,YAAY,OAAO,EAAE,oCAAoC,EAGxD;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAsCvB;CAuBF"}
+{"version":3,"file":"angular-ssr-dev-server.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/angular-ssr-dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAInE,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAIlE,qBAAa,mBAAoB,YAAW,oBAAoB;;IAG5D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAFhC,YACmB,OAAO,EAAE,oCAAoC,EAC7C,YAAY,CAAC,EAAE,eAAe,EAC7C;IAEJ,KAAK,CAAC,QAAQ,EAAE,QAAQ,QA0BvB;CAiBF"}

package/dist/lib/plugins/angular-ssr-dev-server.js

@@ -1,24 +1,18 @@
 "use strict";
-var _AngularSsrDevServer_instances, _AngularSsrDevServer_devServerProcess, _AngularSsrDevServer_wsServer, _AngularSsrDevServer_options, _AngularSsrDevServer_attachSSRReloadClient;
+var _AngularSsrDevServer_instances, _AngularSsrDevServer_devServerProcess, _AngularSsrDevServer_stopServer;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularSsrDevServer = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@rspack/core");
-const child_process_1 = require("child_process");
-const ssr_reload_server_1 = require("./server/ssr-reload-server");
+const node_child_process_1 = require("node:child_process");
+const node_events_1 = require("node:events");
 const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
-const get_index_output_file_1 = require("../utils/index-file/get-index-output-file");
-const add_body_script_1 = require("../utils/index-file/add-body-script");
 const PLUGIN_NAME = 'AngularSsrDevServer';
 class AngularSsrDevServer {
-    constructor(options) {
+    constructor(options, reloadServer) {
         _AngularSsrDevServer_instances.add(this);
+        this.options = options;
+        this.reloadServer = reloadServer;
         _AngularSsrDevServer_devServerProcess.set(this, void 0);
-        _AngularSsrDevServer_wsServer.set(this, void 0);
-        _AngularSsrDevServer_options.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _AngularSsrDevServer_wsServer, new ssr_reload_server_1.SsrReloadServer(), "f");
-        tslib_1.__classPrivateFieldSet(this, _AngularSsrDevServer_options, options, "f");
     }
     apply(compiler) {
         compiler.hooks.entryOption.tap(PLUGIN_NAME, (context, entry) => {
@@ -28,35 +22,34 @@ class AngularSsrDevServer {
                 entryValue.import = [...entryValue.import];
             }
         });
-        compiler.hooks.watchRun.tapAsync(PLUGIN_NAME, async (compiler, callback) => {
-            compiler.hooks.afterEmit.tapAsync(PLUGIN_NAME, async (compilation, callback) => {
-                await tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_instances, "m", _AngularSsrDevServer_attachSSRReloadClient).call(this, compilation);
-                const serverPath = (0, node_path_1.join)(tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_options, "f").outputPath.server, 'server.js');
-                if (tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_devServerProcess, "f")) {
-                    tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_devServerProcess, "f").kill();
-                    tslib_1.__classPrivateFieldSet(this, _AngularSsrDevServer_devServerProcess, undefined, "f");
-                    await new Promise((res) => setTimeout(res, 50));
-                }
-                if (!(0, node_fs_1.existsSync)(serverPath)) {
-                    await new Promise((res) => setTimeout(res, 50));
-                }
-                tslib_1.__classPrivateFieldSet(this, _AngularSsrDevServer_devServerProcess, (0, child_process_1.fork)(serverPath), "f");
-                tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_devServerProcess, "f").on('spawn', () => {
-                    tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_wsServer, "f").sendReload();
-                });
-                callback();
-            });
-            callback();
+        compiler.hooks.afterEmit.tapPromise(
+        // Prerender must finish writing routes before the server can serve them.
+        { name: PLUGIN_NAME, stage: 1 }, async (compilation) => {
+            if (!compiler.watchMode || compilation.errors.length) {
+                return;
+            }
+            await tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_instances, "m", _AngularSsrDevServer_stopServer).call(this);
+            tslib_1.__classPrivateFieldSet(this, _AngularSsrDevServer_devServerProcess, (0, node_child_process_1.fork)((0, node_path_1.join)(this.options.outputPath.server, 'server.js')), "f");
+            await (0, node_events_1.once)(tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_devServerProcess, "f"), 'spawn');
+            this.reloadServer?.sendReload();
         });
+        compiler.hooks.shutdown.tapPromise(PLUGIN_NAME, () => tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_instances, "m", _AngularSsrDevServer_stopServer).call(this));
     }
 }
 exports.AngularSsrDevServer = AngularSsrDevServer;
-_AngularSsrDevServer_devServerProcess = new WeakMap(), _AngularSsrDevServer_wsServer = new WeakMap(), _AngularSsrDevServer_options = new WeakMap(), _AngularSsrDevServer_instances = new WeakSet(), _AngularSsrDevServer_attachSSRReloadClient = async function _AngularSsrDevServer_attachSSRReloadClient(compilation) {
-    const clientPath = require.resolve(`${__dirname}/client/ssr-reload-client.js`);
-    const pathToIndex = (0, node_path_1.join)(tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_options, "f").outputPath.browser, (0, get_index_output_file_1.getIndexOutputFile)(tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_options, "f").index));
-    const html = (0, node_fs_1.readFileSync)(pathToIndex, 'utf-8');
-    const updatedHtml = await (0, add_body_script_1.addBodyScript)(html, (0, node_fs_1.readFileSync)(clientPath, 'utf-8'));
-    const source = new core_1.sources.RawSource(updatedHtml);
-    const relativePathToIndex = pathToIndex.replace(tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_options, "f").outputPath.browser, '');
-    compilation.emitAsset(relativePathToIndex, source);
+_AngularSsrDevServer_devServerProcess = new WeakMap(), _AngularSsrDevServer_instances = new WeakSet(), _AngularSsrDevServer_stopServer = async function _AngularSsrDevServer_stopServer() {
+    const server = tslib_1.__classPrivateFieldGet(this, _AngularSsrDevServer_devServerProcess, "f");
+    tslib_1.__classPrivateFieldSet(this, _AngularSsrDevServer_devServerProcess, undefined, "f");
+    if (server && server.exitCode === null && server.signalCode === null) {
+        const exited = (0, node_events_1.once)(server, 'exit');
+        const forceStop = setTimeout(() => server.kill('SIGKILL'), 5000);
+        forceStop.unref();
+        try {
+            server.kill();
+            await exited;
+        }
+        finally {
+            clearTimeout(forceStop);
+        }
+    }
 };

package/dist/lib/plugins/client/ssr-reload-client.d.ts

@@ -1,2 +1,2 @@
-export {};
+export declare function connectSsrReload(port: number): void;
 //# sourceMappingURL=ssr-reload-client.d.ts.map

package/dist/lib/plugins/client/ssr-reload-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-reload-client.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/client/ssr-reload-client.ts"],"names":[],"mappings":""}
+{"version":3,"file":"ssr-reload-client.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/client/ssr-reload-client.ts"],"names":[],"mappings":"AACA,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,QAiC5C"}

package/dist/lib/plugins/client/ssr-reload-client.js

@@ -1,17 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// casting is needed to force the type to be the global WebSocket and avoid type errors
-const socket = new WebSocket(`ws://localhost:60000`);
-socket.addEventListener('message', (event) => {
-    if (event.data === 'ssr-reload') {
-        console.log('[AngularSSRDevServer] Reloading the page...');
-        // @ts-expect-error: This is a client-side file
-        window.location.reload();
+exports.connectSsrReload = connectSsrReload;
+// This function is serialized into HTML and cannot reference module-scoped values.
+function connectSsrReload(port) {
+    const socket = new WebSocket(`ws://${globalThis.location.hostname}:${port}`);
+    let reloading = false;
+    async function reloadWhenReady() {
+        try {
+            await fetch(globalThis.location.href, {
+                cache: 'no-store',
+                mode: 'no-cors',
+            });
+        }
+        catch {
+            setTimeout(reloadWhenReady, 100);
+            return;
+        }
+        reloading = false;
+        globalThis.location.reload();
     }
-});
-socket.addEventListener('open', () => {
-    console.log('[AngularSSRDevServer] WebSocket connection established.');
-});
-socket.addEventListener('close', () => {
-    console.warn('[AngularSSRDevServer] WebSocket connection closed.');
-});
+    socket.addEventListener('message', (event) => {
+        if (event.data === 'ssr-reload' && !reloading) {
+            reloading = true;
+            console.log('[AngularSSRDevServer] Reloading the page...');
+            void reloadWhenReady();
+        }
+    });
+    socket.addEventListener('open', () => {
+        console.log('[AngularSSRDevServer] WebSocket connection established.');
+    });
+    socket.addEventListener('close', () => {
+        console.warn('[AngularSSRDevServer] WebSocket connection closed.');
+    });
+}

package/dist/lib/plugins/index-html-plugin.d.ts

@@ -19,6 +19,7 @@ export interface ServerRenderingInputs {
      * `@angular/build` >= 22.2 does.
      */
     criticalCssPlans: CriticalCssPlan[] | undefined;
+    emitsOriginalIndex?: boolean;
 }
 /**
  * Holds the server rendering inputs of the browser compiler's last
@@ -34,6 +35,7 @@ export interface IndexHtmlPluginOptions extends IndexHtmlGeneratorOptions {
     isSsr: boolean;
     outputPath: string;
     serverRenderingInputs?: SharedServerRenderingInputs;
+    serverPostTransform?: IndexHtmlGeneratorOptions['postTransform'];
 }
 /**
  * Whether a server build emits its server index as `index.original.html`,

package/dist/lib/plugins/index-html-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index-html-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/index-html-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIhF,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EACL,KAAK,eAAe,EAErB,MAAM,mBAAmB,CAAC;AAc3B,iEAAiE;AACjE,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,6DAA6D;IAC7D,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACxC;;;OAGG;IACH,gBAAgB,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;CACjD;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB;IACvE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,uBAAuB,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;CACrD;AAID;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAKT;AAQD,qBAAa,eACX,SAAQ,kBACR,YAAW,oBAAoB;;aAeD,OAAO,EAAE,sBAAsB;IAb7D,OAAO,CAAC,YAAY,CAA0B;IAC9C,IAAI,WAAW,IAAI,WAAW,CAM7B;IAMD,YAA8B,OAAO,EAAE,sBAAsB,EAgB5D;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAqNvB;IA2Bc,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAItD;IAED,UAAyB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBhE;IAED,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAwBpD;CACF"}
+{"version":3,"file":"index-html-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/index-html-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIhF,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EACL,KAAK,eAAe,EAErB,MAAM,mBAAmB,CAAC;AAc3B,iEAAiE;AACjE,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,6DAA6D;IAC7D,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACxC;;;OAGG;IACH,gBAAgB,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IAChD,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB;IACvE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,uBAAuB,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;IACpD,mBAAmB,CAAC,EAAE,yBAAyB,CAAC,eAAe,CAAC,CAAC;CAClE;AAID;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAKT;AAQD,qBAAa,eACX,SAAQ,kBACR,YAAW,oBAAoB;;aAeD,OAAO,EAAE,sBAAsB;IAb7D,OAAO,CAAC,YAAY,CAA0B;IAC9C,IAAI,WAAW,IAAI,WAAW,CAM7B;IAMD,YAA8B,OAAO,EAAE,sBAAsB,EAgB5D;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QA8OvB;IA2Bc,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAItD;IAED,UAAyB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBhE;IAED,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAwBpD;CACF"}

package/dist/lib/plugins/index-html-plugin.js

@@ -66,6 +66,9 @@ class IndexHtmlPlugin extends private_1.IndexHtmlGenerator {
     apply(compiler) {
         const { serverRenderingInputs } = this.options;
         const emitServerIndexAsOriginal = emitsServerIndexAsOriginal(this.options.index);
+        const emitOriginalIndex = emitServerIndexAsOriginal ||
+            (!!this.options.serverPostTransform &&
+                (0, get_index_output_file_1.getIndexOutputFile)(this.options.index) !== 'index.original.html');
         const compileCriticalCssPlans = (0, angular_rspack_compiler_1.isAngularBuildVersionAtLeast)('22.2.0') &&
             !!this.options.optimization?.styles.inlineCritical;
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
@@ -145,10 +148,16 @@ class IndexHtmlPlugin extends private_1.IndexHtmlGenerator {
                             (0, node_assert_1.default)(tslib_1.__classPrivateFieldGet(this, _IndexHtmlPlugin_sharedIndexContent, "f") !== undefined, 'The index html generator did not run its shared steps.');
                             // Unlike the browser index, these match the documents the
                             // `@angular/build` application builder generates for a server.
-                            const [server, csr] = await Promise.all([
+                            let [server, csr] = await Promise.all([
                                 (0, add_event_dispatch_contract_1.addEventDispatchContract)(tslib_1.__classPrivateFieldGet(this, _IndexHtmlPlugin_sharedIndexContent, "f")).then(nonce_1.addNonce),
                                 (0, ngcm_attribute_1.addNgcmAttribute)(csrContent),
                             ]);
+                            if (this.options.serverPostTransform) {
+                                [server, csr] = await Promise.all([
+                                    this.options.serverPostTransform(server).then(nonce_1.addNonce),
+                                    this.options.serverPostTransform(csr).then(nonce_1.addNonce),
+                                ]);
+                            }
                             const assetsDir = `${SERVER_INDEX_ASSETS_DIR}/${serverIndexAssets.length}`;
                             const serverIndexAsset = {
                                 locale,
@@ -191,12 +200,23 @@ class IndexHtmlPlugin extends private_1.IndexHtmlGenerator {
                             csr: csrContent,
                             nonce: (await (0, nonce_1.findNonce)(serverContent)) ?? undefined,
                         });
-                        if (emitServerIndexAsOriginal) {
-                            compilation.emitAsset((0, node_path_1.join)(outputPath, 'index.original.html'), new compiler.rspack.sources.RawSource(serverContent));
+                        if (emitOriginalIndex) {
+                            let originalContent = serverContent;
+                            if (!emitServerIndexAsOriginal &&
+                                this.options.serverPostTransform) {
+                                const browserContent = compilation.assets[(0, node_path_1.join)(outputPath, (0, get_index_output_file_1.getIndexOutputFile)(this.options.index))]
+                                    .source()
+                                    .toString();
+                                originalContent = await this.options
+                                    .serverPostTransform(browserContent)
+                                    .then(nonce_1.addNonce);
+                            }
+                            compilation.emitAsset((0, node_path_1.join)(outputPath, 'index.original.html'), new compiler.rspack.sources.RawSource(originalContent));
                         }
                     }
                     tslib_1.__classPrivateFieldSet(this, _IndexHtmlPlugin_pendingServerRenderingInputs, {
                         indexHtml,
+                        emitsOriginalIndex: emitOriginalIndex,
                         criticalCssPlans: compileCriticalCssPlans
                             ? await tslib_1.__classPrivateFieldGet(this, _IndexHtmlPlugin_instances, "m", _IndexHtmlPlugin_compileCriticalCssPlans).call(this, compilation)
                             : undefined,

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

@@ -2,6 +2,7 @@ import { Compiler, RspackPluginInstance } from '@rspack/core';
 import type { I18nOptions, NormalizedAngularRspackPluginOptions } from '../models';
 import { READY_SIGNAL_PLUGIN } from '../utils/dev-server-ready-signal';
 import { AngularRspackPlugin } from './angular-rspack-plugin';
+import type { SsrReloadServer } from './server/ssr-reload-server';
 import { type SharedLicenseInputs } from './extract-licenses-plugin';
 import { type SharedServerRenderingInputs } from './index-html-plugin';
 export declare class NgRspackPlugin implements RspackPluginInstance {
@@ -11,6 +12,7 @@ export declare class NgRspackPlugin implements RspackPluginInstance {
     private readonly sharedLicenseInputs;
     private readonly sharedAngularPlugin;
     private readonly serverRenderingInputs;
+    private readonly ssrReloadServer;
     readonly [READY_SIGNAL_PLUGIN] = true;
     constructor(pluginOptions: NormalizedAngularRspackPluginOptions, extraOptions: {
         platform: 'browser' | 'server';
@@ -34,6 +36,7 @@ export declare class NgRspackPlugin implements RspackPluginInstance {
          * compiler.
          */
         serverRenderingInputs?: SharedServerRenderingInputs;
+        ssrReloadServer?: SsrReloadServer;
     });
     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;AACnB,OAAO,EAGL,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAG1C,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;IACd,QAAQ,CAAC,CAAC,mBAAmB,CAAC,QAAQ;IAEtC,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,QAwNvB;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;AACnB,OAAO,EAGL,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,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;IACd,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;IAC9D,QAAQ,CAAC,CAAC,mBAAmB,CAAC,QAAQ;IAEtC,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;QACpD,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,EASF;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QA6OvB;CACF"}

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

@@ -9,8 +9,10 @@ const entry_points_1 = require("../config/config-utils/entry-points");
 const dev_server_ready_signal_1 = require("../utils/dev-server-ready-signal");
 const misc_helpers_1 = require("../utils/misc-helpers");
 const rspack_serve_env_1 = require("../utils/rspack-serve-env");
+const add_body_script_1 = require("../utils/index-file/add-body-script");
 const angular_rspack_plugin_1 = require("./angular-rspack-plugin");
 const angular_ssr_dev_server_1 = require("./angular-ssr-dev-server");
+const ssr_reload_client_1 = require("./client/ssr-reload-client");
 const extract_licenses_plugin_1 = require("./extract-licenses-plugin");
 const i18n_inline_plugin_1 = require("./i18n-inline-plugin");
 const index_html_plugin_1 = require("./index-html-plugin");
@@ -25,10 +27,12 @@ class NgRspackPlugin {
         this.sharedLicenseInputs = extraOptions.sharedLicenseInputs;
         this.sharedAngularPlugin = extraOptions.sharedAngularPlugin;
         this.serverRenderingInputs = extraOptions.serverRenderingInputs;
+        this.ssrReloadServer = extraOptions.ssrReloadServer;
     }
     apply(compiler) {
         const root = this.pluginOptions.root;
         const isDevServer = (0, rspack_serve_env_1.isServeMode)();
+        const ssrReloadServer = this.ssrReloadServer;
         if (!isDevServer ||
             !this.pluginOptions.hasServer ||
             !(0, dev_server_ready_signal_1.ssrServerEmitsReadySignal)(root, this.pluginOptions.ssr, this.pluginOptions.fileReplacements)) {
@@ -38,7 +42,7 @@ class NgRspackPlugin {
             if (this.pluginOptions.ssr &&
                 typeof this.pluginOptions.ssr === 'object' &&
                 this.pluginOptions.ssr.entry !== undefined) {
-                new angular_ssr_dev_server_1.AngularSsrDevServer(this.pluginOptions).apply(compiler);
+                new angular_ssr_dev_server_1.AngularSsrDevServer(this.pluginOptions, ssrReloadServer).apply(compiler);
             }
         }
         if (this.isPlatformServer) {
@@ -134,6 +138,9 @@ class NgRspackPlugin {
         else {
             new angular_rspack_plugin_1.AngularRspackPlugin(this.pluginOptions, this.i18n).apply(compiler);
         }
+        if (!this.isPlatformServer && ssrReloadServer) {
+            compiler.hooks.shutdown.tapPromise('NgRspackPlugin', () => ssrReloadServer.close());
+        }
         if (!this.isPlatformServer && this.pluginOptions.index) {
             new index_html_plugin_1.IndexHtmlPlugin({
                 indexPath: this.pluginOptions.index.input,
@@ -144,6 +151,15 @@ class NgRspackPlugin {
                 i18n: this.i18n,
                 optimization: this.pluginOptions.optimization,
                 postTransform: this.pluginOptions.index.transformer,
+                serverPostTransform: ssrReloadServer
+                    ? async (html) => {
+                        if (!compiler.watchMode) {
+                            return html;
+                        }
+                        const port = await ssrReloadServer.getPort();
+                        return (0, add_body_script_1.addBodyScript)(html, `(${ssr_reload_client_1.connectSsrReload.toString()})(${port});`, 'nx-angular-ssr-reload');
+                    }
+                    : undefined,
                 isSsr: !!(this.pluginOptions.ssr ||
                     this.pluginOptions.prerender ||
                     this.pluginOptions.appShell),

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;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"}
+{"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;CAuTF"}

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

@@ -95,7 +95,8 @@ async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prer
                 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),
+                    emitsOriginalIndex: inputs.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,
@@ -152,7 +153,8 @@ 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 emitsOriginalIndex = inputs.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,

package/dist/lib/plugins/server/ssr-reload-server.d.ts

@@ -1,6 +1,7 @@
 export declare class SsrReloadServer {
     #private;
-    constructor();
+    getPort(): Promise<number>;
     sendReload(): void;
+    close(): Promise<void>;
 }
 //# sourceMappingURL=ssr-reload-server.d.ts.map

package/dist/lib/plugins/server/ssr-reload-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-reload-server.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/server/ssr-reload-server.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAe;;IAG1B,cAIC;IAED,UAAU,SAIT;CACF"}
+{"version":3,"file":"ssr-reload-server.d.ts","sourceRoot":"","sources":["../../../../src/lib/plugins/server/ssr-reload-server.ts"],"names":[],"mappings":"AAIA,qBAAa,eAAe;;IAIpB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAO/B;IAED,UAAU,SAMT;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAW3B;CACF"}

package/dist/lib/plugins/server/ssr-reload-server.js

@@ -1,21 +1,42 @@
 "use strict";
-var _SsrReloadServer_server;
+var _SsrReloadServer_server, _SsrReloadServer_listening;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SsrReloadServer = void 0;
 const tslib_1 = require("tslib");
+const node_events_1 = require("node:events");
 const ws_1 = require("ws");
 class SsrReloadServer {
     constructor() {
         _SsrReloadServer_server.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _SsrReloadServer_server, new ws_1.WebSocket.Server({ port: 60_000 }), "f");
-        process.on('SIGTERM', () => tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f").close());
-        process.on('exit', () => tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f").close());
+        _SsrReloadServer_listening.set(this, void 0);
+    }
+    async getPort() {
+        if (!tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f")) {
+            tslib_1.__classPrivateFieldSet(this, _SsrReloadServer_server, new ws_1.WebSocketServer({ port: 0 }), "f");
+            tslib_1.__classPrivateFieldSet(this, _SsrReloadServer_listening, (0, node_events_1.once)(tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f"), 'listening'), "f");
+        }
+        await tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_listening, "f");
+        return tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f").address().port;
     }
     sendReload() {
-        tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f").clients.forEach((client) => {
-            client.send('ssr-reload');
+        tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f")?.clients.forEach((client) => {
+            if (client.readyState === ws_1.WebSocket.OPEN) {
+                client.send('ssr-reload');
+            }
+        });
+    }
+    async close() {
+        const server = tslib_1.__classPrivateFieldGet(this, _SsrReloadServer_server, "f");
+        if (!server) {
+            return;
+        }
+        tslib_1.__classPrivateFieldSet(this, _SsrReloadServer_server, undefined, "f");
+        tslib_1.__classPrivateFieldSet(this, _SsrReloadServer_listening, undefined, "f");
+        server.clients.forEach((client) => client.terminate());
+        await new Promise((resolve, reject) => {
+            server.close((error) => (error ? reject(error) : resolve()));
         });
     }
 }
 exports.SsrReloadServer = SsrReloadServer;
-_SsrReloadServer_server = new WeakMap();
+_SsrReloadServer_server = new WeakMap(), _SsrReloadServer_listening = new WeakMap();

package/dist/lib/utils/index-file/add-body-script.d.ts

@@ -1,2 +1,2 @@
-export declare function addBodyScript(html: string, bodyScriptContents: string): Promise<string>;
+export declare function addBodyScript(html: string, bodyScriptContents: string, id: string): Promise<string>;
 //# sourceMappingURL=add-body-script.d.ts.map

package/dist/lib/utils/index-file/add-body-script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-body-script.d.ts","sourceRoot":"","sources":["../../../../src/lib/utils/index-file/add-body-script.ts"],"names":[],"mappings":"AAEA,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CAcjB"}
+{"version":3,"file":"add-body-script.d.ts","sourceRoot":"","sources":["../../../../src/lib/utils/index-file/add-body-script.ts"],"names":[],"mappings":"AAEA,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,MAAM,EAC1B,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,MAAM,CAAC,CAcjB"}

package/dist/lib/utils/index-file/add-body-script.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBodyScript = addBodyScript;
 const html_rewriting_stream_1 = require("./html-rewriting-stream");
-async function addBodyScript(html, bodyScriptContents) {
+async function addBodyScript(html, bodyScriptContents, id) {
     const { rewriter, transformedContent } = await (0, html_rewriting_stream_1.htmlRewritingStream)(html);
-    const bodyScript = `<script type="text/javascript">${bodyScriptContents}</script>`;
+    const bodyScript = `<script id="${id}" type="text/javascript">${bodyScriptContents}</script>`;
     rewriter.on('startTag', (tag) => {
         rewriter.emitStartTag(tag);
         if (tag.tagName === 'body') {

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.1",
+  "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.1",
-    "@nx/devkit": "24.0.1",
+    "@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;
-    });
-}