@nx/react 24.0.0-canary.20261016-5ef7804 → 24.0.0-canary.20261020-e7ffd79

package/dist/internal.d.ts

@@ -6,3 +6,4 @@ export { suppressReactComposeHelperWarnings } from './src/utils/deprecation';
 export { hasWebpackPlugin } from './src/utils/has-webpack-plugin';
 export { getReactDependenciesVersionsToInstall, isReact18, } from './src/utils/version-utils';
 export { testingLibraryDomVersion, testingLibraryReactVersion, babelCoreVersion, babelPresetReactVersion, } from './src/utils/versions';
+export { applyReactConfig } from './plugins/nx-react-webpack-plugin/lib/apply-react-config';

package/dist/internal.js

@@ -5,7 +5,7 @@
 // internal consumers and may change without semver protection. Mirrors
 // `@nx/devkit/internal`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.babelPresetReactVersion = exports.babelCoreVersion = exports.testingLibraryReactVersion = exports.testingLibraryDomVersion = exports.isReact18 = exports.getReactDependenciesVersionsToInstall = exports.hasWebpackPlugin = exports.suppressReactComposeHelperWarnings = exports.isComponent = exports.assertPackageIsInstalled = exports.addRollupBuildTarget = exports.addE2e = void 0;
+exports.applyReactConfig = exports.babelPresetReactVersion = exports.babelCoreVersion = exports.testingLibraryReactVersion = exports.testingLibraryDomVersion = exports.isReact18 = exports.getReactDependenciesVersionsToInstall = exports.hasWebpackPlugin = exports.suppressReactComposeHelperWarnings = exports.isComponent = exports.assertPackageIsInstalled = exports.addRollupBuildTarget = exports.addE2e = void 0;
 var add_e2e_1 = require("./src/generators/application/lib/add-e2e");
 Object.defineProperty(exports, "addE2e", { enumerable: true, get: function () { return add_e2e_1.addE2e; } });
 var add_rollup_build_target_1 = require("./src/generators/library/lib/add-rollup-build-target");
@@ -26,3 +26,5 @@ Object.defineProperty(exports, "testingLibraryDomVersion", { enumerable: true, g
 Object.defineProperty(exports, "testingLibraryReactVersion", { enumerable: true, get: function () { return versions_1.testingLibraryReactVersion; } });
 Object.defineProperty(exports, "babelCoreVersion", { enumerable: true, get: function () { return versions_1.babelCoreVersion; } });
 Object.defineProperty(exports, "babelPresetReactVersion", { enumerable: true, get: function () { return versions_1.babelPresetReactVersion; } });
+var apply_react_config_1 = require("./plugins/nx-react-webpack-plugin/lib/apply-react-config");
+Object.defineProperty(exports, "applyReactConfig", { enumerable: true, get: function () { return apply_react_config_1.applyReactConfig; } });

package/dist/module-federation.d.ts

@@ -0,0 +1,6 @@
+type IdentityConfigFn = <T>(config: T, ...rest: unknown[]) => T;
+/** @deprecated Removed in Nx v24. Use `ModuleFederationPlugin` from `@module-federation/enhanced`. This stub will be removed in Nx v25. */
+export declare function withModuleFederation(..._args: unknown[]): Promise<IdentityConfigFn>;
+/** @deprecated Removed in Nx v24. Use `ModuleFederationPlugin` from `@module-federation/enhanced`. This stub will be removed in Nx v25. */
+export declare function withModuleFederationForSSR(..._args: unknown[]): Promise<IdentityConfigFn>;
+export {};

package/dist/module-federation.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withModuleFederation = withModuleFederation;
+exports.withModuleFederationForSSR = withModuleFederationForSSR;
+const devkit_1 = require("@nx/devkit");
+// TODO(v25): Delete this subpath. It keeps 23.x configs loading during graph creation so `nx migrate` can run.
+const REMOVED_MESSAGE = 'Nx Module Federation was removed in Nx v24. `@nx/react/module-federation` is a stub that keeps old configs loadable during project graph creation; it does not configure Module Federation. Follow https://nx.dev/docs/kb/migrate-from-nx-module-federation to move to the official Module Federation plugin.';
+let warned = false;
+// Graph creation only reads the config, so it keeps working; a build would silently drop federation.
+function failOutsideGraphCreation() {
+    if (!global.NX_GRAPH_CREATION)
+        throw new Error(REMOVED_MESSAGE);
+    if (warned)
+        return;
+    warned = true;
+    devkit_1.logger.warn(REMOVED_MESSAGE);
+}
+/** @deprecated Removed in Nx v24. Use `ModuleFederationPlugin` from `@module-federation/enhanced`. This stub will be removed in Nx v25. */
+async function withModuleFederation(..._args) {
+    failOutsideGraphCreation();
+    return (config) => config;
+}
+/** @deprecated Removed in Nx v24. Use `ModuleFederationPlugin` from `@module-federation/enhanced`. This stub will be removed in Nx v25. */
+async function withModuleFederationForSSR(..._args) {
+    failOutsideGraphCreation();
+    return (config) => config;
+}
+// Older generated configs use `const withModuleFederation = require('@nx/react/module-federation')`.
+module.exports = withModuleFederation;
+module.exports.withModuleFederation = withModuleFederation;
+module.exports.withModuleFederationForSSR = withModuleFederationForSSR;

package/dist/plugins/component-testing/index.js

@@ -4,9 +4,11 @@ exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
 const internal_1 = require("@nx/cypress/internal");
 const devkit_1 = require("@nx/devkit");
-const internal_2 = require("@nx/js/internal");
+const internal_2 = require("@nx/devkit/internal");
+const internal_3 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const url_1 = require("url");
 /**
  * React nx preset for Cypress Component Testing
  *
@@ -34,7 +36,10 @@ function nxComponentTestingPreset(pathToConfig, options) {
         // options, cast to any to avoid type errors
         return basePresetSettings;
     }
-    const normalizedProjectRootPath = ['.ts', '.js'].some((ext) => pathToConfig.endsWith(ext))
+    pathToConfig = pathToConfig.startsWith('file://')
+        ? (0, url_1.fileURLToPath)(pathToConfig)
+        : pathToConfig;
+    const normalizedProjectRootPath = (0, fs_1.statSync)(pathToConfig).isDirectory()
         ? pathToConfig
         : (0, path_1.dirname)(pathToConfig);
     if (options?.bundler === 'vite') {
@@ -154,51 +159,105 @@ function buildTargetWebpack(ctx, buildTarget, componentTestingProjectName) {
     Has component config? ${!!ctProjectConfig}
     `);
     }
+    const buildConfig = buildableProjectConfig.targets[parsed.target];
+    if (buildConfig.metadata?.technologies?.includes('webpack')) {
+        return async () => {
+            const configPath = ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts']
+                .map((ext) => (0, path_1.join)(devkit_1.workspaceRoot, buildableProjectConfig.root, `webpack.config.${ext}`))
+                .find((path) => (0, fs_1.existsSync)(path));
+            if (!configPath)
+                throw new Error(`Cannot find webpack config for ${buildTarget}`);
+            const previousBuildTarget = process.env.NX_BUILD_TARGET;
+            process.env.NX_BUILD_TARGET = buildTarget;
+            try {
+                const exported = await (0, internal_2.loadConfigFile)(configPath);
+                const config = typeof exported === 'function'
+                    ? await exported({}, { mode: 'development' })
+                    : exported;
+                // Cypress runs its own dev server; the app's port and history
+                // fallback would collide with it and replace its spec page.
+                const { devServer: _devServer, ...ctConfig } = config;
+                return ctConfig;
+            }
+            finally {
+                if (previousBuildTarget === undefined)
+                    delete process.env.NX_BUILD_TARGET;
+                else
+                    process.env.NX_BUILD_TARGET = previousBuildTarget;
+            }
+        };
+    }
     if (buildableProjectConfig.targets[parsed.target].executor !==
         '@nx/webpack:webpack' &&
         buildableProjectConfig.targets[parsed.target].executor !==
             '@nx/rspack:rspack') {
-        throw new InvalidExecutorError(`The '${parsed.target}' target of the '${parsed.project}' project is not using the '@nx/webpack:webpack' or '@nx/rspack:rspack' executor. ` +
-            `Please make sure to use '@nx/webpack:webpack' or '@nx/rspack:rspack' executor in that target to use Cypress Component Testing.`);
+        throw new InvalidExecutorError(`The '${parsed.target}' target of the '${parsed.project}' project is not a Webpack build target. ` +
+            `Cypress Component Testing needs a build target inferred by '@nx/webpack/plugin'.`);
+    }
+    const context = (0, internal_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.configuration);
+    const { resolveUserDefinedWebpackConfig, webpackExecutorContext, } = require('@nx/webpack/internal');
+    const { normalizeOptions } = require('@nx/webpack');
+    const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.root, (0, internal_3.getProjectSourceRoot)(buildableProjectConfig));
+    if (!options.webpackConfig) {
+        return null;
     }
-    const context = (0, internal_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target);
-    const { resolveUserDefinedWebpackConfig } = require('@nx/webpack/internal');
-    const { normalizeOptions, composePluginsSync, withNx, withWeb, } = require('@nx/webpack');
-    const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.root, (0, internal_2.getProjectSourceRoot)(buildableProjectConfig));
-    let customWebpack;
-    if (options.webpackConfig) {
-        customWebpack = resolveUserDefinedWebpackConfig(options.webpackConfig, options.tsConfig.startsWith(context.root)
+    return () => webpackExecutorContext.run({
+        target: parsed,
+        options: {
+            ...options,
+            // Cypress supplies component-index.html and builds library sources.
+            generateIndexHtml: false,
+            extractLicenses: false,
+        },
+    }, async () => {
+        const customWebpack = await resolveUserDefinedWebpackConfig(options.webpackConfig, options.tsConfig.startsWith(context.root)
             ? options.tsConfig
             : (0, path_1.join)(context.root, options.tsConfig));
-    }
-    return async () => {
-        customWebpack = await customWebpack;
-        // For legacy `composePlugins(...)` setup, we need change some options to make Cypress CT work properly.
+        // Unmigrated `composePlugins(...)` configs are inert, so CT uses its fallback config.
         if (customWebpack &&
             require('@nx/webpack').isNxWebpackComposablePlugin(customWebpack) // using inline since @nx/webpack may not be installed when using vite so top-level import would error
         ) {
-            return await customWebpack({}, {
-                options: {
-                    ...options,
-                    // cypress will generate its own index.html from component-index.html
-                    generateIndexHtml: false,
-                    // causes issues with buildable libraries with ENOENT: no such file or directory, scandir error
-                    extractLicenses: false,
-                    root: devkit_1.workspaceRoot,
-                    projectRoot: ctProjectConfig.root,
-                    sourceRoot: (0, internal_2.getProjectSourceRoot)(ctProjectConfig),
-                },
-                context,
-                configuration: parsed.configuration,
+            const { buildBaseWebpackConfig } = require('./webpack-fallback');
+            return buildBaseWebpackConfig({
+                tsConfigPath: findTsConfig((0, path_1.join)(devkit_1.workspaceRoot, ctProjectConfig.root)),
+                compiler: options.compiler || 'babel',
             });
         }
         else if (typeof customWebpack === 'object' ||
             typeof customWebpack === 'function') {
-            // If this is a standard webpack config object or function, just return. it
-            return customWebpack;
+            const config = typeof customWebpack === 'function'
+                ? await customWebpack({}, { mode: 'development' })
+                : customWebpack;
+            const { NxAppWebpackPlugin, } = require('@nx/webpack/app-plugin');
+            config.plugins = config.plugins?.map((plugin) => plugin instanceof NxAppWebpackPlugin
+                ? {
+                    apply(compiler) {
+                        // Cypress installs its harness after this config is returned.
+                        const entry = { ...compiler.options.entry };
+                        const output = { ...compiler.options.output };
+                        const devtool = compiler.options.devtool;
+                        const optimization = {
+                            ...compiler.options.optimization,
+                        };
+                        const mode = compiler.options.mode;
+                        const watchOptions = compiler.options.watchOptions;
+                        const context = compiler.options.context;
+                        plugin.apply(compiler);
+                        compiler.options.entry = entry;
+                        compiler.options.output = output;
+                        compiler.options.devtool = devtool;
+                        compiler.options.optimization = optimization;
+                        compiler.options.mode = mode;
+                        compiler.options.watchOptions = watchOptions;
+                        compiler.options.context = context;
+                        compiler.context = context;
+                    },
+                }
+                : plugin);
+            return config;
         }
-        return null; // return null to use fallback config
-    };
+        return null;
+    });
 }
 function findViteConfig(projectRootFullPath) {
     const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];
@@ -216,7 +275,7 @@ function findTsConfig(projectRoot) {
     ];
     for (const config of potentialConfigs) {
         if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, config))) {
-            return config;
+            return (0, path_1.join)(projectRoot, config);
         }
     }
 }

package/dist/plugins/storybook/index.js

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpack = exports.core = void 0;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
-const webpack_1 = require("@nx/webpack");
 const internal_2 = require("@nx/webpack/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const webpack_2 = require("webpack");
-const with_react_1 = require("../with-react");
-const deprecation_1 = require("../../src/utils/deprecation");
+const webpack_1 = require("webpack");
+const apply_react_config_1 = require("../nx-react-webpack-plugin/lib/apply-react-config");
 const merge_plugins_1 = require("./merge-plugins");
 // This is shamelessly taken from CRA and modified for NX use
 // https://github.com/facebook/create-react-app/blob/4784997f0682e75eb32a897b4ffe34d735912e6c/packages/react-scripts/config/env.js#L71
@@ -120,7 +118,6 @@ const webpack = async (storybookWebpackConfig = {}, options) => {
     catch {
         throw new Error(`'@nx/webpack' package is not installed. Install it and try again.`);
     }
-    const { withNx, withWeb } = require('@nx/webpack');
     const projectData = await getProjectData(options);
     const tsconfigPath = (0, fs_1.existsSync)((0, path_1.join)(projectData.projectRoot, 'tsconfig.storybook.json'))
         ? (0, path_1.join)(projectData.projectRoot, 'tsconfig.storybook.json')
@@ -141,18 +138,21 @@ const webpack = async (storybookWebpackConfig = {}, options) => {
         extractCss: storybookWebpackConfig.mode === 'production',
         target: 'web',
     };
-    // ESM build for modern browsers.
-    let baseWebpackConfig = {};
-    // Nx composes these helpers internally for the storybook preset; suppress
-    // their deprecation warning so it fires only for user-authored configs.
-    const finalConfig = (0, internal_2.suppressWebpackComposeHelperWarnings)(() => (0, deprecation_1.suppressReactComposeHelperWarnings)(() => {
-        const configure = (0, webpack_1.composePluginsSync)(withNx({ target: 'web', skipTypeChecking: true }), (0, with_react_1.withReact)());
-        return configure(baseWebpackConfig, {
-            options: builderOptions,
-            // TODO(JamesHenry): replace as any type assertion with as ExecutorContext once the nx repo is updated to use https://github.com/nrwl/nx/pull/33095
-            context: { root: devkit_1.workspaceRoot }, // The context is not used here.
-        });
-    }));
+    const finalConfig = {};
+    const configOptions = {
+        ...builderOptions,
+        projectName: undefined,
+        targetName: undefined,
+        configurationName: undefined,
+        projectGraph: undefined,
+    };
+    (0, internal_2.applyBaseConfig)({
+        ...configOptions,
+        assets: builderOptions.assets ?? [],
+        skipTypeChecking: true,
+    }, finalConfig);
+    (0, internal_2.applyWebConfig)(configOptions, finalConfig);
+    (0, apply_react_config_1.applyReactConfig)({}, finalConfig);
     return {
         ...storybookWebpackConfig,
         module: {
@@ -176,7 +176,7 @@ const webpack = async (storybookWebpackConfig = {}, options) => {
                 []), ...(finalConfig.resolve
                 .plugins ?? [])),
         },
-        plugins: (0, merge_plugins_1.mergePlugins)(new webpack_2.DefinePlugin(getClientEnvironment(storybookWebpackConfig.mode).stringified), ...(storybookWebpackConfig.plugins ?? []), ...(finalConfig.plugins ?? [])),
+        plugins: (0, merge_plugins_1.mergePlugins)(new webpack_1.DefinePlugin(getClientEnvironment(storybookWebpackConfig.mode).stringified), ...(storybookWebpackConfig.plugins ?? []), ...(finalConfig.plugins ?? [])),
     };
 };
 exports.webpack = webpack;

package/dist/plugins/with-react.d.ts

@@ -3,11 +3,7 @@ import type { NxWebpackExecutionContext, WithWebOptions } from '@nx/webpack';
 export interface WithReactOptions extends WithWebOptions {
 }
 /**
- * @deprecated Will be removed in Nx v24. Use `NxReactWebpackPlugin` from
- * `@nx/react/webpack-plugin` in a standard webpack config and run
- * `nx g @nx/webpack:convert-to-inferred`. See
- * https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.
- * @param {WithReactOptions} pluginOptions
- * @returns {NxWebpackPlugin}
+ * @deprecated Use `NxReactWebpackPlugin` from `@nx/react/webpack-plugin`.
+ * This inert stub will be removed in Nx v25.
  */
-export declare function withReact(pluginOptions?: WithReactOptions): (config: Configuration, context: NxWebpackExecutionContext) => Configuration;
+export declare function withReact(_options?: WithReactOptions): (config: Configuration, _context?: NxWebpackExecutionContext) => Configuration;

package/dist/plugins/with-react.js

@@ -1,27 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withReact = withReact;
-const apply_react_config_1 = require("./nx-react-webpack-plugin/lib/apply-react-config");
 const deprecation_1 = require("../src/utils/deprecation");
-const processed = new Set();
+// TODO(v25): remove the inert config-helper stubs in this file.
 /**
- * @deprecated Will be removed in Nx v24. Use `NxReactWebpackPlugin` from
- * `@nx/react/webpack-plugin` in a standard webpack config and run
- * `nx g @nx/webpack:convert-to-inferred`. See
- * https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.
- * @param {WithReactOptions} pluginOptions
- * @returns {NxWebpackPlugin}
+ * @deprecated Use `NxReactWebpackPlugin` from `@nx/react/webpack-plugin`.
+ * This inert stub will be removed in Nx v25.
  */
-function withReact(pluginOptions = {}) {
+function withReact(_options = {}) {
     (0, deprecation_1.warnReactWithReactDeprecation)();
-    return function configure(config, context) {
-        const { withWeb } = require('@nx/webpack');
-        if (processed.has(config))
-            return config;
-        // Apply web config for CSS, JSX, index.html handling, etc.
-        config = withWeb(pluginOptions)(config, context);
-        (0, apply_react_config_1.applyReactConfig)({}, config);
-        processed.add(config);
-        return config;
-    };
+    return (config, _context) => config;
 }

package/dist/ready-check.d.ts

@@ -0,0 +1 @@
+export { waitForReactRouterServe as waitForDevServer } from './src/utils/react-router-serve-ready-check';

package/dist/ready-check.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForDevServer = void 0;
+var react_router_serve_ready_check_1 = require("./src/utils/react-router-serve-ready-check");
+Object.defineProperty(exports, "waitForDevServer", { enumerable: true, get: function () { return react_router_serve_ready_check_1.waitForReactRouterServe; } });

package/dist/src/generators/_utils/mf-dependencies.js

@@ -48,6 +48,7 @@ function bundlerDeps(bundler) {
                 dependencies: {},
                 devDependencies: {
                     '@module-federation/vite': mfVersions.moduleFederationVitePluginVersion,
+                    '@nx/vite': versions_2.nxVersion,
                     '@vitejs/plugin-react': mfVersions.vitejsPluginReactVersion,
                     vite: mfVersions.viteVersion,
                 },
@@ -57,6 +58,7 @@ function bundlerDeps(bundler) {
                 dependencies: {},
                 devDependencies: {
                     '@module-federation/rsbuild-plugin': mfVersions.moduleFederationRsbuildPluginVersion,
+                    '@nx/rsbuild': versions_2.nxVersion,
                     '@rsbuild/core': mfVersions.rsbuildCoreVersion,
                     '@rsbuild/plugin-react': mfVersions.rsbuildPluginReactVersion,
                 },
@@ -69,6 +71,7 @@ function bundlerDeps(bundler) {
                     '@module-federation/enhanced': mfVersions.moduleFederationEnhancedVersion,
                 },
                 devDependencies: {
+                    '@nx/rspack': versions_2.nxVersion,
                     '@rspack/cli': mfVersions.rspackCliVersion,
                     '@rspack/core': mfVersions.rspackCoreVersion,
                     '@rspack/dev-server': mfVersions.rspackDevServerVersion,

package/dist/src/generators/application/application.js

@@ -26,7 +26,6 @@ const add_rsbuild_1 = require("./lib/bundlers/add-rsbuild");
 const add_vite_1 = require("./lib/bundlers/add-vite");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
-        addPlugin: false,
         useProjectJson: true,
         ...schema,
     });
@@ -34,7 +33,7 @@ async function applicationGenerator(tree, schema) {
 async function applicationGeneratorInternal(tree, schema) {
     (0, assert_supported_react_version_1.assertSupportedReactVersion)(tree);
     const tasks = [];
-    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -59,25 +58,6 @@ async function applicationGeneratorInternal(tree, schema) {
         useReactRouterPlugin: options.useReactRouter,
     });
     tasks.push(initTask);
-    if (!options.addPlugin) {
-        const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
-        const existing = findBuildDefault(nxJson.targetDefaults);
-        if (!existing) {
-            (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-                target: 'build',
-                cache: true,
-                dependsOn: ['^build'],
-            });
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-        else if (!existing.dependsOn) {
-            (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-                target: 'build',
-                dependsOn: ['^build'],
-            });
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-    }
     if (options.bundler === 'webpack') {
         await (0, add_webpack_1.initWebpack)(tree, options, tasks);
     }
@@ -160,19 +140,4 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function findBuildDefault(td) {
-    if (!td)
-        return undefined;
-    const value = td['build'];
-    if (value === undefined)
-        return undefined;
-    if (Array.isArray(value)) {
-        const found = value.find((e) => e.filter === undefined);
-        if (!found)
-            return undefined;
-        const { filter: _f, ...rest } = found;
-        return rest;
-    }
-    return value;
-}
 exports.default = applicationGenerator;

package/dist/src/generators/application/files/base-rspack/rspack.config.js__tmpl__

@@ -1,4 +1,3 @@
-<%_ if (rspackPluginOptions) { _%>
 const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
 const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
 const { join } = require('path');
@@ -29,17 +28,3 @@ module.exports = {
     new NxReactRspackPlugin(),
   ],
 };
-<%_ } else { _%>
-const { composePlugins, withNx, withReact } = require('@nx/rspack');
-
-// Nx plugins for rspack.
-module.exports = composePlugins(
-  withNx(),
-  withReact(),
-  (config) => {
-    // Update the rspack config as needed here.
-    // e.g. `config.plugins.push(new MyPlugin())`
-    return config;
-  }
-);
-<%_ } _%>

package/dist/src/generators/application/files/base-webpack/webpack.config.js__tmpl__

@@ -1,4 +1,3 @@
-<%_ if (webpackPluginOptions) { _%>
 const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
 const { NxReactWebpackPlugin } = require('@nx/react/webpack-plugin');
 const { join } = require('path');
@@ -31,19 +30,3 @@ module.exports = {
     new NxReactWebpackPlugin(),
   ],
 };
-<%_ } else { _%>
-const { composePlugins, withNx } = require('@nx/webpack');
-const { withReact } = require('@nx/react');
-
-// Nx plugins for webpack.
-module.exports = composePlugins(
-  withNx(),
-  withReact(),
-  (config) => {
-    // Update the webpack config as needed here.
-    // e.g. `config.plugins.push(new MyPlugin())`
-    config.output.clean = true;
-    return config;
-  }
-);
-<%_ } _%>

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

@@ -24,26 +24,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, {
@@ -138,10 +138,11 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
-                webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
-                webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
+                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

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