@nx/angular 17.0.3 → 17.0.4

package/src/generators/ng-add/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularNgAddGenerator",
   "title": "Angular plugin initialization",
   "cli": "nx",

package/src/generators/ng-add/utilities/workspace.d.ts

@@ -7,7 +7,7 @@ export declare function createNxJson(tree: Tree, options: GeneratorOptions, defa
 export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
 export declare function updateRootTsConfig(tree: Tree): void;
 export declare function updatePackageJson(tree: Tree): void;
-export declare function updateRootEsLintConfig(tree: Tree, existingEsLintConfig: any | undefined, unitTestRunner?: string): void;
+export declare function updateRootEsLintConfig(tree: Tree, existingEsLintConfig: any | undefined, unitTestRunner?: string): Promise<void>;
 export declare function cleanupEsLintPackages(tree: Tree): void;
 export declare function createWorkspaceFiles(tree: Tree): Promise<void>;
 export declare function createRootKarmaConfig(tree: Tree): void;

package/src/generators/ng-add/utilities/workspace.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
+const setup_root_eslint_1 = require("@nx/eslint/src/generators/lint-project/setup-root-eslint");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
 const versions_1 = require("@nx/js/src/utils/versions");
@@ -28,9 +29,7 @@ exports.validateWorkspace = validateWorkspace;
 function createNxJson(tree, options, defaultProject) {
     const targets = getWorkspaceCommonTargets(tree);
     (0, devkit_1.writeJson)(tree, 'nx.json', {
-        affected: {
-            defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
-        },
+        defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
         namedInputs: {
             sharedGlobals: [],
             default: ['{projectRoot}/**/*', 'sharedGlobals'],
@@ -148,23 +147,17 @@ function updatePackageJson(tree) {
     });
 }
 exports.updatePackageJson = updatePackageJson;
-function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
-    if (tree.exists('.eslintrc.json')) {
-        /**
-         * If it still exists it means that there was no project at the root of the
-         * workspace, so it was not moved. In that case, we remove the file so the
-         * init generator do its work. We still receive the content of the file,
-         * so we update it after the init generator has run.
-         */
-        tree.delete('.eslintrc.json');
-    }
-    (0, eslint_1.lintInitGenerator)(tree, { linter: eslint_1.Linter.EsLint, unitTestRunner });
+async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
+    await (0, eslint_1.lintInitGenerator)(tree, {
+        addPlugin: false,
+    });
     if (!existingEsLintConfig) {
-        // There was no eslint config in the root, so we keep the generated one as-is.
+        // There was no eslint config in the root, so we set it up and use it as-is
+        (0, setup_root_eslint_1.setupRootEsLint)(tree, { unitTestRunner });
         return;
     }
     existingEsLintConfig.ignorePatterns = ['**/*'];
-    if (!(existingEsLintConfig.plugins ?? []).includes('@nrwl/nx')) {
+    if (!(existingEsLintConfig.plugins ?? []).includes('@nx')) {
         existingEsLintConfig.plugins = Array.from(new Set([...(existingEsLintConfig.plugins ?? []), '@nx']));
     }
     existingEsLintConfig.overrides?.forEach((override) => {

package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.models.ts__tmpl__

@@ -4,4 +4,4 @@
 export interface <%= className %>Entity {
   id: string | number; // Primary ID
   name: string;
-};
+}

package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.selectors.spec.ts__tmpl__

@@ -20,7 +20,7 @@ describe('<%= className %> Selectors', () => {
         create<%= className %>Entity('PRODUCT-CCC')
       ], {
         ...initial<%= className %>State,
-        selectedId : 'PRODUCT-BBB',
+        selectedId: 'PRODUCT-BBB',
         error: ERROR_MSG,
         loaded: true
       })

package/src/generators/ngrx/lib/generate-files.js

@@ -3,27 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateNgrxFilesFromTemplates = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
 /**
  * Generate 'feature' scaffolding: actions, reducer, effects, interfaces, selectors, facade
  */
 function generateNgrxFilesFromTemplates(tree, options) {
     const name = options.name;
     const projectNames = (0, devkit_1.names)(name);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.parentDirectory, {
         ...options,
         ...projectNames,
         importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'),
         tmpl: '',
     });
-    const angularVersion = (0, version_utils_1.getInstalledAngularVersion)(tree);
-    if ((0, semver_1.lt)(angularVersion, '14.1.0')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, {
-            ...options,
-            ...projectNames,
-            tmpl: '',
-        });
-    }
     if (!options.facade) {
         tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.ts`));
         tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.spec.ts`));

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

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
-const version_utils_2 = require("../../../utils/version-utils");
 function validateOptions(tree, options) {
     if (!options.module && !options.parent) {
         throw new Error('Please provide a value for "--parent"!');
@@ -14,25 +11,5 @@ function validateOptions(tree, options) {
     if (options.parent && !tree.exists(options.parent)) {
         throw new Error(`Parent does not exist: ${options.parent}.`);
     }
-    const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
-    const ngrxMajorVersion = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')?.major ??
-        (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
-    if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
-        const parentPath = options.parent ?? options.module;
-        const parentContent = tree.read(parentPath, 'utf-8');
-        const { tsquery } = require('@phenomnomnominal/tsquery');
-        const ast = tsquery.ast(parentContent);
-        const NG_MODULE_DECORATOR_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule])';
-        const nodes = tsquery(ast, NG_MODULE_DECORATOR_SELECTOR, {
-            visitAllChildren: true,
-        });
-        if (nodes.length === 0) {
-            throw new Error(`The provided parent path "${parentPath}" does not contain an "NgModule". ` +
-                'Please make sure to provide a path to an "NgModule" where the state will be registered. ' +
-                'If you are trying to use a "Routes" definition file (for Standalone API usage), ' +
-                'please note this is not supported in Angular versions lower than 14.1.0.');
-        }
-    }
 }
 exports.validateOptions = validateOptions;

package/src/generators/ngrx/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxNgrxGenerator",
   "title": "Add NgRx support to an application or library.",
   "description": "Adds NgRx support to an application or library.",
@@ -42,13 +42,13 @@
     },
     "parent": {
       "type": "string",
-      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your `app.module.ts` for your root state, or your Feature Module for feature state. For Standalone API usage, this will be your `app.config.ts` file for your root state, or the Routes definition file for your feature state. The host directory will create/use the new state directory. _Note: The Standalone API usage is only supported in Angular versions >= 14.1.0_.",
+      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your `app.module.ts` for your root state, or your Feature Module for feature state. For Standalone API usage, this will be your `app.config.ts` file for your root state, or the Routes definition file for your feature state. The host directory will create/use the new state directory.",
       "x-prompt": "What is the path to the module or Routes definition where this NgRx state should be registered?",
       "x-priority": "important"
     },
     "route": {
       "type": "string",
-      "description": "The route that the Standalone NgRx Providers should be added to. _Note: This is only supported in Angular versions >= 14.1.0_.",
+      "description": "The route that the Standalone NgRx Providers should be added to.",
       "default": "''"
     },
     "directory": {

package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.models.ts__tmpl__

@@ -4,4 +4,4 @@
 export interface <%= className %>Entity {
   id: string | number; // Primary ID
   name: string;
-};
+}

package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.selectors.spec.ts__tmpl__

@@ -20,7 +20,7 @@ describe('<%= className %> Selectors', () => {
         create<%= className %>Entity('PRODUCT-CCC')
       ], {
         ...initial<%= className %>State,
-        selectedId : 'PRODUCT-BBB',
+        selectedId: 'PRODUCT-BBB',
         error: ERROR_MSG,
         loaded: true
       })

package/src/generators/ngrx-feature-store/lib/generate-files.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFilesFromTemplates = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
 function generateFilesFromTemplates(tree, options) {
     const projectNames = (0, devkit_1.names)(options.name);
     const fileName = options.subdirectory
         ? (0, devkit_1.joinPathFragments)(options.subdirectory, projectNames.fileName)
         : projectNames.fileName;
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.parentDirectory, {
         ...options,
         ...projectNames,
         fileName,
@@ -17,16 +16,6 @@ function generateFilesFromTemplates(tree, options) {
         importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'),
         tmpl: '',
     });
-    const angularVersion = (0, version_utils_1.getInstalledAngularVersion)(tree);
-    if ((0, semver_1.lt)(angularVersion, '14.1.0')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, {
-            ...options,
-            ...projectNames,
-            fileName,
-            relativeFileName: projectNames.fileName,
-            tmpl: '',
-        });
-    }
     if (!options.facade) {
         tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${options.subdirectory ? `${options.subdirectory}/` : ''}${projectNames.fileName}.facade.ts`));
         tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${options.subdirectory ? `${options.subdirectory}/` : ''}${projectNames.fileName}.facade.spec.ts`));

package/src/generators/ngrx-feature-store/lib/validate-options.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const version_utils_1 = require("../..//utils/version-utils");
-const version_utils_2 = require("../../../utils/version-utils");
-const semver_1 = require("semver");
 function validateOptions(tree, options) {
     if (!options.parent) {
         throw new Error('Please provide a value for "--parent"!');
@@ -11,24 +8,5 @@ function validateOptions(tree, options) {
     if (options.parent && !tree.exists(options.parent)) {
         throw new Error(`Parent does not exist: ${options.parent}.`);
     }
-    const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
-    const ngrxMajorVersion = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')?.major ??
-        (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
-    if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
-        const parentContent = tree.read(options.parent, 'utf-8');
-        const { tsquery } = require('@phenomnomnominal/tsquery');
-        const ast = tsquery.ast(parentContent);
-        const NG_MODULE_DECORATOR_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule])';
-        const nodes = tsquery(ast, NG_MODULE_DECORATOR_SELECTOR, {
-            visitAllChildren: true,
-        });
-        if (nodes.length === 0) {
-            throw new Error(`The provided parent path "${options.parent}" does not contain an "NgModule". ` +
-                'Please make sure to provide a path to an "NgModule" where the state will be registered. ' +
-                'If you are trying to use a "Routes" definition file (for Standalone API usage), ' +
-                'please note this is not supported in Angular versions lower than 14.1.0.');
-        }
-    }
 }
 exports.validateOptions = validateOptions;

package/src/generators/ngrx-feature-store/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxNgrxFeatureStoreGenerator",
   "title": "NgRx Feature Store Generator",
   "description": "Add an NgRx Feature Store to an application or library.",
@@ -18,13 +18,13 @@
     },
     "parent": {
       "type": "string",
-      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your Feature Module. For Standalone API usage, this will be your Routes definition file for your feature state. The host directory will create/use the new state directory. _Note: The Standalone API usage is only supported in Angular versions >= 14.1.0_.",
+      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your Feature Module. For Standalone API usage, this will be your Routes definition file for your feature state. The host directory will create/use the new state directory.",
       "x-prompt": "What is the path to the module or Routes definition where this NgRx state should be registered?",
       "x-priority": "important"
     },
     "route": {
       "type": "string",
-      "description": "The route that the Standalone NgRx Providers should be added to. _Note: This is only supported in Angular versions >= 14.1.0_.",
+      "description": "The route that the Standalone NgRx Providers should be added to.",
       "default": "''"
     },
     "minimal": {

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -16,7 +16,7 @@ function normalizeOptions(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     const appConfigPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
-    const appMainPath = project.targets.build.options.main;
+    const appMainPath = project.targets.build.options.main ?? project.targets.build.options.browser;
     /** If NgModule App
      * -> Use App Module
      * If Standalone

package/src/generators/ngrx-root-store/lib/validate-options.js

@@ -2,10 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("../../utils/version-utils");
-const version_utils_2 = require("../../../utils/version-utils");
-const semver_1 = require("semver");
-const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 function validateOptions(tree, options) {
     if (!(0, devkit_1.getProjects)(tree).has(options.project)) {
         throw new Error(`Could not find project '${options.project}'. Please ensure the project name is correct and exists.`);
@@ -17,16 +13,5 @@ function validateOptions(tree, options) {
     if (!options.minimal && !options.name) {
         throw new Error(`If generating a global feature state with your root store, you must provide a name for it with '--name'.`);
     }
-    const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
-    const ngrxMajorVersion = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')?.major ??
-        (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
-    const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
-    if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
-        if (isStandalone) {
-            throw new Error(`The provided project '${options.project}' is set up to use Standalone APIs, however your workspace is not configured to support Standalone APIs. ` +
-                'Please make sure to provide a path to an "NgModule" where the state will be registered. ');
-        }
-    }
 }
 exports.validateOptions = validateOptions;

package/src/generators/ngrx-root-store/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxNgrxRootStoreGenerator",
   "title": "Add NgRx support to an application.",
   "description": "Adds NgRx support to an application.",
@@ -29,7 +29,7 @@
     },
     "route": {
       "type": "string",
-      "description": "The route that the Standalone NgRx Providers should be added to. _Note: This is only supported in Angular versions >= 14.1.0_.",
+      "description": "The route that the Standalone NgRx Providers should be added to.",
       "default": "''"
     },
     "directory": {

package/src/generators/pipe/files/__fileName__.ts__tpl__

@@ -5,9 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core';
   standalone: true<%}%>
 })
 export class <%= symbolName %> implements PipeTransform {
-
   transform(value: unknown, ...args: unknown[]): unknown {
     return null;
   }
-
 }

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

@@ -1,2 +1 @@
 export * from './normalize-options';
-export * from './validate-options';

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

@@ -2,4 +2,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./normalize-options"), exports);
-tslib_1.__exportStar(require("./validate-options"), exports);

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

@@ -25,6 +25,7 @@ async function normalizeOptions(tree, options) {
         fileName,
         filePath,
         symbolName,
+        standalone: options.standalone ?? true,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/pipe/pipe.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const lib_1 = require("./lib");
 async function pipeGenerator(tree, rawOptions) {
-    (0, lib_1.validateOptions)(tree, rawOptions);
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const pipeNames = (0, devkit_1.names)(options.name);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {

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

@@ -11,15 +11,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
    */
   project?: string;
 }

package/src/generators/pipe/schema.json

@@ -34,13 +34,13 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
     },
     "flat": {
       "type": "boolean",
       "default": true,
       "description": "When true (the default) creates files at the top level of the project.",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
     },
     "skipTests": {
       "type": "boolean",
@@ -53,9 +53,9 @@
       "description": "Do not import this pipe into the owning NgModule."
     },
     "standalone": {
-      "description": "Whether the generated pipe is standalone. _Note: This is only supported in Angular versions >= 14.1.0_.",
+      "description": "Whether the generated pipe is standalone.",
       "type": "boolean",
-      "default": false
+      "default": true
     },
     "module": {
       "type": "string",

package/src/generators/remote/files/base-ts/webpack.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {withModuleFederationForSSR} from '@nx/angular/module-federation';
+import { withModuleFederationForSSR } from '@nx/angular/module-federation';
 import config from './module-federation.config';
 
-export default withModuleFederationForSSR(config)
+export default withModuleFederationForSSR(config);

package/src/generators/remote/files/common/{src → pre-v17/src}/main.server.ts__tmpl__

@@ -31,17 +31,15 @@ export function app(): express.Express {
   server.set('view engine', 'html');
   server.set('views', browserBundles);
 
-
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
   // serve static files
-  server.use('/', express.static(browserBundles, { maxAge: '1y' }));
+  server.get('*.*', express.static(browserBundles, { maxAge: '1y' }));
   server.use('/server', express.static(serverBundles, { 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 }],

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

@@ -0,0 +1,73 @@
+import 'zone.js/node';
+
+import { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine } from '@angular/ssr';
+import * as express from 'express';
+import * as cors from 'cors';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import<% if(standalone) { %> bootstrap <% } else { %> { AppServerModule } <% } %>from './bootstrap.server';
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app(): express.Express {
+  const server = express();
+  const browserBundles = join(process.cwd(), '<%= browserBundleOutput %>');
+  const serverBundles = join(process.cwd(), '<%= serverBundleOutput %>');
+  const indexHtml = existsSync(join(browserBundles, 'index.original.html'))
+    ? join(browserBundles, 'index.original.html')
+    : join(browserBundles, 'index.html');
+
+  server.use(cors());
+
+  const commonEngine = new CommonEngine();
+
+  server.set('view engine', 'html');
+  server.set('views', browserBundles);
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  server.get('*.*', express.static(browserBundles, { maxAge: '1y' }));
+  // Serve static files from /server
+  server.use('/server', express.static(serverBundles, { 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) { %>: AppServerModule<% } %>,
+        documentFilePath: indexHtml,
+        url: `${protocol}://${headers.host}${originalUrl}`,
+        publicPath: browserBundles,
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+      })
+      .then((html) => res.send(html))
+      .catch((err) => next(err));
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env['PORT'] || 4000;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+
+    /**
+     * DO NOT REMOVE IF USING @nx/angular:module-federation-dev-ssr executor
+     * to serve your Host application with this Remote application.
+     * This message allows Nx to determine when the Remote is ready to be
+     * consumed by the Host.
+     */
+    process.send && process.send('nx.server.ready');
+  });
+}
+
+run();
+
+export default <% if (standalone) { %>bootstrap<% } else { %>AppServerModule<% } %>;

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

@@ -1,2 +1,2 @@
 export * from './find-next-available-port';
-export * from './add-ssr';
+export * from './update-ssr-setup';

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

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

package/src/generators/remote/lib/{add-ssr.d.ts → update-ssr-setup.d.ts}

@@ -1,5 +1,5 @@
 import type { Tree } from '@nx/devkit';
-export declare function addSsr(tree: Tree, { appName, port, standalone, typescriptConfiguration, }: {
+export declare function updateSsrSetup(tree: Tree, { appName, port, standalone, typescriptConfiguration, }: {
     appName: string;
     port: number;
     standalone: boolean;

package/src/generators/remote/lib/{add-ssr.js → update-ssr-setup.js}

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSsr = void 0;
+exports.updateSsrSetup = void 0;
 const devkit_1 = require("@nx/devkit");
-const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
+const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
-async function addSsr(tree, { appName, port, standalone, typescriptConfiguration, }) {
+const version_utils_1 = require("../../utils/version-utils");
+async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, }) {
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-    await (0, setup_ssr_1.default)(tree, {
-        project: appName,
-        standalone,
-    });
     tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
     tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-    const browserBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'browser');
-    const serverBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'server');
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/common`), project.root, {
+    const browserBundleOutput = project.targets.build.options.outputPath;
+    const serverBundleOutput = project.targets.build.options.outputPath.replace(/\/browser$/, '/server');
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common', angularMajorVersion >= 17 ? 'v17+' : 'pre-v17'), project.root, {
         appName,
         browserBundleOutput,
         serverBundleOutput,
@@ -52,12 +50,10 @@ async function addSsr(tree, { appName, port, standalone, typescriptConfiguration
     (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         cors: versions_1.corsVersion,
-        express: versions_1.expressVersion,
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
     }, {
         '@types/cors': versions_1.typesCorsVersion,
-        '@types/express': versions_1.typesExpressVersion,
     });
     return installTask;
 }
-exports.addSsr = addSsr;
+exports.updateSsrSetup = updateSsrSetup;