@nx/react 0.0.0-pr-29122-4727ac1 → 0.0.0-pr-29156-41ae81c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-29122-4727ac1",
+  "version": "0.0.0-pr-29156-41ae81c",
   "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-29156-41ae81c",
+    "@nx/js": "0.0.0-pr-29156-41ae81c",
+    "@nx/eslint": "0.0.0-pr-29156-41ae81c",
+    "@nx/web": "0.0.0-pr-29156-41ae81c",
+    "@nx/module-federation": "0.0.0-pr-29156-41ae81c",
     "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");
@@ -28,6 +27,7 @@ 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,17 +73,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 +116,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 +151,6 @@ async function applicationGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             addPlugin: options.addPlugin,
-            projectType: 'application',
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -174,19 +172,7 @@ async function applicationGeneratorInternal(host, schema) {
         }, 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);
+        (0, add_project_root_to_rspack_plugin_excludes_1.addProjectRootToRspackPluginExcludesIfExists)(host, options.appProjectRoot);
     }
     if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
         const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
@@ -260,11 +246,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

@@ -6,12 +6,10 @@ 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}`,
@@ -38,28 +36,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 +88,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-root-to-rspack-plugin-excludes.d.ts

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

@@ -0,0 +1,31 @@
+"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/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;