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

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

@@ -41,7 +41,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

@@ -33,7 +33,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 +52,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/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,10 +18,6 @@ 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, {
         project: options.project,
@@ -39,7 +32,6 @@ async function cypressComponentConfigGeneratorInternal(tree, options) {
         project: options.project,
         skipFormat: true,
         jsx: true,
-        addPlugin: options.addPlugin,
         bundler,
     });
     await (0, ct_utils_1.configureCypressCT)(tree, { project: options.project, found, bundler });

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

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

package/dist/src/generators/library/lib/add-rollup-build-target.js

@@ -20,13 +20,7 @@ async function addRollupBuildTarget(host, options, external = new Set(['react',
         }, undefined, true));
     }
     external.add('react/jsx-runtime');
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const hasRollupPlugin = !!nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/rollup/plugin'
-        : p.plugin === '@nx/rollup/plugin');
-    if (hasRollupPlugin) {
-        // New behavior, using rollup config file and inferred target.
-        host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'rollup.config.cjs'), `const { withNx } = require('@nx/rollup/with-nx');
+    host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'rollup.config.cjs'), `const { withNx } = require('@nx/rollup/with-nx');
 const url = require('@rollup/plugin-url');
 const svg = require('@svgr/rollup');
 
@@ -34,8 +28,8 @@ module.exports = withNx(
   {
     main: '${(0, maybe_js_1.maybeJs)(options, './src/index.ts')}',
     outputPath: '${options.isUsingTsSolutionConfig
-            ? './dist'
-            : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', options.projectRoot)}',
+        ? './dist'
+        : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', options.projectRoot)}',
     tsConfig: './tsconfig.lib.json',
     compiler: '${options.compiler ?? 'babel'}',
     external: ${JSON.stringify(Array.from(external))},
@@ -56,43 +50,5 @@ module.exports = withNx(
   }
 );
 `);
-    }
-    else {
-        // Legacy behavior, there is a target in project.json using rollup executor.
-        // Mirrors warnRollupExecutorGenerating from @nx/rollup/src/utils/deprecation.
-        // Inlined to avoid a cross-package deep import; @nx/rollup'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('The `@nx/rollup:rollup` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` to migrate to the `@nx/rollup/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
-        const { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
-        targets.build = {
-            executor: '@nx/rollup:rollup',
-            outputs: ['{options.outputPath}'],
-            options: {
-                outputPath: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),
-                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-                project: `${options.projectRoot}/package.json`,
-                entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
-                external: Array.from(external),
-                rollupConfig: `@nx/react/plugins/bundle-rollup`,
-                compiler: options.compiler ?? 'babel',
-                assets: [
-                    {
-                        glob: `${options.projectRoot}/README.md`,
-                        input: '.',
-                        output: '.',
-                    },
-                ],
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, options.name, {
-            root: options.projectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-            projectType: 'library',
-            tags: options.parsedTags,
-            targets,
-        });
-    }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -14,10 +14,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         importPath: options.importPath,
     });
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
     const fileName = projectNames.projectFileName;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())

package/dist/src/generators/library/library.js

@@ -25,7 +25,6 @@ const set_defaults_1 = require("./lib/set-defaults");
 const update_app_routes_1 = require("./lib/update-app-routes");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
-        addPlugin: false,
         useProjectJson: true,
         ...schema,
     });
@@ -33,7 +32,7 @@ async function libraryGenerator(host, schema) {
 async function libraryGeneratorInternal(host, schema) {
     (0, assert_supported_react_version_1.assertSupportedReactVersion)(host);
     const tasks = [];
-    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         addTsPlugin,
@@ -101,7 +100,6 @@ async function libraryGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             testEnvironment: 'jsdom',
-            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -159,7 +157,6 @@ async function libraryGeneratorInternal(host, schema) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             testEnvironment: 'jsdom',
-            addPlugin: options.addPlugin,
             compiler: options.compiler,
         });
         tasks.push(vitestTask);

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

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

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

@@ -8,18 +8,11 @@ const framework_1 = require("../../utils/framework");
 const versions_1 = require("../../utils/versions");
 const stories_1 = require("../stories/stories");
 function storybookConfigurationGenerator(host, schema) {
-    return storybookConfigurationGeneratorInternal(host, {
-        addPlugin: false,
-        ...schema,
-    });
+    return storybookConfigurationGeneratorInternal(host, schema);
 }
 async function storybookConfigurationGeneratorInternal(host, schema) {
     (0, assert_supported_react_version_1.assertSupportedReactVersion)(host);
     const tasks = [];
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    schema.addPlugin ??= addPluginDefault;
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     const uiFramework = (0, framework_1.getUiFramework)(host, schema.project);
     if (uiFramework === '@storybook/react-vite') {
@@ -34,7 +27,6 @@ async function storybookConfigurationGeneratorInternal(host, schema) {
         configureStaticServe: schema.configureStaticServe,
         uiFramework: uiFramework, // cannot import UiFramework type dynamically
         skipFormat: true,
-        addPlugin: schema.addPlugin,
     });
     tasks.push(installTask);
     if (schema.generateStories) {

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

@@ -9,5 +9,4 @@ export interface StorybookConfigureSchema {
   linter?: LinterType;
   ignorePaths?: string[];
   configureStaticServe?: boolean;
-  addPlugin?: boolean;
 }

package/dist/src/migrations/update-23-2-0/add-optional-module-federation-packages.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = addOptionalModuleFederationPackages;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
+const httpProxyMiddlewareVersion = '^3.0.5';
 const moduleFederationExecutors = new Set([
     '@nx/react:module-federation-dev-server',
     '@nx/react:module-federation-ssr-dev-server',
@@ -54,7 +55,7 @@ async function addOptionalModuleFederationPackages(tree) {
         ...(needsStaticServer
             ? {
                 express: versions_1.expressVersion,
-                'http-proxy-middleware': versions_1.httpProxyMiddlewareVersion,
+                'http-proxy-middleware': httpProxyMiddlewareVersion,
             }
             : {}),
     }, undefined, true);

package/dist/src/migrations/update-24-0-0/register-typescript-plugin-for-typecheck.d.ts

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

package/dist/src/migrations/update-24-0-0/register-typescript-plugin-for-typecheck.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/js/internal");
+async function update(tree) {
+    if (!(0, internal_1.registerTypescriptPluginForTypecheck)(tree, '@nx/react/router-plugin', {
+        removeTypecheckTargetName: true,
+    })) {
+        return { skipAgentic: true };
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/dist/src/migrations/update-24-0-0/register-typescript-plugin-for-typecheck.md

@@ -0,0 +1,40 @@
+#### Register `@nx/js/typescript` for typecheck targets
+
+`@nx/react/router-plugin` no longer infers a `typecheck` target in any setup, and its `typecheckTargetName` option is removed. `@nx/js/typescript` provides the target instead. This migration registers `@nx/js/typescript` with only its typecheck target when the workspace uses `@nx/react/router-plugin` and doesn't register `@nx/js/typescript` yet, so your projects keep a `typecheck` target.
+
+The new registration is added before the framework plugin and reuses its `typecheckTargetName`, and the migration then removes that option from `@nx/react/router-plugin`. Registrations with `typecheckTargetName: false` have the option removed and don't register `@nx/js/typescript`.
+
+#### Sample code changes
+
+##### Before
+
+```json title="nx.json"
+{
+  "plugins": [
+    {
+      "plugin": "@nx/react/router-plugin",
+      "options": {
+        "buildTargetName": "build",
+        "typecheckTargetName": "typecheck"
+      }
+    }
+  ]
+}
+```
+
+##### After
+
+```json title="nx.json"
+{
+  "plugins": [
+    {
+      "plugin": "@nx/js/typescript",
+      "options": { "typecheck": { "targetName": "typecheck" } }
+    },
+    {
+      "plugin": "@nx/react/router-plugin",
+      "options": { "buildTargetName": "build" }
+    }
+  ]
+}
+```

package/dist/src/plugins/router-plugin.d.ts

@@ -3,7 +3,6 @@ export interface ReactRouterPluginOptions {
     buildTargetName?: string;
     devTargetName?: string;
     startTargetName?: string;
-    typecheckTargetName?: string;
     buildDepsTargetName?: string;
     watchDepsTargetName?: string;
 }