@nx/angular 20.2.0-canary.20241130-ec5a5e6 → 20.2.0-canary.20241204-75b2080

package/src/generators/setup-ssr/files/v19+/server-builder/root/tsconfig.server.json.template

@@ -0,0 +1,16 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+  "extends": "./tsconfig.app.json",
+  "compilerOptions": {
+    "outDir": "<%= rootOffset %>out-tsc/server",
+    "types": [
+      "node"<% if (hasLocalizePackage) { %>,
+      "@angular/localize"<% } %>
+    ]
+  },
+  "files": [
+    "src/<%= main %>",
+    "src/server.ts"
+  ]
+}

package/src/generators/setup-ssr/files/{server/server-builder/pre-v17 → v19+/server-builder/server}/__serverFileName__

@@ -1,22 +1,21 @@
-import 'zone.js/dist/zone-node';
+import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';
-import { ngExpressEngine } from '@nguniversal/express-engine';
+import { CommonEngine } from '@angular/ssr/node';
 import * as express from 'express';
-import { existsSync } from 'fs';
-import { join } from 'path';
-import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './<%= main.slice(0, -3) %>';
 
 // 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(), '<%= browserBundleOutputPath %>');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
+  const distFolder = join(process.cwd(), '<%= browserDistDirectory %>');
+  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
+    ? join(distFolder, 'index.original.html')
+    : join(distFolder, 'index.html');
 
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
-  server.engine('html', ngExpressEngine({
-    bootstrap<% if (!standalone) { %>: <%= rootModuleClassName %><% } %>,
-  }));
+  const commonEngine = new CommonEngine();
 
   server.set('view engine', 'html');
   server.set('views', distFolder);
@@ -28,9 +27,20 @@ export function app(): express.Express {
     maxAge: '1y'
   }));
 
-  // All regular routes use the Universal engine
-  server.get('*', (req, res) => {
-    res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
+  // All regular routes use the Angular engine
+  server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
+    commonEngine
+      .render({
+        bootstrap<% if (!standalone) { %>: <%= rootModuleClassName %><% } %>,
+        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;
@@ -56,4 +66,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 
-export <% if (standalone) { %>default bootstrap<% } else { %>* from './src/<%= main.slice(0, -3) %>'<% } %>;
+export default <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %>;

package/src/generators/setup-ssr/files/v19+/server-builder/standalone-src/__main__

@@ -0,0 +1,7 @@
+import { bootstrapApplication } from '@angular/platform-browser';
+import { AppComponent } from './app/app.component';
+import { config } from './app/app.config.server';
+
+const bootstrap = () => bootstrapApplication(AppComponent, config);
+
+export default bootstrap;

package/src/generators/setup-ssr/files/v19+/server-builder/standalone-src/app/app.config.server.ts.template

@@ -0,0 +1,11 @@
+import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
+import { provideServerRendering } from '@angular/platform-server';
+import { appConfig } from './app.config';
+
+const serverConfig: ApplicationConfig = {
+  providers: [
+    provideServerRendering()
+  ]
+};
+
+export const config = mergeApplicationConfig(appConfig, serverConfig);

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

@@ -6,7 +6,7 @@ const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function addDependencies(tree, isUsingApplicationBuilder) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
-    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const dependencies = {
         '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
             ?.version ?? pkgVersions.angularVersion,
@@ -15,22 +15,11 @@ function addDependencies(tree, isUsingApplicationBuilder) {
     const devDependencies = {
         '@types/express': pkgVersions.typesExpressVersion,
     };
-    if (angularMajorVersion >= 17) {
-        dependencies['@angular/ssr'] =
-            (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular-devkit/build-angular')
-                ?.version ?? pkgVersions.angularDevkitVersion;
-        if (!isUsingApplicationBuilder && (0, semver_1.gte)(angularVersion, '17.1.0')) {
-            devDependencies['browser-sync'] = pkgVersions.browserSyncVersion;
-        }
-    }
-    else {
-        dependencies['@nguniversal/express-engine'] =
-            (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')
-                ?.version ??
-                pkgVersions.ngUniversalVersion;
-        devDependencies['@nguniversal/builders'] =
-            (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')?.version ??
-                pkgVersions.ngUniversalVersion;
+    dependencies['@angular/ssr'] =
+        (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular-devkit/build-angular')
+            ?.version ?? pkgVersions.angularDevkitVersion;
+    if (!isUsingApplicationBuilder && (0, semver_1.gte)(angularVersion, '17.1.0')) {
+        devDependencies['browser-sync'] = pkgVersions.browserSyncVersion;
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
 }

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

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

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

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 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) {
@@ -25,11 +26,18 @@ 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()';
     if (options.standalone) {
-        (0, ast_utils_1.addProviderToAppConfig)(tree, pathToClientConfigFile, 'provideClientHydration()');
+        (0, ast_utils_1.addProviderToAppConfig)(tree, pathToClientConfigFile, provider);
     }
     else {
-        (0, ast_utils_1.addProviderToModule)(tree, sourceFile, pathToClientConfigFile, 'provideClientHydration()');
+        (0, ast_utils_1.addProviderToModule)(tree, sourceFile, pathToClientConfigFile, provider);
     }
 }

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

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

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

@@ -2,21 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServerFile = addServerFile;
 const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
 const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
-function addServerFile(tree, schema, isUsingApplicationBuilder) {
-    const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    const { outputPath } = targets.build.options;
-    const browserBundleOutputPath = isUsingApplicationBuilder
+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 pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'server', ...(isUsingApplicationBuilder
-        ? ['application-builder']
-        : angularMajorVersion >= 17
-            ? ['server-builder', 'v17+']
-            : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+    const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
+    let pathToFiles;
+    if (angularMajorVersion >= 19) {
+        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 = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    (0, devkit_1.generateFiles)(tree, pathToFiles, angularMajorVersion >= 19 ? sourceRoot : project.root, {
+        ...options,
+        browserDistDirectory,
+        tpl: '',
+    });
 }
 function getApplicationBuilderBrowserOutputPath(outputPath) {
     if (outputPath) {

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

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

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

@@ -2,18 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
-function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
-    const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    if (targets.server ||
-        (isUsingApplicationBuilder && targets.build.options?.server !== undefined)) {
+const path_1 = require("path");
+const version_utils_1 = require("../../utils/version-utils");
+function generateSSRFiles(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (project.targets.server ||
+        (options.isUsingApplicationBuilder &&
+            project.targets.build.options?.server !== undefined)) {
         // server has already been added
         return;
     }
-    const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
+    let pathToFiles;
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', options.isUsingApplicationBuilder
+            ? 'application-builder'
+            : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule'), projectRoot, { ...schema, tpl: '' });
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
+    }
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, { ...options, tpl: '' });
+    if (angularMajorVersion >= 19 && !options.serverRouting) {
+        tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.server.ts'));
     }
 }

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

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

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

@@ -4,13 +4,20 @@ exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptions
 exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const version_utils_1 = require("../../utils/version-utils");
 function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
     const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const tsConfigPath = targets.build.options.tsConfig;
     (0, devkit_1.updateJson)(tree, tsConfigPath, (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));
-        files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        if (angularMajorVersion >= 19) {
+            files.add((0, devkit_1.joinPathFragments)('src', options.serverFileName));
+        }
+        else {
+            files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        }
         json.files = Array.from(files);
         json.compilerOptions ??= {};
         const types = new Set(json.compilerOptions.types ?? []);
@@ -20,9 +27,23 @@ function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
     });
 }
 function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '..', 'files', 'root'), root, {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const hasLocalizePackage = !!packageJson.dependencies?.['@angular/localize'] ||
+        !!packageJson.devDependencies?.['@angular/localize'];
+    const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
+    let pathToFiles;
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', 'server-builder', 'root');
+    }
+    else {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', 'root');
+    }
+    (0, devkit_1.generateFiles)(tree, pathToFiles, project.root, {
         ...options,
+        rootOffset: (0, devkit_1.offsetFromRoot)(project.root),
+        hasLocalizePackage,
         tpl: '',
     });
 }

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

@@ -1,14 +1,3 @@
-import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function normalizeOptions(tree: Tree, options: Schema): {
-    project: string;
-    appId: string;
-    main: string;
-    serverFileName: string;
-    serverPort: number;
-    rootModuleFileName: string;
-    rootModuleClassName: string;
-    skipFormat: boolean;
-    standalone: boolean;
-    hydration: boolean;
-};
+import { type Tree } from '@nx/devkit';
+import type { NormalizedGeneratorOptions, Schema } from '../schema';
+export declare function normalizeOptions(tree: Tree, options: Schema): Promise<NormalizedGeneratorOptions>;

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

@@ -1,15 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const devkit_1 = require("@nx/devkit");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const version_utils_1 = require("../../utils/version-utils");
-function normalizeOptions(tree, options) {
-    const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
-    let hydration = options.hydration;
-    if (hydration === undefined) {
+async function normalizeOptions(tree, options) {
+    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
+        targets.build.executor === '@angular/build:application' ||
+        targets.build.executor === '@nx/angular:application';
+    if (options.serverRouting === undefined && isUsingApplicationBuilder) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        hydration = angularMajorVersion >= 17;
+        if (angularMajorVersion >= 19) {
+            options.serverRouting = await (0, prompt_1.promptWhenInteractive)({
+                type: 'confirm',
+                name: 'serverRouting',
+                message: 'Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?',
+                initial: false,
+            }, { serverRouting: false }).then(({ serverRouting }) => serverRouting);
+        }
+        else {
+            options.serverRouting = false;
+        }
     }
+    const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,
         appId: options.appId ?? 'serverApp',
@@ -20,6 +35,8 @@ function normalizeOptions(tree, options) {
         rootModuleClassName: options.rootModuleClassName ?? 'AppServerModule',
         skipFormat: options.skipFormat ?? false,
         standalone: options.standalone ?? isStandaloneApp,
-        hydration,
+        hydration: options.hydration ?? true,
+        serverRouting: options.serverRouting,
+        isUsingApplicationBuilder,
     };
 }

package/src/generators/setup-ssr/lib/set-router-initial-navigation.d.ts

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

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

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

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

@@ -23,17 +23,32 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
             outputPath = outputPath.base;
         }
     }
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
-    buildTarget.options.server = (0, devkit_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src'), options.main);
-    buildTarget.options.prerender = true;
-    buildTarget.options.ssr = {
-        entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
-    };
+    buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
+    if (angularMajorVersion >= 19) {
+        buildTarget.options.ssr = {
+            entry: (0, devkit_1.joinPathFragments)(sourceRoot, options.serverFileName),
+        };
+        if (options.serverRouting) {
+            buildTarget.options.outputMode = 'server';
+        }
+        else {
+            buildTarget.options.prerender = true;
+        }
+    }
+    else {
+        buildTarget.options.prerender = true;
+        buildTarget.options.ssr = {
+            entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
+        };
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
-function updateProjectConfigForBrowserBuilder(tree, schema) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+function updateProjectConfigForBrowserBuilder(tree, options) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildTarget = projectConfig.targets.build;
     const baseOutputPath = buildTarget.options.outputPath;
     buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
@@ -44,6 +59,8 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
             configurations[key] = getServerOptions(options);
         }
     }
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const sourceRoot = projectConfig.sourceRoot ?? (0, devkit_1.joinPathFragments)(projectConfig.root, 'src');
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
@@ -51,50 +68,45 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
             : '@nx/angular:webpack-server',
         options: {
             outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
-            main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
+            main: (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19 ? sourceRoot : projectConfig.root, options.serverFileName),
             tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json'),
             ...(buildTarget.options ? getServerOptions(buildTarget.options) : {}),
         },
         configurations,
         defaultConfiguration: 'production',
     };
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     projectConfig.targets['serve-ssr'] = {
-        executor: angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:ssr-dev-server'
-            : '@nguniversal/builders:ssr-dev-server',
+        executor: '@angular-devkit/build-angular:ssr-dev-server',
         configurations: {
             development: {
-                browserTarget: `${schema.project}:build:development`,
-                serverTarget: `${schema.project}:server:development`,
+                browserTarget: `${options.project}:build:development`,
+                serverTarget: `${options.project}:server:development`,
             },
             production: {
-                browserTarget: `${schema.project}:build:production`,
-                serverTarget: `${schema.project}:server:production`,
+                browserTarget: `${options.project}:build:production`,
+                serverTarget: `${options.project}:server:production`,
             },
         },
         defaultConfiguration: 'development',
     };
     projectConfig.targets.prerender = {
-        executor: angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:prerender'
-            : '@nguniversal/builders:prerender',
+        executor: '@angular-devkit/build-angular:prerender',
         options: {
             routes: ['/'],
         },
         configurations: {
             development: {
-                browserTarget: `${schema.project}:build:development`,
-                serverTarget: `${schema.project}:server:development`,
+                browserTarget: `${options.project}:build:development`,
+                serverTarget: `${options.project}:server:development`,
             },
             production: {
-                browserTarget: `${schema.project}:build:production`,
-                serverTarget: `${schema.project}:server:production`,
+                browserTarget: `${options.project}:build:production`,
+                serverTarget: `${options.project}:server:production`,
             },
         },
         defaultConfiguration: 'production',
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {

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

@@ -3,9 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = validateOptions;
 const devkit_1 = require("@nx/devkit");
 const validations_1 = require("../../utils/validations");
+const version_utils_1 = require("../../utils/version-utils");
 function validateOptions(tree, options) {
     validateProject(tree, options.project);
     validateBuildTarget(tree, options.project);
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 19 && options.serverRouting) {
+        throw new Error(`The "serverRouting" option is only supported in Angular versions >= 19.0.0. You are using Angular ${angularVersion}.`);
+    }
 }
 function validateProject(tree, project) {
     (0, validations_1.validateProject)(tree, project);

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

@@ -8,6 +8,11 @@ export interface Schema {
   rootModuleClassName?: string;
   standalone?: boolean;
   hydration?: boolean;
+  serverRouting?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
 }
+
+export interface NormalizedGeneratorOptions extends Schema {
+  isUsingApplicationBuilder: boolean;
+}

package/src/generators/setup-ssr/schema.json

@@ -16,13 +16,6 @@
       "x-prompt": "What app would you like to generate an Angular Universal configuration for?",
       "x-dropdown": "projects"
     },
-    "appId": {
-      "type": "string",
-      "format": "html-selector",
-      "description": "The `appId` to use with `withServerTransition`.",
-      "default": "serverApp",
-      "x-deprecated": "This is deprecated and ignored since Angular 16 and not supported since Angular 17."
-    },
     "main": {
       "type": "string",
       "format": "path",
@@ -56,7 +49,12 @@
     },
     "hydration": {
       "type": "boolean",
-      "description": "Set up Hydration for the SSR application. It defaults to `true` for Angular versions >= 17.0.0. Otherwise, it defaults to `false`."
+      "description": "Set up Hydration for the SSR application.",
+      "default": true
+    },
+    "serverRouting": {
+      "description": "Creates a server application using the Server Routing and App Engine APIs (Developer Preview). _Note: this is only supported in Angular versions >= 19.0.0_.",
+      "type": "boolean"
     },
     "skipFormat": {
       "type": "boolean",

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

@@ -2,26 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsr = setupSsr;
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
-    const options = (0, lib_1.normalizeOptions)(tree, schema);
-    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
-        targets.build.executor === '@nx/angular:application';
+    const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (!schema.skipPackageJson) {
-        (0, lib_1.addDependencies)(tree, isUsingApplicationBuilder);
+        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder);
     }
-    (0, lib_1.generateSSRFiles)(tree, options, isUsingApplicationBuilder);
+    (0, lib_1.generateSSRFiles)(tree, options);
     if (options.hydration) {
         (0, lib_1.addHydration)(tree, options);
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 17 || !options.hydration) {
+    if (!options.hydration) {
         (0, lib_1.setRouterInitialNavigation)(tree, options);
     }
-    if (isUsingApplicationBuilder) {
+    if (options.isUsingApplicationBuilder) {
         (0, lib_1.updateProjectConfigForApplicationBuilder)(tree, options);
         (0, lib_1.setServerTsConfigOptionsForApplicationBuilder)(tree, options);
     }
@@ -29,7 +24,7 @@ async function setupSsr(tree, schema) {
         (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
         (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
     }
-    (0, lib_1.addServerFile)(tree, options, isUsingApplicationBuilder);
+    (0, lib_1.addServerFile)(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }