@nx/angular 23.3.0-pr.36841.f66e88b → 23.3.0-pr.37036.2b7abf9

package/dist/src/generators/application/application.js

@@ -8,6 +8,7 @@ const assert_supported_angular_version_1 = require("../../utils/assert-supported
 const convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 const init_1 = require("../init/init");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
+const acknowledge_build_scripts_1 = require("../utils/acknowledge-build-scripts");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
@@ -57,6 +58,7 @@ async function applicationGenerator(tree, schema) {
             project: options.name,
             standalone: options.standalone,
             skipPackageJson: options.skipPackageJson,
+            isRspack,
         });
     }
     if (isRspack) {
@@ -65,16 +67,6 @@ async function applicationGenerator(tree, schema) {
             skipInstall: options.skipPackageJson,
             skipFormat: true,
         });
-        if (options.ssr) {
-            const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/rspack-ssr'), options.appProjectSourceRoot, {
-                pathToDistFolder: (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), options.outputPath, 'browser'),
-                zoneless: options.zoneless,
-                useDefaultImport: angularMajorVersion >= 21,
-                angularMajorVersion,
-                tmpl: '',
-            });
-        }
     }
     if (!options.skipPackageJson) {
         const devDependencies = {};
@@ -93,8 +85,14 @@ async function applicationGenerator(tree, schema) {
         }
         if (options.style === 'less') {
             devDependencies['less'] = packageVersions.lessVersion;
+            // less's postinstall only installs Playwright browsers, which nothing
+            // that consumes less needs.
+            (0, internal_1.acknowledgeBuildScripts)(tree, (0, devkit_1.detectPackageManager)(tree.root), {
+                less: false,
+            });
         }
         if (Object.keys(devDependencies).length) {
+            (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
         }
     }

package/dist/src/generators/component-test/component-test.js

@@ -27,8 +27,7 @@ async function componentTestGenerator(tree, options) {
         });
     }
     const tasks = [];
-    if (!options.skipPackageJson) {
-        // Cypress CT still requires @angular/platform-browser-dynamic
+    if (!options.skipPackageJson && usesPlatformBrowserDynamic(tree)) {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@angular/platform-browser-dynamic': (0, version_utils_1.versions)(tree).angularVersion,
         }, undefined, true));
@@ -38,4 +37,11 @@ async function componentTestGenerator(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+// The Cypress 16 harness bootstraps through @angular/platform-browser/testing;
+// earlier harnesses need @angular/platform-browser-dynamic/testing.
+function usesPlatformBrowserDynamic(tree) {
+    const { getInstalledCypressMajorVersion, } = require('@nx/cypress/internal');
+    const cypressMajorVersion = getInstalledCypressMajorVersion(tree);
+    return cypressMajorVersion !== null && cypressMajorVersion < 16;
+}
 exports.default = componentTestGenerator;

package/dist/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -7,9 +7,11 @@ const path_1 = require("path");
 const posix_1 = require("path/posix");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const versions_1 = require("../../utils/versions");
+const acknowledge_build_scripts_1 = require("../utils/acknowledge-build-scripts");
 const version_utils_1 = require("../utils/version-utils");
 const create_config_1 = require("./lib/create-config");
 const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
+const merge_server_tsconfig_1 = require("./lib/merge-server-tsconfig");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const validate_supported_executor_1 = require("./lib/validate-supported-executor");
 const SUPPORTED_EXECUTORS = [
@@ -244,6 +246,8 @@ async function convertToRspack(tree, schema) {
     const configurationOptions = {};
     let buildTarget;
     let serveTarget;
+    const buildTsConfigPaths = new Set();
+    let serverTsConfigPath;
     const targetsToRemove = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
@@ -253,10 +257,16 @@ async function convertToRspack(tree, schema) {
         if (target.executor === '@angular-devkit/build-angular:browser' ||
             target.executor === '@nx/angular:webpack-browser') {
             customWebpackConfigPath = handleBuildTargetOptions(tree, target.options, createConfigOptions, project.root);
+            if (target.options?.tsConfig) {
+                buildTsConfigPaths.add((0, devkit_1.joinPathFragments)(target.options.tsConfig));
+            }
             if (target.configurations) {
                 for (const [configurationName, configuration] of Object.entries(target.configurations)) {
                     configurationOptions[configurationName] = {};
                     handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
+                    if (configuration.tsConfig) {
+                        buildTsConfigPaths.add((0, devkit_1.joinPathFragments)(configuration.tsConfig));
+                    }
                 }
             }
             buildTarget = { name: targetName, config: target };
@@ -267,6 +277,10 @@ async function convertToRspack(tree, schema) {
             createConfigOptions.ssr ??= {};
             createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
             createConfigOptions.server = './src/main.server.ts';
+            serverTsConfigPath = target.options?.tsConfig
+                ? // each target can spell the same path differently
+                    (0, devkit_1.joinPathFragments)(target.options.tsConfig)
+                : undefined;
             targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
@@ -320,11 +334,21 @@ async function convertToRspack(tree, schema) {
             targetsToRemove.push(targetName);
         }
     }
+    if (createConfigOptions.ssr && (0, version_utils_1.supportsSsrAllowedHosts)(tree)) {
+        // The engine matches the request host against this list and an unset list
+        // matches nothing, so surface it for the deployment to fill in. Serving
+        // seeds its own hosts and does not read it.
+        createConfigOptions.security ??= {};
+        createConfigOptions.security.allowedHosts ??= [];
+    }
     const customWebpackConfigInfo = customWebpackConfigPath
         ? await (0, get_custom_webpack_config_1.getCustomWebpackConfig)(tree, project.root, customWebpackConfigPath)
         : undefined;
     (0, create_config_1.createConfig)(tree, createConfigOptions, configurationOptions, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
     (0, update_tsconfig_1.updateTsconfig)(tree, project.root);
+    if (serverTsConfigPath) {
+        (0, merge_server_tsconfig_1.mergeServerTsConfig)(tree, project.root, serverTsConfigPath, buildTsConfigPaths);
+    }
     for (const targetName of targetsToRemove) {
         delete project.targets[targetName];
     }
@@ -501,6 +525,14 @@ async function convertToRspack(tree, schema) {
     }
     if (!schema.skipInstall) {
         const { webpackMergeVersion, tsNodeVersion } = (0, version_utils_1.versions)(tree);
+        (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
+        // @nx/angular-rspack-compiler's install script patches `@angular/build`
+        // versions below 20.2.0, so it has to run. core-js only prints a funding
+        // message.
+        (0, internal_1.acknowledgeBuildScripts)(tree, (0, devkit_1.detectPackageManager)(tree.root), {
+            '@nx/angular-rspack-compiler': true,
+            'core-js': false,
+        });
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/angular-rspack': versions_1.nxVersion,
             'webpack-merge': webpackMergeVersion,

package/dist/src/generators/convert-to-rspack/lib/merge-server-tsconfig.d.ts

@@ -0,0 +1,8 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * Folds the tsconfig the server builder used into every tsconfig the rspack
+ * build compiles with. The rspack build compiles the browser and the server
+ * bundles from a single tsconfig, so the server sources have to be part of it.
+ * The server tsconfig is then deleted, unless a build target also points at it.
+ */
+export declare function mergeServerTsConfig(tree: Tree, projectRoot: string, serverTsConfigPath: string, buildTsConfigPaths: Set<string>): void;

package/dist/src/generators/convert-to-rspack/lib/merge-server-tsconfig.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeServerTsConfig = mergeServerTsConfig;
+const devkit_1 = require("@nx/devkit");
+const posix_1 = require("path/posix");
+const constants_1 = require("../../setup-ssr/lib/constants");
+const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
+/**
+ * Folds the tsconfig the server builder used into every tsconfig the rspack
+ * build compiles with. The rspack build compiles the browser and the server
+ * bundles from a single tsconfig, so the server sources have to be part of it.
+ * The server tsconfig is then deleted, unless a build target also points at it.
+ */
+function mergeServerTsConfig(tree, projectRoot, serverTsConfigPath, buildTsConfigPaths) {
+    if (!tree.exists(serverTsConfigPath)) {
+        return;
+    }
+    const serverTsConfig = (0, tsconfig_utils_1.readResolvedTsConfig)(tree, serverTsConfigPath);
+    const serverTsConfigDir = (0, posix_1.dirname)(serverTsConfigPath);
+    // entries in each tsconfig are relative to it, so compare them from the
+    // workspace root and write them back relative to the tsconfig receiving them
+    const serverEntries = (serverTsConfig.raw.files ?? []).map((file) => (0, devkit_1.joinPathFragments)(serverTsConfigDir, file));
+    const serverSources = new Set([
+        ...serverEntries,
+        // excluded alongside the server entries, and reachable from them
+        (0, devkit_1.joinPathFragments)(projectRoot, constants_1.SERVER_APP_CONFIG_FILE),
+    ]);
+    for (const buildTsConfigPath of buildTsConfigPaths) {
+        // the server entries come from this tsconfig, so folding it into itself
+        // would only rewrite what it already declares
+        if (buildTsConfigPath === serverTsConfigPath ||
+            !tree.exists(buildTsConfigPath)) {
+            continue;
+        }
+        const buildTsConfigDir = (0, posix_1.dirname)(buildTsConfigPath);
+        (0, devkit_1.updateJson)(tree, buildTsConfigPath, (json) => {
+            if (json.exclude) {
+                json.exclude = json.exclude.filter((pattern) => !serverSources.has((0, devkit_1.joinPathFragments)(buildTsConfigDir, pattern)));
+            }
+            return json;
+        });
+        // `files`, `include`, `exclude` and `types` are all inherited through
+        // `extends`, so what the build tsconfig compiles is only visible with the
+        // chain applied, and the entries it contributes have to be kept when this
+        // config takes them over
+        const { raw, options } = (0, tsconfig_utils_1.readResolvedTsConfig)(tree, buildTsConfigPath);
+        // `exclude` cannot drop a `files` entry, so list the server sources instead
+        // of working out whether the config's globs already reach them. A config
+        // declaring none of the three takes everything beside it, which already
+        // covers entries sitting there.
+        const mustListServerEntries = !!raw.files ||
+            !!raw.include ||
+            !!raw.exclude ||
+            serverEntries.some((entry) => (0, posix_1.relative)(buildTsConfigDir, entry).startsWith('../'));
+        const types = new Set([
+            ...(options.types ?? []),
+            ...(serverTsConfig.options.types ?? []),
+        ]);
+        (0, devkit_1.updateJson)(tree, buildTsConfigPath, (json) => {
+            if (mustListServerEntries) {
+                const inheritedEntries = (raw.files ?? []).map((file) => (0, devkit_1.joinPathFragments)(buildTsConfigDir, file));
+                json.files = Array.from(new Set([...inheritedEntries, ...serverEntries])).map((entry) => (0, posix_1.relative)(buildTsConfigDir, entry));
+            }
+            if (types.size) {
+                json.compilerOptions ??= {};
+                json.compilerOptions.types = Array.from(types);
+            }
+            return json;
+        });
+    }
+    // a build target or one of its configurations can point at the tsconfig the
+    // server target used, and the rspack build still compiles with it
+    if (buildTsConfigPaths.has(serverTsConfigPath)) {
+        return;
+    }
+    tree.delete(serverTsConfigPath);
+    const projectTsConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
+    if (!tree.exists(projectTsConfigPath)) {
+        return;
+    }
+    (0, devkit_1.updateJson)(tree, projectTsConfigPath, (json) => {
+        if (json.references) {
+            json.references = json.references.filter((reference) => (0, devkit_1.joinPathFragments)(projectRoot, reference.path) !==
+                serverTsConfigPath &&
+                // setups generated before the reference path was corrected wrote it
+                // relative to the workspace root
+                reference.path !== serverTsConfigPath);
+        }
+        return json;
+    });
+}

package/dist/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -43,15 +43,21 @@ async function cypressComponentConfiguration(tree, options) {
         // For libraries, check if zone.js is installed in the workspace
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
+    // Cypress 16 dropped `cypress/angular-zoneless`; `cypress/angular` is zoneless there.
+    let mountModule = 'cypress/angular';
     if (isZoneless) {
         const { getInstalledCypressVersion, } = require('@nx/cypress/internal');
         const installedCypressVersion = getInstalledCypressVersion(tree);
-        // Zoneless support was introduced in Cypress 15.8.0
         // If Cypress is not yet installed, we'll install the latest version, which will have zoneless support
-        if (installedCypressVersion && (0, semver_1.lt)(installedCypressVersion, '15.8.0')) {
-            throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects for your installed Cypress version (${installedCypressVersion}). ` +
-                `The project "${options.project}" is configured without Zone.js. ` +
-                `Please upgrade Cypress to version 15.8.0 or higher.`);
+        if (installedCypressVersion && (0, semver_1.major)(installedCypressVersion) < 16) {
+            // Zoneless support was introduced in Cypress 15.8.0
+            const unsupportedCypressVersion = (0, assert_cypress_component_testing_support_1.findCypressBelow)(tree, '15.8.0');
+            if (unsupportedCypressVersion) {
+                throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects for your Cypress version (${unsupportedCypressVersion}). ` +
+                    `The project "${options.project}" is configured without Zone.js. ` +
+                    `Please upgrade Cypress to version 15.8.0 or higher.`);
+            }
+            mountModule = 'cypress/angular-zoneless';
         }
     }
     const tasks = [];
@@ -63,7 +69,7 @@ async function cypressComponentConfiguration(tree, options) {
         skipPackageJson: options.skipPackageJson,
     }));
     await configureCypressCT(tree, options);
-    tasks.push(await addFiles(tree, projectConfig, options, isZoneless));
+    tasks.push(await addFiles(tree, projectConfig, options, mountModule));
     if (projectConfig.projectType === 'application') {
         (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, projectConfig);
     }
@@ -72,11 +78,11 @@ async function cypressComponentConfiguration(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-async function addFiles(tree, projectConfig, options, isZoneless) {
+async function addFiles(tree, projectConfig, options, mountModule) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const { addMountDefinition } = (require('@nx/cypress/internal'));
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
-    tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
+    tree.write(componentFile, `import { mount } from '${mountModule}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
         return () => { };
     }

package/dist/src/generators/host/files/common/src/main.server.ts__tmpl__

@@ -25,7 +25,11 @@ export function app(): express.Express {
 
   server.use(cors());
 
-  const commonEngine = new CommonEngine();
+  const commonEngine = new CommonEngine(<%_ if (supportsAllowedHosts) { _%>{
+    // The engine rejects any host that is not listed here. Add the hosts this
+    // server is reached through before deploying it, or set NG_ALLOWED_HOSTS.
+    allowedHosts: ['localhost', '127.0.0.1', '[::1]'],
+  }<%_ } _%>);
 
   server.set('view engine', 'html');
   server.set('views', distFolder);

package/dist/src/generators/host/lib/update-ssr-setup.js

@@ -20,6 +20,7 @@ async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
         zoneless: options.zoneless,
         useDefaultImport: angularMajorVersion >= 21,
         angularMajorVersion,
+        supportsAllowedHosts: (0, version_utils_1.supportsSsrAllowedHosts)(tree),
         tmpl: '',
     });
     const pathToTemplateFiles = typescriptConfiguration ? 'ts' : 'js';

package/dist/src/generators/library/library.js

@@ -11,6 +11,7 @@ const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = tslib_1.__importDefault(require("../add-linting/add-linting"));
+const acknowledge_build_scripts_1 = require("../utils/acknowledge-build-scripts");
 const add_jest_1 = require("../utils/add-jest");
 const add_vitest_1 = require("../utils/add-vitest");
 const dependencies_1 = require("../utils/dependencies");
@@ -59,6 +60,7 @@ async function libraryGenerator(tree, schema) {
     await addLinting(tree, libraryOptions);
     if ((libraryOptions.buildable || libraryOptions.publishable) &&
         !libraryOptions.skipPackageJson) {
+        (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             'ng-packagr': pkgVersions.ngPackagrVersion,
         }, undefined, true);

package/dist/src/generators/remote/files/common/src/main.server.ts__tmpl__

@@ -26,7 +26,11 @@ export function app(): express.Express {
 
   server.use(cors());
 
-  const commonEngine = new CommonEngine();
+  const commonEngine = new CommonEngine(<%_ if (supportsAllowedHosts) { _%>{
+    // The engine rejects any host that is not listed here. Add the hosts this
+    // server is reached through before deploying it, or set NG_ALLOWED_HOSTS.
+    allowedHosts: ['localhost', '127.0.0.1', '[::1]'],
+  }<%_ } _%>);
 
   server.set('view engine', 'html');
   server.set('views', browserBundles);

package/dist/src/generators/remote/lib/update-ssr-setup.js

@@ -25,6 +25,7 @@ async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfi
         zoneless,
         useDefaultImport: angularMajorVersion >= 21,
         angularMajorVersion,
+        supportsAllowedHosts: (0, version_utils_1.supportsSsrAllowedHosts)(tree),
         tmpl: '',
     });
     const pathToTemplateFiles = typescriptConfiguration ? 'base-ts' : 'base';

package/dist/src/generators/setup-ssr/files/v20+/server-builder/server/__serverFileName__

@@ -21,7 +21,11 @@ export function app(): express.Express {
     ? join(distFolder, 'index.original.html')
     : join(distFolder, 'index.html');
 
-  const commonEngine = new CommonEngine();
+  const commonEngine = new CommonEngine(<%_ if (supportsAllowedHosts) { _%>{
+    // The engine rejects any host that is not listed here. Add the hosts this
+    // server is reached through before deploying it, or set NG_ALLOWED_HOSTS.
+    allowedHosts: ['localhost', '127.0.0.1', '[::1]'],
+  }<%_ } _%>);
 
   server.set('view engine', 'html');
   server.set('views', distFolder);

package/dist/src/generators/setup-ssr/lib/add-dependencies.d.ts

@@ -1,2 +1,3 @@
 import { type Tree } from '@nx/devkit';
-export declare function addDependencies(tree: Tree, isUsingApplicationBuilder: boolean, isUsingWebpackBuilder: boolean): void;
+import type { NormalizedGeneratorOptions } from '../schema';
+export declare function addDependencies(tree: Tree, options: NormalizedGeneratorOptions): void;

package/dist/src/generators/setup-ssr/lib/add-dependencies.js

@@ -4,7 +4,7 @@ exports.addDependencies = addDependencies;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
-function addDependencies(tree, isUsingApplicationBuilder, isUsingWebpackBuilder) {
+function addDependencies(tree, options) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
     const dependencies = {
         '@angular/platform-server': (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/platform-server') ??
@@ -16,16 +16,20 @@ function addDependencies(tree, isUsingApplicationBuilder, isUsingWebpackBuilder)
         '@types/node': pkgVersions.typesNodeVersion,
     };
     const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ?? pkgVersions.angularDevkitVersion;
-    dependencies['@angular/ssr'] = angularDevkitVersion;
-    if (!isUsingApplicationBuilder) {
+    // The setup below configures the allowed hosts when the version allows it,
+    // so ask for one that does rather than for whichever the range resolves to
+    dependencies['@angular/ssr'] =
+        (0, version_utils_1.withSsrAllowedHostsSupport)(angularDevkitVersion);
+    if (options.isUsingApplicationBuilder) {
+        dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
+    }
+    else if (!options.isRspack) {
+        // The rspack conversion removes the targets that use these packages
         devDependencies['browser-sync'] = pkgVersions.browserSyncVersion;
-        if (isUsingWebpackBuilder) {
+        if (options.isUsingWebpackBuilder) {
             devDependencies['@nx/webpack'] = versions_1.nxVersion;
             devDependencies['webpack-merge'] = pkgVersions.webpackMergeVersion;
         }
     }
-    else {
-        dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
-    }
     (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies, undefined, true);
 }

package/dist/src/generators/setup-ssr/lib/add-server-file.js

@@ -10,13 +10,20 @@ const constants_1 = require("./constants");
 function addServerFile(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const { outputPath } = project.targets.build.options;
-    const browserDistDirectory = options.isUsingApplicationBuilder
-        ? getApplicationBuilderBrowserOutputPath(outputPath)
-        : outputPath;
+    const usesApplicationEngine = options.isUsingApplicationBuilder || options.isRspack;
+    let browserDistDirectory;
+    if (options.isRspack) {
+        // rspack always emits the browser bundle under the default directory name
+        browserDistDirectory = constants_1.DEFAULT_BROWSER_DIR;
+    }
+    else if (options.isUsingApplicationBuilder) {
+        browserDistDirectory = getApplicationBuilderBrowserOutputPath(outputPath);
+    }
+    else {
+        browserDistDirectory = outputPath;
+    }
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const pathToFiles = (0, path_1.join)(__dirname, '..', 'files', 'v20+', options.isUsingApplicationBuilder
-        ? 'application-builder'
-        : 'server-builder', 'server');
+    const pathToFiles = (0, path_1.join)(__dirname, '..', 'files', 'v20+', usesApplicationEngine ? 'application-builder' : 'server-builder', 'server');
     const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const zoneless = (0, zoneless_1.isZonelessApp)(project);
     (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
@@ -25,6 +32,7 @@ function addServerFile(tree, options) {
         zoneless,
         useDefaultImport: angularMajorVersion >= 21,
         angularMajorVersion,
+        supportsAllowedHosts: (0, version_utils_1.supportsSsrAllowedHosts)(tree),
         tpl: '',
     });
 }

package/dist/src/generators/setup-ssr/lib/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const DEFAULT_BROWSER_DIR = "browser";
 export declare const DEFAULT_MEDIA_DIR = "media";
 export declare const DEFAULT_SERVER_DIR = "server";
+export declare const SERVER_APP_CONFIG_FILE = "src/app/app.config.server.ts";

package/dist/src/generators/setup-ssr/lib/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_SERVER_DIR = exports.DEFAULT_MEDIA_DIR = exports.DEFAULT_BROWSER_DIR = void 0;
+exports.SERVER_APP_CONFIG_FILE = exports.DEFAULT_SERVER_DIR = exports.DEFAULT_MEDIA_DIR = exports.DEFAULT_BROWSER_DIR = void 0;
 exports.DEFAULT_BROWSER_DIR = 'browser';
 exports.DEFAULT_MEDIA_DIR = 'media';
 exports.DEFAULT_SERVER_DIR = 'server';
+exports.SERVER_APP_CONFIG_FILE = 'src/app/app.config.server.ts';

package/dist/src/generators/setup-ssr/lib/generate-files.js

@@ -17,7 +17,7 @@ function generateSSRFiles(tree, options) {
         return;
     }
     const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const pathToFiles = (0, path_1.join)(__dirname, '..', 'files', 'v20+', options.isUsingApplicationBuilder
+    const pathToFiles = (0, path_1.join)(__dirname, '..', 'files', 'v20+', options.isUsingApplicationBuilder || options.isRspack
         ? 'application-builder'
         : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);

package/dist/src/generators/setup-ssr/lib/generate-server-ts-config.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import type { NormalizedGeneratorOptions } from '../schema';
-export declare function setServerTsConfigOptionsForApplicationBuilder(tree: Tree, options: NormalizedGeneratorOptions): void;
+export declare function setServerTsConfigOptionsForSingleProgramBuild(tree: Tree, options: NormalizedGeneratorOptions): void;
 export declare function generateTsConfigServerJsonForBrowserBuilder(tree: Tree, options: NormalizedGeneratorOptions): void;

package/dist/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
+exports.setServerTsConfigOptionsForSingleProgramBuild = setServerTsConfigOptionsForSingleProgramBuild;
 exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const version_utils_1 = require("../../utils/version-utils");
-function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
+const constants_1 = require("./constants");
+function setServerTsConfigOptionsForSingleProgramBuild(tree, options) {
     const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const tsConfigPath = targets.build.options.tsConfig;
     (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
@@ -42,9 +43,8 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
     const tsconfigServerPath = (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.server.json');
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.json'), (json) => {
         json.references ??= [];
-        json.references.push({
-            path: tsconfigServerPath,
-        });
+        // TypeScript resolves a reference relative to the file declaring it
+        json.references.push({ path: './tsconfig.server.json' });
         return json;
     });
     (0, devkit_1.updateJson)(tree, options.buildTargetTsConfigPath, (json) => {
@@ -52,7 +52,7 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
         exclude.add(`src/${options.main}`);
         exclude.add(`src/${options.serverFileName}`);
         if (options.standalone) {
-            exclude.add('src/app/app.config.server.ts');
+            exclude.add(constants_1.SERVER_APP_CONFIG_FILE);
         }
         json.exclude = Array.from(exclude);
         return json;

package/dist/src/generators/setup-ssr/lib/normalize-options.js

@@ -32,6 +32,7 @@ async function normalizeOptions(tree, options) {
         hydration: options.hydration ?? true,
         isUsingApplicationBuilder,
         isUsingWebpackBuilder,
+        isRspack: options.isRspack ?? false,
         buildTargetExecutor,
         buildTargetTsConfigPath: targets.build.options?.tsConfig ??
             (0, devkit_1.joinPathFragments)(root, 'tsconfig.app.json'),

package/dist/src/generators/setup-ssr/lib/update-project-config.js

@@ -5,6 +5,7 @@ exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuil
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
+const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -37,6 +38,12 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
         entry: (0, devkit_1.joinPathFragments)(sourceRoot, options.serverFileName),
     };
     buildTarget.options.outputMode = 'server';
+    if ((0, version_utils_1.supportsSsrAllowedHosts)(tree)) {
+        // The engine matches the request host against this list and an unset list
+        // matches nothing, so surface it for the deployment to fill in
+        buildTarget.options.security ??= {};
+        buildTarget.options.security.allowedHosts ??= [];
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
 function updateProjectConfigForBrowserBuilder(tree, options) {

package/dist/src/generators/setup-ssr/schema.d.ts

@@ -10,6 +10,12 @@ export interface Schema {
   hydration?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  /**
+   * Internal. The project's build is converted to `@nx/angular-rspack` right
+   * after this generator runs, so the setup must match what the rspack build
+   * supports rather than the build executor the project has right now.
+   */
+  isRspack?: boolean;
 }
 
 export interface NormalizedGeneratorOptions extends Schema {

package/dist/src/generators/setup-ssr/setup-ssr.js

@@ -9,7 +9,7 @@ async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (!schema.skipPackageJson) {
-        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder, options.isUsingWebpackBuilder);
+        (0, lib_1.addDependencies)(tree, options);
     }
     (0, lib_1.generateSSRFiles)(tree, options);
     if (options.hydration) {
@@ -20,10 +20,16 @@ async function setupSsr(tree, schema) {
     }
     if (options.isUsingApplicationBuilder) {
         (0, lib_1.updateProjectConfigForApplicationBuilder)(tree, options);
-        (0, lib_1.setServerTsConfigOptionsForApplicationBuilder)(tree, options);
     }
     else {
         (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
+    }
+    // rspack compiles the browser and the server bundles from the build tsconfig,
+    // so the separate tsconfig.server.json the server builder needs is dead weight
+    if (options.isUsingApplicationBuilder || options.isRspack) {
+        (0, lib_1.setServerTsConfigOptionsForSingleProgramBuild)(tree, options);
+    }
+    else {
         (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
     }
     (0, lib_1.addServerFile)(tree, options);

package/dist/src/generators/utils/acknowledge-build-scripts.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function acknowledgeAngularBuildScripts(tree: Tree): void;

package/dist/src/generators/utils/acknowledge-build-scripts.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.acknowledgeAngularBuildScripts = acknowledgeAngularBuildScripts;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+// The Angular build tooling (`@angular/build`, `@angular-devkit/build-angular`,
+// `ng-packagr`) pulls in esbuild, lmdb (-> msgpackr-extract) and sass
+// (-> @parcel/watcher). All of them ship prebuilt binaries as optional
+// dependencies, so their install scripts have nothing to do.
+const angularBuildAllowBuilds = {
+    esbuild: false,
+    lmdb: false,
+    'msgpackr-extract': false,
+    '@parcel/watcher': false,
+};
+function acknowledgeAngularBuildScripts(tree) {
+    (0, internal_1.acknowledgeBuildScripts)(tree, (0, devkit_1.detectPackageManager)(tree.root), angularBuildAllowBuilds);
+}

package/dist/src/generators/utils/add-vitest.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
+const acknowledge_build_scripts_1 = require("./acknowledge-build-scripts");
 const version_utils_1 = require("./version-utils");
 async function addVitestAngular(tree, options) {
     validateVitestVersion(tree);
@@ -35,6 +36,7 @@ async function addVitestAngular(tree, options) {
     }
     const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
     const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ?? pkgVersions.angularDevkitVersion;
+    (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@angular/build': angularDevkitVersion,
         jsdom: pkgVersions.jsdomVersion,
@@ -69,6 +71,7 @@ async function addVitestAnalog(tree, options) {
             devDependencies['vitest'] = pkgVersions.vitestVersion;
             devDependencies['jsdom'] = pkgVersions.jsdomVersion;
         }
+        (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true));
     }
     (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);

package/dist/src/generators/utils/tsconfig-utils.d.ts

@@ -9,4 +9,10 @@ import type * as ts from 'typescript';
  * @returns The resolved value of the compiler option, or undefined if not set
  */
 export declare function getDefinedCompilerOption(tree: Tree, tsConfigPath: string, optionName: keyof ts.CompilerOptions): any | undefined;
+/**
+ * Reads a tsconfig with its `extends` chain applied. The `files`, `include` and
+ * `exclude` entries come back relative to `tsConfigPath` no matter which config
+ * in the chain declared them.
+ */
+export declare function readResolvedTsConfig(tree: Tree, tsConfigPath: string): ts.ParsedCommandLine;
 export declare function readCompilerOptionsFromTsConfig(tree: Tree, tsConfigPath: string): ts.CompilerOptions;

package/dist/src/generators/utils/tsconfig-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefinedCompilerOption = getDefinedCompilerOption;
+exports.readResolvedTsConfig = readResolvedTsConfig;
 exports.readCompilerOptionsFromTsConfig = readCompilerOptionsFromTsConfig;
 const internal_1 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
@@ -16,6 +17,19 @@ function getDefinedCompilerOption(tree, tsConfigPath, optionName) {
     const compilerOptions = readCompilerOptionsFromTsConfig(tree, tsConfigPath);
     return compilerOptions[optionName];
 }
+/**
+ * Reads a tsconfig with its `extends` chain applied. The `files`, `include` and
+ * `exclude` entries come back relative to `tsConfigPath` no matter which config
+ * in the chain declared them.
+ */
+function readResolvedTsConfig(tree, tsConfigPath) {
+    const ts = (0, internal_1.ensureTypescript)();
+    const host = (0, internal_1.createTreeParseConfigHost)(tree);
+    // an absolute path is what makes the inherited entries come back relative to
+    // this config
+    const absoluteTsConfigPath = (0, node_path_1.join)(tree.root, tsConfigPath);
+    return ts.parseJsonConfigFileContent(ts.readConfigFile(absoluteTsConfigPath, host.readFile).config, host, (0, node_path_1.dirname)(absoluteTsConfigPath));
+}
 function readCompilerOptionsFromTsConfig(tree, tsConfigPath) {
     const ts = (0, internal_1.ensureTypescript)();
     const host = (0, internal_1.createTreeParseConfigHost)(tree);

package/dist/src/generators/utils/version-utils.d.ts

@@ -11,6 +11,20 @@ export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: stri
     major: number;
     version: string;
 };
+/**
+ * Whether every `@angular/ssr` version the workspace can end up with accepts
+ * an allowed hosts configuration. The application engine and `CommonEngine`
+ * validate the request host against it, and an unset allowlist matches nothing.
+ */
+export declare function supportsSsrAllowedHosts(tree: Tree): boolean;
+/**
+ * Raises the floor of an `@angular/ssr` version range to the first version in
+ * it that accepts an allowed hosts configuration, so the scaffolded setup can
+ * use the option no matter how the range is resolved. The range is returned
+ * unchanged when every version it allows already accepts one, when no version
+ * in it does, and when raising it would change the release lines it covers.
+ */
+export declare function withSsrAllowedHostsSupport(range: string): string;
 export declare function versions(tree: Tree): PackageCompatVersions;
 export declare function versions<V extends SupportedVersion>(tree: Tree, options: {
     minAngularMajorVersion: V;

package/dist/src/generators/utils/version-utils.js

@@ -5,6 +5,8 @@ exports.getInstalledAngularVersion = getInstalledAngularVersion;
 exports.getInstalledAngularMajorVersion = getInstalledAngularMajorVersion;
 exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
 exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
+exports.supportsSsrAllowedHosts = supportsSsrAllowedHosts;
+exports.withSsrAllowedHostsSupport = withSsrAllowedHostsSupport;
 exports.versions = versions;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
@@ -33,6 +35,56 @@ function getInstalledPackageVersionInfo(tree, pkgName) {
     const version = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkgName);
     return version ? { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version } : null;
 }
+// Released in 20.3.17, 21.1.5 and 21.2.0, and never backported to 21.0.
+// Prereleases are deliberately not matched: the option landed part-way through
+// the 21.2 prerelease train, so a prerelease says nothing about whether it is
+// there.
+const SSR_ALLOWED_HOSTS_RANGE = '>=20.3.17 <21.0.0 || >=21.1.5';
+const SSR_ALLOWED_HOSTS_FLOORS = ['20.3.17', '21.1.5', '21.2.0'];
+// A single caret, tilde or exact version. Raising anything else, a union of
+// ranges above all, would drop the release lines it covers.
+const RAISABLE_RANGE = /^[~^]?\d+\.\d+\.\d+(?:-[\w.]+)?$/;
+/**
+ * Whether every `@angular/ssr` version a range allows accepts an allowed hosts
+ * configuration. A range is not always resolved to its highest version, the
+ * `resolution-mode` setting in pnpm being one way to ask for the lowest, so a
+ * range that merely reaches such a version is not enough.
+ */
+function rangeAcceptsSsrAllowedHosts(range) {
+    return !!(0, semver_1.validRange)(range) && (0, semver_1.subset)(range, SSR_ALLOWED_HOSTS_RANGE);
+}
+/**
+ * Whether every `@angular/ssr` version the workspace can end up with accepts
+ * an allowed hosts configuration. The application engine and `CommonEngine`
+ * validate the request host against it, and an unset allowlist matches nothing.
+ */
+function supportsSsrAllowedHosts(tree) {
+    const installed = (0, internal_1.getInstalledPackageVersionFromTree)(tree, '@angular/ssr');
+    if (installed) {
+        return (0, semver_1.satisfies)(installed, SSR_ALLOWED_HOSTS_RANGE);
+    }
+    const declared = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
+    return !!declared && rangeAcceptsSsrAllowedHosts(declared);
+}
+/**
+ * Raises the floor of an `@angular/ssr` version range to the first version in
+ * it that accepts an allowed hosts configuration, so the scaffolded setup can
+ * use the option no matter how the range is resolved. The range is returned
+ * unchanged when every version it allows already accepts one, when no version
+ * in it does, and when raising it would change the release lines it covers.
+ */
+function withSsrAllowedHostsSupport(range) {
+    if (rangeAcceptsSsrAllowedHosts(range) || !RAISABLE_RANGE.test(range)) {
+        return range;
+    }
+    const floor = SSR_ALLOWED_HOSTS_FLOORS.find((version) => (0, semver_1.satisfies)(version, range));
+    if (!floor) {
+        return range;
+    }
+    const operator = range.startsWith('~') || range.startsWith('^') ? range[0] : '';
+    const raised = `${operator}${floor}`;
+    return rangeAcceptsSsrAllowedHosts(raised) ? raised : range;
+}
 function versions(tree, options) {
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
     if (options?.minAngularMajorVersion &&

package/dist/src/migrations/update-23-1-0/add-angular-build.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
+const acknowledge_build_scripts_1 = require("../../generators/utils/acknowledge-build-scripts");
 const versions_1 = require("../../utils/versions");
 // The `@nx/angular:application` and `@nx/angular:unit-test` executors import
 // `@angular/build` directly to run the Angular builders, and any
@@ -49,5 +50,6 @@ async function default_1(tree) {
     if (!needsAngularBuild) {
         return;
     }
+    (0, acknowledge_build_scripts_1.acknowledgeAngularBuildScripts)(tree);
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/build': versions_1.angularDevkitVersion }, undefined, true);
 }

package/dist/src/migrations/update-23-1-0/add-angular-build.md

@@ -4,6 +4,8 @@ The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Ang
 
 Executor usage is detected on any target using `@nx/angular:application`, `@nx/angular:unit-test`, or an `@angular/build:*` executor. Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
 
+On pnpm 11 and above, the migration also writes `pnpm-workspace.yaml`. `@angular/build` reaches four packages that run a build script on install (`esbuild`, `lmdb`, `msgpackr-extract` and `@parcel/watcher`), and pnpm 11 refuses to install a package whose script is neither allowed nor denied, so the migration records an `allowBuilds` decision for each. A decision already in the file is left untouched.
+
 #### Examples
 
 ##### `project.json`
@@ -28,7 +30,7 @@ After (`package.json`):
 // package.json
 {
   "devDependencies": {
-    "@angular/build": "~22.0.4",
+    "@angular/build": "~22.1.0",
   },
 }
 ```

package/dist/src/migrations/update-23-1-0/add-optional-webpack-packages.js

@@ -88,6 +88,14 @@ async function addOptionalWebpackPackages(tree) {
     if (!needsWebpack && !needsModuleFederation && !needsRspack) {
         return;
     }
+    if (needsWebpack || needsRspack) {
+        // @nx/webpack and @nx/rspack depend on sass, which pulls in
+        // @parcel/watcher. Its install script only builds from source when
+        // npm_config_build_from_source is set, so skip it.
+        (0, internal_1.acknowledgeBuildScripts)(tree, (0, devkit_1.detectPackageManager)(tree.root), {
+            '@parcel/watcher': false,
+        });
+    }
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         ...(needsWebpack
             ? {

package/dist/src/migrations/update-23-1-0/add-optional-webpack-packages.md

@@ -12,6 +12,8 @@ A package is added only when a matching target exists:
 
 Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
 
+On pnpm 11 and above, adding `@nx/webpack` or `@nx/rspack` also writes `pnpm-workspace.yaml`. Both reach `@parcel/watcher` through sass, and pnpm 11 refuses to install a package whose build script is neither allowed nor denied, so the migration records an `allowBuilds` decision for it. A decision already in the file is left untouched.
+
 #### Examples
 
 For a workspace with an `@nx/angular:webpack-browser` build target, the migration adds the webpack packages to `devDependencies`.

package/dist/src/utils/assert-cypress-component-testing-support.d.ts

@@ -4,3 +4,14 @@ import { type Tree } from '@nx/devkit';
  * Angular version. Must be called after `@nx/cypress` has been ensured.
  */
 export declare function assertCypressComponentTestingSupport(tree: Tree): void;
+/**
+ * Returns the installed Cypress version, or the declared range when nothing
+ * satisfying is installed, if it cannot reach `floor`; `null` otherwise.
+ *
+ * A satisfying install decides. Without one, only a range capped below the
+ * floor fails: `^15.17.0` installs 15.20.1+, so its lower bound cannot be
+ * compared. Declarations that are not ranges (`latest`, `file:`) are not
+ * gated.
+ * When Cypress is not declared, the generators install `cypressVersion`.
+ */
+export declare function findCypressBelow(tree: Tree, floor: string): string | null;

package/dist/src/utils/assert-cypress-component-testing-support.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertCypressComponentTestingSupport = assertCypressComponentTestingSupport;
+exports.findCypressBelow = findCypressBelow;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
@@ -10,22 +11,46 @@ const minCypressVersion = '15.20.1';
  * Angular version. Must be called after `@nx/cypress` has been ensured.
  */
 function assertCypressComponentTestingSupport(tree) {
-    const angularVersion = (0, internal_1.getDeclaredPackageVersion)(tree, '@angular/core');
-    if (!angularVersion || (0, semver_1.lt)(angularVersion, '22.1.0')) {
+    const angularVersion = (0, internal_1.getResolvedPackageVersion)(tree, '@angular/core');
+    if (!angularVersion) {
         return;
     }
-    const { cypressVersion, } = require('@nx/cypress/internal');
-    // When Cypress is not installed, the generators install `cypressVersion`
-    const declaredCypressVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'cypress') ?? cypressVersion;
-    // Gate only ranges capped below the floor. `^15.17.0` installs 15.20.1+, so
-    // comparing its lower bound would reject workspaces that work. Dist tags
-    // (`latest`, `next`) aren't ranges and aren't gated.
-    if (!(0, semver_1.validRange)(declaredCypressVersion) ||
-        !(0, semver_1.subset)(declaredCypressVersion, `<${minCypressVersion}`)) {
+    // A prerelease of 22.1 counts as 22.1.
+    const angularRelease = (0, semver_1.coerce)(angularVersion)?.version ?? angularVersion;
+    if ((0, semver_1.lt)(angularRelease, '22.1.0')) {
         return;
     }
+    const found = findCypressBelow(tree, minCypressVersion);
+    if (found) {
+        throwForUnsupportedCypress(found);
+    }
+}
+/**
+ * Returns the installed Cypress version, or the declared range when nothing
+ * satisfying is installed, if it cannot reach `floor`; `null` otherwise.
+ *
+ * A satisfying install decides. Without one, only a range capped below the
+ * floor fails: `^15.17.0` installs 15.20.1+, so its lower bound cannot be
+ * compared. Declarations that are not ranges (`latest`, `file:`) are not
+ * gated.
+ * When Cypress is not declared, the generators install `cypressVersion`.
+ */
+function findCypressBelow(tree, floor) {
+    const { cypressVersion, } = require('@nx/cypress/internal');
+    const declaredCypressVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'cypress');
+    const installedCypressVersion = declaredCypressVersion
+        ? (0, internal_1.getSatisfyingInstalledPackageVersion)(tree, 'cypress', declaredCypressVersion)
+        : null;
+    if (installedCypressVersion) {
+        const release = (0, semver_1.coerce)(installedCypressVersion)?.version ?? installedCypressVersion;
+        return (0, semver_1.lt)(release, floor) ? installedCypressVersion : null;
+    }
+    const range = declaredCypressVersion ?? cypressVersion;
+    return (0, semver_1.validRange)(range) && (0, semver_1.subset)(range, `<${floor}`) ? range : null;
+}
+function throwForUnsupportedCypress(found) {
     throw new Error(`Cypress Component Testing with Angular 22.1 and higher requires Cypress ${minCypressVersion} or higher. ` +
-        `Found Cypress ${declaredCypressVersion}. Earlier Cypress versions can't load Angular's Babel 8 dependencies. ` +
+        `Found Cypress ${found}. Earlier Cypress versions can't load Angular's Babel 8 dependencies. ` +
         `Please upgrade Cypress. ` +
         `See https://github.com/cypress-io/cypress/issues/34461.`);
 }

package/dist/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~22.1.0";
 export declare const angularDevkitVersion = "~22.1.0";
 export declare const ngPackagrVersion = "~22.1.0";
-export declare const ngrxVersion = "^21.0.0";
+export declare const ngrxVersion = "^22.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.16.2";
 export declare const tsLibVersion = "^2.3.0";

package/dist/src/utils/versions.js

@@ -6,7 +6,7 @@ exports.nxVersion = require((0, path_1.join)('@nx/angular', 'package.json')).ver
 exports.angularVersion = '~22.1.0';
 exports.angularDevkitVersion = '~22.1.0';
 exports.ngPackagrVersion = '~22.1.0';
-exports.ngrxVersion = '^21.0.0';
+exports.ngrxVersion = '^22.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.16.2';
 exports.tsLibVersion = '^2.3.0';

package/migrations.json

@@ -2311,6 +2311,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "23.3.0-ngrx": {
+      "version": "23.3.0-beta.1",
+      "requires": {
+        "@angular/core": "^22.0.0"
+      },
+      "packages": {
+        "@ngrx/store": {
+          "version": "^22.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.3.0-pr.36841.f66e88b",
+  "version": "23.3.0-pr.37036.2b7abf9",
   "private": false,
   "type": "commonjs",
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
@@ -79,15 +79,15 @@
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.3.0-pr.36841.f66e88b",
-    "@nx/web": "23.3.0-pr.36841.f66e88b",
-    "@nx/eslint": "23.3.0-pr.36841.f66e88b",
-    "@nx/js": "23.3.0-pr.36841.f66e88b"
+    "@nx/devkit": "23.3.0-pr.37036.2b7abf9",
+    "@nx/js": "23.3.0-pr.37036.2b7abf9",
+    "@nx/web": "23.3.0-pr.37036.2b7abf9",
+    "@nx/eslint": "23.3.0-pr.37036.2b7abf9"
   },
   "devDependencies": {
-    "@nx/storybook": "23.3.0-pr.36841.f66e88b",
-    "@nx/vitest": "23.3.0-pr.36841.f66e88b",
-    "nx": "23.3.0-pr.36841.f66e88b"
+    "@nx/storybook": "23.3.0-pr.37036.2b7abf9",
+    "@nx/vitest": "23.3.0-pr.37036.2b7abf9",
+    "nx": "23.3.0-pr.37036.2b7abf9"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",
@@ -98,11 +98,11 @@
     "ng-packagr": ">= 20.0.0 < 23.0.0",
     "rxjs": "^6.5.3 || ^7.5.0",
     "webpack-merge": "^5.8.0",
-    "@nx/cypress": "23.3.0-pr.36841.f66e88b",
-    "@nx/playwright": "23.3.0-pr.36841.f66e88b",
-    "@nx/module-federation": "23.3.0-pr.36841.f66e88b",
-    "@nx/rspack": "23.3.0-pr.36841.f66e88b",
-    "@nx/webpack": "23.3.0-pr.36841.f66e88b"
+    "@nx/cypress": "23.3.0-pr.37036.2b7abf9",
+    "@nx/playwright": "23.3.0-pr.37036.2b7abf9",
+    "@nx/module-federation": "23.3.0-pr.37036.2b7abf9",
+    "@nx/webpack": "23.3.0-pr.37036.2b7abf9",
+    "@nx/rspack": "23.3.0-pr.37036.2b7abf9"
   },
   "peerDependenciesMeta": {
     "@angular/build": {

package/dist/src/generators/application/files/rspack-ssr/server.ts__tmpl__

@@ -1,78 +0,0 @@
-<%_ if (!zoneless && angularMajorVersion < 21) { _%>
-import 'zone.js/node';
-
-<%_ } _%>
-import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine } from '@angular/ssr/node';
-<%_ if (useDefaultImport) { _%>
-import express from 'express';
-<%_ } else { _%>
-import * as express from 'express';
-<%_ } _%>
-import { existsSync } from 'node:fs';
-import { join } from 'node:path';
-import bootstrap from './main.server';
-
-// The Express app is exported so that it can be used by serverless Functions.
-export function app(): express.Express {
-  const server = express();
-  const distFolder = join(process.cwd(), "<%= pathToDistFolder %>");
-  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
-    ? join(distFolder, 'index.original.html')
-    : join(distFolder, 'index.html');
-
-  const commonEngine = new CommonEngine();
-
-  server.set('view engine', 'html');
-  server.set('views', distFolder);
-
-  // Example Express Rest API endpoints
-  // server.get('/api/**', (req, res) => { });
-  // Serve static files from /browser
-  server.get(
-    '*.*',
-    express.static(distFolder, {
-      maxAge: '1y',
-    })
-  );
-
-  // All regular routes use the Angular engine
-  server.get('*', (req, res, next) => {
-    const { protocol, originalUrl, baseUrl, headers } = req;
-
-    commonEngine
-      .render({
-        bootstrap,
-        documentFilePath: indexHtml,
-        url: `${protocol}://${headers.host}${originalUrl}`,
-        publicPath: distFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
-      })
-      .then((html) => res.send(html))
-      .catch((err) => next(err));
-  });
-
-  return server;
-}
-
-function run(): void {
-  const port = process.env['PORT'] || 4000;
-
-  // Start up the Node server
-  const server = app();
-  server.listen(port, () => {
-    console.log(`Node Express server listening on http://localhost:${port}`);
-  });
-}
-
-// Webpack will replace 'require' with '__webpack_require__'
-// '__non_webpack_require__' is a proxy to Node 'require'
-// The below code is to ensure that the server is run only when not requiring the bundle.
-declare const __non_webpack_require__: NodeRequire;
-const mainModule = __non_webpack_require__.main;
-const moduleFilename = (mainModule && mainModule.filename) || '';
-if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
-  run();
-}
-
-export default bootstrap;