@nx/react 18.0.0-beta.0 → 18.0.0-beta.2

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

@@ -1,6 +1,6 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter } from '@nx/eslint';
-import type { SupportedStyles } from '../../../typings';
+import type { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
   classComponent?: boolean;
@@ -26,10 +26,12 @@ export interface Schema {
   minimal?: boolean;
   typescriptConfiguration?: boolean;
   dynamic?: boolean;
+  addPlugin?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
   appProjectRoot: string;
   e2eProjectName: string;
   projectName: string;
+  addPlugin?: boolean;
 }

package/src/generators/host/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactHost",
   "cli": "nx",
   "title": "Generate Module Federation Setup for React Host App",
@@ -43,11 +43,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ http://lesscss.org                       ]"
+            "label": "LESS              [ https://lesscss.org                       ]"
           },
           {
             "value": "styled-components",

package/src/generators/init/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxReactNgInit",
   "title": "Init React Plugin",
   "description": "Initialize a React Plugin.",

package/src/generators/library/lib/add-linting.js

@@ -18,6 +18,7 @@ async function addLinting(host, options) {
             skipFormat: true,
             skipPackageJson: options.skipPackageJson,
             setParserOptionsProject: options.setParserOptionsProject,
+            addPlugin: options.addPlugin,
         });
         if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
             (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');

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

@@ -13,6 +13,7 @@ async function normalizeOptions(host, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/react:library',
     });
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const fileName = options.simpleName
         ? projectNames.projectSimpleName
         : projectNames.projectFileName;
@@ -50,7 +51,7 @@ async function normalizeOptions(host, options) {
             throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
         }
         normalized.appMain =
-            appProjectConfig.targets.build.options.main ??
+            appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);
         normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
         // TODO(jack): We should use appEntryFile instead of appProject so users can directly set it rather than us inferring it.

package/src/generators/library/library.js

@@ -17,8 +17,10 @@ const create_ts_config_1 = require("../../utils/create-ts-config");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const set_defaults_1 = require("./lib/set-defaults");
 const path_1 = require("path");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -66,6 +68,7 @@ async function libraryGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             testEnvironment: 'jsdom',
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -120,6 +123,7 @@ async function libraryGeneratorInternal(host, schema) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             testEnvironment: 'jsdom',
+            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -179,6 +183,9 @@ async function libraryGeneratorInternal(host, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;

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

@@ -29,6 +29,7 @@ export interface Schema {
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   minimal?: boolean;
   simpleName?: boolean;
+  addPlugin?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/library/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactLibrary",
   "title": "Create a React Library",
@@ -50,11 +50,11 @@
           { "value": "css", "label": "CSS" },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ http://sass-lang.com          ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com          ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ http://lesscss.org            ]"
+            "label": "LESS              [ https://lesscss.org            ]"
           },
           {
             "value": "styled-components",

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

@@ -1,7 +1,7 @@
 export interface Schema {
   name: string;
   /**
-   * @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.
+   * @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.
    */
   project?: string;
   directory?: string;

package/src/generators/redux/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "redux",
   "title": "Create Redux state",
@@ -22,7 +22,7 @@
       "$default": {
         "$source": "projectName"
       },
-      "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."
     },
     "directory": {
       "type": "string",

package/src/generators/remote/remote.js

@@ -11,6 +11,7 @@ const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_ssr_for_remote_1 = require("./lib/setup-ssr-for-remote");
 const setup_tspath_for_remote_1 = require("./lib/setup-tspath-for-remote");
 const add_remote_to_dynamic_host_1 = require("./lib/add-remote-to-dynamic-host");
+const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 function addModuleFederationFiles(host, options) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.name),
@@ -46,6 +47,8 @@ async function remoteGeneratorInternal(host, schema) {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:remote')),
         typescriptConfiguration: schema.typescriptConfiguration ?? false,
         dynamic: schema.dynamic ?? false,
+        // TODO(colum): remove when MF works with Crystal
+        addPlugin: false,
     };
     const initAppTask = await (0, application_1.default)(host, {
         ...options,
@@ -85,6 +88,7 @@ async function remoteGeneratorInternal(host, schema) {
         const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'assets/module-federation.manifest.json');
         (0, add_remote_to_dynamic_host_1.addRemoteToDynamicHost)(host, options.name, options.devServerPort, pathToMFManifest);
     }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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

@@ -1,6 +1,6 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter } from '@nx/eslint';
-import type { SupportedStyles } from '../../../typings';
+import type { SupportedStyles } from '../../../typings/style';
 import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
 
 export interface Schema {

package/src/generators/remote/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactRemote",
   "cli": "nx",
   "title": "Generate Module Federation Setup for React Remote App",
@@ -49,11 +49,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ http://lesscss.org                       ]"
+            "label": "LESS              [ https://lesscss.org                       ]"
           },
           {
             "value": "styled-components",

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactSSRSetup",
   "cli": "nx",
   "title": "Generate SSR setup for a React app",

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

@@ -18,7 +18,14 @@ function readEntryFile(host, path) {
     };
 }
 async function setupSsrGenerator(tree, options) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    let projectGraph;
+    try {
+        projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    }
+    catch {
+        projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    }
+    const projectConfig = projectGraph.nodes[options.project].data;
     const projectRoot = projectConfig.root;
     const appImportCandidates = [
         options.appComponentImportPath ?? 'app/app',
@@ -42,11 +49,15 @@ async function setupSsrGenerator(tree, options) {
     if (projectConfig.targets.server) {
         throw new Error(`Project ${options.project} already has a server target.`);
     }
-    const originalOutputPath = projectConfig.targets.build?.options?.outputPath;
+    const originalOutputPath = projectConfig.targets.build?.options?.outputPath ??
+        projectConfig.targets.build?.outputs[0];
     if (!originalOutputPath) {
         throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
     }
-    projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
+    // TODO(colum): We need to figure out how to handle this for Crystal
+    if (projectConfig.targets.build.options?.outputPath) {
+        projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
+    }
     projectConfig.targets = {
         ...projectConfig.targets,
         server: {
@@ -136,7 +147,8 @@ async function setupSsrGenerator(tree, options) {
             ? `"${options.extraInclude.join('", "')}",`
             : '',
         appComponentImport: appComponentInfo.importPath,
-        browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
+        browserBuildOutputPath: projectConfig.targets.build?.options?.outputPath ??
+            projectConfig.targets.build?.outputs[0],
     });
     // Add <StaticRouter> to server main if needed.
     // TODO: need to read main.server.tsx not main.tsx.

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactTailwindSetupGenerator",
   "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",
   "cli": "nx",
   "$id": "NxReactStorybookStories",
   "title": "Generate React Storybook stories",

package/src/generators/stories/stories.js

@@ -11,11 +11,10 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
 const versions_1 = require("../../utils/versions");
 let tsModule;
 async function projectRootPath(tree, config) {
-    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
     let projectDir;
     if (config.projectType === 'application') {
-        const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
-        if (!!nextBuildTarget) {
+        const isNextJs = await isNextJsProject(tree, config);
+        if (isNextJs) {
             // Next.js apps
             projectDir = 'components';
         }
@@ -115,4 +114,17 @@ async function storiesGenerator(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.storiesGenerator = storiesGenerator;
+async function isNextJsProject(tree, config) {
+    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
+    const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
+    if (nextBuildTarget) {
+        return true;
+    }
+    for (const configFile of ['next.config.js', 'next.config.ts']) {
+        if (tree.exists((0, path_1.join)(config.root, configFile))) {
+            return true;
+        }
+    }
+    return false;
+}
 exports.default = storiesGenerator;

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

@@ -1,5 +1,6 @@
 import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function storybookConfigurationGeneratorInternal(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;
 export declare function findWebpackConfig(tree: Tree, projectRoot: string): string | undefined;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findWebpackConfig = exports.storybookConfigurationGenerator = void 0;
+exports.findWebpackConfig = exports.storybookConfigurationGeneratorInternal = exports.storybookConfigurationGenerator = void 0;
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 async function generateStories(host, schema) {
-    // TODO(katerina): Nx 18 -> remove Cypress
+    // TODO(katerina): Nx 19 -> remove Cypress
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
@@ -20,13 +20,22 @@ async function generateStories(host, schema) {
         interactionTests: schema.interactionTests ?? true,
     });
 }
-async function storybookConfigurationGenerator(host, schema) {
+function storybookConfigurationGenerator(host, schema) {
+    return storybookConfigurationGeneratorInternal(host, {
+        addPlugin: false,
+        ...schema,
+    });
+}
+exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
+async function storybookConfigurationGeneratorInternal(host, schema) {
+    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     let uiFramework = '@storybook/react-vite';
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
     if (findWebpackConfig(host, projectConfig.root) ||
         projectConfig.targets['build']?.executor === '@nx/rollup:rollup' ||
-        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup') {
+        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup' ||
+        projectConfig.targets['build']?.executor === '@nx/expo:build') {
         uiFramework = '@storybook/react-webpack5';
     }
     const installTask = await configurationGenerator(host, {
@@ -40,6 +49,7 @@ async function storybookConfigurationGenerator(host, schema) {
         configureStaticServe: schema.configureStaticServe,
         uiFramework: uiFramework, // cannot import UiFramework type dynamically
         skipFormat: true,
+        addPlugin: schema.addPlugin,
     });
     if (schema.generateStories) {
         await generateStories(host, schema);
@@ -47,7 +57,7 @@ async function storybookConfigurationGenerator(host, schema) {
     await (0, devkit_1.formatFiles)(host);
     return installTask;
 }
-exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
+exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;
 exports.default = storybookConfigurationGenerator;
 function findWebpackConfig(tree, projectRoot) {
     const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];

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

@@ -12,4 +12,5 @@ export interface StorybookConfigureSchema {
   configureCypress?: boolean;
   generateCypressSpecs?: boolean;
   cypressDirectory?: string;
+  addPlugin?: boolean;
 }

package/src/generators/storybook-configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactStorybookConfigure",
   "title": "React Storybook Configure",
@@ -29,7 +29,7 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Run the cypress-configure generator.",
-      "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": "Automatically generate test files in the Cypress E2E app generated by the `cypress-configure` generator.",
-      "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."
     },
     "js": {
       "type": "boolean",

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
+async function default_1(tree) {
+    if (!hasModuleFederationProject(tree)) {
+        return;
+    }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;
+function hasModuleFederationProject(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const project of projects.values()) {
+        const targets = project.targets;
+        for (const [_, target] of Object.entries(targets)) {
+            if (target.executor === '@nx/webpack:webpack' &&
+                (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||
+                    tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js')))) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

package/src/module-federation/with-module-federation-ssr.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = void 0;
 const utils_1 = require("./utils");
 async function withModuleFederationForSSR(options) {
+    if (global.NX_GRAPH_CREATION) {
+        return (config) => config;
+    }
     const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
         isServer: true,
     });

package/src/module-federation/with-module-federation.js

@@ -9,6 +9,9 @@ const isVarOrWindow = (libType) => libType === 'var' || libType === 'window';
  * @return {Promise<AsyncNxComposableWebpackPlugin>}
  */
 async function withModuleFederation(options) {
+    if (global.NX_GRAPH_CREATION) {
+        return (config) => config;
+    }
     const { sharedDependencies, sharedLibraries, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
     const isGlobal = isVarOrWindow(options.library?.type);
     return (config, ctx) => {

package/src/utils/add-mf-env-to-inputs.d.ts

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

package/src/utils/add-mf-env-to-inputs.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMfEnvToTargetDefaultInputs = void 0;
+const devkit_1 = require("@nx/devkit");
+function addMfEnvToTargetDefaultInputs(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const webpackExecutor = '@nx/webpack:webpack';
+    const mfEnvVar = 'NX_MF_DEV_SERVER_STATIC_REMOTES';
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[webpackExecutor] ??= {};
+    nxJson.targetDefaults[webpackExecutor].inputs ??= [];
+    let mfEnvVarExists = false;
+    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
+        if (typeof input === 'object' && input['env'] === mfEnvVar) {
+            mfEnvVarExists = true;
+            break;
+        }
+    }
+    if (!mfEnvVarExists) {
+        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;

package/src/utils/ct-utils.d.ts

@@ -1,9 +1,14 @@
 import { Tree } from '@nx/devkit';
 import { type FoundTarget } from '@nx/cypress/src/utils/find-target-options';
-export declare function addCTTargetWithBuildTarget(tree: Tree, options: {
+export declare function configureCypressCT(tree: Tree, options: {
     project: string;
     buildTarget: string;
+    bundler: 'vite' | 'webpack';
     validExecutorNames: Set<string>;
 }): Promise<FoundTarget>;
 export declare function getBundlerFromTarget(found: FoundTarget, tree: Tree): Promise<'vite' | 'webpack'>;
+export declare function getActualBundler(tree: Tree, options: {
+    buildTarget?: string;
+    bundler?: 'vite' | 'webpack';
+}, found: FoundTarget): Promise<"vite" | "webpack">;
 export declare function isComponent(tree: Tree, filePath: string): boolean;

package/src/utils/ct-utils.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isComponent = exports.getBundlerFromTarget = exports.addCTTargetWithBuildTarget = void 0;
+exports.isComponent = exports.getActualBundler = exports.getBundlerFromTarget = exports.configureCypressCT = void 0;
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ast_utils_1 = require("./ast-utils");
 let tsModule;
 const allowedFileExt = new RegExp(/\.[jt]sx?/);
 const isSpecFile = new RegExp(/(spec|test)\./);
-async function addCTTargetWithBuildTarget(tree, options) {
+async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     // Specifically undefined as a workaround for Remix to pass an empty string as the buildTarget
     if (options.buildTarget === undefined) {
@@ -19,16 +19,29 @@ async function addCTTargetWithBuildTarget(tree, options) {
         });
         assertValidConfig(found?.config);
     }
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    projectConfig.targets['component-test'].options = {
-        ...projectConfig.targets['component-test'].options,
-        devServerTarget: found.target,
-        skipServe: true,
+    const { addDefaultCTConfig, getProjectCypressConfigPath } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const ctConfigOptions = {
+        bundler: options.bundler ?? (await getActualBundler(tree, options, found)),
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (projectConfig.targets?.['component-test']?.executor ===
+        '@nx/cypress:cypress') {
+        projectConfig.targets['component-test'].options = {
+            ...projectConfig.targets['component-test'].options,
+            devServerTarget: found.target,
+            skipServe: true,
+        };
+        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    }
+    else {
+        ctConfigOptions.buildTarget = found.target;
+    }
+    const cypressConfigFilePath = getProjectCypressConfigPath(tree, projectConfig.root);
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigFilePath, 'utf-8'), ctConfigOptions);
+    tree.write(cypressConfigFilePath, `import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';\n${updatedCyConfig}`);
     return found;
 }
-exports.addCTTargetWithBuildTarget = addCTTargetWithBuildTarget;
+exports.configureCypressCT = configureCypressCT;
 function assertValidConfig(config) {
     if (!config) {
         throw new Error('Unable to find a valid build configuration. Try passing in a target for an app. --build-target=<project>:<target>[:<configuration>]');
@@ -49,6 +62,14 @@ async function getBundlerFromTarget(found, tree) {
         : 'webpack';
 }
 exports.getBundlerFromTarget = getBundlerFromTarget;
+async function getActualBundler(tree, options, found) {
+    // Specifically undefined to allow Remix workaround of passing an empty string
+    const actualBundler = options.buildTarget !== undefined && options.bundler
+        ? options.bundler
+        : await getBundlerFromTarget(found, tree);
+    return actualBundler;
+}
+exports.getActualBundler = getActualBundler;
 function isComponent(tree, filePath) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();