@nx/angular 17.0.4 → 17.0.6

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/setup-mf/schema.d.ts

@@ -15,7 +15,6 @@ 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": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorAngularMFSetup",
   "cli": "nx",
   "title": "Generate Module Federation Setup for Angular App",
@@ -71,18 +71,13 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Whether the application is a standalone application.",
-      "default": true
+      "description": "Whether the application is a standalone application. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "default": false
     },
     "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,8 +3,14 @@ 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 = () => { };
@@ -18,7 +24,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.updateTsConfig)(tree, options);
+    (0, lib_1.updateTsConfigTarget)(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/{server/server-builder/pre-v17 → ngmodule/base}/__serverFileName__

@@ -1,11 +1,12 @@
 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 <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
+import {existsSync} from 'fs';
+import {join} from 'path';
+
+import {<%= 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 {
@@ -15,7 +16,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<% if (!standalone) { %>: <%= rootModuleClassName %><% } %>,
+    bootstrap: <%= rootModuleClassName %>,
   }));
 
   server.set('view engine', 'html');
@@ -56,4 +57,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 
-export <% if (standalone) { %>default bootstrap<% } else { %>* from './src/<%= main.slice(0, -3) %>'<% } %>;
+export * from './src/<%= main.slice(0, -3) %>';

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

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

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

@@ -0,0 +1,11 @@
+/***************************************************************************************************
+ * Initialize the server environment - for example, adding DOM built-in types to the global scope.
+ *
+ * NOTE:
+ * This import must come before any imports (direct or transitive) that rely on DOM built-ins being
+ * available, such as `@angular/elements`.
+ */
+import '@angular/platform-server/init';
+
+export { <%= rootModuleClassName %> } from './app/<%= rootModuleFileName.slice(0, -3) %>';
+export { renderModule } from '@angular/platform-server';

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

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

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

@@ -2,29 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addHydration = void 0;
 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 ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const js_1 = require("@nx/js");
 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/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;
+export declare function generateSSRFiles(tree: Tree, schema: Schema): void;

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

@@ -4,22 +4,27 @@ exports.generateSSRFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
-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 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;
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(pathToFiles, 'base'), projectRoot, {
+        ...schema,
+        tpl: '',
+    });
     if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, tpl: '' });
+        (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: '' });
+        }
         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, tpl: '' });
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
         }
     }
 }

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

@@ -1,10 +1,6 @@
-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,13 +1,9 @@
 "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,14 +2,8 @@
 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',
@@ -20,7 +14,7 @@ function normalizeOptions(tree, options) {
         rootModuleClassName: options.rootModuleClassName ?? 'AppServerModule',
         skipFormat: options.skipFormat ?? false,
         standalone: options.standalone ?? isStandaloneApp,
-        hydration,
+        hydration: options.hydration ?? false,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

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

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

@@ -1,39 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateProjectConfigForBrowserBuilder = exports.updateProjectConfigForApplicationBuilder = void 0;
+exports.updateProjectConfig = void 0;
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("../../utils/version-utils");
-const constants_1 = require("./constants");
-function updateProjectConfigForApplicationBuilder(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const buildTarget = project.targets.build;
-    let outputPath = buildTarget.options?.outputPath;
-    if (outputPath &&
-        typeof outputPath !== 'string' &&
-        outputPath.browser === '') {
-        const base = outputPath.base;
-        devkit_1.logger.warn(`The output location of the browser build has been updated from "${base}" to "${(0, devkit_1.joinPathFragments)(base, constants_1.DEFAULT_BROWSER_DIR)}".
-          You might need to adjust your deployment pipeline.`);
-        if ((outputPath.media && outputPath.media !== constants_1.DEFAULT_MEDIA_DIR) ||
-            (outputPath.server && outputPath.server !== constants_1.DEFAULT_SERVER_DIR)) {
-            delete outputPath.browser;
-        }
-        else {
-            outputPath = outputPath.base;
-        }
-    }
-    buildTarget.options ??= {};
-    buildTarget.options.outputPath = outputPath;
-    buildTarget.options.server = (0, devkit_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src'), options.main);
-    buildTarget.options.prerender = true;
-    buildTarget.options.ssr = {
-        entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
-    };
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
-}
-exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
-function updateProjectConfigForBrowserBuilder(tree, schema) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+function updateProjectConfig(tree, schema) {
+    let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const buildTarget = projectConfig.targets.build;
     const baseOutputPath = buildTarget.options.outputPath;
     buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
@@ -46,9 +16,7 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
     }
     projectConfig.targets.server = {
         dependsOn: ['build'],
-        executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
-            ? '@angular-devkit/build-angular:server'
-            : '@nx/angular:webpack-server',
+        executor: '@angular-devkit/build-angular:server',
         options: {
             outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
             main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
@@ -58,11 +26,8 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
         configurations,
         defaultConfiguration: 'production',
     };
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     projectConfig.targets['serve-ssr'] = {
-        executor: angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:ssr-dev-server'
-            : '@nguniversal/builders:ssr-dev-server',
+        executor: '@nguniversal/builders:ssr-dev-server',
         configurations: {
             development: {
                 browserTarget: `${schema.project}:build:development`,
@@ -76,9 +41,7 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
         defaultConfiguration: 'development',
     };
     projectConfig.targets.prerender = {
-        executor: angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:prerender'
-            : '@nguniversal/builders:prerender',
+        executor: '@nguniversal/builders:prerender',
         options: {
             routes: ['/'],
         },
@@ -96,16 +59,20 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
+    if (nxJson.tasksRunnerOptions?.default &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
-        nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('server');
+        nxJson.tasksRunnerOptions.default.options.cacheableOperations = [
+            ...nxJson.tasksRunnerOptions.default.options.cacheableOperations,
+            'server',
+        ];
+        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults.server ??= {};
     nxJson.targetDefaults.server.cache ??= true;
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
+exports.updateProjectConfig = updateProjectConfig;
 function getServerOptions(options = {}) {
     return {
         buildOptimizer: options?.buildOptimizer,

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

@@ -6,24 +6,11 @@ const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
 const semver_1 = require("semver");
 function validateOptions(tree, options) {
-    validateProject(tree, options.project);
-    validateBuildTarget(tree, options.project);
+    (0, validations_1.validateProject)(tree, options.project);
+    (0, validations_1.validateStandaloneOption)(tree, options.standalone);
     validateHydrationOption(tree, options.hydration);
 }
 exports.validateOptions = validateOptions;
-function validateProject(tree, project) {
-    (0, validations_1.validateProject)(tree, project);
-    const { projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
-    if (projectType !== 'application') {
-        throw new Error(`The "${project}" project is not an application. Only application projects are supported by the "setup-ssr" generator.`);
-    }
-}
-function validateBuildTarget(tree, project) {
-    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, project);
-    if (!targets?.build) {
-        throw new Error(`The "${project}" project does not have a "build" target. Please add a "build" target.`);
-    }
-}
 function validateHydrationOption(tree, hydration) {
     if (!hydration) {
         return;

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorAngularUniversalSetup",
   "cli": "nx",
   "title": "Generate Angular Universal (SSR) setup for an Angular App",
@@ -19,7 +19,7 @@
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The `appId` to use with `withServerTransition`. _Note: This is only used in Angular versions <16.0.0. It's deprecated since Angular 16 and not supported since Angular 17._",
+      "description": "The `appId` to use with `withServerTransition`. _Note: This is only used in Angular versions <16.0.0. It's deprecated since Angular 16._",
       "default": "serverApp"
     },
     "main": {
@@ -51,11 +51,11 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Use Standalone Components to bootstrap SSR."
+      "description": "Use Standalone Components to bootstrap SSR. _Note: This is only supported in Angular versions >= 14.1.0_."
     },
     "hydration": {
       "type": "boolean",
-      "description": "Set up Hydration for the SSR application. It defaults to `true` for Angular versions >= 17.0.0. Otherwise, it defaults to `false`. _Note: This is only supported in Angular versions >= 16.0.0_."
+      "description": "Set up Hydration for the SSR application. _Note: This is only supported in Angular versions >= 16.0.0_."
     },
     "skipFormat": {
       "type": "boolean",

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

@@ -7,30 +7,24 @@ const lib_1 = require("./lib");
 async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = (0, lib_1.normalizeOptions)(tree, schema);
-    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
-        targets.build.executor === '@nx/angular:application';
-    (0, lib_1.addDependencies)(tree, isUsingApplicationBuilder);
-    (0, lib_1.generateSSRFiles)(tree, options, isUsingApplicationBuilder);
+    (0, lib_1.updateProjectConfig)(tree, options);
+    (0, lib_1.generateSSRFiles)(tree, options);
     if (!options.standalone) {
         (0, lib_1.updateAppModule)(tree, options);
     }
     if (options.hydration) {
         (0, lib_1.addHydration)(tree, options);
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 17 || !options.hydration) {
-        (0, lib_1.setRouterInitialNavigation)(tree, options);
-    }
-    if (isUsingApplicationBuilder) {
-        (0, lib_1.updateProjectConfigForApplicationBuilder)(tree, options);
-        (0, lib_1.setServerTsConfigOptionsForApplicationBuilder)(tree, options);
-    }
-    else {
-        (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
-        (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
-    }
-    (0, lib_1.addServerFile)(tree, options, isUsingApplicationBuilder);
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@nguniversal/express-engine': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')
+            ?.version ?? pkgVersions.ngUniversalVersion,
+        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
+            ?.version ?? pkgVersions.angularVersion,
+    }, {
+        '@nguniversal/builders': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')
+            ?.version ?? pkgVersions.ngUniversalVersion,
+    });
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxAngularTailwindSetupGenerator",
   "cli": "nx",
   "title": "Configures Tailwind CSS for an application or a buildable/publishable library.",

package/src/generators/stories/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxAngularStorybookStoriesGenerator",
   "title": "Create Storybook stories/specs",
   "description": "Creates Storybook stories/specs for all Angular components declared in a project.",

package/src/generators/stories/stories.js

@@ -8,7 +8,7 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch_1 = require("minimatch");
+const minimatch = require("minimatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const e2eProjectName = options.cypressProject ?? `${options.name}-e2e`;
@@ -23,7 +23,7 @@ async function angularStoriesGenerator(tree, options) {
         devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
     }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {

package/src/generators/storybook-configuration/lib/generate-stories.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStories = void 0;
+const project_name_1 = require("@nx/cypress/src/utils/project-name");
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../../utils/versions");
 const stories_1 = require("../../stories/stories");
 async function generateStories(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
-    const e2eProjectName = getE2eProjectName(options.project, project.root, options.cypressDirectory);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.name, project.root, options.cypressDirectory);
     await (0, stories_1.angularStoriesGenerator)(tree, {
-        name: options.project,
+        name: options.name,
         generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
         cypressProject: e2eProjectName,
         ignorePaths: options.ignorePaths,

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -6,7 +6,7 @@ const versions_1 = require("../../../utils/versions");
 async function generateStorybookConfiguration(tree, options) {
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     return await configurationGenerator(tree, {
-        project: options.project,
+        name: options.name,
         uiFramework: '@storybook/angular',
         configureCypress: options.configureCypress,
         linter: options.linter,
@@ -15,8 +15,6 @@ async function generateStorybookConfiguration(tree, options) {
         interactionTests: options.interactionTests,
         configureStaticServe: options.configureStaticServe,
         skipFormat: true,
-        addPlugin: false,
-        addExplicitTargets: true,
     });
 }
 exports.generateStorybookConfiguration = generateStorybookConfiguration;

package/src/generators/storybook-configuration/schema.d.ts

@@ -4,7 +4,7 @@ export interface StorybookConfigurationOptions {
   configureStaticServe?: boolean;
   generateStories: boolean;
   linter: Linter;
-  project: string;
+  name: string;
   tsConfiguration?: boolean;
   skipFormat?: boolean;
   ignorePaths?: string[];