@nx/react 23.0.0-beta.15 → 23.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "23.0.0-beta.15",
+  "version": "23.0.0-beta.17",
   "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": {
@@ -37,28 +37,28 @@
     "@svgr/webpack": "^8.0.1",
     "minimatch": "10.2.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.15",
-    "@nx/js": "23.0.0-beta.15",
-    "@nx/eslint": "23.0.0-beta.15",
-    "@nx/web": "23.0.0-beta.15",
-    "@nx/module-federation": "23.0.0-beta.15",
-    "@nx/rollup": "23.0.0-beta.15",
+    "@nx/devkit": "23.0.0-beta.17",
+    "@nx/js": "23.0.0-beta.17",
+    "@nx/eslint": "23.0.0-beta.17",
+    "@nx/web": "23.0.0-beta.17",
+    "@nx/module-federation": "23.0.0-beta.17",
+    "@nx/rollup": "23.0.0-beta.17",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.5",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@nx/cypress": "23.0.0-beta.15",
-    "@nx/playwright": "23.0.0-beta.15",
-    "@nx/rsbuild": "23.0.0-beta.15",
-    "@nx/vite": "23.0.0-beta.15",
-    "@nx/vitest": "23.0.0-beta.15",
-    "@nx/webpack": "23.0.0-beta.15",
-    "@nx/storybook": "23.0.0-beta.15",
-    "nx": "23.0.0-beta.15"
+    "@nx/cypress": "23.0.0-beta.17",
+    "@nx/playwright": "23.0.0-beta.17",
+    "@nx/rsbuild": "23.0.0-beta.17",
+    "@nx/vite": "23.0.0-beta.17",
+    "@nx/vitest": "23.0.0-beta.17",
+    "@nx/webpack": "23.0.0-beta.17",
+    "@nx/storybook": "23.0.0-beta.17",
+    "nx": "23.0.0-beta.17"
   },
   "optionalDependencies": {
-    "@nx/vite": "23.0.0-beta.15"
+    "@nx/vite": "23.0.0-beta.17"
   },
   "publishConfig": {
     "access": "public"

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

@@ -37,10 +37,9 @@ exports.addLinting = addLinting;
 exports.isEslintInstalled = isEslintInstalled;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+const internal_1 = require("@nx/eslint/internal");
 const devkit_2 = require("@nx/devkit");
-const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const lint_1 = require("../../../utils/lint");
 const versions_1 = require("../../../utils/versions");
 async function addLinting(host, options) {
@@ -59,23 +58,23 @@ async function addLinting(host, options) {
             addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
-        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-            if ((0, flat_config_1.useFlatConfig)(host)) {
-                (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(host, options.appProjectRoot, 'flat/react', { checkBaseConfig: true });
+        if ((0, internal_1.isEslintConfigSupported)(host)) {
+            if ((0, internal_1.useFlatConfig)(host)) {
+                (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.appProjectRoot, 'flat/react', { checkBaseConfig: true });
                 // Add an empty rules object to users know how to add/override rules
-                (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
+                (0, internal_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
                     files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
                     rules: {},
                 });
             }
             else {
-                const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, { name: 'plugin:@nx/react', needCompatFixup: true });
+                const addExtendsTask = (0, internal_1.addExtendsToLintConfig)(host, options.appProjectRoot, { name: 'plugin:@nx/react', needCompatFixup: true });
                 tasks.push(addExtendsTask);
             }
         }
         if (!options.skipPackageJson) {
             const installTask = (0, devkit_2.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-            const addSwcTask = (0, internal_1.addSwcDependencies)(host);
+            const addSwcTask = (0, internal_2.addSwcDependencies)(host);
             tasks.push(installTask, addSwcTask);
         }
         if (options.useReactRouter) {
@@ -89,11 +88,11 @@ async function ignoreReactRouterFilesInEslintConfig(tree, projectRoot) {
         return;
     }
     (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
-    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/src/generators/utils/eslint-file')));
+    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/internal')));
     if (!isEslintConfigSupported(tree)) {
         return;
     }
-    const { useFlatConfig } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/src/utils/flat-config')));
+    const { useFlatConfig } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/internal')));
     const isUsingFlatConfig = useFlatConfig(tree);
     if (!projectRoot && !isUsingFlatConfig) {
         // root eslintrc files ignore all files and the root eslintrc files add

package/src/generators/application/lib/create-application-files.d.ts

@@ -37,7 +37,7 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     tags?: string;
     inSourceTests?: boolean;
     e2eTestRunner: "cypress" | "playwright" | "none";
-    linter: import("packages/eslint").Linter | import("packages/eslint").LinterType;
+    linter: import("packages/eslint/dist").Linter | import("packages/eslint/dist").LinterType;
     classComponent?: boolean;
     routing?: boolean;
     useReactRouter?: boolean;

package/src/generators/host/files/rspack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/module-federation';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/host/files/rspack-module-federation-ssr-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
 import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import browserMfConfig from './module-federation.config';

package/src/generators/host/files/rspack-module-federation-ts/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/module-federation';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/host/files/rspack-module-federation-ts/rspack.config.prod.ts__tmpl__

@@ -1,7 +1,7 @@
 import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
 import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack.js';
-import { ModuleFederationConfig } from '@nx/module-federation';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 import { join } from 'path';
 
 import baseConfig from './module-federation.config';

package/src/generators/host/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
 import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import config from './module-federation.config';

package/src/generators/host/files/webpack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/module-federation';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/host/files/webpack-module-federation-ssr-ts/webpack.server.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederationForSSR} from '@nx/module-federation/webpack.js';
+import {withModuleFederationForSSR} from '@nx/module-federation/webpack';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/host/files/webpack-module-federation-ts/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/module-federation';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/host/files/webpack-module-federation-ts/webpack.config.prod.ts__tmpl__

@@ -1,7 +1,7 @@
 import { composePlugins, withNx } from '@nx/webpack';
 import { withReact } from '@nx/react';
-import { withModuleFederation } from '@nx/module-federation/webpack.js';
-import { ModuleFederationConfig } from '@nx/module-federation';
+import { withModuleFederation } from '@nx/module-federation/webpack';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/host/files/webpack-module-federation-ts/webpack.config.ts__tmpl__

@@ -1,7 +1,7 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederation} from '@nx/module-federation/webpack.js';
-import { ModuleFederationConfig } from '@nx/module-federation';
+import {withModuleFederation} from '@nx/module-federation/webpack';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';
 

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

@@ -5,8 +5,7 @@ const eslint_1 = require("@nx/eslint");
 const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("../../../utils/lint");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+const internal_1 = require("@nx/eslint/internal");
 async function addLinting(host, options) {
     if (options.linter === 'eslint') {
         const tasks = [];
@@ -23,17 +22,17 @@ async function addLinting(host, options) {
             addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
-        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-            if ((0, flat_config_1.useFlatConfig)(host)) {
-                (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react', { checkBaseConfig: true });
+        if ((0, internal_1.isEslintConfigSupported)(host)) {
+            if ((0, internal_1.useFlatConfig)(host)) {
+                (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react', { checkBaseConfig: true });
                 // Add an empty rules object to users know how to add/override rules
-                (0, eslint_file_1.addOverrideToLintConfig)(host, options.projectRoot, {
+                (0, internal_1.addOverrideToLintConfig)(host, options.projectRoot, {
                     files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
                     rules: {},
                 });
             }
             else {
-                const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, {
+                const addExtendsTask = (0, internal_1.addExtendsToLintConfig)(host, options.projectRoot, {
                     name: 'plugin:@nx/react',
                     needCompatFixup: true,
                 });
@@ -41,7 +40,7 @@ async function addLinting(host, options) {
             }
             // Add out-tsc ignore pattern when using TS solution setup
             if (options.isUsingTsSolutionConfig) {
-                (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, ['**/out-tsc']);
+                (0, internal_1.addIgnoresToLintConfig)(host, options.projectRoot, ['**/out-tsc']);
             }
         }
         let installTask = () => { };

package/src/generators/remote/files/rspack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/remote/files/rspack-module-federation-ssr-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
 import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import browserMfConfig from './module-federation.config';

package/src/generators/remote/files/rspack-module-federation-ts/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/remote/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
 import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import config from './module-federation.config';

package/src/generators/remote/files/webpack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/remote/files/webpack-module-federation-ssr-ts/webpack.server.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederationForSSR} from '@nx/module-federation/webpack.js';
+import {withModuleFederationForSSR} from '@nx/module-federation/webpack';
 
 import baseConfig from "./module-federation.server.config";
 

package/src/generators/remote/files/webpack-module-federation-ts/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/generators/remote/files/webpack-module-federation-ts/webpack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederation} from '@nx/module-federation/webpack.js';
+import {withModuleFederation} from '@nx/module-federation/webpack';
 
 import baseConfig from './module-federation.config';
 

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

@@ -1 +1 @@
-{"version":3,"file":"ct-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ct-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAQ7E,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACjC,GACA,OAAO,CAAC,WAAW,CAAC,CAqEtB;AAUD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAY7B;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAC/D,KAAK,EAAE,WAAW,+BASnB;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAmBjE"}
+{"version":3,"file":"ct-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ct-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAQ7E,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACjC,GACA,OAAO,CAAC,WAAW,CAAC,CAmEtB;AAUD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAY7B;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAC/D,KAAK,EAAE,WAAW,+BASnB;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAmBjE"}

package/src/utils/ct-utils.js

@@ -82,8 +82,8 @@ async function configureCypressCT(tree, options) {
         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}`);
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigFilePath, 'utf-8'), ctConfigOptions, '@nx/react/plugins/component-testing');
+    tree.write(cypressConfigFilePath, updatedCyConfig);
     return found;
 }
 function assertValidConfig(config) {