@nx/angular 17.3.0 → 17.3.1

package/executors.d.ts

@@ -10,6 +10,6 @@ export * from './src/executors/application/application.impl';
 import { executeDevServerBuilder } from './src/builders/dev-server/dev-server.impl';
 export { 
 /**
- * @deprecated Use executeDevServerBuilder instead. It will be removed in Nx v18.
+ * @deprecated Use executeDevServerBuilder instead. It will be removed in Nx v19.
  */
 executeDevServerBuilder as executeWebpackDevServerBuilder, executeDevServerBuilder, };

package/generators.json

@@ -39,6 +39,11 @@
       "schema": "./src/generators/component-test/schema.json",
       "description": "Creates a cypress component test file for a component."
     },
+    "convert-to-application-executor": {
+      "factory": "./src/generators/convert-to-application-executor/convert-to-application-executor",
+      "schema": "./src/generators/convert-to-application-executor/schema.json",
+      "description": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder. _Note: this is only supported in Angular versions >= 17.0.0_."
+    },
     "directive": {
       "factory": "./src/generators/directive/directive",
       "schema": "./src/generators/directive/schema.json",
@@ -81,7 +86,7 @@
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.",
-      "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v18."
+      "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v19."
     },
     "convert-to-with-mf": {
       "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.3.0",
+  "version": "17.3.1",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -78,16 +78,16 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.3.0",
-    "@nx/cypress": "17.3.0",
-    "@nx/jest": "17.3.0",
-    "@nx/js": "17.3.0",
-    "@nx/eslint": "17.3.0",
-    "@nx/webpack": "17.3.0",
-    "@nx/web": "17.3.0",
-    "@nx/workspace": "17.3.0",
+    "@nx/devkit": "17.3.1",
+    "@nx/cypress": "17.3.1",
+    "@nx/jest": "17.3.1",
+    "@nx/js": "17.3.1",
+    "@nx/eslint": "17.3.1",
+    "@nx/webpack": "17.3.1",
+    "@nx/web": "17.3.1",
+    "@nx/workspace": "17.3.1",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "17.3.0"
+    "@nrwl/angular": "17.3.1"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/builders/dev-server/dev-server.impl.js

@@ -16,7 +16,7 @@ const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const lib_1 = require("./lib");
 function executeDevServerBuilder(rawOptions, context) {
-    if (rawOptions.esbuildMiddleware) {
+    if (rawOptions.esbuildMiddleware?.length > 0) {
         const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
         if (angularMajorVersion < 17) {
             throw new Error((0, devkit_1.stripIndents) `The "esbuildMiddleware" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".

package/src/builders/dev-server/schema.json

@@ -17,7 +17,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`. Ignored if `buildTarget` is set.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v18."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
     },
     "buildTarget": {
       "type": "string",

package/src/executors/module-federation-dev-server/schema.json

@@ -15,7 +15,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v18."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
     },
     "buildTarget": {
       "type": "string",

package/src/executors/ng-packagr-lite/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
   "description": "Builds a library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but with some key differences:\n- For supported Angular versions lower than v16, it doesn't run `ngcc` automatically (`ngcc` is no longer available from Angular v16 onwards, for lower versions, it needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2022 bundles (ESM2020 for supported Angular versions lower than v16).",
   "cli": "nx",

package/src/executors/package/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
   "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is similar to the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
   "cli": "nx",

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularAddLintingGenerator",
   "title": "Add linting to an Angular project.",
   "description": "Adds linting configuration to an Angular project.",

package/src/generators/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorNxApp",
   "title": "Creates an Angular application.",
   "description": "Creates an Angular application.",
@@ -41,15 +41,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

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

@@ -22,15 +22,15 @@ export interface Schema {
   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/component/schema.json

@@ -34,7 +34,7 @@
         "$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."
     },
     "prefix": {
       "type": "string",
@@ -98,7 +98,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": false,
-      "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."
     },
     "skipImport": {
       "type": "boolean",

package/src/generators/component-cypress-spec/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularComponentCypressSpecGenerator",
   "type": "object",
   "cli": "nx",

package/src/generators/component-test/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularComponentTestGenerator",
   "type": "object",
   "cli": "nx",

package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts

@@ -0,0 +1,4 @@
+import { type Tree } from '@nx/devkit';
+import type { GeneratorOptions } from './schema';
+export declare function convertToApplicationExecutor(tree: Tree, options: GeneratorOptions): Promise<() => void>;
+export default convertToApplicationExecutor;

package/src/generators/convert-to-application-executor/convert-to-application-executor.js

@@ -0,0 +1,240 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToApplicationExecutor = void 0;
+const devkit_1 = require("@nx/devkit");
+const posix_1 = require("node:path/posix");
+const semver_1 = require("semver");
+const targets_1 = require("../../utils/targets");
+const setup_ssr_1 = require("../setup-ssr/setup-ssr");
+const validations_1 = require("../utils/validations");
+const version_utils_1 = require("../utils/version-utils");
+const executorsToConvert = new Set([
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:browser-esbuild',
+    '@nx/angular:webpack-browser',
+    '@nx/angular:browser-esbuild',
+]);
+const serverTargetExecutors = new Set([
+    '@angular-devkit/build-angular:server',
+    '@nx/angular:webpack-server',
+]);
+const redundantExecutors = new Set([
+    '@angular-devkit/build-angular:server',
+    '@angular-devkit/build-angular:prerender',
+    '@angular-devkit/build-angular:app-shell',
+    '@angular-devkit/build-angular:ssr-dev-server',
+    '@nx/angular:webpack-server',
+]);
+async function convertToApplicationExecutor(tree, options) {
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 17) {
+        throw new Error(`The "convert-to-application-executor" generator is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".`);
+    }
+    let didAnySucceed = false;
+    if (options.project) {
+        (0, validations_1.validateProject)(tree, options.project);
+        didAnySucceed = await convertProjectTargets(tree, options.project, angularVersion, true);
+    }
+    else {
+        const projects = (0, devkit_1.getProjects)(tree);
+        for (const [projectName] of projects) {
+            devkit_1.logger.info(`Converting project "${projectName}"...`);
+            const success = await convertProjectTargets(tree, projectName, angularVersion);
+            if (success) {
+                devkit_1.logger.info(`Project "${projectName}" converted successfully.`);
+            }
+            else {
+                devkit_1.logger.info(`Project "${projectName}" could not be converted. See above for more information.`);
+            }
+            devkit_1.logger.info('');
+            didAnySucceed = didAnySucceed || success;
+        }
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return didAnySucceed ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
+}
+exports.convertToApplicationExecutor = convertToApplicationExecutor;
+async function convertProjectTargets(tree, projectName, angularVersion, isProvidedProject = false) {
+    function warnIfProvided(message) {
+        if (isProvidedProject) {
+            devkit_1.logger.warn(message);
+        }
+    }
+    let project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    if (project.projectType !== 'application') {
+        warnIfProvided(`The provided project "${projectName}" is not an application. Skipping conversion.`);
+        return false;
+    }
+    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets);
+    if (!buildTargetName) {
+        warnIfProvided(`The provided project "${projectName}" does not have any targets using on of the ` +
+            `'@angular-devkit/build-angular:browser', '@angular-devkit/build-angular:browser-esbuild', ` +
+            `'@nx/angular:browser' and '@nx/angular:browser-esbuild' executors. Skipping conversion.`);
+        return false;
+    }
+    const useNxExecutor = project.targets[buildTargetName].executor.startsWith('@nx/angular:');
+    const newExecutor = useNxExecutor
+        ? '@nx/angular:application'
+        : '@angular-devkit/build-angular:application';
+    const buildTarget = project.targets[buildTargetName];
+    buildTarget.executor = newExecutor;
+    if ((0, semver_1.gte)(angularVersion, '17.1.0') && buildTarget.outputs) {
+        buildTarget.outputs = buildTarget.outputs.map((output) => output === '{options.outputPath}' ? '{options.outputPath.base}' : output);
+    }
+    for (const [, options] of (0, targets_1.allTargetOptions)(buildTarget)) {
+        if (options['index'] === '') {
+            options['index'] = false;
+        }
+        // Rename and transform options
+        options['browser'] = options['main'];
+        if (serverTargetName && typeof options['browser'] === 'string') {
+            options['server'] = (0, posix_1.dirname)(options['browser']) + '/main.server.ts';
+        }
+        options['serviceWorker'] =
+            options['ngswConfigPath'] ?? options['serviceWorker'];
+        if (typeof options['polyfills'] === 'string') {
+            options['polyfills'] = [options['polyfills']];
+        }
+        let outputPath = options['outputPath'];
+        if ((0, semver_1.lt)(angularVersion, '17.1.0')) {
+            options['outputPath'] = outputPath?.replace(/\/browser\/?$/, '');
+        }
+        else if (typeof outputPath === 'string') {
+            if (!/\/browser\/?$/.test(outputPath)) {
+                devkit_1.logger.warn(`The output location of the browser build has been updated from "${outputPath}" to ` +
+                    `"${(0, posix_1.join)(outputPath, 'browser')}". ` +
+                    'You might need to adjust your deployment pipeline or, as an alternative, ' +
+                    'set outputPath.browser to "" in order to maintain the previous functionality.');
+            }
+            else {
+                outputPath = outputPath.replace(/\/browser\/?$/, '');
+            }
+            options['outputPath'] = {
+                base: outputPath,
+            };
+            if (typeof options['resourcesOutputPath'] === 'string') {
+                const media = options['resourcesOutputPath'].replaceAll('/', '');
+                if (media && media !== 'media') {
+                    options['outputPath'] = {
+                        base: outputPath,
+                        media: media,
+                    };
+                }
+            }
+        }
+        // Delete removed options
+        delete options['deployUrl'];
+        delete options['vendorChunk'];
+        delete options['commonChunk'];
+        delete options['resourcesOutputPath'];
+        delete options['buildOptimizer'];
+        delete options['main'];
+        delete options['ngswConfigPath'];
+    }
+    // Merge browser and server tsconfig
+    if (serverTargetName) {
+        const browserTsConfigPath = buildTarget?.options?.tsConfig;
+        const serverTsConfigPath = project.targets['server']?.options?.tsConfig;
+        if (typeof browserTsConfigPath !== 'string') {
+            devkit_1.logger.warn(`Cannot update project "${projectName}" to use the application executor ` +
+                `as the browser tsconfig cannot be located.`);
+        }
+        if (typeof serverTsConfigPath !== 'string') {
+            devkit_1.logger.warn(`Cannot update project "${projectName}" to use the application executor ` +
+                `as the server tsconfig cannot be located.`);
+        }
+        const browserTsConfigJson = (0, devkit_1.readJson)(tree, browserTsConfigPath);
+        const serverTsConfigJson = (0, devkit_1.readJson)(tree, serverTsConfigPath);
+        const files = new Set([
+            ...(browserTsConfigJson.files ?? []),
+            ...(serverTsConfigJson.files ?? []),
+        ]);
+        // Server file will be added later by the setup-ssr generator
+        files.delete('server.ts');
+        browserTsConfigJson.files = Array.from(files);
+        browserTsConfigJson.compilerOptions ?? {};
+        browserTsConfigJson.compilerOptions.types = Array.from(new Set([
+            ...(browserTsConfigJson.compilerOptions.types ?? []),
+            ...(serverTsConfigJson.compilerOptions?.types ?? []),
+        ]));
+        // Delete server tsconfig
+        tree.delete(serverTsConfigPath);
+    }
+    // Update project main tsconfig
+    const projectRootTsConfigPath = (0, posix_1.join)(project.root, 'tsconfig.json');
+    if (tree.exists(projectRootTsConfigPath)) {
+        const rootTsConfigJson = (0, devkit_1.readJson)(tree, projectRootTsConfigPath);
+        rootTsConfigJson.compilerOptions ?? {};
+        rootTsConfigJson.compilerOptions.esModuleInterop = true;
+        rootTsConfigJson.compilerOptions.downlevelIteration = undefined;
+        rootTsConfigJson.compilerOptions.allowSyntheticDefaultImports = undefined;
+        (0, devkit_1.writeJson)(tree, projectRootTsConfigPath, rootTsConfigJson);
+    }
+    // Update server file
+    const ssrMainFile = project.targets['server']?.options?.['main'];
+    if (typeof ssrMainFile === 'string') {
+        tree.delete(ssrMainFile);
+        // apply changes so the setup-ssr generator can access the updated project
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        await (0, setup_ssr_1.setupSsr)(tree, { project: projectName, skipFormat: true });
+        // re-read project configuration as it might have changed
+        project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    }
+    // Delete all redundant targets
+    for (const [targetName, target] of Object.entries(project.targets)) {
+        if (redundantExecutors.has(target.executor)) {
+            delete project.targets[targetName];
+        }
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    return true;
+}
+function getTargetsToConvert(targets) {
+    let buildTargetName;
+    let serverTargetName;
+    for (const target of Object.keys(targets)) {
+        if (targets[target].executor === '@nx/angular:application' ||
+            targets[target].executor === '@angular-devkit/build-angular:application') {
+            devkit_1.logger.warn('The project is already using the application builder. Skipping conversion.');
+            return {};
+        }
+        // build target
+        if (executorsToConvert.has(targets[target].executor)) {
+            for (const [, options] of (0, targets_1.allTargetOptions)(targets[target])) {
+                if (options.deployUrl) {
+                    devkit_1.logger.warn(`The project is using the "deployUrl" option which is not available in the application builder. Skipping conversion.`);
+                    return {};
+                }
+                if (options.customWebpackConfig) {
+                    devkit_1.logger.warn(`The project is using a custom webpack configuration which is not supported by the esbuild-based application executor. Skipping conversion.`);
+                    return {};
+                }
+            }
+            if (buildTargetName) {
+                devkit_1.logger.warn('The project has more than one build target. Skipping conversion.');
+                return {};
+            }
+            buildTargetName = target;
+        }
+        // server target
+        if (serverTargetExecutors.has(targets[target].executor)) {
+            if (targets[target].executor === '@nx/angular:webpack-server') {
+                for (const [, options] of (0, targets_1.allTargetOptions)(targets[target])) {
+                    if (options.customWebpackConfig) {
+                        devkit_1.logger.warn(`The project is using a custom webpack configuration which is not supported by the esbuild-based application executor. Skipping conversion.`);
+                        return {};
+                    }
+                }
+            }
+            if (serverTargetName) {
+                devkit_1.logger.warn('The project has more than one server target. Skipping conversion.');
+                return {};
+            }
+            serverTargetName = target;
+        }
+    }
+    return { buildTargetName, serverTargetName };
+}
+exports.default = convertToApplicationExecutor;

package/src/generators/convert-to-application-executor/schema.d.ts

@@ -0,0 +1,4 @@
+export interface GeneratorOptions {
+  project?: string;
+  skipFormat?: boolean;
+}

package/src/generators/convert-to-application-executor/schema.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxAngularConvertToApplicationExecutorGenerator",
+  "cli": "nx",
+  "title": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder. _Note: this is only supported in Angular versions >= 17.0.0_.",
+  "description": "Converts a project or all projects using one of the `@angular-devkit/build-angular:browser`, `@angular-devkit/build-angular:browser-esbuild`, `@nx/angular:browser` and `@nx/angular:browser-esbuild` executors to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder. If the converted target is using one of the `@nx/angular` executors, the `@nx/angular:application` executor will be used. Otherwise, the `@angular-devkit/build-angular:application` builder will be used.",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Name of the Angular application project to convert. It has to contain a target using one of the `@angular-devkit/build-angular:browser`, `@angular-devkit/build-angular:browser-esbuild`, `@nx/angular:browser` and `@nx/angular:browser-esbuild` executors. If not specified, all projects with such targets will be converted.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": false
+}

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

@@ -13,15 +13,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/directive/schema.json

@@ -34,7 +34,7 @@
         "$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."
     },
     "prefix": {
       "type": "string",
@@ -74,7 +74,7 @@
       "type": "boolean",
       "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true,
-      "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."
     },
     "module": {
       "type": "string",

package/src/generators/federate-module/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactFederateModule",
   "title": "Federate Module",

package/src/generators/host/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxMFHost",
   "cli": "nx",
   "title": "Nx Module Federation Host Application",
@@ -55,15 +55,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

package/src/generators/init/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SchematicsAngularModuleInit",
   "cli": "nx",
   "title": "Init Angular Plugin",

package/src/generators/library/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorAngularLibrary",
   "title": "Create a library",
   "description": "Creates an Angular library.",

package/src/generators/library-secondary-entry-point/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularLibrarySecondaryEntryPoint",
   "title": "Creates a secondary entry point for a library",
   "description": "Creates a secondary entry point for an Angular publishable library.",

package/src/generators/move/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularMove",
   "cli": "nx",
   "title": "Nx Angular Move",

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/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.",

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.",

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.",

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",

package/src/generators/remote/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxMFRemote",
   "cli": "nx",
   "title": "Nx Module Federation Remote App",
@@ -55,15 +55,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

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

@@ -19,15 +19,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/scam/schema.json

@@ -40,7 +40,7 @@
         "$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."
     },
     "displayBlock": {
       "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -94,7 +94,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": false,
-      "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."
     },
     "selector": {
       "type": "string",

package/src/generators/scam-directive/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/scam-directive/schema.json

@@ -41,7 +41,7 @@
         "$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."
     },
     "skipTests": {
       "type": "boolean",
@@ -58,7 +58,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": true,
-      "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."
     },
     "selector": {
       "type": "string",

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

@@ -9,15 +9,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/scam-pipe/schema.json

@@ -41,7 +41,7 @@
         "$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."
     },
     "skipTests": {
       "type": "boolean",
@@ -58,7 +58,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": true,
-      "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."
     },
     "export": {
       "type": "boolean",

package/src/generators/scam-to-standalone/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorAngularScamToStandalone",
   "cli": "nx",
   "title": "Convert an Inline SCAM to Standalone Component",

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",

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/update-project-config.js

@@ -46,7 +46,9 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
     }
     projectConfig.targets.server = {
         dependsOn: ['build'],
-        executor: '@angular-devkit/build-angular:server',
+        executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
+            ? '@angular-devkit/build-angular:server'
+            : '@nx/angular:webpack-server',
         options: {
             outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
             main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorAngularUniversalSetup",
   "cli": "nx",
   "title": "Generate Angular Universal (SSR) setup for an Angular App",

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

@@ -8,7 +8,8 @@ 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';
+    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);
     if (!options.standalone) {

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://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": "http://json-schema.org/schema",
+  "$schema": "https://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/storybook-configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularStorybookConfigurationGenerator",
   "title": "Adds Storybook configuration to a project.",
   "description": "Adds Storybook configuration to a project to be able to use and create stories.",
@@ -29,7 +29,7 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Specifies whether to configure Cypress or not.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "generateStories": {
       "type": "boolean",
@@ -41,7 +41,7 @@
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -53,7 +53,7 @@
     "cypressDirectory": {
       "type": "string",
       "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",

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

@@ -6,7 +6,7 @@ const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-s
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
 const validate_options_1 = require("./lib/validate-options");
-// TODO(katerina): Nx 18 -> remove Cypress
+// TODO(katerina): Nx 19 -> remove Cypress
 async function storybookConfigurationGenerator(tree, options) {
     (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
     (0, validate_options_1.validateOptions)(options);

package/src/migrations/update-17-1-0/replace-nguniversal-engines.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const version_utils_1 = require("../../generators/utils/version-utils");
+const targets_1 = require("../../utils/targets");
 const projects_1 = require("../utils/projects");
 const UNIVERSAL_PACKAGES = [
     '@nguniversal/common',
@@ -38,7 +39,7 @@ async function default_1(tree) {
                 continue;
             }
             const outputPath = project.targets.build?.options?.outputPath;
-            for (const [, { main }] of allTargetOptions(target)) {
+            for (const [, { main }] of (0, targets_1.allTargetOptions)(target)) {
                 if (typeof main === 'string' &&
                     typeof outputPath === 'string' &&
                     tree.read(main, 'utf-8').includes('ngExpressEngine')) {
@@ -91,19 +92,6 @@ async function default_1(tree) {
     await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
-function* allTargetOptions(target) {
-    if (target.options) {
-        yield [undefined, target.options];
-    }
-    if (!target.configurations) {
-        return;
-    }
-    for (const [name, options] of Object.entries(target.configurations)) {
-        if (options !== undefined) {
-            yield [name, options];
-        }
-    }
-}
 const TOKENS_FILE_CONTENT = `
 import { InjectionToken } from '@angular/core';
 import { Request, Response } from 'express';

package/src/utils/targets.d.ts

@@ -0,0 +1,2 @@
+import { TargetConfiguration } from '@nx/devkit';
+export declare function allTargetOptions<T>(target: TargetConfiguration<T>): Iterable<[string | undefined, T]>;

package/src/utils/targets.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allTargetOptions = void 0;
+function* allTargetOptions(target) {
+    if (target.options) {
+        yield [undefined, target.options];
+    }
+    if (!target.configurations) {
+        return;
+    }
+    for (const [name, options] of Object.entries(target.configurations)) {
+        if (options !== undefined) {
+            yield [name, options];
+        }
+    }
+}
+exports.allTargetOptions = allTargetOptions;