@nx/react 20.8.0-canary.20250408-32b48a3 → 20.8.0-canary.20250412-07ad2d7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "20.8.0-canary.20250408-32b48a3",
+  "version": "20.8.0-canary.20250412-07ad2d7",
   "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": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.8.0-canary.20250408-32b48a3",
-    "@nx/js": "20.8.0-canary.20250408-32b48a3",
-    "@nx/eslint": "20.8.0-canary.20250408-32b48a3",
-    "@nx/web": "20.8.0-canary.20250408-32b48a3",
-    "@nx/module-federation": "20.8.0-canary.20250408-32b48a3",
+    "@nx/devkit": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/js": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/eslint": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/web": "20.8.0-canary.20250412-07ad2d7",
+    "@nx/module-federation": "20.8.0-canary.20250412-07ad2d7",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/component-test/component-test.js

@@ -10,7 +10,7 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
 let tsModule;
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/cypress-version'));
+    const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/versions'));
     assertMinimumCypressVersion(10);
     // normalize any windows paths
     options.componentPath = options.componentPath.replace(/\\/g, '/');

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

@@ -1,4 +1,4 @@
+import type { FoundTarget } from '@nx/cypress/src/utils/find-target-options';
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 import type { CypressComponentConfigurationSchema } from '../schema';
-import { FoundTarget } from '@nx/cypress/src/utils/find-target-options';
 export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, found: FoundTarget): Promise<void>;

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

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFiles = addFiles;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("nx/src/utils/versions");
-const component_test_1 = require("../../component-test/component-test");
 const ct_utils_1 = require("../../../utils/ct-utils");
+const component_test_1 = require("../../component-test/component-test");
 async function addFiles(tree, projectConfig, options, found) {
-    // must dyanmicaly import to prevent packages not using cypress from erroring out
+    // must dynamicaly import to prevent packages not using cypress from erroring out
     // when importing react
-    const { addMountDefinition, addDefaultCTConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const { addMountDefinition } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const { getInstalledCypressMajorVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/versions'));
+    const installedCypressMajorVersion = getInstalledCypressMajorVersion(tree);
     // Specifically undefined to allow Remix workaround of passing an empty string
     const actualBundler = await (0, ct_utils_1.getActualBundler)(tree, options, found);
     if (options.bundler && options.bundler !== actualBundler) {
@@ -18,7 +20,8 @@ async function addFiles(tree, projectConfig, options, found) {
     const bundlerToUse = options.bundler ?? actualBundler;
     const commandFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const updatedCommandFile = await addMountDefinition(tree.read(commandFile, 'utf-8'));
-    tree.write(commandFile, `import { mount } from 'cypress/react18';\n${updatedCommandFile}`);
+    const moduleSpecifier = installedCypressMajorVersion >= 14 ? 'cypress/react' : 'cypress/react18';
+    tree.write(commandFile, `import { mount } from '${moduleSpecifier}';\n${updatedCommandFile}`);
     if (options.bundler === 'webpack' ||
         (!options.bundler && actualBundler === 'webpack')) {
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });

package/src/generators/library/library.js

@@ -2,28 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
-const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
-const versions_1 = require("../../utils/versions");
+const path_1 = require("path");
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const use_legacy_versioning_1 = require("nx/src/command-line/release/config/use-legacy-versioning");
+const create_ts_config_1 = require("../../utils/create-ts-config");
+const jest_utils_1 = require("../../utils/jest-utils");
 const maybe_js_1 = require("../../utils/maybe-js");
+const versions_1 = require("../../utils/versions");
 const component_1 = require("../component/component");
 const init_1 = require("../init/init");
-const jest_utils_1 = require("../../utils/jest-utils");
-const normalize_options_1 = require("./lib/normalize-options");
-const add_rollup_build_target_1 = require("./lib/add-rollup-build-target");
 const add_linting_1 = require("./lib/add-linting");
-const update_app_routes_1 = require("./lib/update-app-routes");
+const add_rollup_build_target_1 = require("./lib/add-rollup-build-target");
 const create_files_1 = require("./lib/create-files");
-const create_ts_config_1 = require("../../utils/create-ts-config");
+const determine_entry_fields_1 = require("./lib/determine-entry-fields");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
+const normalize_options_1 = require("./lib/normalize-options");
 const set_defaults_1 = require("./lib/set-defaults");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const determine_entry_fields_1 = require("./lib/determine-entry-fields");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
-const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const update_app_routes_1 = require("./lib/update-app-routes");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -196,7 +197,8 @@ async function libraryGeneratorInternal(host, schema) {
             await (0, add_release_config_1.addReleaseConfigForTsSolution)(host, options.name, projectConfiguration);
         }
         else {
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(host, options.name, projectConfiguration);
+            const nxJson = (0, devkit_1.readNxJson)(host);
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)((0, use_legacy_versioning_1.shouldUseLegacyVersioning)(nxJson.release), host, options.name, projectConfiguration);
         }
         (0, devkit_1.updateProjectConfiguration)(host, options.name, projectConfiguration);
         tasks.push(await (0, add_release_config_1.releaseTasks)(host));