@nx/angular 17.3.0-rc.1 → 17.3.1

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/files/server/application-builder/__serverFileName__

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

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

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

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

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

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addServerFile = void 0;
+const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../utils/version-utils");
+const constants_1 = require("./constants");
+function addServerFile(tree, schema, isUsingApplicationBuilder) {
+    const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    const { outputPath } = targets.build.options;
+    const browserBundleOutputPath = isUsingApplicationBuilder
+        ? getApplicationBuilderBrowserOutputPath(outputPath)
+        : outputPath;
+    const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'server', ...(isUsingApplicationBuilder
+        ? ['application-builder']
+        : angularMajorVersion >= 17
+            ? ['server-builder', 'v17+']
+            : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+}
+exports.addServerFile = addServerFile;
+function getApplicationBuilderBrowserOutputPath(outputPath) {
+    if (outputPath) {
+        if (typeof outputPath === 'string') {
+            // when `outputPath` is a string, it's the base path, so we return the default browser path
+            return constants_1.DEFAULT_BROWSER_DIR;
+        }
+        return outputPath.browser ?? constants_1.DEFAULT_BROWSER_DIR;
+    }
+    return constants_1.DEFAULT_BROWSER_DIR;
+}

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

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

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

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

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

@@ -6,23 +6,21 @@ 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);
-    const baseOutputPath = targets.build.options.outputPath;
-    const browserBundleOutputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
+    if (targets.server ||
+        (isUsingApplicationBuilder && targets.build.options?.server !== undefined)) {
+        // server has already been added
+        return;
+    }
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    const { version: angularVersion, major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, tpl: '' });
         if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, tpl: '' });
         }
     }
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'server', ...(isUsingApplicationBuilder
-        ? ['application-builder']
-        : angularMajorVersion >= 17
-            ? ['server-builder', 'v17+']
-            : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
 }
 exports.generateSSRFiles = generateSSRFiles;

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

@@ -7,11 +7,14 @@ function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
     const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const tsConfigPath = targets.build.options.tsConfig;
     (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
-        json.files ??= [];
-        json.files.push((0, devkit_1.joinPathFragments)('src', options.main), (0, devkit_1.joinPathFragments)(options.serverFileName));
+        const files = new Set(json.files ?? []);
+        files.add((0, devkit_1.joinPathFragments)('src', options.main));
+        files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        json.files = Array.from(files);
         json.compilerOptions ??= {};
-        json.compilerOptions.types ??= [];
-        json.compilerOptions.types.push('node');
+        const types = new Set(json.compilerOptions.types ?? []);
+        types.add('node');
+        json.compilerOptions.types = Array.from(types);
         return json;
     });
 }

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

@@ -1,4 +1,5 @@
 export * from './add-dependencies';
+export * from './add-server-file';
 export * from './generate-files';
 export * from './generate-server-ts-config';
 export * from './normalize-options';

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

@@ -2,6 +2,7 @@
 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);

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

@@ -3,10 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfigForBrowserBuilder = exports.updateProjectConfigForApplicationBuilder = 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 = {
@@ -29,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) {
@@ -29,6 +30,7 @@ async function setupSsr(tree, schema) {
         (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
         (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
     }
+    (0, lib_1.addServerFile)(tree, options, isUsingApplicationBuilder);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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;