@nx/angular 20.2.0-canary.20241130-ec5a5e6 → 20.2.0-canary.20241203-6b87005

package/src/generators/scam-directive/lib/normalize-options.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const validations_1 = require("../../utils/validations");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
@@ -12,6 +13,7 @@ async function normalizeOptions(tree, options) {
     const { className } = (0, devkit_1.names)(name);
     const { className: suffixClassName } = (0, devkit_1.names)('directive');
     const symbolName = `${className}${suffixClassName}`;
+    (0, validations_1.validateClassName)(symbolName);
     return {
         ...options,
         export: options.export ?? true,

package/src/generators/scam-pipe/lib/normalize-options.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const validations_1 = require("../../utils/validations");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
@@ -12,6 +13,7 @@ async function normalizeOptions(tree, options) {
     const { className } = (0, devkit_1.names)(name);
     const { className: suffixClassName } = (0, devkit_1.names)('pipe');
     const symbolName = `${className}${suffixClassName}`;
+    (0, validations_1.validateClassName)(symbolName);
     return {
         ...options,
         export: options.export ?? true,

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.d.ts

@@ -1,3 +1,3 @@
+import { type Tree } from '@nx/devkit';
 import type { Node, SourceFile } from 'typescript';
-import { Tree } from 'nx/src/generators/tree';
 export declare function convertScamToStandalone(componentAST: SourceFile, componentFileContents: string, importsArray: string[], providersArray: string[], moduleNodes: Array<Node>, tree: Tree, normalizedComponentPath: string, componentName: string): void;

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

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertScamToStandalone = convertScamToStandalone;
+const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const path_2 = require("nx/src/utils/path");
+const version_utils_1 = require("../../utils/version-utils");
 function convertScamToStandalone(componentAST, componentFileContents, importsArray, providersArray, moduleNodes, tree, normalizedComponentPath, componentName) {
     let newComponentContents = '';
     const COMPONENT_PROPERTY_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression';
     const { tsquery } = require('@phenomnomnominal/tsquery');
     const componentDecoratorMetadataNode = tsquery(componentAST, COMPONENT_PROPERTY_SELECTOR, { visitAllChildren: true })[0];
-    newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({
-    standalone: true,
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({${angularMajorVersion < 19 ? `\nstandalone: true,` : ''}
     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);
-    const pathToComponentSpec = (0, path_2.joinPathFragments)(componentPathParts.dir, '/', `${componentPathParts.name}.spec.ts`);
+    const pathToComponentSpec = (0, devkit_1.joinPathFragments)(componentPathParts.dir, '/', `${componentPathParts.name}.spec.ts`);
     if (tree.exists(pathToComponentSpec)) {
         const componentSpecContents = tree.read(pathToComponentSpec, 'utf-8');
         // Only support testbed based tests

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

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

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

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

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

@@ -3,7 +3,9 @@ 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, { appName, routing, prefix, standalone }, appRoot) {
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, standalone
         ? (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-entry-component-files')
         : (0, devkit_1.joinPathFragments)(__dirname, '../files/entry-module-files'), `${appRoot}/src/app/remote-entry`, {
@@ -11,6 +13,9 @@ function addRemoteEntry(tree, { appName, routing, prefix, standalone }, appRoot)
         appName,
         routing,
         prefix,
+        // Angular v19 or higher defaults to true, while v18 or lower defaults to false
+        setStandaloneFalse: angularMajorVersion >= 19,
+        setStandaloneTrue: angularMajorVersion < 19,
     });
     if (standalone && routing) {
         (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.routes').then(m => m.remoteRoutes)}`);

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

@@ -9,7 +9,7 @@ import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><
 export function app(): express.Express {
   const server = express();
   const serverDistFolder = dirname(fileURLToPath(import.meta.url));
-  const browserDistFolder = resolve(serverDistFolder, '../<%= browserBundleOutputPath %>');
+  const browserDistFolder = resolve(serverDistFolder, '../<%= browserDistDirectory %>');
   const indexHtml = join(serverDistFolder, 'index.server.html');
 
   const commonEngine = new CommonEngine();

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

@@ -10,7 +10,7 @@ import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><
 // 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 distFolder = join(process.cwd(), '<%= browserDistDirectory %>');
   const indexHtml = existsSync(join(distFolder, 'index.original.html'))
     ? join(distFolder, 'index.original.html')
     : join(distFolder, 'index.html');

package/src/generators/setup-ssr/files/v19+/application-builder/ngmodule-src/__main__

@@ -0,0 +1 @@
+export { <%= rootModuleClassName %> as default } from './app/<%= rootModuleFileName.slice(0, -3) %>';

package/src/generators/setup-ssr/files/v19+/application-builder/ngmodule-src/app/__rootModuleFileName__

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { ServerModule } from '@angular/platform-server';<% if(serverRouting) { %>
+import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { AppComponent } from './app.component';
+import { AppModule } from './app.module';<% if(serverRouting) { %>
+import { serverRoutes } from './app.routes.server';<% } %>
+
+@NgModule({
+  imports: [AppModule, ServerModule],<% if(serverRouting) { %>
+  providers: [provideServerRoutesConfig(serverRoutes)],<% } %>
+  bootstrap: [AppComponent],
+})
+export class <%= rootModuleClassName %> {}

package/src/generators/setup-ssr/files/v19+/application-builder/ngmodule-src/app/app.routes.server.ts__tpl__

@@ -0,0 +1,8 @@
+import { RenderMode, ServerRoute } from '@angular/ssr';
+
+export const serverRoutes: ServerRoute[] = [
+  {
+    path: '**',
+    renderMode: RenderMode.Prerender
+  }
+];

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

@@ -0,0 +1,66 @@
+import {
+  AngularNodeAppEngine,
+  createNodeRequestHandler,
+  isMainModule,
+  writeResponseToNodeResponse,
+} from '@angular/ssr/node';
+import express from 'express';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const serverDistFolder = dirname(fileURLToPath(import.meta.url));
+const browserDistFolder = resolve(serverDistFolder, '../<%= browserDistDirectory %>');
+
+const app = express();
+const angularApp = new AngularNodeAppEngine();
+
+/**
+ * Example Express Rest API endpoints can be defined here.
+ * Uncomment and define endpoints as necessary.
+ *
+ * Example:
+ * ```ts
+ * app.get('/api/**', (req, res) => {
+ *   // Handle API request
+ * });
+ * ```
+ */
+
+/**
+ * Serve static files from /<%= browserDistDirectory %>
+ */
+app.use(
+  express.static(browserDistFolder, {
+    maxAge: '1y',
+    index: false,
+    redirect: false,
+  })
+);
+
+/**
+ * Handle all other requests by rendering the Angular application.
+ */
+app.use('/**', (req, res, next) => {
+  angularApp
+    .handle(req)
+    .then((response) =>
+      response ? writeResponseToNodeResponse(response, res) : next()
+    )
+    .catch(next);
+});
+
+/**
+ * Start the server if this module is the main entry point.
+ * The server listens on the port defined by the `PORT` environment variable, or defaults to <%= serverPort %>.
+ */
+if (isMainModule(import.meta.url)) {
+  const port = process.env['PORT'] || <%= serverPort %>;
+  app.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+/**
+ * The request handler used by the Angular CLI (dev-server and during build).
+ */
+export const reqHandler = createNodeRequestHandler(app);

package/src/generators/setup-ssr/files/v19+/application-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+/application-builder/standalone-src/app/app.config.server.ts__tpl__

@@ -0,0 +1,14 @@
+import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
+import { provideServerRendering } from '@angular/platform-server';<% if(serverRouting) { %>
+import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { appConfig } from './app.config';<% if(serverRouting) { %>
+import { serverRoutes } from './app.routes.server';<% } %>
+
+const serverConfig: ApplicationConfig = {
+  providers: [
+    provideServerRendering()<% if(serverRouting) { %>,
+    provideServerRoutesConfig(serverRoutes)<% } %>
+  ]
+};
+
+export const config = mergeApplicationConfig(appConfig, serverConfig);

package/src/generators/setup-ssr/files/v19+/application-builder/standalone-src/app/app.routes.server.ts__tpl__

@@ -0,0 +1,8 @@
+import { RenderMode, ServerRoute } from '@angular/ssr';
+
+export const serverRoutes: ServerRoute[] = [
+  {
+    path: '**',
+    renderMode: RenderMode.Prerender
+  }
+];

package/src/generators/setup-ssr/files/v19+/application-builder-common-engine/server/__serverFileName__

@@ -0,0 +1,65 @@
+import { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine, isMainModule } from '@angular/ssr/node';
+import express from 'express';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './<%= main.slice(0, -3) %>';
+
+const serverDistFolder = dirname(fileURLToPath(import.meta.url));
+const browserDistFolder = resolve(serverDistFolder, '../<%= browserDistDirectory %>');
+const indexHtml = join(serverDistFolder, 'index.server.html');
+
+const app = express();
+const commonEngine = new CommonEngine();
+
+/**
+ * Example Express Rest API endpoints can be defined here.
+ * Uncomment and define endpoints as necessary.
+ *
+ * Example:
+ * ```ts
+ * app.get('/api/**', (req, res) => {
+ *   // Handle API request
+ * });
+ * ```
+ */
+
+/**
+ * Serve static files from /<%= browserDistDirectory %>
+ */
+app.get(
+  '**',
+  express.static(browserDistFolder, {
+    maxAge: '1y',
+    index: 'index.html'
+  }),
+);
+
+/**
+ * Handle all other requests by rendering the Angular application.
+ */
+app.get('**', (req, res, next) => {
+  const { protocol, originalUrl, baseUrl, headers } = req;
+
+  commonEngine
+    .render({
+      bootstrap<% if (!standalone) { %>: <%= rootModuleClassName %><% } %>,
+      documentFilePath: indexHtml,
+      url: `${protocol}://${headers.host}${originalUrl}`,
+      publicPath: browserDistFolder,
+      providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+    })
+    .then((html) => res.send(html))
+    .catch((err) => next(err));
+});
+
+/**
+ * Start the server if this module is the main entry point.
+ * The server listens on the port defined by the `PORT` environment variable, or defaults to 4000.
+ */
+if (isMainModule(import.meta.url)) {
+  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/v19+/server-builder/ngmodule-src/__main__

@@ -0,0 +1 @@
+export { <%= rootModuleClassName %> as default } from './app/<%= rootModuleFileName.slice(0, -3) %>';

package/src/generators/setup-ssr/files/v19+/server-builder/ngmodule-src/app/__rootModuleFileName__

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { ServerModule } from '@angular/platform-server';
+
+import { AppModule } from './app.module';
+import { AppComponent } from './app.component';
+
+@NgModule({
+  imports: [
+    AppModule,
+    ServerModule,
+  ],
+  bootstrap: [AppComponent],
+})
+export class <%= rootModuleClassName %> {}

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'));
     }
 }