@nx/react 0.0.0-pr-29464-ef5660f → 0.0.0-pr-29720-06f67e5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-29464-ef5660f",
+  "version": "0.0.0-pr-29720-06f67e5",
   "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-29464-ef5660f",
-    "@nx/js": "0.0.0-pr-29464-ef5660f",
-    "@nx/eslint": "0.0.0-pr-29464-ef5660f",
-    "@nx/web": "0.0.0-pr-29464-ef5660f",
-    "@nx/module-federation": "0.0.0-pr-29464-ef5660f",
+    "@nx/devkit": "0.0.0-pr-29720-06f67e5",
+    "@nx/js": "0.0.0-pr-29720-06f67e5",
+    "@nx/eslint": "0.0.0-pr-29720-06f67e5",
+    "@nx/web": "0.0.0-pr-29720-06f67e5",
+    "@nx/module-federation": "0.0.0-pr-29720-06f67e5",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/application/application.js

@@ -26,11 +26,9 @@ const add_rspack_1 = require("./lib/bundlers/add-rspack");
 const add_rsbuild_1 = require("./lib/bundlers/add-rsbuild");
 const add_vite_1 = require("./lib/bundlers/add-vite");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
-        useProjectJson: true,
         ...schema,
     });
 }
@@ -46,25 +44,11 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
-    options.useReactRouter = options.routing
-        ? options.useReactRouter ??
-            (await (0, prompt_1.promptWhenInteractive)({
-                name: 'response',
-                message: 'Would you like to use react-router for server-side rendering?',
-                type: 'autocomplete',
-                choices: [
-                    {
-                        name: 'Yes',
-                        message: 'I want to use react-router   [ https://reactrouter.com/start/framework/routing   ]',
-                    },
-                    {
-                        name: 'No',
-                        message: 'I do not want to use react-router for server-side rendering',
-                    },
-                ],
-                initial: 0,
-            }, { response: 'No' }).then((r) => r.response === 'Yes'))
-        : false;
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+    }
     (0, show_possible_warnings_1.showPossibleWarnings)(tree, options);
     const initTask = await (0, init_1.default)(tree, {
         ...options,
@@ -99,11 +83,6 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     await (0, create_application_files_1.createApplicationFiles)(tree, options);
     (0, add_project_1.addProject)(tree, options);
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
-    }
     if (options.style === 'tailwind') {
         const twTask = await (0, setup_tailwind_1.setupTailwindGenerator)(tree, {
             project: options.projectName,
@@ -133,34 +112,16 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     // Handle tsconfig.spec.json for jest or vitest
     (0, update_jest_config_1.updateSpecConfig)(tree, options);
-    const commonDependencyTask = await (0, install_common_dependencies_1.installCommonDependencies)(tree, options);
-    tasks.push(commonDependencyTask);
+    const stylePreprocessorTask = await (0, install_common_dependencies_1.installCommonDependencies)(tree, options);
+    tasks.push(stylePreprocessorTask);
     const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(tree, options);
     tasks.push(styledTask);
-    if (!options.useReactRouter) {
-        const routingTask = (0, add_routing_1.addRouting)(tree, options);
-        tasks.push(routingTask);
-    }
+    const routingTask = (0, add_routing_1.addRouting)(tree, options);
+    tasks.push(routingTask);
     (0, set_defaults_1.setDefaults)(tree, options);
     if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
         (0, add_rspack_1.handleStyledJsxForRspack)(tasks, tree, options);
     }
-    if (options.useReactRouter) {
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
-            const types = new Set(json.compilerOptions?.types || []);
-            types.add('@react-router/node');
-            return {
-                ...json,
-                compilerOptions: {
-                    ...json.compilerOptions,
-                    jsx: 'react-jsx',
-                    moduleResolution: 'bundler',
-                    types: Array.from(types),
-                },
-            };
-        });
-    }
-    // Only for the new TS solution
     (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',

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

@@ -28,10 +28,8 @@ async function addE2e(tree, options) {
         e2eWebServerInfo = await getWebpackE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.devServerPort ?? 4200);
     }
     else if (options.bundler === 'vite') {
-        const { getViteE2EWebServerInfo, getReactRouterE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-        e2eWebServerInfo = options.useReactRouter
-            ? await getReactRouterE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.devServerPort ?? 4200)
-            : await getViteE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.devServerPort ?? 4200);
+        const { getViteE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        e2eWebServerInfo = await getViteE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.devServerPort ?? 4200);
     }
     else if (options.bundler === 'rsbuild') {
         (0, devkit_1.ensurePackage)('@nx/rsbuild', versions_1.nxVersion);
@@ -48,15 +46,17 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            const packageJson = {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-            };
-            if (!options.useProjectJson) {
-                packageJson.nx = {
-                    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, {
@@ -68,9 +68,6 @@ async function addE2e(tree, options) {
                     tags: [],
                 });
             }
-            if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -119,15 +116,17 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            const packageJson = {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-            };
-            if (!options.useProjectJson) {
-                packageJson.nx = {
-                    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, {
@@ -136,12 +135,8 @@ async function addE2e(tree, options) {
                     sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     targets: {},
                     implicitDependencies: [options.projectName],
-                    tags: [],
                 });
             }
-            if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-            }
             const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,

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

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

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
-exports.isEslintInstalled = isEslintInstalled;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
@@ -9,7 +8,6 @@ const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 const devkit_2 = require("@nx/devkit");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const lint_1 = require("../../../utils/lint");
-const versions_1 = require("../../../utils/versions");
 async function addLinting(host, options) {
     const tasks = [];
     if (options.linter === eslint_1.Linter.EsLint) {
@@ -45,42 +43,6 @@ async function addLinting(host, options) {
             const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(host);
             tasks.push(installTask, addSwcTask);
         }
-        if (options.useReactRouter) {
-            await ignoreReactRouterFilesInEslintConfig(host, options.appProjectRoot);
-        }
     }
     return (0, devkit_2.runTasksInSerial)(...tasks);
 }
-async function ignoreReactRouterFilesInEslintConfig(tree, projectRoot) {
-    if (!isEslintInstalled(tree)) {
-        return;
-    }
-    (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
-    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => require('@nx/eslint/src/generators/utils/eslint-file'));
-    if (!isEslintConfigSupported(tree)) {
-        return;
-    }
-    const { useFlatConfig } = await Promise.resolve().then(() => require('@nx/eslint/src/utils/flat-config'));
-    const isUsingFlatConfig = useFlatConfig(tree);
-    if (!projectRoot && !isUsingFlatConfig) {
-        // root eslintrc files ignore all files and the root eslintrc files add
-        // back all the project files, so we only add the ignores to the project
-        // eslintrc files
-        return;
-    }
-    // for flat config, we update the root config file
-    const directory = isUsingFlatConfig ? '' : projectRoot ?? '';
-    addIgnoresToLintConfig(tree, directory, ['**/build', '**/.react-router']);
-}
-function isEslintInstalled(tree) {
-    try {
-        require('eslint');
-        return true;
-    }
-    catch { }
-    // it might not be installed yet, but it might be in the tree pending install
-    const { devDependencies, dependencies } = tree.exists('package.json')
-        ? (0, devkit_1.readJson)(tree, 'package.json')
-        : {};
-    return !!devDependencies?.['eslint'] || !!dependencies?.['eslint'];
-}

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

@@ -28,42 +28,26 @@ function addProject(host, options) {
             serve: createRspackServeTarget(options),
         };
     }
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        private: true,
-    };
-    if (!options.useProjectJson) {
-        if (options.projectName !== options.importPath) {
-            packageJson.nx = { name: options.projectName };
-        }
-        if (Object.keys(project.targets).length) {
-            packageJson.nx ??= {};
-            packageJson.nx.targets = project.targets;
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: options.projectName,
+            version: '0.0.1',
+            private: true,
+        });
     }
-    else {
+    if (!options.isUsingTsSolutionConfig || options.alwaysGenerateProjectJson) {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
             ...project,
         });
     }
-    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-        // React Router already adds a package.json to the project root
-        if (options.useReactRouter) {
-            (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), (json) => {
-                return {
-                    name: packageJson.name,
-                    ...json,
-                };
-            });
-        }
-        else {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
-        }
+    else if (options.parsedTags?.length ||
+        Object.keys(project.targets).length) {
+        const updatedProject = {
+            root: options.appProjectRoot,
+            targets: project.targets,
+            tags: options.parsedTags?.length ? options.parsedTags : undefined,
+        };
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, updatedProject);
     }
 }
 function createRspackBuildTarget(options) {

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

@@ -20,7 +20,7 @@ function addRouting(host, options) {
     }, `src/app/${options.fileName}.tsx`));
     const appFileContent = host.read(appPath, 'utf-8');
     const appSource = tsModule.createSourceFile(appPath, appFileContent, tsModule.ScriptTarget.Latest, true);
-    const changes = (0, devkit_1.applyChangesToString)(appFileContent, (0, ast_utils_1.addInitialRoutes)(appPath, appSource, options.inSourceTests));
+    const changes = (0, devkit_1.applyChangesToString)(appFileContent, (0, ast_utils_1.addInitialRoutes)(appPath, appSource));
     host.write(appPath, changes);
     if (!options.skipPackageJson) {
         return (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {});

package/src/generators/application/lib/bundlers/add-vite.js

@@ -11,18 +11,6 @@ async function setupViteConfiguration(tree, options, tasks) {
     if (tree.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'))) {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'));
     }
-    const reactRouterFrameworkConfig = {
-        imports: [`import { reactRouter } from '@react-router/dev/vite'`],
-        plugins: ['!process.env.VITEST && reactRouter()'],
-    };
-    const baseReactConfig = {
-        imports: [
-            options.compiler === 'swc'
-                ? `import react from '@vitejs/plugin-react-swc'`
-                : `import react from '@vitejs/plugin-react'`,
-        ],
-        plugins: ['react()'],
-    };
     const viteTask = await viteConfigurationGenerator(tree, {
         uiFramework: 'react',
         project: options.projectName,
@@ -41,9 +29,12 @@ async function setupViteConfiguration(tree, options, tasks) {
         includeVitest: options.unitTestRunner === 'vitest',
         inSourceTests: options.inSourceTests,
         rollupOptionsExternal: ["'react'", "'react-dom'", "'react/jsx-runtime'"],
-        ...(options.useReactRouter
-            ? reactRouterFrameworkConfig
-            : baseReactConfig),
+        imports: [
+            options.compiler === 'swc'
+                ? `import react from '@vitejs/plugin-react-swc'`
+                : `import react from '@vitejs/plugin-react'`,
+        ],
+        plugins: ['react()'],
     }, false);
 }
 async function setupVitestConfiguration(tree, options, tasks) {

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

@@ -12,7 +12,6 @@ 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");
-const versions_1 = require("../../../utils/versions");
 async function createApplicationFiles(host, options) {
     let styleSolutionSpecificAppFiles;
     if (options.styledModule && options.style !== 'styled-jsx') {
@@ -40,15 +39,8 @@ async function createApplicationFiles(host, options) {
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
     const appTests = (0, get_app_tests_1.getAppTests)(options);
     const templateVariables = {
-        ...options.names,
+        ...(0, devkit_1.names)(options.name),
         ...options,
-        typesNodeVersion: versions_1.typesNodeVersion,
-        typesReactDomVersion: versions_1.typesReactDomVersion,
-        reactRouterVersion: versions_1.reactRouterVersion,
-        typesReactVersion: versions_1.typesReactVersion,
-        reactDomVersion: versions_1.reactDomVersion,
-        reactVersion: versions_1.reactVersion,
-        reactRouterIsBotVersion: versions_1.reactRouterIsBotVersion,
         js: !!options.js, // Ensure this is defined in template
         tmpl: '',
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
@@ -58,12 +50,9 @@ async function createApplicationFiles(host, options) {
         hasStyleFile,
         isUsingTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
-    if (options.bundler === 'vite' && !options.useReactRouter) {
+    if (options.bundler === 'vite') {
         (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/base-vite'), options.appProjectRoot, templateVariables);
     }
-    else if (options.bundler === 'vite' && options.useReactRouter) {
-        generateReactRouterFiles(host, options, templateVariables);
-    }
     else if (options.bundler === 'webpack') {
         (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/base-webpack'), options.appProjectRoot, {
             ...templateVariables,
@@ -148,12 +137,9 @@ async function createApplicationFiles(host, options) {
         const tutorialUrl = options.rootProject
             ? 'https://nx.dev/getting-started/tutorials/react-standalone-tutorial'
             : 'https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project';
-        const path = options.useReactRouter
-            ? '../files/react-router-ssr/nx-welcome'
-            : '../files/nx-welcome';
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, path, onBoardingStatus), options.appProjectRoot, { ...templateVariables, connectCloudUrl, tutorialUrl });
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/nx-welcome', onBoardingStatus), options.appProjectRoot, { ...templateVariables, connectCloudUrl, tutorialUrl });
     }
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, styleSolutionSpecificAppFiles, options.useReactRouter ? 'src' : ''), options.appProjectRoot, templateVariables);
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, styleSolutionSpecificAppFiles), options.appProjectRoot, templateVariables);
     if (options.js) {
         (0, devkit_1.toJS)(host, {
             useJsx: options.bundler === 'vite' || options.bundler === 'rspack',
@@ -208,26 +194,3 @@ function createNxRspackPluginOptions(options, rootOffset) {
             ],
     };
 }
-function generateReactRouterFiles(tree, options, templateVariables) {
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/react-router-ssr/common'), options.appProjectRoot, templateVariables);
-    if (options.rootProject) {
-        const gitignore = tree.read('.gitignore', 'utf-8');
-        tree.write('.gitignore', `${gitignore}\n.cache\nbuild\npublic/build\n.env\n\.react-router\n`);
-    }
-    else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/react-router-ssr/non-root'), options.appProjectRoot, templateVariables);
-    }
-    if (options.isUsingTsSolutionConfig) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/react-router-ssr/ts-solution'), options.appProjectRoot, templateVariables);
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), (json) => {
-            if (options.projectName !== options.importPath) {
-                json.nx = { name: options.projectName };
-            }
-            if (options.parsedTags?.length) {
-                json.nx ??= {};
-                json.nx.tags = options.parsedTags;
-            }
-            return json;
-        });
-    }
-}

package/src/generators/application/lib/install-common-dependencies.js

@@ -11,24 +11,13 @@ async function installCommonDependencies(host, options) {
     const reactDeps = await (0, version_utils_1.getReactDependenciesVersionsToInstall)(host);
     const dependencies = {};
     const devDependencies = {
+        '@types/node': versions_1.typesNodeVersion,
         '@types/react': reactDeps['@types/react'],
         '@types/react-dom': reactDeps['@types/react-dom'],
-        '@types/node': versions_1.typesNodeVersion,
-        ...(options.useReactRouter
-            ? {
-                '@react-router/dev': versions_1.reactRouterVersion,
-            }
-            : {}),
     };
     if (options.bundler !== 'vite') {
         dependencies['tslib'] = versions_1.tsLibVersion;
     }
-    if (options.useReactRouter) {
-        dependencies['react-router'] = versions_1.reactRouterVersion;
-        dependencies['@react-router/node'] = versions_1.reactRouterVersion;
-        dependencies['@react-router/serve'] = versions_1.reactRouterVersion;
-        dependencies['isbot'] = versions_1.reactRouterIsBotVersion;
-    }
     // Vite requires style preprocessors to be installed manually.
     // `@nx/webpack` installs them automatically for now.
     if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
@@ -56,5 +45,5 @@ async function installCommonDependencies(host, options) {
         devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
         devDependencies['@testing-library/dom'] = versions_1.testingLibraryDomVersion;
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies);
 }

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,3 +1,5 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../schema';
+export declare function normalizeDirectory(options: Schema): string;
+export declare function normalizeProjectName(options: Schema): string;
 export declare function normalizeOptions<T extends Schema = Schema>(host: Tree, options: Schema): Promise<NormalizedSchema<T>>;

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

@@ -1,14 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeDirectory = normalizeDirectory;
+exports.normalizeProjectName = normalizeProjectName;
 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 find_free_port_1 = require("./find-free-port");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+function normalizeDirectory(options) {
+    options.directory = options.directory?.replace(/\\{1,2}/g, '/');
+    const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+    return projectDirectory
+        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
+        : (0, devkit_1.names)(options.name).fileName;
+}
+function normalizeProjectName(options) {
+    return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
+}
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -19,8 +32,6 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
@@ -31,25 +42,23 @@ async function normalizeOptions(host, options) {
         ? null
         : options.style;
     (0, assertion_1.assertValidStyle)(options.style);
-    options.bundler = options.useReactRouter ? 'vite' : options.bundler;
-    options.useReactRouter = options.routing ? options.useReactRouter : false;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
-        projectName: appProjectName,
+        name: appProjectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
+            : appProjectName,
         appProjectRoot,
-        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
         fileName,
         styledModule,
         hasStyles: options.style !== 'none',
-        names: (0, devkit_1.names)(projectNames.projectSimpleName),
         isUsingTsSolutionConfig,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     normalized.routing = normalized.routing ?? false;
-    normalized.useReactRouter = normalized.useReactRouter ?? false;
     normalized.strict = normalized.strict ?? true;
     normalized.classComponent = normalized.classComponent ?? false;
     normalized.compiler = normalized.compiler ?? 'babel';

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

@@ -1,4 +1,3 @@
-import type { names } from '@nx/devkit';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '../../../typings/style';
 
@@ -14,7 +13,6 @@ export interface Schema {
   linter: Linter | LinterType;
   classComponent?: boolean;
   routing?: boolean;
-  useReactRouter?: boolean;
   skipNxJson?: boolean;
   js?: boolean;
   globalCss?: boolean;
@@ -32,7 +30,7 @@ export interface Schema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
-  useProjectJson?: boolean;
+  alwaysGenerateProjectJson?: boolean; // this is needed for MF currently
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {
@@ -40,13 +38,11 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   appProjectRoot: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
-  importPath: string;
   parsedTags: string[];
   fileName: string;
   styledModule: null | SupportedStyles;
   hasStyles: boolean;
   unitTestRunner: 'jest' | 'vitest' | 'none';
   addPlugin?: boolean;
-  names: ReturnType<typeof names>;
   isUsingTsSolutionConfig?: boolean;
 }

package/src/generators/application/schema.json

@@ -83,12 +83,7 @@
     "routing": {
       "type": "boolean",
       "description": "Generate application with routes.",
-      "x-prompt": "Would you like to add routing to this application?",
-      "default": false
-    },
-    "useReactRouter": {
-      "description": "Use React Router for routing.",
-      "type": "boolean",
+      "x-prompt": "Would you like to add React Router to this application?",
       "default": false
     },
     "skipFormat": {
@@ -192,10 +187,6 @@
       "description": "Generate a React app with a minimal setup, no separate test files.",
       "type": "boolean",
       "default": false
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],