@nx/angular 22.3.0-canary.20251211-205daee → 22.3.0-canary.20251216-71bfc21

package/src/generators/pipe/pipe.js

@@ -3,20 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipeGenerator = pipeGenerator;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
-const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function pipeGenerator(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const pipeNames = (0, devkit_1.names)(options.name);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
         symbolName: options.symbolName,
         fileName: options.fileName,
         selector: pipeNames.propertyName,
         standalone: options.standalone,
-        // Angular v19 or higher defaults to true, while lower versions default to false
-        setStandalone: (angularMajorVersion >= 19 && !options.standalone) ||
-            (angularMajorVersion < 19 && options.standalone),
         tpl: '',
     });
     if (options.skipTests) {

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

@@ -1,9 +1,16 @@
+<%_ if (!zoneless && angularMajorVersion < 21) { _%>
 import 'zone.js/node';
 
+<%_ } _%>
 import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine } from '<%= commonEngineEntryPoint %>';
+import { CommonEngine } from '@angular/ssr/node';
+<%_ if (useDefaultImport) { _%>
+import express from 'express';
+import cors from 'cors';
+<%_ } else { _%>
 import * as express from 'express';
 import * as cors from 'cors';
+<%_ } _%>
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import<% if(standalone) { %> bootstrap <% } else { %> { AppServerModule } <% } %>from './bootstrap.server';

package/src/generators/remote/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './find-next-available-port';
 export * from './update-ssr-setup';
+export * from './validate-options';
 //# sourceMappingURL=index.d.ts.map

package/src/generators/remote/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC"}

package/src/generators/remote/lib/index.js

@@ -3,3 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./find-next-available-port"), exports);
 tslib_1.__exportStar(require("./update-ssr-setup"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);

package/src/generators/remote/lib/update-ssr-setup.d.ts

@@ -1,9 +1,10 @@
 import type { Tree } from '@nx/devkit';
-export declare function updateSsrSetup(tree: Tree, { appName, port, standalone, typescriptConfiguration, skipPackageJson, }: {
+export declare function updateSsrSetup(tree: Tree, { appName, port, standalone, typescriptConfiguration, zoneless, skipPackageJson, }: {
     appName: string;
     port: number;
     standalone: boolean;
     typescriptConfiguration: boolean;
+    zoneless: boolean;
     skipPackageJson?: boolean;
 }): Promise<import("@nx/devkit").GeneratorCallback>;
 //# sourceMappingURL=update-ssr-setup.d.ts.map

package/src/generators/remote/lib/update-ssr-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-ssr-setup.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/update-ssr-setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAoBvC,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,EACE,OAAO,EACP,IAAI,EACJ,UAAU,EACV,uBAAuB,EACvB,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,mDA6HF"}
+{"version":3,"file":"update-ssr-setup.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/update-ssr-setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAoBvC,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,EACE,OAAO,EACP,IAAI,EACJ,UAAU,EACV,uBAAuB,EACvB,QAAQ,EACR,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,mDAsHF"}

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

@@ -8,13 +8,13 @@ const semver_1 = require("semver");
 const versions_1 = require("../../../utils/versions");
 const artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
-async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, skipPackageJson, }) {
+async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, zoneless, skipPackageJson, }) {
     const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     tree.rename((0, devkit_1.joinPathFragments)(sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(sourceRoot, 'bootstrap.server.ts'));
-    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19 ? sourceRoot : project.root, 'server.ts');
-    tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(sourceRoot, 'server.ts');
+    tree.write(pathToServerEntry, `import('./main.server');`);
     const browserBundleOutput = project.targets.build.options.outputPath;
     const serverBundleOutput = project.targets.build.options.outputPath.replace(/\/browser$/, '/server');
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
@@ -22,7 +22,9 @@ async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfi
         browserBundleOutput,
         serverBundleOutput,
         standalone,
-        commonEngineEntryPoint: angularMajorVersion >= 19 ? '@angular/ssr/node' : '@angular/ssr',
+        zoneless,
+        useDefaultImport: angularMajorVersion >= 21,
+        angularMajorVersion,
         tmpl: '',
     });
     const pathToTemplateFiles = typescriptConfiguration ? 'base-ts' : 'base';
@@ -36,9 +38,7 @@ async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfi
         // https://github.com/angular/angular-cli/releases/tag/20.3.0
         (0, semver_1.gte)(angularVersion, '20.3.0') ||
             // https://github.com/angular/angular-cli/releases/tag/19.2.16
-            (angularMajorVersion === 19 && (0, semver_1.gte)(angularVersion, '19.2.16')) ||
-            // https://github.com/angular/angular-cli/releases/tag/18.2.21
-            (angularMajorVersion === 18 && (0, semver_1.gte)(angularVersion, '18.2.21'));
+            (angularMajorVersion === 19 && (0, semver_1.gte)(angularVersion, '19.2.16'));
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone'), project.root, {
             appName,
             standalone,

package/src/generators/remote/lib/validate-options.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function validateOptions(tree: Tree, options: Schema): void;
+//# sourceMappingURL=validate-options.d.ts.map

package/src/generators/remote/lib/validate-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/validate-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAW1D"}

package/src/generators/remote/lib/validate-options.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = validateOptions;
+const version_utils_1 = require("../../utils/version-utils");
+function validateOptions(tree, options) {
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 21) {
+        if (options.zoneless) {
+            throw new Error(`The "zoneless" option is only supported for Angular versions >= 21.0.0. You are using Angular ${angularVersion}.`);
+        }
+    }
+}

package/src/generators/remote/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAEL,MAAM,YAAY,CAAC;AAcpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAqHtD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAEL,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAqHtD;AAED,eAAe,MAAM,CAAC"}

package/src/generators/remote/remote.js

@@ -12,13 +12,17 @@ const setup_mf_1 = require("../setup-mf/setup-mf");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 const assert_mf_utils_1 = require("../utils/assert-mf-utils");
 const validations_1 = require("../utils/validations");
+const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function remote(tree, schema) {
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'remote');
+    (0, lib_1.validateOptions)(tree, schema);
     // TODO: Replace with Rspack when confidence is high enough
     schema.bundler ??= 'webpack';
     const isRspack = schema.bundler === 'rspack';
-    (0, assert_mf_utils_1.assertRspackIsCSR)(schema.bundler, schema.ssr ?? false, schema.serverRouting ?? false);
+    (0, assert_mf_utils_1.assertRspackIsCSR)(schema.bundler, schema.ssr ?? false);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    schema.zoneless ??= angularMajorVersion >= 21 ? true : false;
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -78,6 +82,7 @@ async function remote(tree, schema) {
             typescriptConfiguration,
             standalone: options.standalone,
             skipPackageJson: options.skipPackageJson,
+            zoneless: options.zoneless,
         });
         installTasks.push(ssrInstallTask);
     }

package/src/generators/remote/schema.d.ts

@@ -16,7 +16,7 @@ export interface Schema {
   skipTests?: boolean;
   tags?: string;
   linter?: Linter | LinterType;
-  unitTestRunner?: UnitTestRunner;
+  unitTestRunner?: Exclude<UnitTestRunner, UnitTestRunner.VitestAngular>;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
@@ -26,6 +26,6 @@ export interface Schema {
   skipFormat?: boolean;
   standalone?: boolean;
   ssr?: boolean;
-  serverRouting?: boolean;
+  zoneless?: boolean;
   typescriptConfiguration?: boolean;
 }

package/src/generators/remote/schema.json

@@ -113,10 +113,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "x-prompt": "Which unit test runner would you like to use?",
-      "default": "jest"
+      "enum": ["vitest-analog", "jest", "none"],
+      "description": "Test runner to use for unit tests. `vitest-analog` uses AnalogJS-based setup with `@nx/vitest`. It defaults to `vitest-analog` for Angular versions >= 21.0.0, otherwise `jest`.",
+      "x-prompt": "Which unit test runner would you like to use?"
     },
     "e2eTestRunner": {
       "type": "string",
@@ -170,8 +169,8 @@
       "type": "boolean",
       "default": false
     },
-    "serverRouting": {
-      "description": "Creates a server application using the Server Routing and App Engine APIs for application using the `application` builder (Developer Preview). _Note: this is only supported in Angular versions 19.x.x_. From Angular 20 onwards, SSR will always enable server routing when using the `application` builder.",
+    "zoneless": {
+      "description": "Generate an application that does not use `zone.js`. It defaults to `true`. _Note: this is only supported in Angular versions >= 21.0.0_",
       "type": "boolean"
     },
     "typescriptConfiguration": {

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js

@@ -10,7 +10,7 @@ function convertScamToStandalone(componentAST, componentFileContents, importsArr
     const { tsquery } = require('@phenomnomnominal/tsquery');
     const componentDecoratorMetadataNode = tsquery(componentAST, COMPONENT_PROPERTY_SELECTOR, { visitAllChildren: true })[0];
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({${angularMajorVersion < 19 ? `\nstandalone: true,` : ''}
+    newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({
     imports: [${importsArray.join(',')}],${providersArray.length > 0 ? `providers: [${providersArray.join(',')}],` : ''}${componentFileContents.slice(componentDecoratorMetadataNode.getStart() + 1, moduleNodes[0].getStart() - 1)}`;
     tree.write(normalizedComponentPath, newComponentContents);
     const componentPathParts = (0, path_1.parse)(normalizedComponentPath);

package/src/generators/setup-mf/files/entry-module-files/entry__componentFileSuffix__.ts__tmpl__

@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
 @Component({<% if (prefix) { %>
-  selector: '<%= prefix %>-<%= appName %>-entry',<% if (setStandaloneFalse) { %>
-  standalone: false,<% } %>
+  selector: '<%= prefix %>-<%= appName %>-entry',
+  standalone: false,
   template: `<<%= prefix %>-nx-welcome></<%= prefix %>-nx-welcome>`<% } else { %>
   selector: '<%= appName %>-entry',
   template: `<nx-welcome></nx-welcome>`<% } %>

package/src/generators/setup-mf/files/host-files/__appFileName__.spec.ts__tmpl__

@@ -1,4 +1,4 @@
-import { fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { <%= appSymbolName %> } from './<%= appFileName %>';
 import { <%= nxWelcomeSymbolName %> } from './<%= nxWelcomeFileName %>';
 import { Router, RouterModule } from '@angular/router';
@@ -29,15 +29,14 @@ describe('<%= appSymbolName %>', () => {
     expect(app.title).toEqual('<%= appName %>');
   });
 
-  it('should render title', fakeAsync(() => {
+  it('should render title', async () => {
     const fixture = TestBed.createComponent(<%= appSymbolName %>);
     const router = TestBed.inject(Router);
-    fixture.ngZone?.run(() => router.navigate(['']));
-    tick();
-    fixture.detectChanges();
+    await router.navigate(['']);
+    <%= zoneless ? 'await fixture.whenStable();' : 'fixture.detectChanges();' %>
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain(
       'Welcome <%= appName %>'
     );
-  }));
+  });
 });

package/src/generators/setup-mf/files/standalone-entry-component-files/entry__componentFileSuffix__.ts__tmpl__

@@ -1,8 +1,7 @@
 import { Component } from '@angular/core';
 import { <%= nxWelcomeSymbolName %> } from './<%= nxWelcomeFileName %>';
 
-@Component({<% if (setStandaloneTrue) { %>
-  standalone: true,<% } %>
+@Component({
   imports: [<%= nxWelcomeSymbolName %>],<% if (prefix) { %>
   selector: '<%= prefix %>-<%= appName %>-entry',
   template: `<<%= prefix %>-nx-welcome></<%= prefix %>-nx-welcome>`<% } else { %>

package/src/generators/setup-mf/lib/add-remote-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-entry.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,MAAM,QAoDhB"}
+{"version":3,"file":"add-remote-entry.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,MAAM,QAgDhB"}

package/src/generators/setup-mf/lib/add-remote-entry.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemoteEntry = addRemoteEntry;
 const devkit_1 = require("@nx/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
-const version_utils_1 = require("../../utils/version-utils");
 function addRemoteEntry(tree, options, appRoot) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const { appName, routing, prefix, standalone, componentType, componentFileSuffix, nxWelcomeComponentInfo, entryModuleFileName, } = options;
     (0, devkit_1.generateFiles)(tree, standalone
         ? (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-entry-component-files')
@@ -14,9 +12,6 @@ function addRemoteEntry(tree, options, appRoot) {
         appName,
         routing,
         prefix,
-        // Angular v19 or higher defaults to true, while lower versions default to false
-        setStandaloneFalse: angularMajorVersion >= 19,
-        setStandaloneTrue: angularMajorVersion < 19,
         componentType,
         componentFileSuffix,
         entryModuleFileName,

package/src/generators/setup-mf/lib/update-host-app-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-host-app-routes.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,QAiEzE"}
+{"version":3,"file":"update-host-app-routes.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,QAmEzE"}

package/src/generators/setup-mf/lib/update-host-app-routes.js

@@ -3,20 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateHostAppRoutes = updateHostAppRoutes;
 const devkit_1 = require("@nx/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
+const zoneless_1 = require("../../../utils/zoneless");
 function updateHostAppRoutes(tree, options) {
-    const { sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     const { appComponentInfo, nxWelcomeComponentInfo } = options;
-    tree.write((0, devkit_1.joinPathFragments)(sourceRoot, 'app', `${appComponentInfo.extensionlessFileName}.html`), `<ul class="remote-menu">
+    const zoneless = (0, zoneless_1.isZonelessApp)(project);
+    tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app', `${appComponentInfo.extensionlessFileName}.html`), `<ul class="remote-menu">
 <li><a routerLink="/">Home</a></li>
 </ul>
 <router-outlet></router-outlet>
 `);
-    let pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
+    let pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.routes.ts');
     if (!tree.exists(pathToHostRootRoutingFile)) {
-        pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-routing.module.ts');
+        pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-routing.module.ts');
     }
     if (!tree.exists(pathToHostRootRoutingFile)) {
-        pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-routing-module.ts');
+        pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-routing-module.ts');
     }
     (0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
       path: '',
@@ -24,13 +26,14 @@ function updateHostAppRoutes(tree, options) {
     }`);
     tree.write(pathToHostRootRoutingFile, `import { ${nxWelcomeComponentInfo.symbolName} } from './${nxWelcomeComponentInfo.extensionlessFileName}';
 ${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/host-files'), (0, devkit_1.joinPathFragments)(sourceRoot, 'app'), {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/host-files'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app'), {
         appName: options.appName,
         standalone: options.standalone,
         appFileName: appComponentInfo.extensionlessFileName,
         appSymbolName: appComponentInfo.symbolName,
         nxWelcomeFileName: nxWelcomeComponentInfo.extensionlessFileName,
         nxWelcomeSymbolName: nxWelcomeComponentInfo.symbolName,
+        zoneless,
         tmpl: '',
     });
 }

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

@@ -50,10 +50,10 @@ app.use('/**', (req, res, next) => {
 });
 
 /**
- * Start the server if this module is the main entry point.
+ * Start the server if this module is the main entry point, or it is ran via PM2.
  * The server listens on the port defined by the `PORT` environment variable, or defaults to <%= serverPort %>.
  */
-if (isMainModule(import.meta.url)) {
+if (isMainModule(import.meta.url) || process.env['pm_id']) {
   const port = process.env['PORT'] || <%= serverPort %>;
   app.listen(port, () => {
     console.log(`Node Express server listening on http://localhost:${port}`);

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

@@ -1,8 +1,14 @@
+<%_ 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 <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './<%= main.slice(0, -3) %>';

package/src/generators/setup-ssr/lib/add-hydration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAUpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QAmF3E"}
+{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0E3E"}

package/src/generators/setup-ssr/lib/add-hydration.js

@@ -6,7 +6,6 @@ const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const version_utils_1 = require("../../utils/version-utils");
 let tsModule;
 let tsquery;
 function addHydration(tree, options) {
@@ -35,14 +34,9 @@ function addHydration(tree, options) {
     const addImport = (source, symbolName, packageName, filePath, isDefault = false) => {
         return (0, js_1.insertImport)(tree, source, filePath, symbolName, packageName, isDefault);
     };
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     sourceFile = addImport(sourceFile, 'provideClientHydration', '@angular/platform-browser', pathToClientConfigFile);
-    if (angularMajorVersion >= 19) {
-        sourceFile = addImport(sourceFile, 'withEventReplay', '@angular/platform-browser', pathToClientConfigFile);
-    }
-    const provider = angularMajorVersion >= 19
-        ? 'provideClientHydration(withEventReplay())'
-        : 'provideClientHydration()';
+    sourceFile = addImport(sourceFile, 'withEventReplay', '@angular/platform-browser', pathToClientConfigFile);
+    const provider = 'provideClientHydration(withEventReplay())';
     if (options.standalone) {
         (0, ast_utils_1.addProviderToAppConfig)(tree, pathToClientConfigFile, provider);
     }

package/src/generators/setup-ssr/lib/add-server-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-server-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-server-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAG5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QAoD5E"}
+{"version":3,"file":"add-server-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-server-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAG5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0C5E"}

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

@@ -4,6 +4,7 @@ exports.addServerFile = addServerFile;
 const devkit_1 = require("@nx/devkit");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
+const zoneless_1 = require("../../../utils/zoneless");
 const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
 function addServerFile(tree, options) {
@@ -20,21 +21,20 @@ function addServerFile(tree, options) {
             ? 'application-builder'
             : 'server-builder', 'server');
     }
-    else if (angularMajorVersion === 19) {
+    else {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', options.isUsingApplicationBuilder
             ? 'application-builder' +
                 (options.serverRouting ? '' : '-common-engine')
             : 'server-builder', 'server');
     }
-    else {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', 'server', options.isUsingApplicationBuilder
-            ? 'application-builder'
-            : 'server-builder');
-    }
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
-    (0, devkit_1.generateFiles)(tree, pathToFiles, angularMajorVersion >= 19 ? sourceRoot : project.root, {
+    const zoneless = (0, zoneless_1.isZonelessApp)(project);
+    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
         ...options,
         browserDistDirectory,
+        zoneless,
+        useDefaultImport: angularMajorVersion >= 21,
+        angularMajorVersion,
         tpl: '',
     });
 }

package/src/generators/setup-ssr/lib/generate-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgBvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAiFpC"}
+{"version":3,"file":"generate-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgBvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAyEpC"}

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

@@ -24,14 +24,11 @@ function generateSSRFiles(tree, options) {
             ? 'application-builder'
             : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
-    else if (angularMajorVersion === 19) {
+    else {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', options.isUsingApplicationBuilder
             ? 'application-builder'
             : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
-    else {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
-    }
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     const ssrVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
     const cleanedSsrVersion = ssrVersion
@@ -44,9 +41,7 @@ function generateSSRFiles(tree, options) {
     // https://github.com/angular/angular-cli/releases/tag/20.3.0
     (0, semver_1.gte)(angularVersion, '20.3.0') ||
         // https://github.com/angular/angular-cli/releases/tag/19.2.16
-        (angularMajorVersion === 19 && (0, semver_1.gte)(angularVersion, '19.2.16')) ||
-        // https://github.com/angular/angular-cli/releases/tag/18.2.21
-        (angularMajorVersion === 18 && (0, semver_1.gte)(angularVersion, '18.2.21'));
+        (angularMajorVersion === 19 && (0, semver_1.gte)(angularVersion, '19.2.16'));
     (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
         ...options,
         provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')

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

@@ -1 +1 @@
-{"version":3,"file":"generate-server-ts-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-server-ts-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QA6BpC;AAED,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAgDpC"}
+{"version":3,"file":"generate-server-ts-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-server-ts-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAKpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAuBpC;AAED,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QA8EpC"}

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

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
 exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 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 { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -17,15 +19,9 @@ function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
             // server file is already included, no need to add it
             return json;
         }
-        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         const files = new Set(json.files ?? []);
         files.add((0, devkit_1.joinPathFragments)('src', options.main));
-        if (angularMajorVersion >= 19) {
-            files.add((0, devkit_1.joinPathFragments)('src', options.serverFileName));
-        }
-        else {
-            files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
-        }
+        files.add((0, devkit_1.joinPathFragments)('src', options.serverFileName));
         json.files = Array.from(files);
         return json;
     });
@@ -41,11 +37,8 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
     if (angularMajorVersion >= 20) {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'v20+', 'server-builder', 'root');
     }
-    else if (angularMajorVersion === 19) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', 'server-builder', 'root');
-    }
     else {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', 'root');
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', 'server-builder', 'root');
     }
     (0, devkit_1.generateFiles)(tree, pathToFiles, project.root, {
         ...options,
@@ -53,10 +46,11 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
         hasLocalizePackage,
         tpl: '',
     });
+    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: (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.server.json'),
+            path: tsconfigServerPath,
         });
         return json;
     });
@@ -72,4 +66,24 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
             return json;
         });
     }
+    if (angularMajorVersion >= 21) {
+        // remove module and moduleResolution from tsconfig.server.json
+        (0, devkit_1.updateJson)(tree, tsconfigServerPath, (json) => {
+            delete json.compilerOptions.module;
+            delete json.compilerOptions.moduleResolution;
+            return json;
+        });
+        // read the parsed compiler options from tsconfig.server.json
+        const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsconfigServerPath);
+        const ts = (0, ensure_typescript_1.ensureTypescript)();
+        if (compilerOptions.module === ts.ModuleKind.Preserve &&
+            compilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler) {
+            return;
+        }
+        (0, devkit_1.updateJson)(tree, tsconfigServerPath, (json) => {
+            json.compilerOptions.module = 'preserve';
+            json.compilerOptions.moduleResolution = 'bundler';
+            return json;
+        });
+    }
 }

package/src/generators/setup-ssr/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CAsDrC"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CA+CrC"}

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

@@ -21,13 +21,9 @@ async function normalizeOptions(tree, options) {
             }, { serverRouting: false }).then(({ serverRouting }) => serverRouting);
         }
         else {
-            options.serverRouting = angularMajorVersion >= 20;
+            options.serverRouting = true;
         }
     }
-    else if (options.serverRouting !== undefined &&
-        !isUsingApplicationBuilder) {
-        throw new Error('Server routing APIs can only be added to a project using `application` builder.');
-    }
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,

package/src/generators/setup-ssr/lib/update-project-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAWvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CA4DN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAuFpC"}
+{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAUvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAmDN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAmFpC"}