@nx/react 24.0.0-beta.3 → 24.0.0-beta.4

package/dist/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -19,15 +19,11 @@ async function cypressComponentConfigGeneratorInternal(tree, options) {
     (0, assert_supported_react_version_1.assertSupportedReactVersion)(tree);
     const { componentConfigurationGenerator: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const { found, bundler } = await (0, ct_utils_1.resolveCypressCTTarget)(tree, {
+    const { found, bundler: buildBundler } = await (0, ct_utils_1.resolveCypressCTTarget)(tree, {
         project: options.project,
         buildTarget: options.buildTarget,
-        bundler: options.bundler,
-        validExecutorNames: new Set([
-            '@nx/webpack:webpack',
-            '@nx/vite:build',
-        ]),
     });
+    const bundler = options.bundler ?? buildBundler;
     const installTask = await baseCyCtConfig(tree, {
         project: options.project,
         skipFormat: true,
@@ -35,7 +31,7 @@ async function cypressComponentConfigGeneratorInternal(tree, options) {
         bundler,
     });
     await (0, ct_utils_1.configureCypressCT)(tree, { project: options.project, found, bundler });
-    await (0, add_files_1.addFiles)(tree, projectConfig, options, found);
+    await (0, add_files_1.addFiles)(tree, projectConfig, options, buildBundler);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/dist/src/generators/cypress-component-configuration/lib/add-files.d.ts

@@ -1,4 +1,3 @@
-import type { FoundTarget } from '@nx/cypress/internal';
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 import type { CypressComponentConfigurationSchema } from '../schema';
-export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, found: FoundTarget): Promise<void>;
+export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, buildBundler: 'vite' | 'webpack'): Promise<void>;

package/dist/src/generators/cypress-component-configuration/lib/add-files.js

@@ -6,12 +6,14 @@ const internal_1 = require("@nx/js/internal");
 const ct_utils_1 = require("../../../utils/ct-utils");
 const component_test_1 = require("../../component-test/component-test");
 const internal_2 = require("@nx/devkit/internal");
-async function addFiles(tree, projectConfig, options, found) {
+async function addFiles(tree, projectConfig, options, buildBundler) {
     // must dynamicaly import to prevent packages not using cypress from erroring out
     // when importing react
     const { addMountDefinition, getInstalledCypressMajorVersion, } = require('@nx/cypress/internal');
     const installedCypressMajorVersion = getInstalledCypressMajorVersion(tree);
-    const actualBundler = await (0, ct_utils_1.getActualBundler)(tree, options, found);
+    const actualBundler = options.buildTarget !== undefined && options.bundler
+        ? options.bundler
+        : buildBundler;
     if (options.bundler && options.bundler !== actualBundler) {
         devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
       This may cause errors. If you are seeing errors, try removing the --bundler option.`);

package/dist/src/generators/stories/stories.js

@@ -100,11 +100,6 @@ async function storiesGenerator(host, schema) {
     }
 }
 async function isNextJsProject(tree, config) {
-    const { findStorybookAndBuildTargetsAndCompiler, } = 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;

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

@@ -3,8 +3,6 @@ import { type FoundTarget } from '@nx/cypress/internal';
 export declare function resolveCypressCTTarget(tree: Tree, options: {
     project: string;
     buildTarget: string;
-    bundler: 'vite' | 'webpack';
-    validExecutorNames: Set<string>;
 }): Promise<{
     found: FoundTarget;
     bundler: 'vite' | 'webpack';
@@ -14,9 +12,4 @@ export declare function configureCypressCT(tree: Tree, options: {
     found: FoundTarget;
     bundler: 'vite' | 'webpack';
 }): Promise<void>;
-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/dist/src/utils/ct-utils.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveCypressCTTarget = resolveCypressCTTarget;
 exports.configureCypressCT = configureCypressCT;
-exports.getBundlerFromTarget = getBundlerFromTarget;
-exports.getActualBundler = getActualBundler;
 exports.isComponent = isComponent;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
@@ -14,7 +12,6 @@ const allowedFileExt = new RegExp(/\.[jt]sx?/);
 const isSpecFile = new RegExp(/(spec|test)\./);
 // Resolved before the shared cypress generator runs, so the bundler reaches it.
 async function resolveCypressCTTarget(tree, options) {
-    let found = { target: options.buildTarget, config: undefined };
     const graph = await (0, devkit_1.createProjectGraphAsync)();
     const parsed = options.buildTarget
         ? (0, devkit_1.parseTargetString)(options.buildTarget, graph)
@@ -25,40 +22,40 @@ async function resolveCypressCTTarget(tree, options) {
             options.project,
             ...Object.keys(graph.dependencies).filter((name) => graph.dependencies[name].some((dep) => dep.target === options.project)),
         ];
+    let overridden;
     for (const project of candidates) {
         const native = await findNativeBuild(tree, project, parsed?.target);
-        if (native) {
-            return {
-                found: {
-                    target: options.buildTarget ?? native.target,
-                    config: { command: `${native.bundler} build` },
-                },
-                bundler: options.bundler ?? native.bundler,
+        if (!native)
+            continue;
+        if (native.overridingExecutor) {
+            overridden ??= {
+                project,
+                target: native.target,
+                executor: native.overridingExecutor,
             };
+            continue;
         }
+        return {
+            found: {
+                target: options.buildTarget ?? native.target,
+                config: { command: `${native.bundler} build` },
+            },
+            bundler: native.bundler,
+        };
     }
-    if (options.buildTarget === undefined) {
-        const { findBuildConfig, } = require('@nx/cypress/internal');
-        found = await findBuildConfig(tree, {
-            project: options.project,
-            buildTarget: options.buildTarget,
-            validExecutorNames: options.validExecutorNames,
-        });
-        assertValidConfig(found?.config);
+    if (parsed) {
+        const executor = (0, devkit_1.readProjectConfiguration)(tree, parsed.project).targets?.[parsed.target]?.executor;
+        throw notInferredBuildTargetError(options.buildTarget, parsed.project, executor);
     }
-    else if (options.buildTarget) {
-        const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-        const { project, target } = (0, devkit_1.parseTargetString)(options.buildTarget, projectGraph);
-        const buildTargetProject = (0, devkit_1.readProjectConfiguration)(tree, project);
-        const executor = buildTargetProject.targets?.[target]?.executor;
-        if (!executor || !options.validExecutorNames.has(executor)) {
-            throw new Error(`Cypress Component Testing is not currently supported for this project. Either 'executer' is not defined in '${target} target' of '${project} project.json' or executer present is not valid one. Valid ones are ${JSON.stringify([...options.validExecutorNames])}. Please check https://github.com/nrwl/nx/issues/21546 for more information.`);
-        }
+    if (overridden) {
+        throw notInferredBuildTargetError(overridden.target, overridden.project, overridden.executor);
     }
-    return {
-        found,
-        bundler: options.bundler ?? (await getActualBundler(tree, options, found)),
-    };
+    throw new Error(`Unable to find a build target inferred by @nx/vite/plugin or @nx/webpack/plugin for project "${options.project}" or the projects that depend on it. Pass one with --build-target=<project>:<target>[:<configuration>].`);
+}
+function notInferredBuildTargetError(buildTarget, project, executor) {
+    return new Error(`Cypress Component Testing needs a build target inferred by @nx/vite/plugin or @nx/webpack/plugin, and "${buildTarget}" is not one.${executor && executor !== 'nx:run-commands'
+        ? ` It uses the "${executor}" executor. Convert it to an inferred target first, for example with "nx g @nx/workspace:infer-targets --project=${project}".`
+        : ''}`);
 }
 async function configureCypressCT(tree, options) {
     const { found } = options;
@@ -72,30 +69,8 @@ async function configureCypressCT(tree, options) {
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigFilePath, 'utf-8'), ctConfigOptions, '@nx/react/plugins/component-testing', getInstalledCypressMajorVersion(tree));
     tree.write(cypressConfigFilePath, updatedCyConfig);
 }
-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>]');
-    }
-}
-async function getBundlerFromTarget(found, tree) {
-    if (found.target && found.config?.executor) {
-        return found.config.executor === '@nx/vite:build' ? 'vite' : 'webpack';
-    }
-    const { target, project } = (0, devkit_1.parseTargetString)(found.target, await (0, devkit_1.createProjectGraphAsync)());
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-    const native = await findNativeBuild(tree, project, target);
-    if (native)
-        return native.bundler;
-    const executor = projectConfig?.targets?.[target]?.executor;
-    return executor === '@nx/vite:build' ? 'vite' : 'webpack';
-}
 async function findNativeBuild(tree, project, target) {
     const config = (0, devkit_1.readProjectConfiguration)(tree, project);
-    if (target &&
-        config.targets?.[target]?.executor &&
-        config.targets[target].executor !== 'nx:run-commands') {
-        return;
-    }
     for (const bundler of ['vite', 'webpack']) {
         for (const ext of ['ts', 'mts', 'cts', 'js', 'mjs', 'cjs']) {
             const path = (0, devkit_1.joinPathFragments)(config.root, `${bundler}.config.${ext}`);
@@ -110,16 +85,17 @@ async function findNativeBuild(tree, project, target) {
                     ?.buildTargetName ?? 'build');
             if (target && target !== buildTarget)
                 continue;
-            return { target: `${project}:${buildTarget}`, bundler };
+            // A project.json or package.json target on another executor replaces the
+            // inferred one (nx.json targetDefaults can't change its executor).
+            const executor = config.targets?.[buildTarget]?.executor;
+            return {
+                target: `${project}:${buildTarget}`,
+                bundler,
+                overridingExecutor: executor && executor !== 'nx:run-commands' ? executor : undefined,
+            };
         }
     }
 }
-async function getActualBundler(tree, options, found) {
-    const actualBundler = options.buildTarget !== undefined && options.bundler
-        ? options.bundler
-        : await getBundlerFromTarget(found, tree);
-    return actualBundler;
-}
 function isComponent(tree, filePath) {
     if (!tsModule) {
         tsModule = (0, internal_2.ensureTypescript)();

package/dist/src/utils/framework.js

@@ -4,9 +4,7 @@ exports.getUiFramework = getUiFramework;
 const devkit_1 = require("@nx/devkit");
 function getUiFramework(tree, project) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-    if (findWebpackConfig(tree, projectConfig.root) ||
-        projectConfig.targets?.['build']?.executor === '@nx/rollup:rollup' ||
-        projectConfig.targets?.['build']?.executor === '@nx/expo:build') {
+    if (findWebpackConfig(tree, projectConfig.root)) {
         return '@storybook/react-webpack5';
     }
     return '@storybook/react-vite';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "24.0.0-beta.3",
+  "version": "24.0.0-beta.4",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -99,26 +99,26 @@
     "@phenomnomnominal/tsquery": "~6.2.0",
     "minimatch": "10.2.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "24.0.0-beta.3",
-    "@nx/js": "24.0.0-beta.3",
-    "@nx/eslint": "24.0.0-beta.3",
-    "@nx/web": "24.0.0-beta.3",
+    "@nx/devkit": "24.0.0-beta.4",
+    "@nx/js": "24.0.0-beta.4",
+    "@nx/eslint": "24.0.0-beta.4",
+    "@nx/web": "24.0.0-beta.4",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@nx/cypress": "24.0.0-beta.3",
-    "@nx/playwright": "24.0.0-beta.3",
-    "@nx/rollup": "24.0.0-beta.3",
-    "@nx/rsbuild": "24.0.0-beta.3",
-    "@nx/rspack": "24.0.0-beta.3",
-    "@nx/vite": "24.0.0-beta.3",
-    "@nx/vitest": "24.0.0-beta.3",
-    "@nx/webpack": "24.0.0-beta.3",
-    "@nx/storybook": "24.0.0-beta.3",
-    "nx": "24.0.0-beta.3"
+    "@nx/cypress": "24.0.0-beta.4",
+    "@nx/playwright": "24.0.0-beta.4",
+    "@nx/rollup": "24.0.0-beta.4",
+    "@nx/rsbuild": "24.0.0-beta.4",
+    "@nx/rspack": "24.0.0-beta.4",
+    "@nx/vite": "24.0.0-beta.4",
+    "@nx/vitest": "24.0.0-beta.4",
+    "@nx/webpack": "24.0.0-beta.4",
+    "@nx/storybook": "24.0.0-beta.4",
+    "nx": "24.0.0-beta.4"
   },
   "optionalDependencies": {
-    "@nx/vite": "24.0.0-beta.3"
+    "@nx/vite": "24.0.0-beta.4"
   },
   "publishConfig": {
     "access": "public"