@nx/angular 17.0.3 → 17.0.4

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

@@ -15,7 +15,7 @@ function updateHostAppRoutes(tree, options) {
         ? options.remotes.reduce((routes, remote) => `${routes}\n<li><a routerLink='${remote}'>${(0, devkit_1.names)(remote).className}</a></li>`, '')
         : '';
     tree.write((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.component.html'), `<ul class="remote-menu">
-<li><a routerLink='/'>Home</a></li>${remoteRoutes}
+<li><a routerLink="/">Home</a></li>${remoteRoutes}
 </ul>
 <router-outlet></router-outlet>
 `);
@@ -31,7 +31,7 @@ function updateHostAppRoutes(tree, options) {
       component: NxWelcomeComponent
     }`);
     tree.write(pathToHostRootRoutingFile, `import { NxWelcomeComponent } from './nx-welcome.component';
-    ${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
+${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/host-files'), (0, devkit_1.joinPathFragments)(sourceRoot, 'app'), {
         appName: options.appName,
         standalone: options.standalone,

package/src/generators/{pipe/lib/validate-options.d.ts → setup-mf/lib/update-tsconfig.d.ts}

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

package/src/generators/setup-mf/lib/update-tsconfig.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsConfig = void 0;
+const devkit_1 = require("@nx/devkit");
+function updateTsConfig(tree, schema) {
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.appName);
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(root, `tsconfig.app.json`), (json) => {
+        json.compilerOptions ??= {};
+        json.compilerOptions.target = 'ES2020';
+        if (schema.mfType === 'remote') {
+            json.files ??= [];
+            json.files.push(schema.standalone
+                ? 'src/app/remote-entry/entry.routes.ts'
+                : 'src/app/remote-entry/entry.module.ts');
+        }
+        return json;
+    });
+}
+exports.updateTsConfig = updateTsConfig;

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

@@ -15,6 +15,7 @@ export interface Schema {
   standalone?: boolean;
   skipE2E?: boolean;
   typescriptConfiguration?: boolean;
+  setParserOptionsProject?: boolean;
 }
 
 export interface NormalizedOptions extends Schema {

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorAngularMFSetup",
   "cli": "nx",
   "title": "Generate Module Federation Setup for Angular App",
@@ -71,13 +71,18 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Whether the application is a standalone application. _Note: This is only supported in Angular versions >= 14.1.0_",
-      "default": false
+      "description": "Whether the application is a standalone application.",
+      "default": true
     },
     "typescriptConfiguration": {
       "type": "boolean",
       "description": "Whether the module federation configuration and webpack configuration files should use TS.",
       "default": true
+    },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "default": false
     }
   },
   "required": ["appName", "mfType"],

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

@@ -3,14 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupMf = void 0;
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-const version_utils_1 = require("../utils/version-utils");
 const versions_1 = require("../../utils/versions");
-const semver_1 = require("semver");
 async function setupMf(tree, rawOptions) {
-    const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if ((0, semver_1.lt)(installedAngularInfo.version, '14.1.0') && rawOptions.standalone) {
-        throw new Error(`The --standalone flag is not supported in your current version of Angular (${installedAngularInfo.version}). Please update to a version of Angular that supports Standalone Components (>= 14.1.0).`);
-    }
     const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     let installTask = () => { };
@@ -24,7 +18,7 @@ async function setupMf(tree, rawOptions) {
     const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
     (0, lib_1.generateWebpackConfig)(tree, options, projectConfig.root, remotesWithPorts);
     (0, lib_1.changeBuildTarget)(tree, options);
-    (0, lib_1.updateTsConfigTarget)(tree, options);
+    (0, lib_1.updateTsConfig)(tree, options);
     (0, lib_1.setupServeTarget)(tree, options);
     (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
     if (options.mfType === 'host') {

package/src/generators/setup-ssr/files/ngmodule/base/src/__main__

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

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

@@ -0,0 +1,56 @@
+import { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine } from '@angular/ssr';
+import express from 'express';
+import { fileURLToPath } from 'node:url';
+import { dirname, join, resolve } from 'node:path';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= 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 serverDistFolder = dirname(fileURLToPath(import.meta.url));
+  const browserDistFolder = resolve(serverDistFolder, '../<%= browserBundleOutputPath %>');
+  const indexHtml = join(serverDistFolder, 'index.server.html');
+
+  const commonEngine = new CommonEngine();
+
+  server.set('view engine', 'html');
+  server.set('views', browserDistFolder);
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  server.get('*.*', express.static(browserDistFolder, {
+    maxAge: '1y'
+  }));
+
+  // 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: browserDistFolder,
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+      })
+      .then((html) => res.send(html))
+      .catch((err) => next(err));
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env['PORT'] || <%= serverPort %>;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+run();

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

@@ -1,12 +1,11 @@
 import 'zone.js/dist/zone-node';
 
-import {APP_BASE_HREF} from '@angular/common';
-import {ngExpressEngine} from '@nguniversal/express-engine';
+import { APP_BASE_HREF } from '@angular/common';
+import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
-import {existsSync} from 'fs';
-import {join} from 'path';
-
-import {<%= rootModuleClassName %>} from './src/<%= main.slice(0, -3) %>';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
@@ -16,7 +15,7 @@ export function app(): express.Express {
 
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
   server.engine('html', ngExpressEngine({
-    bootstrap: <%= rootModuleClassName %>,
+    bootstrap<% if (!standalone) { %>: <%= rootModuleClassName %><% } %>,
   }));
 
   server.set('view engine', 'html');
@@ -57,4 +56,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 
-export * from './src/<%= main.slice(0, -3) %>';
+export <% if (standalone) { %>default bootstrap<% } else { %>* from './src/<%= main.slice(0, -3) %>'<% } %>;

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

@@ -1,23 +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 { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine } from '@angular/ssr';
 import * as express from 'express';
-import {existsSync} from 'fs';
-import {join} from 'path';
-
-import bootstrap from './src/<%= main.slice(0, -3) %>';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= 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 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
-  }));
+  const commonEngine = new CommonEngine();
 
   server.set('view engine', 'html');
   server.set('views', distFolder);
@@ -29,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;
@@ -57,4 +66,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 
-export default bootstrap;
+export default <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %>;

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

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

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

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+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 dependencies = {
+        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
+            ?.version ?? pkgVersions.angularVersion,
+        express: pkgVersions.expressVersion,
+    };
+    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;
+    }
+    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+}
+exports.addDependencies = addDependencies;

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

@@ -2,23 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addHydration = void 0;
 const devkit_1 = require("@nx/devkit");
-const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 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");
 let tsModule;
+let tsquery;
 function addHydration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
-    const addImport = (source, symbolName, packageName, filePath, isDefault = false) => {
-        return (0, js_1.insertImport)(tree, source, filePath, symbolName, packageName, isDefault);
-    };
     const pathToClientConfigFile = options.standalone
         ? (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.config.ts')
         : (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
     const sourceText = tree.read(pathToClientConfigFile, 'utf-8');
     let sourceFile = tsModule.createSourceFile(pathToClientConfigFile, sourceText, tsModule.ScriptTarget.Latest, true);
+    const provideClientHydrationCallExpression = tsquery(sourceFile, 'ObjectLiteralExpression PropertyAssignment:has(Identifier[name=providers]) ArrayLiteralExpression CallExpression:has(Identifier[name=provideClientHydration])')[0];
+    if (provideClientHydrationCallExpression) {
+        return;
+    }
+    const addImport = (source, symbolName, packageName, filePath, isDefault = false) => {
+        return (0, js_1.insertImport)(tree, source, filePath, symbolName, packageName, isDefault);
+    };
     sourceFile = addImport(sourceFile, 'provideClientHydration', '@angular/platform-browser', pathToClientConfigFile);
     if (options.standalone) {
         (0, ast_utils_1.addProviderToAppConfig)(tree, pathToClientConfigFile, 'provideClientHydration()');

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

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

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addServerFile = void 0;
+const devkit_1 = require("@nx/devkit");
+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
+        ? 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: '' });
+}
+exports.addServerFile = addServerFile;
+function getApplicationBuilderBrowserOutputPath(outputPath) {
+    if (outputPath) {
+        if (typeof outputPath === 'string') {
+            // when `outputPath` is a string, it's the base path, so we return the default browser path
+            return constants_1.DEFAULT_BROWSER_DIR;
+        }
+        return outputPath.browser ?? constants_1.DEFAULT_BROWSER_DIR;
+    }
+    return constants_1.DEFAULT_BROWSER_DIR;
+}

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

@@ -0,0 +1,3 @@
+export declare const DEFAULT_BROWSER_DIR = "browser";
+export declare const DEFAULT_MEDIA_DIR = "media";
+export declare const DEFAULT_SERVER_DIR = "server";

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

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

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): void;
+export declare function generateSSRFiles(tree: Tree, schema: Schema, isUsingApplicationBuilder: boolean): void;

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

@@ -4,27 +4,22 @@ exports.generateSSRFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
-const path_1 = require("path");
-function generateSSRFiles(tree, schema) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    const projectRoot = projectConfig.root;
-    const browserBundleOutputPath = projectConfig.targets.build.options.outputPath;
+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)) {
+        // server has already been added
+        return;
+    }
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(pathToFiles, 'base'), projectRoot, {
-        ...schema,
-        tpl: '',
-    });
+    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
-        const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        if (angularMajorVersion < 15) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
-        }
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, tpl: '' });
         if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, tpl: '' });
         }
     }
 }

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

@@ -0,0 +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;

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateTsConfigServerJsonForBrowserBuilder = exports.setServerTsConfigOptionsForApplicationBuilder = void 0;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+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 files = new Set(json.files ?? []);
+        files.add((0, devkit_1.joinPathFragments)('src', options.main));
+        files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        json.files = Array.from(files);
+        json.compilerOptions ??= {};
+        const types = new Set(json.compilerOptions.types ?? []);
+        types.add('node');
+        json.compilerOptions.types = Array.from(types);
+        return json;
+    });
+}
+exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
+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, {
+        ...options,
+        tpl: '',
+    });
+}
+exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;

package/src/generators/setup-ssr/lib/index.d.ts

@@ -1,6 +1,10 @@
+export * from './add-dependencies';
+export * from './add-server-file';
 export * from './generate-files';
+export * from './generate-server-ts-config';
 export * from './normalize-options';
 export * from './update-app-module';
 export * from './update-project-config';
 export * from './validate-options';
 export * from './add-hydration';
+export * from './set-router-initial-navigation';

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

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./add-dependencies"), exports);
+tslib_1.__exportStar(require("./add-server-file"), exports);
 tslib_1.__exportStar(require("./generate-files"), exports);
+tslib_1.__exportStar(require("./generate-server-ts-config"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-app-module"), exports);
 tslib_1.__exportStar(require("./update-project-config"), exports);
 tslib_1.__exportStar(require("./validate-options"), exports);
 tslib_1.__exportStar(require("./add-hydration"), exports);
+tslib_1.__exportStar(require("./set-router-initial-navigation"), exports);

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

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 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) {
+        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+        hydration = angularMajorVersion >= 17;
+    }
     return {
         project: options.project,
         appId: options.appId ?? 'serverApp',
@@ -14,7 +20,7 @@ function normalizeOptions(tree, options) {
         rootModuleClassName: options.rootModuleClassName ?? 'AppServerModule',
         skipFormat: options.skipFormat ?? false,
         standalone: options.standalone ?? isStandaloneApp,
-        hydration: options.hydration ?? false,
+        hydration,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

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

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

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setRouterInitialNavigation = void 0;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const typescript_1 = require("typescript");
+function setRouterInitialNavigation(tree, options) {
+    const printer = (0, typescript_1.createPrinter)();
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
+        // we are only interested in .ts files
+        if (!filePath.endsWith('.ts')) {
+            return;
+        }
+        if (options.standalone) {
+            processFileWithStandaloneSetup(tree, filePath, printer);
+        }
+        else {
+            processFileWithNgModuleSetup(tree, filePath, printer);
+        }
+    });
+}
+exports.setRouterInitialNavigation = setRouterInitialNavigation;
+function processFileWithStandaloneSetup(tree, filePath, printer) {
+    let content = tree.read(filePath, 'utf-8');
+    let sourceFile = tsquery_1.tsquery.ast(content);
+    const provideRouterCallExpression = getProvideRouterCallExpression(sourceFile);
+    if (!provideRouterCallExpression) {
+        return;
+    }
+    if (provideRouterCallExpression.arguments.some((arg) => (0, typescript_1.isCallExpression)(arg) &&
+        (0, typescript_1.isIdentifier)(arg.expression) &&
+        arg.expression.text === 'withEnabledBlockingInitialNavigation')) {
+        return;
+    }
+    const updatedProvideRouterCallExpression = printer.printNode(typescript_1.EmitHint.Unspecified, updateProvideRouterCallExpression(provideRouterCallExpression), sourceFile);
+    content = `${content.slice(0, provideRouterCallExpression.getStart())}${updatedProvideRouterCallExpression}${content.slice(provideRouterCallExpression.getEnd())}`;
+    tree.write(filePath, content);
+    sourceFile = tsquery_1.tsquery.ast(content);
+    sourceFile = (0, js_1.insertImport)(tree, sourceFile, filePath, 'withEnabledBlockingInitialNavigation', '@angular/router');
+    const withDisabledInitialNavigationImportNode = (0, tsquery_1.tsquery)(sourceFile, 'ImportDeclaration ImportSpecifier:has(Identifier[name=withDisabledInitialNavigation])')[0];
+    if (!withDisabledInitialNavigationImportNode) {
+        return;
+    }
+    const hasTrailingComma = withDisabledInitialNavigationImportNode.parent.elements.hasTrailingComma;
+    content = tree.read(filePath, 'utf-8');
+    tree.write(filePath, `${content.slice(0, withDisabledInitialNavigationImportNode.getStart())}${content.slice(withDisabledInitialNavigationImportNode.getEnd() +
+        (hasTrailingComma ? 1 : 0))}`);
+}
+function updateProvideRouterCallExpression(node) {
+    const filteredArgs = node.arguments.filter((arg) => !((0, typescript_1.isCallExpression)(arg) &&
+        (0, typescript_1.isIdentifier)(arg.expression) &&
+        arg.expression.text === 'withDisabledInitialNavigation'));
+    const initialNavigationFeatureArg = typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('withEnabledBlockingInitialNavigation'), [], []);
+    return typescript_1.factory.updateCallExpression(node, node.expression, node.typeArguments, [...filteredArgs, initialNavigationFeatureArg]);
+}
+function processFileWithNgModuleSetup(tree, filePath, printer) {
+    const content = tree.read(filePath, 'utf-8');
+    const sourceFile = tsquery_1.tsquery.ast(content);
+    const routerModuleForRootCallExpression = getRouterModuleForRootCallExpression(sourceFile);
+    if (!routerModuleForRootCallExpression) {
+        return;
+    }
+    const updatedRouterModuleForRootCallExpression = printer.printNode(typescript_1.EmitHint.Unspecified, updateRouterModuleForRootCallExpression(routerModuleForRootCallExpression), sourceFile);
+    tree.write(filePath, `${content.slice(0, routerModuleForRootCallExpression.getStart())}${updatedRouterModuleForRootCallExpression}${content.slice(routerModuleForRootCallExpression.getEnd())}`);
+}
+function updateRouterModuleForRootCallExpression(node) {
+    const existingOptions = node.arguments[1];
+    const existingProperties = existingOptions?.properties
+        ? typescript_1.factory.createNodeArray(existingOptions.properties.filter((exp) => !((0, typescript_1.isPropertyAssignment)(exp) &&
+            (0, typescript_1.isIdentifier)(exp.name) &&
+            exp.name.text === 'initialNavigation')))
+        : typescript_1.factory.createNodeArray();
+    const enabledLiteral = typescript_1.factory.createStringLiteral('enabledBlocking', true);
+    const initialNavigationProperty = typescript_1.factory.createPropertyAssignment('initialNavigation', enabledLiteral);
+    const routerOptions = existingOptions
+        ? typescript_1.factory.updateObjectLiteralExpression(existingOptions, typescript_1.factory.createNodeArray([
+            ...existingProperties,
+            initialNavigationProperty,
+        ]))
+        : typescript_1.factory.createObjectLiteralExpression(typescript_1.factory.createNodeArray([initialNavigationProperty]));
+    const args = [node.arguments[0], routerOptions];
+    return typescript_1.factory.createCallExpression(node.expression, node.typeArguments, args);
+}
+function getProvideRouterCallExpression(sourceFile) {
+    const routerModuleForRootCalls = (0, tsquery_1.tsquery)(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression CallExpression:has(Identifier[name=provideRouter])', { visitAllChildren: true });
+    return routerModuleForRootCalls.length ? routerModuleForRootCalls[0] : null;
+}
+function getRouterModuleForRootCallExpression(sourceFile) {
+    const routerModuleForRootCalls = (0, tsquery_1.tsquery)(sourceFile, 'Decorator > CallExpression:has(Identifier[name=NgModule]) PropertyAssignment:has(Identifier[name=imports]) > ArrayLiteralExpression CallExpression:has(Identifier[name=forRoot])', { visitAllChildren: true });
+    return routerModuleForRootCalls.length ? routerModuleForRootCalls[0] : null;
+}

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

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