@nx/react 23.0.0-pr.35465.2bc2643 → 23.0.0-rc.1

package/{src → dist/src}/executors/module-federation-static-server/module-federation-static-server.impl.js

@@ -2,14 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startProxies = startProxies;
 exports.default = moduleFederationStaticServer;
-const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
-const utils_2 = require("@nx/module-federation/src/utils");
-const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
-const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
+const internal_2 = require("@nx/js/internal");
+const internal_3 = require("@nx/module-federation/internal");
+const internal_4 = require("@nx/web/internal");
+const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -18,7 +16,7 @@ function getBuildAndServeOptionsFromServeTarget(serveTarget, context) {
     const serveOptions = (0, devkit_1.readTargetOptions)(target, context);
     const buildTarget = (0, devkit_1.parseTargetString)(serveOptions.buildTarget, context);
     const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
     if (serveOptions.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, serveOptions.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
@@ -159,20 +157,21 @@ function startProxies(staticRemotesConfig, hostServeOptions, mappedLocationOfHos
     devkit_1.logger.info('NX Static Consumer (host) proxy started successfully');
 }
 async function* moduleFederationStaticServer(schema, context) {
+    (0, module_federation_deprecation_1.warnReactMfStaticServerExecutorDeprecation)();
     // Force Node to resolve to look for the nx binary that is inside node_modules
     const nxBin = require.resolve('nx/bin/nx');
     // Get the remotes from the module federation config
     const p = context.projectsConfigurations.projects[context.projectName];
     const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
-    const moduleFederationConfig = (0, utils_2.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
-    const remotes = (0, utils_2.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
+    const moduleFederationConfig = (0, internal_3.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
+    const remotes = (0, internal_3.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
     }, options.pathToManifestFile);
-    const staticRemotesConfig = (0, utils_2.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, internal_3.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
-    const mappedLocationsOfStaticRemotes = await (0, utils_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
+    const mappedLocationsOfStaticRemotes = await (0, internal_3.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
     // Build the host
     const hostUrlSegment = (0, path_1.basename)(options.buildOptions.outputPath);
     const mappedLocationOfHost = `http${options.serveOptions.ssl ? 's' : ''}://${options.serveOptions.host}:${options.serveOptions.staticRemotesPort}/${hostUrlSegment}`;
@@ -180,7 +179,7 @@ async function* moduleFederationStaticServer(schema, context) {
     // Move to a temporary directory
     const commonOutputDirectory = moveToTmpDirectory(staticRemotesConfig, options.buildOptions.outputPath, hostUrlSegment);
     // File Serve the temporary directory
-    const staticFileServerIter = (0, file_server_impl_1.default)({
+    const staticFileServerIter = (0, internal_4.fileServerExecutor)({
         cors: true,
         watch: false,
         staticFilePath: commonOutputDirectory,
@@ -201,12 +200,12 @@ async function* moduleFederationStaticServer(schema, context) {
             pathToKey: (0, path_1.join)(devkit_1.workspaceRoot, options.serveOptions.sslKey),
         }
         : undefined);
-    return yield* (0, async_iterable_1.combineAsyncIterables)(staticFileServerIter, (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.combineAsyncIterables)(staticFileServerIter, (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         const host = options.serveOptions.host ?? 'localhost';
         const baseUrl = `http${options.serveOptions.ssl ? 's' : ''}://${host}:${options.serveOptions.port}`;
         if (remotes.remotePorts.length === 0) {
             const portsToWaitFor = [options.serveOptions.staticRemotesPort];
-            await Promise.all(portsToWaitFor.map((port) => (0, wait_for_port_open_1.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_4.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: host,
@@ -220,7 +219,7 @@ async function* moduleFederationStaticServer(schema, context) {
             const portsToWaitFor = staticFileServerIter && options.serveOptions.staticRemotesPort
                 ? [options.serveOptions.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
-            await Promise.all(portsToWaitFor.map((port) => (0, wait_for_port_open_1.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_4.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: host,

package/{src → dist/src}/executors/module-federation-static-server/schema.json

@@ -3,6 +3,7 @@
   "continuous": true,
   "outputCapture": "direct-nodejs",
   "title": "Module Federation Static Dev Server",
+  "x-deprecated": "The `@nx/react:module-federation-static-server` executor is deprecated. Use `vite preview` / `rsbuild preview` via `nx:run-commands` instead. Removed in Nx v24.",
   "description": "Serve a Consumer (host) application statically along with its Producers (remotes).",
   "cli": "nx",
   "type": "object",

package/dist/src/generators/_utils/mf-dependencies.d.ts

@@ -0,0 +1,7 @@
+import type { SupportedBundler } from './normalize';
+export interface DepsBundle {
+    dependencies: Record<string, string>;
+    devDependencies: Record<string, string>;
+}
+export declare function getProviderDeps(bundler: SupportedBundler): DepsBundle;
+export declare function getConsumerDeps(bundler: SupportedBundler): DepsBundle;

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProviderDeps = getProviderDeps;
+exports.getConsumerDeps = getConsumerDeps;
+const tslib_1 = require("tslib");
+const mfVersions = tslib_1.__importStar(require("./mf-versions"));
+const versions_1 = require("@nx/js/src/utils/versions");
+const versions_2 = require("../../utils/versions");
+// Returned to both surfaces:
+// - addDependenciesToPackageJson(tree, deps, devDeps) writes to root package.json
+//   so bare `vite` / `rsbuild` / `rspack` in the run-commands serve target resolve
+//   in integrated workspaces.
+// - The per-project package.json template uses the same map so a pnpm-workspace
+//   setup (which installs per-project) gets the same versions without drift.
+function getProviderDeps(bundler) {
+    const base = {
+        dependencies: {
+            react: versions_2.reactVersion,
+            'react-dom': versions_2.reactDomVersion,
+        },
+        devDependencies: {
+            '@types/react': versions_2.typesReactVersion,
+            '@types/react-dom': versions_2.typesReactDomVersion,
+            typescript: versions_1.typescriptVersion,
+        },
+    };
+    return mergeWith(base, bundlerDeps(bundler));
+}
+function getConsumerDeps(bundler) {
+    const base = {
+        dependencies: {
+            '@module-federation/runtime': mfVersions.moduleFederationRuntimeVersion,
+            react: versions_2.reactVersion,
+            'react-dom': versions_2.reactDomVersion,
+        },
+        devDependencies: {
+            '@types/react': versions_2.typesReactVersion,
+            '@types/react-dom': versions_2.typesReactDomVersion,
+            typescript: versions_1.typescriptVersion,
+        },
+    };
+    return mergeWith(base, bundlerDeps(bundler));
+}
+function bundlerDeps(bundler) {
+    switch (bundler) {
+        case 'vite':
+            return {
+                dependencies: {},
+                devDependencies: {
+                    '@module-federation/vite': mfVersions.moduleFederationVitePluginVersion,
+                    '@vitejs/plugin-react': mfVersions.vitejsPluginReactVersion,
+                    vite: mfVersions.viteVersion,
+                },
+            };
+        case 'rsbuild':
+            return {
+                dependencies: {},
+                devDependencies: {
+                    '@module-federation/rsbuild-plugin': mfVersions.moduleFederationRsbuildPluginVersion,
+                    '@rsbuild/core': mfVersions.rsbuildCoreVersion,
+                    '@rsbuild/plugin-react': mfVersions.rsbuildPluginReactVersion,
+                },
+            };
+        case 'rspack':
+            // Rspack provider/consumer both put @module-federation/enhanced in
+            // dependencies (it's imported at runtime by the federation plugin call).
+            return {
+                dependencies: {
+                    '@module-federation/enhanced': mfVersions.moduleFederationEnhancedVersion,
+                },
+                devDependencies: {
+                    '@rspack/cli': mfVersions.rspackCliVersion,
+                    '@rspack/core': mfVersions.rspackCoreVersion,
+                    '@rspack/dev-server': mfVersions.rspackDevServerVersion,
+                },
+            };
+    }
+}
+function mergeWith(a, b) {
+    return {
+        dependencies: { ...a.dependencies, ...b.dependencies },
+        devDependencies: { ...a.devDependencies, ...b.devDependencies },
+    };
+}

package/dist/src/generators/_utils/mf-versions.d.ts

@@ -0,0 +1,11 @@
+export declare const moduleFederationEnhancedVersion = "^2.4.0";
+export declare const moduleFederationVitePluginVersion = "^1.15.5";
+export declare const moduleFederationRuntimeVersion = "^2.4.0";
+export declare const viteVersion = "^8.0.13";
+export declare const vitejsPluginReactVersion = "^6.0.2";
+export declare const rsbuildCoreVersion = "^1.4.0";
+export declare const rsbuildPluginReactVersion = "^1.3.0";
+export declare const moduleFederationRsbuildPluginVersion = "^2.5.0";
+export declare const rspackCoreVersion = "^2.0.3";
+export declare const rspackCliVersion = "^2.0.3";
+export declare const rspackDevServerVersion = "2.0.1";

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

@@ -0,0 +1,29 @@
+"use strict";
+// Module Federation runtime + bundler-specific deps live here. Framework
+// versions (react, react-dom, @types/*, typescript) are owned by @nx/react
+// (../../utils/versions) and @nx/js so each dep has a single source of truth.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rspackDevServerVersion = exports.rspackCliVersion = exports.rspackCoreVersion = exports.moduleFederationRsbuildPluginVersion = exports.rsbuildPluginReactVersion = exports.rsbuildCoreVersion = exports.vitejsPluginReactVersion = exports.viteVersion = exports.moduleFederationRuntimeVersion = exports.moduleFederationVitePluginVersion = exports.moduleFederationEnhancedVersion = void 0;
+// Module Federation runtime packages. Keep `runtime` on the same major as
+// `enhanced` / the `vite` plugin (both pull runtime 2.4.x). A 0.x runtime in
+// the consumer would mismatch the 2.x runtime baked into the providers.
+exports.moduleFederationEnhancedVersion = '^2.4.0';
+exports.moduleFederationVitePluginVersion = '^1.15.5';
+exports.moduleFederationRuntimeVersion = '^2.4.0';
+// Vite stack.
+exports.viteVersion = '^8.0.13';
+exports.vitejsPluginReactVersion = '^6.0.2';
+// Rsbuild stack.
+exports.rsbuildCoreVersion = '^1.4.0';
+exports.rsbuildPluginReactVersion = '^1.3.0';
+// Official MF rsbuild integration. Peers @rsbuild/core ^1.3.21, so the pin
+// above satisfies it. Used instead of @module-federation/enhanced/rspack so
+// the federation config is a first-class rsbuild plugin, not a tools.rspack hack.
+exports.moduleFederationRsbuildPluginVersion = '^2.5.0';
+// Rspack stack.
+exports.rspackCoreVersion = '^2.0.3';
+exports.rspackCliVersion = '^2.0.3';
+// Pinned (no ^) to dodge the broken 2.0.2 publish, which ships no dist/ so
+// @rspack/cli can't load it for `rspack serve`. Re-float to ^ once upstream
+// republishes a fixed 2.0.3+.
+exports.rspackDevServerVersion = '2.0.1';

package/dist/src/generators/_utils/normalize.d.ts

@@ -0,0 +1,19 @@
+import { Tree } from '@nx/devkit';
+export type SupportedBundler = 'vite' | 'rsbuild' | 'rspack';
+export type SupportedSurface = 'consumer' | 'provider';
+export interface NormalizedScaffoldOptions {
+    projectName: string;
+    federationName: string;
+    bundler: SupportedBundler;
+    port: number;
+    projectRoot: string;
+}
+export interface RawScaffoldOptions {
+    directory: string;
+    surface: SupportedSurface;
+    bundler?: SupportedBundler;
+    port?: number;
+}
+export declare function getDefaultPort(bundler: SupportedBundler, surface: SupportedSurface): number;
+export declare function toFederationName(projectName: string): string;
+export declare function normalizeScaffoldOptions(tree: Tree, raw: RawScaffoldOptions): Promise<NormalizedScaffoldOptions>;

package/dist/src/generators/_utils/normalize.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultPort = getDefaultPort;
+exports.toFederationName = toFederationName;
+exports.normalizeScaffoldOptions = normalizeScaffoldOptions;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+// Default ports are split so a `consumer` + `provider` generated with no
+// overrides don't collide. Consumer gets the round base (the user navigates
+// to it); providers get base+1, base+2, etc., so a manifest pointing at
+// `consumer-base + 1` lines up with the first generated provider.
+//
+// Vite base deliberately avoids 5000 (macOS AirTunes binds it on the IPv4
+// wildcard, leading to silent EADDRINUSE on `127.0.0.1`).
+const DEFAULT_BASE_PORTS = {
+    vite: 5100,
+    rsbuild: 3100,
+    rspack: 8100,
+};
+function getDefaultPort(bundler, surface) {
+    const base = DEFAULT_BASE_PORTS[bundler];
+    return surface === 'consumer' ? base : base + 1;
+}
+// Federation `name` must be a JS identifier so the bundler can use it as a
+// global namespace. Hyphens are allowed in project names but invalid as an
+// identifier, so we coerce to underscores.
+function toFederationName(projectName) {
+    if (!/[A-Za-z0-9]/.test(projectName)) {
+        throw new Error(`Cannot derive a federation name from project name '${projectName}'. Use letters, digits, hyphens, or underscores.`);
+    }
+    const candidate = projectName
+        .replace(/-/g, '_')
+        .replace(/[^A-Za-z0-9_]/g, '');
+    if (/^[0-9]/.test(candidate)) {
+        throw new Error(`Federation name '${candidate}' (derived from project '${projectName}') cannot start with a digit. Rename the project.`);
+    }
+    return candidate;
+}
+async function normalizeScaffoldOptions(tree, raw) {
+    const bundler = raw.bundler ?? 'vite';
+    const { projectName, projectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
+        projectType: 'application',
+        directory: raw.directory,
+    });
+    const federationName = toFederationName((0, devkit_1.names)(projectName).fileName);
+    const port = raw.port ?? getDefaultPort(bundler, raw.surface);
+    return { projectName, federationName, bundler, port, projectRoot };
+}

package/{src → dist/src}/generators/application/application.d.ts

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;
-//# sourceMappingURL=application.d.ts.map

package/{src → dist/src}/generators/application/application.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
+const assert_supported_react_version_1 = require("../../utils/assert-supported-react-version");
 const devkit_1 = require("@nx/devkit");
+const internal_2 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_3 = require("@nx/js/internal");
 const create_ts_config_1 = require("../../utils/create-ts-config");
-const add_styled_dependencies_1 = require("../../rules/add-styled-dependencies");
-const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const create_application_files_1 = require("./lib/create-application-files");
 const update_jest_config_1 = require("./lib/update-jest-config");
@@ -20,14 +20,11 @@ const add_routing_1 = require("./lib/add-routing");
 const set_defaults_1 = require("./lib/set-defaults");
 const add_linting_1 = require("./lib/add-linting");
 const add_e2e_1 = require("./lib/add-e2e");
-const show_possible_warnings_1 = require("./lib/show-possible-warnings");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const add_webpack_1 = require("./lib/bundlers/add-webpack");
 const add_rspack_1 = require("./lib/bundlers/add-rspack");
 const add_rsbuild_1 = require("./lib/bundlers/add-rsbuild");
 const add_vite_1 = require("./lib/bundlers/add-vite");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
@@ -36,8 +33,9 @@ async function applicationGenerator(tree, schema) {
     });
 }
 async function applicationGeneratorInternal(tree, schema) {
+    (0, assert_supported_react_version_1.assertSupportedReactVersion)(tree);
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_3.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -51,7 +49,7 @@ async function applicationGeneratorInternal(tree, schema) {
     options.useReactRouter =
         options.routing && options.bundler === 'vite'
             ? (options.useReactRouter ??
-                (await (0, prompt_1.promptWhenInteractive)({
+                (await (0, internal_1.promptWhenInteractive)({
                     name: 'response',
                     message: 'Would you like to use react-router for server-side rendering?',
                     type: 'autocomplete',
@@ -68,7 +66,6 @@ async function applicationGeneratorInternal(tree, schema) {
                     initial: 0,
                 }, { response: 'No' }).then((r) => r.response === 'Yes')))
             : false;
-    (0, show_possible_warnings_1.showPossibleWarnings)(tree, options);
     const initTask = await (0, init_1.default)(tree, {
         ...options,
         skipFormat: true,
@@ -76,18 +73,23 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     tasks.push(initTask);
     if (!options.addPlugin) {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        nxJson.targetDefaults ??= {};
-        if (!Object.keys(nxJson.targetDefaults).includes('build')) {
-            nxJson.targetDefaults.build = {
+        const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+        const existing = findBuildDefault(nxJson.targetDefaults);
+        if (!existing) {
+            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+                target: 'build',
                 cache: true,
                 dependsOn: ['^build'],
-            };
+            });
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        else if (!nxJson.targetDefaults.build.dependsOn) {
-            nxJson.targetDefaults.build.dependsOn = ['^build'];
+        else if (!existing.dependsOn) {
+            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+                target: 'build',
+                dependsOn: ['^build'],
+            });
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     if (options.bundler === 'webpack') {
         await (0, add_webpack_1.initWebpack)(tree, options, tasks);
@@ -106,13 +108,7 @@ async function applicationGeneratorInternal(tree, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
-    }
-    if (options.style === 'tailwind') {
-        const twTask = await (0, setup_tailwind_1.setupTailwindGenerator)(tree, {
-            project: options.projectName,
-        });
-        tasks.push(twTask);
+        await (0, internal_3.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(tree, options);
     tasks.push(lintTask);
@@ -139,16 +135,11 @@ async function applicationGeneratorInternal(tree, schema) {
     (0, update_jest_config_1.updateSpecConfig)(tree, options);
     const commonDependencyTask = await (0, install_common_dependencies_1.installCommonDependencies)(tree, options);
     tasks.push(commonDependencyTask);
-    const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(tree, options);
-    tasks.push(styledTask);
     if (!options.useReactRouter) {
         const routingTask = (0, add_routing_1.addRouting)(tree, options);
         tasks.push(routingTask);
     }
     (0, set_defaults_1.setDefaults)(tree, options);
-    if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
-        (0, add_rspack_1.handleStyledJsxForRspack)(tasks, tree, options);
-    }
     if (options.useReactRouter) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
             const types = new Set(json.compilerOptions?.types || []);
@@ -166,20 +157,30 @@ async function applicationGeneratorInternal(tree, schema) {
         });
     }
     // Only for the new TS solution
-    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+    (0, internal_3.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined, options.useReactRouter ? 'app' : 'src');
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
+    (0, internal_3.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+        (0, internal_1.logShowProjectCommand)(options.projectName);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function findBuildDefault(td) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'build' &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+    }
+    return td['build'];
+}
 exports.default = applicationGenerator;

package/{src → dist/src}/generators/application/files/base-rsbuild/tsconfig.app.json__tmpl__

@@ -7,7 +7,6 @@
     "lib": ["dom"],
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]
@@ -20,7 +19,6 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]

package/{src/generators/application/files/base-webpack → dist/src/generators/application/files/base-rspack}/tsconfig.app.json__tmpl__

@@ -7,7 +7,6 @@
     "lib": ["dom"],
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]
@@ -20,7 +19,6 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]

package/{src → dist/src}/generators/application/files/base-vite/index.html__tmpl__

@@ -7,7 +7,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
-    <% if (!styledModule && style !== 'none') { %><link rel="stylesheet" href="/src/styles.<%= style === 'tailwind' ? 'css' : style %>" /><% } %>
+    <% if (style !== 'none') { %><link rel="stylesheet" href="/src/styles.<%= style %>" /><% } %>
   </head>
   <body>
     <div id="root"></div>

package/{src/generators/application/files/base-rspack → dist/src/generators/application/files/base-vite}/tsconfig.app.json__tmpl__

@@ -7,7 +7,6 @@
     "lib": ["dom"],
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]
@@ -20,7 +19,6 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]

package/{src/generators/application/files/base-vite → dist/src/generators/application/files/base-webpack}/tsconfig.app.json__tmpl__

@@ -7,7 +7,6 @@
     "lib": ["dom"],
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]
@@ -20,7 +19,6 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]

package/{src → dist/src}/generators/application/lib/add-e2e.d.ts

@@ -1,4 +1,3 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function addE2e(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-e2e.d.ts.map

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

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
@@ -74,7 +41,7 @@ async function addE2e(tree, options) {
     }
     else if (options.bundler === 'rsbuild') {
         (0, devkit_1.ensurePackage)('@nx/rsbuild', versions_1.nxVersion);
-        const { getRsbuildE2EWebServerInfo } = await Promise.resolve().then(() => __importStar(require('@nx/rsbuild/config-utils')));
+        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.devServerPort ?? 4200);
     }
     if (!hasNxBuildPlugin) {

package/{src → dist/src}/generators/application/lib/add-jest.d.ts

@@ -1,4 +1,3 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function addJest(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-jest.d.ts.map

package/{src → dist/src}/generators/application/lib/add-linting.d.ts

@@ -2,4 +2,3 @@ import { type Tree, type GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 export declare function isEslintInstalled(tree: Tree): boolean;
-//# sourceMappingURL=add-linting.d.ts.map