@nx/react 0.0.0-pr-29122-4727ac1 → 0.0.0-pr-29114-4447aa0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-29122-4727ac1",
+  "version": "0.0.0-pr-29114-4447aa0",
   "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-29122-4727ac1",
-    "@nx/js": "0.0.0-pr-29122-4727ac1",
-    "@nx/eslint": "0.0.0-pr-29122-4727ac1",
-    "@nx/web": "0.0.0-pr-29122-4727ac1",
-    "@nx/module-federation": "0.0.0-pr-29122-4727ac1",
+    "@nx/devkit": "0.0.0-pr-29114-4447aa0",
+    "@nx/js": "0.0.0-pr-29114-4447aa0",
+    "@nx/eslint": "0.0.0-pr-29114-4447aa0",
+    "@nx/web": "0.0.0-pr-29114-4447aa0",
+    "@nx/module-federation": "0.0.0-pr-29114-4447aa0",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/generators/application/application.js

@@ -15,7 +15,6 @@ 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");
@@ -73,17 +72,16 @@ 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,
@@ -117,7 +115,7 @@ async function applicationGeneratorInternal(host, schema) {
         }
     }
     else if (options.bundler === 'rspack') {
-        const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
+        const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxRspackVersion);
         const rspackInitTask = await rspackInitGenerator(host, {
             ...options,
             addPlugin: false,
@@ -152,7 +150,6 @@ async function applicationGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             addPlugin: options.addPlugin,
-            projectType: 'application',
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -173,21 +170,6 @@ async function applicationGeneratorInternal(host, schema) {
             plugins: ['react()'],
         }, false);
     }
-    else if (options.bundler === 'rspack') {
-        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);
         const vitestTask = await vitestGenerator(host, {
@@ -260,11 +242,6 @@ 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,31 +1,14 @@
-<%_ 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": ["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": ["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"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
-<% } %>

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

@@ -1,20 +1,4 @@
-<%_ 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",
@@ -23,9 +7,8 @@
       <%_ 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,20 +1,4 @@
-<%_ 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",
@@ -23,9 +7,8 @@
       <%_ 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"],
+  "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"],
   "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';
 <%_ } _%>
-// Uncomment this line to use CSS modules
-// import styles from './<%= fileName %>.module.<%= style %>';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+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 { GeneratorCallback, Tree } from '@nx/devkit';
+import type { 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

@@ -38,28 +38,14 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            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: [],
-                });
-            }
+            (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,
@@ -104,27 +90,13 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            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],
-                });
-            }
+            (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,6 +16,5 @@ 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,7 +5,6 @@ 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,
@@ -29,24 +28,9 @@ function addProject(host, options) {
             serve: createRspackServeTarget(options),
         };
     }
-    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,
-        });
-    }
+    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+        ...project,
+    });
 }
 function createRspackBuildTarget(options) {
     return {

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

@@ -11,7 +11,6 @@ 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') {
@@ -48,7 +47,6 @@ 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,7 +7,6 @@ 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);
@@ -52,7 +51,6 @@ 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,11 +17,6 @@ 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,12 +25,8 @@ 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 {
@@ -44,5 +40,4 @@ 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,6 +80,12 @@
         ]
       }
     },
+    "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.",
@@ -98,29 +104,11 @@
       "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": "none",
-      "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": "none",
-      "x-prompt": "What unit test runner should be used?",
-      "x-priority": "important"
+      "default": "vitest"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -183,6 +171,14 @@
       "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,9 +67,7 @@ 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 = 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 indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, 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,7 +36,6 @@ async function normalizeOptions(tree, options) {
         className,
         fileName,
         filePath,
-        projectRoot,
-        projectSourceRoot: projectSourceRoot,
+        projectSourceRoot: projectSourceRoot ?? projectRoot,
     };
 }

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

@@ -1,3 +1,4 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 import { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
@@ -19,7 +20,6 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   directory: string;
-  projectRoot: string;
   projectSourceRoot: string;
   projectName: string;
   fileName: string;

package/src/generators/component/schema.json

@@ -8,17 +8,19 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the component without the file extension. Relative to the current working directory.",
+      "description": "Path where the component will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What is the component file path?",
+      "x-prompt": "Where should the component be generated?",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "The component symbol name. Defaults to the last segment of the file path."
+      "description": "The name of the component.",
+      "x-prompt": "What name would you like to use for the component?",
+      "x-priority": "important"
     },
     "style": {
       "description": "The file extension to be used for style files.",

package/src/generators/hook/hook.js

@@ -49,20 +49,22 @@ function addExportsToBarrel(host, options) {
     }
 }
 async function normalizeOptions(host, options) {
-    const { artifactName, directory, fileName: hookFilename, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    assertValidOptions(options);
+    const { directory, fileName: _fileName, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
         name: options.name,
         fileExtension: 'tsx',
     });
-    const { className } = (0, devkit_1.names)(hookFilename);
-    // if name is provided, use it as is for the hook name, otherwise prepend
-    // `use` to the pascal-cased file name if it doesn't already start with `use`
-    const hookName = options.name
-        ? artifactName
-        : className.toLocaleLowerCase().startsWith('use')
-            ? className
-            : `use${className}`;
-    const hookTypeName = (0, devkit_1.names)(hookName).className;
+    const { className, fileName } = (0, devkit_1.names)(_fileName);
+    // If using `as-provided` file and directory, then don't normalize.
+    // Otherwise, support legacy behavior of prefixing filename with `use-`.
+    const hookFilename = fileName;
+    const hookName = className.toLocaleLowerCase().startsWith('use')
+        ? className
+        : 'use'.concat(className);
+    const hookTypeName = className.toLocaleLowerCase().startsWith('use')
+        ? className
+        : 'Use'.concat(className);
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { sourceRoot: projectSourceRoot, projectType } = project;
     if (options.export && projectType === 'application') {
@@ -78,4 +80,17 @@ async function normalizeOptions(host, options) {
         projectName,
     };
 }
+function assertValidOptions(options) {
+    const slashes = ['/', '\\'];
+    slashes.forEach((s) => {
+        if (options.name.indexOf(s) !== -1) {
+            const [name, ...rest] = options.name.split(s).reverse();
+            let suggestion = rest.map((x) => x.toLowerCase()).join(s);
+            if (options.directory) {
+                suggestion = `${options.directory}${s}${suggestion}`;
+            }
+            throw new Error(`Found "${s}" in the hook name. Did you mean to use the --directory option (e.g. \`nx g c ${name} --directory ${suggestion}\`)?`);
+        }
+    });
+}
 exports.default = hookGenerator;

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

@@ -2,6 +2,8 @@ export interface Schema {
   path: string;
   name?: string;
   skipTests?: boolean;
+  directory?: string;
   export?: boolean;
   js?: boolean;
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/hook/schema.json

@@ -7,28 +7,26 @@
   "type": "object",
   "examples": [
     {
-      "description": "Generate a hook with the exported symbol matching the file name. It results in the hook `useFoo` at `mylib/src/lib/foo.ts`",
-      "command": "nx g @nx/react:hook mylib/src/lib/foo"
-    },
-    {
-      "description": "Generate a hook with the exported symbol different from the file name. It results in the hook `useCustom` at `mylib/src/lib/foo.ts`",
-      "command": "nx g @nx/react:hook mylib/src/lib/foo --name=useCustom"
+      "command": "nx g hook mylib/my-hook",
+      "description": "Generate a hook `my-hook` in the `mylib` library"
     }
   ],
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the hook without the file extension. Relative to the current working directory.",
+      "description": "Path where the hook will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What is the hook file path?",
+      "x-prompt": "Where should the hook be generated?",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "The hook symbol name. Defaults to the last segment of the file path."
+      "description": "The name of the hook.",
+      "x-prompt": "What name would you like to use for the hook?",
+      "x-priority": "important"
     },
     "js": {
       "type": "boolean",
@@ -41,6 +39,16 @@
       "default": false,
       "x-priority": "internal"
     },
+    "directory": {
+      "type": "string",
+      "description": "The directory at which to create the hook file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the project root.",
+      "x-priority": "important"
+    },
+    "nameAndDirectoryFormat": {
+      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "export": {
       "type": "boolean",
       "description": "When true, the hook is exported from the project `index.ts` (if it exists).",
@@ -49,5 +57,5 @@
       "x-prompt": "Should this hook be exported in the project?"
     }
   },
-  "required": ["path"]
+  "required": ["name"]
 }

package/src/generators/host/host.js

@@ -15,8 +15,9 @@ 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 update_module_federation_tsconfig_1 = require("./lib/update-module-federation-tsconfig");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 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)),
@@ -47,7 +48,6 @@ 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,7 +80,6 @@ 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/init/init.js

@@ -2,8 +2,10 @@
 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/files/common/package.json__tmpl__

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

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

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

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

@@ -1,3 +1,3 @@
-import { Tree } from '@nx/devkit';
+import type { 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,28 +42,8 @@ function createFiles(host, options) {
             ].filter(Boolean),
         });
     }
-    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.publishable && !options.buildable) {
+        host.delete(`${options.projectRoot}/package.json`);
     }
     if (options.js) {
         (0, devkit_1.toJS)(host);

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

@@ -4,9 +4,7 @@ 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");
 async function normalizeOptions(host, options) {
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     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,
@@ -64,7 +62,6 @@ 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,6 +7,7 @@ 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");
@@ -20,7 +21,6 @@ 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,12 +28,8 @@ 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)`);
@@ -41,41 +37,26 @@ 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);
-    if (options.isUsingTsSolutionConfig) {
-        const sourceEntry = options.bundler === 'none'
-            ? options.js
-                ? './src/index.js'
-                : './src/index.ts'
-            : undefined;
-        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
-            name: options.importPath,
-            main: sourceEntry,
-            types: sourceEntry,
-            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);
+    (0, devkit_1.addProjectConfiguration)(host, options.name, {
+        root: options.projectRoot,
+        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+        projectType: 'library',
+        tags: options.parsedTags,
+        targets: {},
+    });
     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);
@@ -197,25 +178,14 @@ 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 && !options.isUsingTsSolutionConfig) {
+    if (!options.skipTsConfig) {
         (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);
     }
-    // Always run install to link packages.
-    if (options.isUsingTsSolutionConfig) {
-        tasks.push(() => (0, devkit_1.installPackagesTask)(host));
-    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });

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

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

package/src/generators/library/schema.json

@@ -71,29 +71,18 @@
         ]
       }
     },
-    "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"
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
-      "x-priority": "important"
+      "default": "eslint"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
-      "default": "none",
+      "default": "vitest",
       "description": "Test runner to use for unit tests.",
-      "x-prompt": "What unit test runner should be used?",
-      "x-priority": "important"
+      "x-prompt": "What unit test runner should be used?"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -165,6 +154,14 @@
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
     },
+    "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"
+    },
     "compiler": {
       "type": "string",
       "enum": ["babel", "swc"],

package/src/generators/redux/schema.json

@@ -5,30 +5,21 @@
   "title": "Create Redux state",
   "description": "Create a Redux state slice for a React project.",
   "type": "object",
-  "examples": [
-    {
-      "description": "Generate a Redux state slice with the exported symbol matching the file name. It results in the slice `fooSlice` at `mylib/src/lib/foo.slice.ts`",
-      "command": "nx g @nx/react:redux mylib/src/lib/foo"
-    },
-    {
-      "description": "Generate a Redux state slice with the exported symbol different from the file name. It results in the slice `customSlice` at `mylib/src/lib/foo.slice.ts`",
-      "command": "nx g @nx/react:redux mylib/src/lib/foo --name=custom"
-    }
-  ],
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the Redux state slice without the file extension. Relative to the current working directory.",
+      "description": "Path where the Redux slice will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What is the Redux stateslice file path?",
+      "x-prompt": "Where should the Redux slice be generated?",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "The Redux state slice symbol name. Defaults to the last segment of the file path."
+      "description": "Redux slice name.",
+      "x-priority": "important"
     },
     "appProject": {
       "type": "string",

package/src/generators/remote/remote.js

@@ -17,6 +17,7 @@ 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),
@@ -46,6 +47,7 @@ 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)),
@@ -80,7 +82,6 @@ async function remoteGenerator(host, schema) {
         ...options,
         name: options.projectName,
         skipFormat: true,
-        alwaysGenerateProjectJson: true,
     });
     tasks.push(initAppTask);
     if (schema.host) {

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

@@ -3,7 +3,6 @@ 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') {
@@ -79,10 +78,5 @@ 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/create-ts-config.js

@@ -4,64 +4,7 @@ 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',
@@ -112,3 +55,10 @@ function createTsConfigForNonTsSolution(host, projectRoot, type, options, relati
         });
     }
 }
+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,4 +1,5 @@
 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,7 +1,9 @@
 "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.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.nxRspackVersion = 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/host/lib/update-module-federation-tsconfig.d.ts

@@ -1,3 +0,0 @@
-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

@@ -1,39 +0,0 @@
-"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;
-            });
-        }
-    }
-}