@nx/react 24.0.0-pr.37405.acdaf31 → 24.0.0-rc.1

package/dist/src/generators/application/lib/add-e2e.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
-const internal_1 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
@@ -24,26 +23,26 @@ async function addE2e(tree, options) {
     };
     if (options.bundler === 'webpack') {
         const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
-        e2eWebServerInfo = await getWebpackE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.port);
+        e2eWebServerInfo = await getWebpackE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.${options.js ? 'js' : 'ts'}`), options.port);
     }
     else if (options.bundler === 'rspack') {
         const { getRspackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
-        e2eWebServerInfo = await getRspackE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `rspack.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.port);
+        e2eWebServerInfo = await getRspackE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `rspack.config.${options.js ? 'js' : 'ts'}`), options.port);
     }
     else if (options.bundler === 'vite') {
         const { getViteE2EWebServerInfo, getReactRouterE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         e2eWebServerInfo = options.useReactRouter
-            ? await getReactRouterE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.port ?? 4200, 
+            ? await getReactRouterE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.port ?? 4200, 
             // If the user manually sets the port, then use it for dev and preview
             options.port)
-            : await getViteE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.port ?? 4200, 
+            : await getViteE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.port ?? 4200, 
             // If the user manually sets the port, then use it for dev and preview
             options.port);
     }
     else if (options.bundler === 'rsbuild') {
         (0, devkit_1.ensurePackage)('@nx/rsbuild', versions_1.nxVersion);
         const { getRsbuildE2EWebServerInfo, } = require('@nx/rsbuild/config-utils');
-        e2eWebServerInfo = await getRsbuildE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `rsbuild.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.port ?? 4200);
+        e2eWebServerInfo = await getRsbuildE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `rsbuild.config.${options.js ? 'js' : 'ts'}`), options.port ?? 4200);
     }
     if (!hasNxBuildPlugin) {
         await (0, web_1.webStaticServeGenerator)(tree, {
@@ -95,7 +94,7 @@ async function addE2e(tree, options) {
                 baseUrl: e2eWebServerInfo.e2eWebServerAddress,
                 jsx: true,
                 rootProject: options.rootProject,
-                enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
+                enableTypedLinting: options.enableTypedLinting,
                 webServerCommands: {
                     default: e2eWebServerInfo.e2eWebServerCommand,
                     production: e2eWebServerInfo.e2eCiWebServerCommand,
@@ -137,11 +136,12 @@ async function addE2e(tree, options) {
                 directory: 'src',
                 js: false,
                 linter: options.linter,
-                enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
-                webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
-                webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
+                enableTypedLinting: options.enableTypedLinting,
+                webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
+                webServerAddress: e2eWebServerInfo.e2eWebServerAddress,
+                ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+                ciWebServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
                 rootProject: options.rootProject,
-                addPlugin: options.addPlugin,
             });
             return e2eTask;
         }

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

@@ -21,8 +21,7 @@ async function addLinting(host, options) {
         unitTestRunner: options.unitTestRunner,
         rootProject: options.rootProject,
         skipPackageJson: options.skipPackageJson,
-        enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
-        addPlugin: options.addPlugin,
+        enableTypedLinting: options.enableTypedLinting,
     }));
     // Predefined configs, `extends` and ignore entries are ESLint concepts with
     // no equivalent in other linters.

package/dist/src/generators/application/lib/add-project.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
-const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
-const maybe_js_1 = require("../../../utils/maybe-js");
-const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
 function addProject(host, options) {
     const project = {
         root: options.appProjectRoot,
@@ -13,31 +10,6 @@ function addProject(host, options) {
         targets: {},
         tags: options.parsedTags,
     };
-    if (options.bundler === 'webpack') {
-        if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(host) || !options.addPlugin) {
-            // Mirrors warnWebpackExecutorGenerating from @nx/webpack/src/utils/deprecation.
-            // Inlined to avoid a cross-package deep import; @nx/webpack's package
-            // exports field doesn't expose internal `src/...` paths, so the import
-            // works at compile time (via tsconfig project refs) but fails at runtime
-            // in published packages.
-            devkit_1.logger.warn('Generating targets that use the deprecated `@nx/webpack:webpack` and `@nx/webpack:dev-server` executors. These executors will be removed in Nx v24. Run `nx g @nx/webpack:convert-to-inferred` next to migrate these targets to the `@nx/webpack/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
-            project.targets = {
-                build: createBuildTarget(options),
-                serve: createServeTarget(options),
-            };
-        }
-    }
-    else if (options.bundler === 'rspack' &&
-        (!(0, has_rspack_plugin_1.hasRspackPlugin)(host) || !options.addPlugin)) {
-        // Mirrors warnRspackExecutorGenerating from @nx/rspack/src/utils/deprecation.
-        // Inlined to avoid a cross-package import where react does not declare a
-        // TypeScript project reference to rspack.
-        devkit_1.logger.warn('Generating targets that use the deprecated `@nx/rspack:rspack` and `@nx/rspack:dev-server` executors. These executors will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` next to migrate these targets to the `@nx/rspack/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
-        project.targets = {
-            build: createRspackBuildTarget(options),
-            serve: createRspackServeTarget(options),
-        };
-    }
     const packageJson = {
         name: options.importPath,
         version: '0.0.1',
@@ -77,142 +49,3 @@ function addProject(host, options) {
         }
     }
 }
-function createRspackBuildTarget(options) {
-    return {
-        executor: '@nx/rspack:rspack',
-        outputs: ['{options.outputPath}'],
-        defaultConfiguration: 'production',
-        options: {
-            outputPath: options.isUsingTsSolutionConfig
-                ? (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'dist')
-                : (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot !== '.'
-                    ? options.appProjectRoot
-                    : options.projectName),
-            index: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/index.html'),
-            baseHref: '/',
-            main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, `src/main.tsx`)),
-            tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            assets: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/favicon.ico'),
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/assets'),
-            ],
-            rspackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'rspack.config.js'),
-            styles: !options.hasStyles
-                ? []
-                : [
-                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
-                ],
-            scripts: [],
-            configurations: {
-                development: {
-                    mode: 'development',
-                },
-                production: {
-                    mode: 'production',
-                    optimization: true,
-                    sourceMap: false,
-                    outputHashing: 'all',
-                    namedChunks: false,
-                    extractLicenses: true,
-                    vendorChunk: false,
-                },
-            },
-        },
-    };
-}
-function createRspackServeTarget(options) {
-    return {
-        executor: '@nx/rspack:dev-server',
-        defaultConfiguration: 'development',
-        options: {
-            buildTarget: `${options.projectName}:build`,
-            // @nx/rspack:dev-server defaults to 4200 at runtime, not in its schema, so
-            // omitting this is safe but the generated executor docs show no default.
-            ...(options.port != null ? { port: options.port } : {}),
-            hmr: true,
-        },
-        configurations: {
-            development: {
-                buildTarget: `${options.projectName}:build:development`,
-            },
-            production: {
-                buildTarget: `${options.projectName}:build:production`,
-                hmr: false,
-            },
-        },
-    };
-}
-function createBuildTarget(options) {
-    return {
-        executor: '@nx/webpack:webpack',
-        outputs: ['{options.outputPath}'],
-        defaultConfiguration: 'production',
-        options: {
-            compiler: options.compiler ?? 'babel',
-            outputPath: options.isUsingTsSolutionConfig
-                ? (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'dist')
-                : (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot !== '.'
-                    ? options.appProjectRoot
-                    : options.projectName),
-            index: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/index.html'),
-            baseHref: '/',
-            main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, `src/main.tsx`)),
-            tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            assets: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/favicon.ico'),
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/assets'),
-            ],
-            styles: !options.hasStyles
-                ? []
-                : [
-                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
-                ],
-            scripts: [],
-            webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
-        },
-        configurations: {
-            development: {
-                extractLicenses: false,
-                optimization: false,
-                sourceMap: true,
-                vendorChunk: true,
-            },
-            production: {
-                fileReplacements: [
-                    {
-                        replace: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, `src/environments/environment.ts`)),
-                        with: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, `src/environments/environment.prod.ts`)),
-                    },
-                ],
-                optimization: true,
-                outputHashing: 'all',
-                sourceMap: false,
-                namedChunks: false,
-                extractLicenses: true,
-                vendorChunk: false,
-            },
-        },
-    };
-}
-function createServeTarget(options) {
-    return {
-        executor: '@nx/webpack:dev-server',
-        defaultConfiguration: 'development',
-        options: {
-            buildTarget: `${options.projectName}:build`,
-            // Only when asked: @nx/webpack:dev-server already defaults to 4200, so writing
-            // it unrequested would just restate the executor's own default.
-            ...(options.port != null ? { port: options.port } : {}),
-            hmr: true,
-        },
-        configurations: {
-            development: {
-                buildTarget: `${options.projectName}:build:development`,
-            },
-            production: {
-                buildTarget: `${options.projectName}:build:production`,
-                hmr: false,
-            },
-        },
-    };
-}

package/dist/src/generators/application/lib/bundlers/add-rsbuild.js

@@ -10,7 +10,6 @@ async function initRsbuild(tree, options, tasks) {
     const { initGenerator, } = require('@nx/rsbuild/generators');
     const initTask = await initGenerator(tree, {
         skipPackageJson: options.skipPackageJson,
-        addPlugin: true,
         skipFormat: true,
     });
     tasks.push(initTask);

package/dist/src/generators/application/lib/bundlers/add-vite.js

@@ -35,7 +35,6 @@ async function setupViteConfiguration(tree, options, tasks) {
         inSourceTests: options.inSourceTests,
         compiler: options.compiler,
         skipFormat: true,
-        addPlugin: options.addPlugin,
         projectType: 'application',
         port: options.port,
         ...(forceViteV7 ? { useViteV7: true } : {}),
@@ -69,7 +68,6 @@ async function setupVitestConfiguration(tree, options, tasks) {
         project: options.projectName,
         inSourceTests: options.inSourceTests,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
     tasks.push(vitestTask);
     createOrEditViteConfig(tree, {

package/dist/src/generators/application/lib/bundlers/add-webpack.js

@@ -8,7 +8,6 @@ async function initWebpack(tree, options, tasks) {
     const webpackInitTask = await webpackInitGenerator(tree, {
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
     tasks.push(webpackInitTask);
     if (!options.skipPackageJson) {

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

@@ -19,7 +19,6 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     globalCss?: boolean;
     strict?: boolean;
     enableTypedLinting?: boolean;
-    setParserOptionsProject?: boolean;
     compiler?: 'babel' | 'swc';
     remotes?: string[];
     devServerPort?: number;
@@ -41,7 +40,6 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     fileName: string;
     hasStyles: boolean;
     unitTestRunner: 'jest' | 'vitest' | 'none';
-    addPlugin?: boolean;
     names: ReturnType<typeof import("@nx/devkit").names>;
     isUsingTsSolutionConfig?: boolean;
     typesNodeVersion: string;

package/dist/src/generators/application/lib/create-application-files.js

@@ -9,9 +9,7 @@ const path_1 = require("path");
 const create_ts_config_1 = require("../../../utils/create-ts-config");
 const get_in_source_vitest_tests_template_1 = require("../../../utils/get-in-source-vitest-tests-template");
 const maybe_js_1 = require("../../../utils/maybe-js");
-const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const get_app_tests_1 = require("./get-app-tests");
-const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
 const internal_1 = require("@nx/js/internal");
 const versions_1 = require("../../../utils/versions");
 const internal_2 = require("@nx/devkit/internal");
@@ -83,12 +81,7 @@ async function createApplicationFiles(host, options) {
     else if (options.bundler === 'webpack') {
         (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/base-webpack'), options.appProjectRoot, {
             ...templateVariables,
-            // Must match addProject's gate. An app that opts out gets executor targets,
-            // so it needs the executor-shaped config too — otherwise the plugin config's
-            // devServer.port and the serve target's port both describe the same server.
-            webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(host) && options.addPlugin
-                ? createNxWebpackPluginOptions(options, templateVariables.offsetFromRoot)
-                : null,
+            webpackPluginOptions: createNxWebpackPluginOptions(options, templateVariables.offsetFromRoot),
         });
         if (options.compiler === 'babel') {
             (0, devkit_1.writeJson)(host, `${options.appProjectRoot}/.babelrc`, {
@@ -114,9 +107,7 @@ async function createApplicationFiles(host, options) {
     else if (options.bundler === 'rspack') {
         (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/base-rspack'), options.appProjectRoot, {
             ...templateVariables,
-            rspackPluginOptions: (0, has_rspack_plugin_1.hasRspackPlugin)(host) && options.addPlugin
-                ? createNxRspackPluginOptions(options, templateVariables.offsetFromRoot)
-                : null,
+            rspackPluginOptions: createNxRspackPluginOptions(options, templateVariables.offsetFromRoot),
         });
     }
     else if (options.bundler === 'rsbuild') {

package/dist/src/generators/application/lib/normalize-options.js

@@ -13,10 +13,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         rootProject: options.rootProject,
     });
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
     const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;

package/dist/src/generators/application/schema.d.ts

@@ -20,10 +20,6 @@ export interface Schema {
   globalCss?: boolean;
   strict?: boolean;
   enableTypedLinting?: boolean;
-  /**
-   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
-   */
-  setParserOptionsProject?: boolean;
   compiler?: 'babel' | 'swc';
   remotes?: string[];
   /** @deprecated Use {@link Schema.port} instead. This option will be removed in Nx v25. */
@@ -33,7 +29,6 @@ export interface Schema {
   bundler?: 'webpack' | 'vite' | 'rspack' | 'rsbuild';
   minimal?: boolean;
   // Internal options
-  addPlugin?: boolean;
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'oxfmt' | 'none';
@@ -53,7 +48,6 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   fileName: string;
   hasStyles: boolean;
   unitTestRunner: 'jest' | 'vitest' | 'none';
-  addPlugin?: boolean;
   names: ReturnType<typeof names>;
   isUsingTsSolutionConfig?: boolean;
 }

package/dist/src/generators/application/schema.json

@@ -158,12 +158,6 @@
       "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
-    "setParserOptionsProject": {
-      "type": "boolean",
-      "description": "Deprecated alias for `enableTypedLinting`.",
-      "default": false,
-      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
-    },
     "compiler": {
       "type": "string",
       "description": "The compiler to use.",

package/dist/src/generators/consumer/consumer.js

@@ -66,6 +66,7 @@ async function consumerGenerator(tree, schema) {
                     command: BUNDLER_DEV_COMMAND[opts.bundler],
                     cwd: opts.projectRoot,
                 },
+                readyWhen: { signal: true },
             },
             build: {
                 executor: 'nx:run-commands',
@@ -118,6 +119,7 @@ async function consumerGenerator(tree, schema) {
         remoteType,
         versions: {
             ...mfVersions,
+            nxVersion: versions_2.nxVersion,
             reactVersion: versions_2.reactVersion,
             reactDomVersion: versions_2.reactDomVersion,
             typesReactVersion: versions_2.typesReactVersion,

package/dist/src/generators/consumer/files/rsbuild/package.json__tmpl__

@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "@module-federation/rsbuild-plugin": "<%= versions.moduleFederationRsbuildPluginVersion %>",
+    "@nx/rsbuild": "<%= versions.nxVersion %>",
     "@rsbuild/core": "<%= versions.rsbuildCoreVersion %>",
     "@rsbuild/plugin-react": "<%= versions.rsbuildPluginReactVersion %>",
     "@types/react": "<%= versions.typesReactVersion %>",

package/dist/src/generators/consumer/files/rsbuild/rsbuild.config.ts__tmpl__

@@ -1,6 +1,7 @@
 import { defineConfig } from '@rsbuild/core';
 import { pluginReact } from '@rsbuild/plugin-react';
 import { pluginModuleFederation } from '@module-federation/rsbuild-plugin';
+import { pluginNxReadySignal } from '@nx/rsbuild/ready-signal';
 
 const PORT = <%= port %>;
 const NAME = '<%= federationName %>';
@@ -21,5 +22,6 @@ export default defineConfig({
       // at module load time.
       shared: ['react', 'react-dom'],
     }),
+    pluginNxReadySignal(),
   ],
 });

package/dist/src/generators/consumer/files/rspack/package.json__tmpl__

@@ -13,6 +13,7 @@
     "react-dom": "<%= versions.reactDomVersion %>"
   },
   "devDependencies": {
+    "@nx/rspack": "<%= versions.nxVersion %>",
     "@rspack/cli": "<%= versions.rspackCliVersion %>",
     "@rspack/core": "<%= versions.rspackCoreVersion %>",
     "@rspack/dev-server": "<%= versions.rspackDevServerVersion %>",

package/dist/src/generators/consumer/files/rspack/rspack.config.ts__tmpl__

@@ -1,6 +1,7 @@
 import { defineConfig } from '@rspack/cli';
 import { rspack } from '@rspack/core';
 import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
+import { NxReadySignalPlugin } from '@nx/rspack/ready-signal';
 import { ReactRefreshRspackPlugin } from '@rspack/plugin-react-refresh';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -58,6 +59,7 @@ export default defineConfig((_env, argv) => {
         // src/mf.ts at module load time.
         shared: ['react', 'react-dom'],
       }),
+      new NxReadySignalPlugin(),
     ].filter(Boolean),
   };
 });

package/dist/src/generators/consumer/files/vite/package.json__tmpl__

@@ -15,6 +15,7 @@
   },
   "devDependencies": {
     "@module-federation/vite": "<%= versions.moduleFederationVitePluginVersion %>",
+    "@nx/vite": "<%= versions.nxVersion %>",
     "@types/react": "<%= versions.typesReactVersion %>",
     "@types/react-dom": "<%= versions.typesReactDomVersion %>",
     "@vitejs/plugin-react": "<%= versions.vitejsPluginReactVersion %>",

package/dist/src/generators/consumer/files/vite/vite.config.mts__tmpl__

@@ -1,6 +1,7 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import { federation } from '@module-federation/vite';
+import { nxReadySignal } from '@nx/vite/plugins/nx-ready-signal.plugin';
 
 const PORT = <%= port %>;
 
@@ -23,5 +24,6 @@ export default defineConfig({
       },
     }),
     react(),
+    nxReadySignal(),
   ],
 });

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

@@ -8,10 +8,7 @@ const versions_1 = require("../../utils/versions");
 const add_files_1 = require("./lib/add-files");
 const ct_utils_1 = require("../../utils/ct-utils");
 function cypressComponentConfigGenerator(tree, options) {
-    return cypressComponentConfigGeneratorInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
+    return cypressComponentConfigGeneratorInternal(tree, options);
 }
 /**
  * This is for using cypresses own Component testing, if you want to use test
@@ -21,29 +18,20 @@ function cypressComponentConfigGenerator(tree, options) {
 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 nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
     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,
         jsx: true,
-        addPlugin: options.addPlugin,
         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/cypress-component-configuration/schema.d.ts

@@ -4,5 +4,4 @@ export interface CypressComponentConfigurationSchema {
   skipFormat?: boolean;
   buildTarget?: string;
   bundler?: 'webpack' | 'vite';
-  addPlugin?: boolean;
 }

package/dist/src/generators/init/init.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitGenerator = reactInitGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const internal_2 = require("@nx/js/internal");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 const assert_supported_react_version_1 = require("../../utils/assert-supported-react-version");
@@ -20,11 +21,7 @@ async function reactInitGenerator(tree, schema) {
             '@nx/react': versions_1.nxVersion,
         }, undefined, schema.keepExistingVersions ?? true));
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    schema.addPlugin ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
-    if (schema.useReactRouterPlugin && schema.addPlugin) {
+    if (schema.useReactRouterPlugin) {
         await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/react/router-plugin', router_plugin_1.createNodes, {
             buildTargetName: ['build', 'react-router:build', 'react-router-build'],
             devTargetName: ['dev', 'react-router:dev', 'react-router-dev'],
@@ -40,6 +37,7 @@ async function reactInitGenerator(tree, schema) {
                 'react-router-build-deps',
             ],
         }, schema.updatePackageScripts);
+        await (0, internal_2.ensureTypescriptPlugin)(tree, schema.updatePackageScripts);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/dist/src/generators/init/schema.d.ts

@@ -3,6 +3,5 @@ export interface InitSchema {
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
   updatePackageScripts?: boolean;
-  addPlugin?: boolean;
   useReactRouterPlugin?: boolean;
 }

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

@@ -19,8 +19,7 @@ async function addLinting(host, options) {
         ],
         unitTestRunner: options.unitTestRunner,
         skipPackageJson: options.skipPackageJson,
-        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
-        addPlugin: options.addPlugin,
+        enableTypedLinting: options.enableTypedLinting,
     }));
     // Predefined configs, `extends` and ignore entries are ESLint concepts with
     // no equivalent in other linters.