@nx/react 0.0.0-pr-30418-0e58904 → 0.0.0-pr-29993-91cbae3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-30418-0e58904",
+  "version": "0.0.0-pr-29993-91cbae3",
   "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-30418-0e58904",
-    "@nx/js": "0.0.0-pr-30418-0e58904",
-    "@nx/eslint": "0.0.0-pr-30418-0e58904",
-    "@nx/web": "0.0.0-pr-30418-0e58904",
-    "@nx/module-federation": "0.0.0-pr-30418-0e58904",
+    "@nx/devkit": "0.0.0-pr-29993-91cbae3",
+    "@nx/js": "0.0.0-pr-29993-91cbae3",
+    "@nx/eslint": "0.0.0-pr-29993-91cbae3",
+    "@nx/web": "0.0.0-pr-29993-91cbae3",
+    "@nx/module-federation": "0.0.0-pr-29993-91cbae3",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/application/application.js

@@ -26,7 +26,6 @@ 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,
@@ -46,25 +45,6 @@ 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;
     (0, show_possible_warnings_1.showPossibleWarnings)(tree, options);
     const initTask = await (0, init_1.default)(tree, {
         ...options,
@@ -133,34 +113,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);

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

@@ -52,18 +52,7 @@ function addProject(host, options) {
         });
     }
     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);
-        }
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
 }
 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') {
@@ -42,13 +41,6 @@ async function createApplicationFiles(host, options) {
     const templateVariables = {
         ...options.names,
         ...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.js

@@ -31,8 +31,6 @@ 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 normalized = {
         ...options,
         projectName: appProjectName,
@@ -49,7 +47,6 @@ async function normalizeOptions(host, options) {
         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

@@ -14,7 +14,6 @@ export interface Schema {
   linter: Linter | LinterType;
   classComponent?: boolean;
   routing?: boolean;
-  useReactRouter?: boolean;
   skipNxJson?: boolean;
   js?: boolean;
   globalCss?: 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": {

package/src/generators/init/init.js

@@ -4,8 +4,6 @@ exports.reactInitGenerator = reactInitGenerator;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const router_plugin_1 = require("../../plugins/router-plugin");
 async function reactInitGenerator(tree, schema) {
     const tasks = [];
     if (!schema.skipPackageJson) {
@@ -18,27 +16,6 @@ async function reactInitGenerator(tree, schema) {
             '@nx/react': versions_1.nxVersion,
         }, undefined, schema.keepExistingVersions));
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    schema.addPlugin ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
-    if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/react/router-plugin', router_plugin_1.createNodesV2, {
-            buildTargetName: ['build', 'react-router:build', 'react-router-build'],
-            devTargetName: ['dev', 'react-router:dev', 'react-router-dev'],
-            startTargetName: ['start', 'react-router-serve', 'react-router-start'],
-            watchDepsTargetName: [
-                'watch-deps',
-                'react-router:watch-deps',
-                'react-router-watch-deps',
-            ],
-            buildDepsTargetName: [
-                'build-deps',
-                'react-router:build-deps',
-                'react-router-build-deps',
-            ],
-        }, schema.updatePackageScripts);
-    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -2,6 +2,4 @@ export interface InitSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
-  updatePackageScripts?: boolean;
-  addPlugin?: boolean;
 }

package/src/generators/library/library.js

@@ -39,6 +39,9 @@ async function libraryGeneratorInternal(host, schema) {
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.isUsingTsSolutionConfig) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+    }
     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)`);
     }
@@ -78,9 +81,6 @@ async function libraryGeneratorInternal(host, schema) {
         (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, packageJson);
     }
     (0, create_files_1.createFiles)(host, options);
-    if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
-    }
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);
     // Set up build target

package/src/utils/ast-utils.d.ts

@@ -11,7 +11,7 @@ export declare function findComponentImportPath(componentName: string, source: t
 export declare function findElements(source: ts.SourceFile, tagName: string): ts.Node[];
 export declare function findClosestOpening(tagName: string, node: ts.Node): ts.Node;
 export declare function isTag(tagName: string, node: ts.Node): boolean;
-export declare function addInitialRoutes(sourcePath: string, source: ts.SourceFile, addBrowserRouter?: boolean): StringChange[];
+export declare function addInitialRoutes(sourcePath: string, source: ts.SourceFile): StringChange[];
 export declare function addRoute(sourcePath: string, source: ts.SourceFile, options: {
     routePath: string;
     componentName: string;

package/src/utils/ast-utils.js

@@ -234,7 +234,7 @@ function isTag(tagName, node) {
     }
     return false;
 }
-function addInitialRoutes(sourcePath, source, addBrowserRouter) {
+function addInitialRoutes(sourcePath, source) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
@@ -281,7 +281,7 @@ function addInitialRoutes(sourcePath, source, addBrowserRouter) {
     `,
     };
     return [
-        ...addImport(source, `import { Route, Routes, Link ${addBrowserRouter ? ', BrowserRouter ' : ''}} from 'react-router-dom';`),
+        ...addImport(source, `import { Route, Routes, Link } from 'react-router-dom';`),
         insertRoutes,
     ];
 }

package/src/utils/versions.d.ts

@@ -14,7 +14,7 @@ export declare const typesReactDomVersion = "19.0.0";
 export declare const typesReactIsV18Version = "18.3.0";
 export declare const typesReactIsVersion = "19.0.0";
 export declare const reactViteVersion = "^4.2.0";
-export declare const typesNodeVersion = "^20.0.0";
+export declare const typesNodeVersion = "18.16.9";
 export declare const babelPresetReactVersion = "^7.14.5";
 export declare const babelCoreVersion = "^7.14.5";
 export declare const styledComponentsVersion = "5.3.6";
@@ -24,8 +24,6 @@ export declare const emotionReactVersion = "11.11.1";
 export declare const emotionBabelPlugin = "11.11.0";
 export declare const styledJsxVersion = "5.1.2";
 export declare const reactRouterDomVersion = "6.29.0";
-export declare const reactRouterVersion = "^7.2.0";
-export declare const reactRouterIsBotVersion = "^4.4.0";
 export declare const testingLibraryReactVersion = "16.1.0";
 export declare const testingLibraryDomVersion = "10.4.0";
 export declare const reduxjsToolkitVersion = "1.9.3";

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.testingLibraryDomVersion = exports.testingLibraryReactVersion = exports.reactRouterIsBotVersion = exports.reactRouterVersion = 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.typesReactIsV18Version = exports.typesReactDomVersion = exports.typesReactDomV18Version = exports.typesReactVersion = exports.typesReactV18Version = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsV18Version = exports.reactIsVersion = exports.reactDomV18Version = exports.reactDomVersion = exports.reactV18Version = exports.reactVersion = exports.nxVersion = void 0;
-exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = void 0;
+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.testingLibraryDomVersion = 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.typesReactIsV18Version = exports.typesReactDomVersion = exports.typesReactDomV18Version = exports.typesReactVersion = exports.typesReactV18Version = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsV18Version = exports.reactIsVersion = exports.reactDomV18Version = exports.reactDomVersion = exports.reactV18Version = exports.reactVersion = exports.nxVersion = void 0;
+exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.reactVersion = '19.0.0';
 exports.reactV18Version = '18.3.1';
@@ -18,8 +18,7 @@ exports.typesReactDomVersion = '19.0.0';
 exports.typesReactIsV18Version = '18.3.0';
 exports.typesReactIsVersion = '19.0.0';
 exports.reactViteVersion = '^4.2.0';
-// Needed for React-Router
-exports.typesNodeVersion = '^20.0.0';
+exports.typesNodeVersion = '18.16.9';
 exports.babelPresetReactVersion = '^7.14.5';
 exports.babelCoreVersion = '^7.14.5';
 exports.styledComponentsVersion = '5.3.6';
@@ -30,8 +29,6 @@ exports.emotionBabelPlugin = '11.11.0';
 // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
 exports.styledJsxVersion = '5.1.2';
 exports.reactRouterDomVersion = '6.29.0';
-exports.reactRouterVersion = '^7.2.0';
-exports.reactRouterIsBotVersion = '^4.4.0';
 exports.testingLibraryReactVersion = '16.1.0';
 exports.testingLibraryDomVersion = '10.4.0';
 exports.reduxjsToolkitVersion = '1.9.3';

package/router-plugin.d.ts

@@ -1 +0,0 @@
-export { createNodesV2, ReactRouterPluginOptions, } from './src/plugins/router-plugin';

package/router-plugin.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodesV2 = void 0;
-var router_plugin_1 = require("./src/plugins/router-plugin");
-Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return router_plugin_1.createNodesV2; } });

package/src/generators/application/files/react-router-ssr/common/app/app-nav.tsx__tmpl__

@@ -1,15 +0,0 @@
-import * as React from "react";
-import { NavLink } from "react-router";
-
-export function AppNav() {
-  return (
-    <nav>
-      <NavLink to="/" end>
-        Home
-      </NavLink>
-      <NavLink to="/about" end>
-        About
-      </NavLink>
-    </nav>
-  );
-}

package/src/generators/application/files/react-router-ssr/common/app/entry.client.tsx__tmpl__

@@ -1,18 +0,0 @@
-/**
- * By default, React Router will handle hydrating your app on the client for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx react-router reveal` ✨
- * For more information, see https://reactrouter.com/explanation/special-files#entryclienttsx
- */
-
-import { HydratedRouter } from 'react-router/dom';
-import { startTransition, StrictMode } from "react";
-import { hydrateRoot } from "react-dom/client";
-
-startTransition(() => {
-  hydrateRoot(
-    document,
-    <StrictMode>
-      <HydratedRouter />
-    </StrictMode>
-  );
-});