@nx/react 0.0.0-pr-29047-57d3073 → 0.0.0-pr-28808-eac89e6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-29047-57d3073",
+  "version": "0.0.0-pr-28808-eac89e6",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-29047-57d3073",
-    "@nx/js": "0.0.0-pr-29047-57d3073",
-    "@nx/eslint": "0.0.0-pr-29047-57d3073",
-    "@nx/web": "0.0.0-pr-29047-57d3073",
-    "@nx/module-federation": "0.0.0-pr-29047-57d3073",
+    "@nx/devkit": "0.0.0-pr-28808-eac89e6",
+    "@nx/js": "0.0.0-pr-28808-eac89e6",
+    "@nx/eslint": "0.0.0-pr-28808-eac89e6",
+    "@nx/web": "0.0.0-pr-28808-eac89e6",
+    "@nx/module-federation": "0.0.0-pr-28808-eac89e6",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/generators/application/application.js

@@ -15,6 +15,7 @@ const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const eslint_1 = require("@nx/eslint");
 const versions_1 = require("../../utils/versions");
+const maybe_js_1 = require("../../utils/maybe-js");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
@@ -27,7 +28,6 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const add_project_root_to_rspack_plugin_excludes_1 = require("./lib/add-project-root-to-rspack-plugin-excludes");
 async function addLinting(host, options) {
     const tasks = [];
     if (options.linter === eslint_1.Linter.EsLint) {
@@ -73,16 +73,17 @@ async function applicationGenerator(host, schema) {
     });
 }
 async function applicationGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'application');
     const tasks = [];
-    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
-    (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
     const initTask = await (0, init_1.default)(host, {
         ...options,
         skipFormat: true,
@@ -116,7 +117,7 @@ async function applicationGeneratorInternal(host, schema) {
         }
     }
     else if (options.bundler === 'rspack') {
-        const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxRspackVersion);
+        const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
         const rspackInitTask = await rspackInitGenerator(host, {
             ...options,
             addPlugin: false,
@@ -151,6 +152,7 @@ async function applicationGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             addPlugin: options.addPlugin,
+            projectType: 'application',
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -172,7 +174,19 @@ async function applicationGeneratorInternal(host, schema) {
         }, false);
     }
     else if (options.bundler === 'rspack') {
-        (0, add_project_root_to_rspack_plugin_excludes_1.addProjectRootToRspackPluginExcludesIfExists)(host, options.appProjectRoot);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
+        const rspackTask = await configurationGenerator(host, {
+            project: options.projectName,
+            main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)({
+                js: options.js,
+                useJsx: true,
+            }, `src/main.tsx`)),
+            tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+            target: 'web',
+            newProject: true,
+            framework: 'react',
+        });
+        tasks.push(rspackTask);
     }
     if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
         const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
@@ -246,6 +260,11 @@ async function applicationGeneratorInternal(host, schema) {
         });
         `);
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    });
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/files/base-rspack/tsconfig.app.json__tmpl__

@@ -1,14 +1,31 @@
-{
+<%_ if (isUsingTsSolutionSetup) { _%>{
+  "extends": "<%= offsetFromRoot%>tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "jsx": "react-jsx",
+    "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"
+    ]
+  },
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}<% } else { %>{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { %>"@nx/react/typings/styled-jsx.d.ts",<% } _%>
+      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
-      ]
+    ]
   },
-  "exclude": ["jest.config.ts","src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
+<% } %>

package/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__

@@ -1,4 +1,20 @@
-{
+<%_ if (isUsingTsSolutionSetup) { _%>{
+  "extends": "<%= offsetFromRoot%>tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "jsx": "react-jsx",
+    "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"
+    ]
+  },
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}<% } else { %>{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
@@ -7,8 +23,9 @@
       <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
-      ]
+    ]
   },
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
+<% } %>

package/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__

@@ -1,4 +1,20 @@
-{
+<%_ if (isUsingTsSolutionSetup) { _%>{
+  "extends": "<%= offsetFromRoot%>tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "jsx": "react-jsx",
+    "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"
+    ]
+  },
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}<% } else { %>{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
@@ -7,8 +23,9 @@
       <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
-      ]
+    ]
   },
-  "exclude": ["jest.config.ts","src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
+<% } %>

package/src/generators/application/files/style-css-module/src/app/__fileName__.tsx__tmpl__

@@ -1,8 +1,8 @@
 <% if (classComponent) { %>
 import { Component } from 'react';
 <%_ } _%>
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import styles from './<%= fileName %>.module.<%= style %>';
+// Uncomment this line to use CSS modules
+// import styles from './<%= fileName %>.module.<%= style %>';
 <%_ if (!minimal) { _%>
 import NxWelcome from "./nx-welcome";
 <%_ } _%>

package/src/generators/application/lib/add-e2e.d.ts

@@ -1,3 +1,3 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function addE2e(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -6,10 +6,12 @@ const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const has_vite_plugin_1 = require("../../../utils/has-vite-plugin");
+const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 async function addE2e(tree, options) {
     const hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
+        (options.bundler === 'rspack' && (0, has_rspack_plugin_1.hasRspackPlugin)(tree)) ||
         (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
     let e2eWebServerInfo = {
         e2eWebServerAddress: `http://localhost:${options.devServerPort ?? 4200}`,
@@ -36,14 +38,28 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                projectType: 'application',
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-                tags: [],
-            });
+            if (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                        implicitDependencies: [options.projectName],
+                    },
+                });
+            }
+            else {
+                (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                    projectType: 'application',
+                    root: options.e2eProjectRoot,
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    targets: {},
+                    implicitDependencies: [options.projectName],
+                    tags: [],
+                });
+            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -88,13 +104,27 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                projectType: 'application',
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-            });
+            if (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                        implicitDependencies: [options.projectName],
+                    },
+                });
+            }
+            else {
+                (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                    projectType: 'application',
+                    root: options.e2eProjectRoot,
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    targets: {},
+                    implicitDependencies: [options.projectName],
+                });
+            }
             const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,

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

@@ -16,5 +16,6 @@ async function addJest(host, options) {
         setupFile: 'none',
         compiler: options.compiler,
         skipFormat: true,
+        runtimeTsconfigFileName: 'tsconfig.app.json',
     });
 }

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

@@ -5,6 +5,7 @@ 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");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 function addProject(host, options) {
     const project = {
         root: options.appProjectRoot,
@@ -28,9 +29,24 @@ function addProject(host, options) {
             serve: createRspackServeTarget(options),
         };
     }
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
-        ...project,
-    });
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(host, options.name),
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: `${options.appProjectRoot}/src`,
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    if (!options.isUsingTsSolutionConfig || options.alwaysGenerateProjectJson) {
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+            ...project,
+        });
+    }
 }
 function createRspackBuildTarget(options) {
     return {

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

@@ -11,6 +11,7 @@ const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const get_app_tests_1 = require("./get-app-tests");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function createApplicationFiles(host, options) {
     let styleSolutionSpecificAppFiles;
     if (options.styledModule && options.style !== 'styled-jsx') {
@@ -47,6 +48,7 @@ async function createApplicationFiles(host, options) {
         inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests),
         style: options.style === 'tailwind' ? 'css' : options.style,
         hasStyleFile,
+        isUsingTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     if (options.bundler === 'vite') {
         (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/base-vite'), options.appProjectRoot, templateVariables);

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

@@ -7,6 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
 const find_free_port_1 = require("./find-free-port");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function normalizeDirectory(options) {
     options.directory = options.directory?.replace(/\\{1,2}/g, '/');
     const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
@@ -51,6 +52,7 @@ async function normalizeOptions(host, options) {
         fileName,
         styledModule,
         hasStyles: options.style !== 'none',
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     normalized.routing = normalized.routing ?? false;
     normalized.strict = normalized.strict ?? true;

package/src/generators/application/lib/update-jest-config.js

@@ -17,6 +17,11 @@ function updateSpecConfig(host, options) {
         types.push('@nx/react/typings/cssmodule.d.ts', '@nx/react/typings/image.d.ts');
         compilerOptions.types = types;
         json.compilerOptions = compilerOptions;
+        if (options.isUsingTsSolutionConfig) {
+            // add project reference to the runtime tsconfig.app.json file
+            json.references ??= [];
+            json.references.push({ path: './tsconfig.app.json' });
+        }
         return json;
     });
     if (options.unitTestRunner !== 'jest') {

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

@@ -25,8 +25,12 @@ export interface Schema {
   rootProject?: boolean;
   bundler?: 'webpack' | 'vite' | 'rspack';
   minimal?: boolean;
+  // Internal options
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
+  formatter?: 'prettier' | 'none';
+  alwaysGenerateProjectJson?: boolean; // this is needed for MF currently
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {
@@ -40,4 +44,5 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   hasStyles: boolean;
   unitTestRunner: 'jest' | 'vitest' | 'none';
   addPlugin?: boolean;
+  isUsingTsSolutionConfig?: boolean;
 }

package/src/generators/application/schema.json

@@ -80,12 +80,6 @@
         ]
       }
     },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
-    },
     "routing": {
       "type": "boolean",
       "description": "Generate application with routes.",
@@ -104,11 +98,29 @@
       "default": false,
       "x-priority": "internal"
     },
+    "bundler": {
+      "description": "The bundler to use.",
+      "type": "string",
+      "enum": ["vite", "webpack", "rspack"],
+      "x-prompt": "Which bundler do you want to use to build the application?",
+      "default": "vite",
+      "x-priority": "important"
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "eslint",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
+    },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "vitest"
+      "default": "vitest",
+      "x-prompt": "What unit test runner should be used?",
+      "x-priority": "important"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -171,14 +183,6 @@
       "default": false,
       "hidden": true
     },
-    "bundler": {
-      "description": "The bundler to use.",
-      "type": "string",
-      "enum": ["vite", "webpack", "rspack"],
-      "x-prompt": "Which bundler do you want to use to build the application?",
-      "default": "vite",
-      "x-priority": "important"
-    },
     "minimal": {
       "description": "Generate a React app with a minimal setup, no separate test files.",
       "type": "boolean",

package/src/generators/component/component.js

@@ -67,7 +67,9 @@ function addExportsToBarrel(host, options) {
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.projectName).projectType === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
+        const indexFilePath = options.projectSourceRoot
+            ? (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts')
+            : (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');
         if (indexSource !== null) {
             const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);

package/src/generators/component/lib/normalize-options.js

@@ -36,6 +36,7 @@ async function normalizeOptions(tree, options) {
         className,
         fileName,
         filePath,
-        projectSourceRoot: projectSourceRoot ?? projectRoot,
+        projectRoot,
+        projectSourceRoot: projectSourceRoot,
     };
 }

package/src/generators/component/schema.d.ts

@@ -20,6 +20,7 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   directory: string;
+  projectRoot: string;
   projectSourceRoot: string;
   projectName: string;
   fileName: string;

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

@@ -1,5 +1,5 @@
 const { composePlugins, withNx, withReact } = require('@nx/rspack');
-const { withModuleFederation } = require('@nx/rspack/module-federation');
+const { withModuleFederation } = require('@nx/module-federation/rspack');
 
 const baseConfig = require('./module-federation.config');
 

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

@@ -1,5 +1,5 @@
 const { composePlugins, withNx, withReact } = require('@nx/rspack');
-const { withModuleFederation } = require('@nx/rspack/module-federation');
+const { withModuleFederation } = require('@nx/module-federation/rspack');
 
 const baseConfig = require('./module-federation.config');
 

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

@@ -1,5 +1,5 @@
 const {composePlugins, withNx, withReact} = require('@nx/rspack');
-const {withModuleFederationForSSR} = require('@nx/rspack/module-federation');
+const {withModuleFederationForSSR} = require('@nx/module-federation/rspack');
 
 const baseConfig = require('./module-federation.config');
 

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

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederationForSSR} from '@nx/rspack/module-federation';
+import {withModuleFederationForSSR} from '@nx/module-federation/rspack';
 
 import baseConfig from './module-federation.config';
 

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

@@ -1,5 +1,5 @@
 import { composePlugins, withNx, withReact } from '@nx/rspack';
-import { withModuleFederation } from '@nx/rspack/module-federation';
+import { withModuleFederation } from '@nx/module-federation/rspack';
 import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';

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

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import { withModuleFederation } from '@nx/rspack/module-federation';
+import { withModuleFederation } from '@nx/module-federation/rspack';
 import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';

package/src/generators/host/host.js

@@ -15,9 +15,8 @@ const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const update_module_federation_tsconfig_1 = require("./lib/update-module-federation-tsconfig");
 async function hostGenerator(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'host');
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
@@ -48,6 +47,7 @@ async function hostGenerator(host, schema) {
         // The target use-case is loading remotes as child routes, thus always enable routing.
         routing: true,
         skipFormat: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initTask);
     const remotesWithPorts = [];
@@ -80,6 +80,7 @@ async function hostGenerator(host, schema) {
     (0, add_module_federation_files_1.addModuleFederationFiles)(host, options, remotesWithPorts);
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
+    (0, update_module_federation_tsconfig_1.updateModuleFederationTsconfig)(host, options);
     if (options.ssr) {
         const setupSsrTask = await (0, setup_ssr_1.default)(host, {
             project: options.projectName,

package/src/generators/host/lib/update-module-federation-tsconfig.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+export declare function updateModuleFederationTsconfig(host: Tree, options: NormalizedSchema): void;

package/src/generators/host/lib/update-module-federation-tsconfig.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateModuleFederationTsconfig = updateModuleFederationTsconfig;
+const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+function updateModuleFederationTsconfig(host, options) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
+    const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
+    if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
+        return;
+    // Not setting `baseUrl` does not work with MF.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
+            json.compilerOptions.baseUrl = '.';
+            return json;
+        });
+        // Update references to match what `nx sync` does.
+        if (options.remotes?.length) {
+            (0, devkit_1.updateJson)(host, tsconfigPath, (json) => {
+                json.references ??= [];
+                for (const remote of options.remotes) {
+                    const remotePath = `../${remote}`;
+                    if (!json.references.some((ref) => ref.path === remotePath))
+                        json.references.push({ path: remotePath });
+                }
+                return json;
+            });
+            (0, devkit_1.updateJson)(host, tsconfigRuntimePath, (json) => {
+                json.references ??= [];
+                for (const remote of options.remotes) {
+                    const remotePath = `../${remote}/tsconfig.app.json`;
+                    if (!json.references.some((ref) => ref.path === remotePath))
+                        json.references.push({ path: remotePath });
+                }
+                return json;
+            });
+        }
+    }
+}

package/src/generators/init/init.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitGenerator = reactInitGenerator;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 async function reactInitGenerator(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'init');
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []));

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

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function createFiles(host: Tree, options: NormalizedSchema): void;

package/src/generators/library/lib/create-files.js

@@ -42,8 +42,28 @@ function createFiles(host, options) {
             ].filter(Boolean),
         });
     }
-    if (!options.publishable && !options.buildable) {
-        host.delete(`${options.projectRoot}/package.json`);
+    if ((options.publishable || options.buildable) &&
+        !options.isUsingTsSolutionConfig) {
+        if (options.bundler === 'vite') {
+            (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+                name: options.importPath,
+                version: '0.0.1',
+                main: './index.js',
+                types: './index.d.ts',
+                exports: {
+                    '.': {
+                        import: './index.mjs',
+                        require: './index.js',
+                    },
+                },
+            });
+        }
+        else {
+            (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+                name: options.importPath,
+                version: '0.0.1',
+            });
+        }
     }
     if (options.js) {
         (0, devkit_1.toJS)(host);

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

@@ -4,7 +4,28 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 async function normalizeOptions(host, options) {
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    if (isUsingTsSolutionConfig) {
+        options.bundler ??= await (0, prompt_1.promptWhenInteractive)({
+            type: 'autocomplete',
+            name: 'bundler',
+            message: `Which bundler would you like to use to build the library? Choose 'none' to skip build setup.`,
+            choices: [{ name: 'vite' }, { name: 'rollup' }, { name: 'none' }],
+            initial: 0,
+        }, { bundler: 'none' }).then(({ bundler }) => bundler);
+    }
+    else {
+        options.bundler ??= await (0, prompt_1.promptWhenInteractive)({
+            type: 'autocomplete',
+            name: 'bundler',
+            message: `Which bundler would you like to use to build the library? Choose 'none' to skip build setup.`,
+            choices: [{ name: 'none' }, { name: 'vite' }, { name: 'rollup' }],
+            initial: 0,
+        }, { bundler: undefined }).then(({ bundler }) => bundler);
+    }
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -62,6 +83,7 @@ async function normalizeOptions(host, options) {
         }
     }
     (0, assertion_1.assertValidStyle)(normalized.style);
+    normalized.isUsingTsSolutionConfig = isUsingTsSolutionConfig;
     return normalized;
 }
 function findMainEntry(tree, projectRoot) {

package/src/generators/library/library.js

@@ -7,7 +7,6 @@ const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const maybe_js_1 = require("../../utils/maybe-js");
 const component_1 = require("../component/component");
@@ -21,6 +20,7 @@ const create_files_1 = require("./lib/create-files");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const set_defaults_1 = require("./lib/set-defaults");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -28,8 +28,12 @@ async function libraryGenerator(host, schema) {
     });
 }
 async function libraryGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'library');
     const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
@@ -37,26 +41,34 @@ async function libraryGeneratorInternal(host, schema) {
     if (!options.component) {
         options.style = 'none';
     }
-    const jsInitTask = await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    });
-    tasks.push(jsInitTask);
     const initTask = await (0, init_1.default)(host, {
         ...options,
         skipFormat: true,
     });
     tasks.push(initTask);
-    (0, devkit_1.addProjectConfiguration)(host, options.name, {
-        root: options.projectRoot,
-        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-        projectType: 'library',
-        tags: options.parsedTags,
-        targets: {},
-    });
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+            name: options.importPath,
+            nx: {
+                name: options.importPath === options.name ? undefined : options.name,
+                projectType: 'library',
+                sourceRoot: `${options.projectRoot}/src`,
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.name, {
+            root: options.projectRoot,
+            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+            projectType: 'library',
+            tags: options.parsedTags,
+            targets: {},
+        });
+    }
+    (0, create_files_1.createFiles)(host, options);
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);
-    (0, create_files_1.createFiles)(host, options);
     // Set up build target
     if (options.buildable && options.bundler === 'vite') {
         const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
@@ -178,11 +190,18 @@ async function libraryGeneratorInternal(host, schema) {
     tasks.push(routeTask);
     (0, set_defaults_1.setDefaults)(host, options);
     (0, create_ts_config_1.extractTsConfigBase)(host);
-    if (!options.skipTsConfig) {
+    if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
             (0, maybe_js_1.maybeJs)(options, (0, devkit_1.joinPathFragments)(options.projectRoot, './src/index.ts')),
         ]);
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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

@@ -39,4 +39,5 @@ export interface NormalizedSchema extends Schema {
   appMain?: string;
   appSourceRoot?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';
+  isUsingTsSolutionConfig?: boolean;
 }

package/src/generators/library/schema.json

@@ -75,14 +75,17 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "eslint",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
       "default": "vitest",
       "description": "Test runner to use for unit tests.",
-      "x-prompt": "What unit test runner should be used?"
+      "x-prompt": "What unit test runner should be used?",
+      "x-priority": "important"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -157,10 +160,7 @@
     "bundler": {
       "type": "string",
       "description": "The bundler to use. Choosing 'none' means this library is not buildable.",
-      "enum": ["none", "vite", "rollup"],
-      "default": "none",
-      "x-prompt": "Which bundler would you like to use to build the library? Choose 'none' to skip build setup.",
-      "x-priority": "important"
+      "enum": ["none", "vite", "rollup"]
     },
     "compiler": {
       "type": "string",

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

@@ -1,5 +1,5 @@
 const { composePlugins, withNx, withReact } = require('@nx/rspack');
-const { withModuleFederation } = require('@nx/rspack/module-federation');
+const { withModuleFederation } = require('@nx/module-federation/rspack');
 
 const baseConfig = require('./module-federation.config');
 

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

@@ -1,5 +1,5 @@
 const {composePlugins, withNx, withReact} = require('@nx/rspack');
-const {withModuleFederationForSSR} = require('@nx/rspack/module-federation');
+const {withModuleFederationForSSR} = require('@nx/module-federation/rspack');
 
 const baseConfig = require("./module-federation.server.config");
 

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

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

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

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederation} from '@nx/rspack/module-federation';
+import {withModuleFederation} from '@nx/module-federation/rspack';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/remote/remote.js

@@ -17,7 +17,6 @@ const maybe_js_1 = require("../../utils/maybe-js");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function addModuleFederationFiles(host, options) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.projectName),
@@ -47,7 +46,6 @@ function addModuleFederationFiles(host, options) {
     }
 }
 async function remoteGenerator(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'remote');
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
@@ -82,6 +80,7 @@ async function remoteGenerator(host, schema) {
         ...options,
         name: options.projectName,
         skipFormat: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initAppTask);
     if (schema.host) {

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -4,7 +4,7 @@ exports.default = migrateWithMfImport;
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
-const NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
+const NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
 const NEW_IMPORT_PATH = `'@nx/module-federation/webpack'`;
 async function migrateWithMfImport(tree) {
     const projects = new Set();
@@ -22,7 +22,7 @@ async function migrateWithMfImport(tree) {
                 return;
             }
             const ast = tsquery_1.tsquery.ast(contents);
-            const importNodes = (0, tsquery_1.tsquery)(ast, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
+            const importNodes = (0, tsquery_1.tsquery)(ast, NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR);
             if (importNodes.length === 0) {
                 return;
             }

package/src/rules/update-module-federation-project.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationProject = updateModuleFederationProject;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../utils/maybe-js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (options.bundler === 'rspack') {
@@ -78,5 +79,10 @@ function updateModuleFederationProject(host, options) {
             },
         },
     };
+    // Typechecks must be performed first before build and serve to generate remote d.ts files.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        projectConfig.targets.build.dependsOn = ['^build', 'typecheck'];
+        projectConfig.targets.serve.dependsOn = ['typecheck'];
+    }
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
 }

package/src/utils/build-static.remotes.d.ts

@@ -1,4 +1,4 @@
-import type { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
+import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 import { ExecutorContext } from '@nx/devkit';
 import { ModuleFederationDevServerOptions } from '../executors/module-federation-dev-server/schema';
 export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: ModuleFederationDevServerOptions): Promise<Record<string, string>>;

package/src/utils/create-ts-config.js

@@ -4,7 +4,64 @@ exports.createTsConfig = createTsConfig;
 exports.extractTsConfigBase = extractTsConfigBase;
 const shared = require("@nx/js/src/utils/typescript/create-ts-config");
 const json_1 = require("nx/src/generators/utils/json");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        createTsConfigForTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig);
+    }
+    else {
+        createTsConfigForNonTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig);
+    }
+}
+function extractTsConfigBase(host) {
+    shared.extractTsConfigBase(host);
+    if (host.exists('vite.config.ts')) {
+        const vite = host.read('vite.config.ts').toString();
+        host.write('vite.config.ts', vite.replace(`projects: []`, `projects: ['tsconfig.base.json']`));
+    }
+}
+function createTsConfigForTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig) {
+    const json = {
+        files: [],
+        include: [],
+        references: [
+            {
+                path: type === 'app' ? './tsconfig.app.json' : './tsconfig.lib.json',
+            },
+        ],
+    };
+    // inline tsconfig.base.json into the project
+    if (options.rootProject) {
+        json.compileOnSave = false;
+        json.compilerOptions = {
+            ...shared.tsConfigBaseOptions,
+            ...json.compilerOptions,
+        };
+        json.exclude = ['node_modules', 'tmp'];
+    }
+    else {
+        json.extends = relativePathToRootTsConfig;
+    }
+    (0, json_1.writeJson)(host, `${projectRoot}/tsconfig.json`, json);
+    const tsconfigProjectPath = `${projectRoot}/tsconfig.${type}.json`;
+    if (host.exists(tsconfigProjectPath)) {
+        (0, json_1.updateJson)(host, tsconfigProjectPath, (json) => {
+            if (options.bundler === 'vite') {
+                json.compilerOptions ??= {};
+                const types = new Set(json.compilerOptions.types ?? []);
+                types.add('node');
+                types.add('vite/client');
+                json.compilerOptions.types = Array.from(types);
+            }
+            if (options.style === '@emotion/styled') {
+                json.compilerOptions ??= {};
+                json.compilerOptions.jsxImportSource = '@emotion/react';
+            }
+            return json;
+        });
+    }
+}
+function createTsConfigForNonTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig) {
     const json = {
         compilerOptions: {
             jsx: 'react-jsx',
@@ -55,10 +112,3 @@ function createTsConfig(host, projectRoot, type, options, relativePathToRootTsCo
         });
     }
 }
-function extractTsConfigBase(host) {
-    shared.extractTsConfigBase(host);
-    if (host.exists('vite.config.ts')) {
-        const vite = host.read('vite.config.ts').toString();
-        host.write('vite.config.ts', vite.replace(`projects: []`, `projects: ['tsconfig.base.json']`));
-    }
-}

package/src/utils/versions.d.ts

@@ -1,5 +1,4 @@
 export declare const nxVersion: any;
-export declare const nxRspackVersion = "*";
 export declare const reactVersion = "18.3.1";
 export declare const reactDomVersion = "18.3.1";
 export declare const reactIsVersion = "18.3.1";

package/src/utils/versions.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelCoreVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.reactViteVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
+exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelCoreVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.reactViteVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-// Always pull the latest version until we merge rspack plugin into the repo.
-exports.nxRspackVersion = '*';
 exports.reactVersion = '18.3.1';
 exports.reactDomVersion = '18.3.1';
 exports.reactIsVersion = '18.3.1';

package/src/generators/application/lib/add-project-root-to-rspack-plugin-excludes.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function addProjectRootToRspackPluginExcludesIfExists(tree: Tree, projectRoot: string): void;

package/src/generators/application/lib/add-project-root-to-rspack-plugin-excludes.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addProjectRootToRspackPluginExcludesIfExists = addProjectRootToRspackPluginExcludesIfExists;
-const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
-function addProjectRootToRspackPluginExcludesIfExists(tree, projectRoot) {
-    const excludeProjectGlob = (0, devkit_1.joinPathFragments)(projectRoot, '/**');
-    const nxJson = (0, devkit_2.readNxJson)(tree);
-    if (!nxJson.plugins?.length) {
-        return;
-    }
-    for (let i = 0; i < nxJson.plugins.length; i++) {
-        let plugin = nxJson.plugins[i];
-        const isRspackPlugin = typeof plugin === 'string'
-            ? plugin === '@nx/rspack/plugin'
-            : plugin.plugin === '@nx/rspack/plugin';
-        if (isRspackPlugin) {
-            if (typeof plugin === 'string') {
-                plugin = {
-                    plugin: plugin,
-                    exclude: [excludeProjectGlob],
-                };
-            }
-            else {
-                plugin.exclude = [...(plugin.exclude ?? []), excludeProjectGlob];
-            }
-            nxJson.plugins[i] = plugin;
-        }
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}

package/src/generators/library/files/common/package.json__tmpl__

@@ -1,4 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "0.0.1"
-}

package/src/generators/library/files/vite/package.json__tmpl__

@@ -1,12 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "0.0.1",
-  "main": "./index.js",
-  "types": "./index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./index.mjs",
-      "require": "./index.js"
-    }
-  }
-}