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

package/src/generators/host/host.js

@@ -19,10 +19,7 @@ const update_module_federation_tsconfig_1 = require("./lib/update-module-federat
 async function hostGenerator(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, {
-            ...schema,
-            useProjectJson: true,
-        })),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
             ? false
@@ -42,7 +39,7 @@ async function hostGenerator(host, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const initTask = await (0, application_1.default)(host, {
         ...options,
         directory: options.appProjectRoot,
@@ -50,7 +47,7 @@ async function hostGenerator(host, schema) {
         // The target use-case is loading remotes as child routes, thus always enable routing.
         routing: true,
         skipFormat: true,
-        useProjectJson: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initTask);
     const remotesWithPorts = [];

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/lib/add-rollup-build-target.d.ts

@@ -1,6 +1,4 @@
 import { Tree } from 'nx/src/generators/tree';
 import { GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
-export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema & {
-    format?: Array<'esm' | 'cjs'>;
-}, external?: Set<String>): Promise<GeneratorCallback>;
+export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

package/src/generators/library/lib/add-rollup-build-target.js

@@ -4,7 +4,7 @@ exports.addRollupBuildTarget = addRollupBuildTarget;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
-async function addRollupBuildTarget(host, options, external = new Set(['react', 'react-dom'])) {
+async function addRollupBuildTarget(host, options) {
     const tasks = [];
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
     tasks.push(await configurationGenerator(host, {
@@ -19,11 +19,12 @@ async function addRollupBuildTarget(host, options, external = new Set(['react',
             '@svgr/rollup': versions_1.svgrRollupVersion,
         }));
     }
+    const external = ['react', 'react-dom'];
     if (options.style === '@emotion/styled') {
-        external.add('@emotion/react/jsx-runtime');
+        external.push('@emotion/react/jsx-runtime');
     }
     else {
-        external.add('react/jsx-runtime');
+        external.push('react/jsx-runtime');
     }
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasRollupPlugin = !!nxJson.plugins?.some((p) => typeof p === 'string'
@@ -43,8 +44,8 @@ module.exports = withNx(
             : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', options.projectRoot)}',
     tsConfig: './tsconfig.lib.json',
     compiler: '${options.compiler ?? 'babel'}',
-    external: ${JSON.stringify(Array.from(external))},
-    format: ${JSON.stringify(options.format ?? ['esm'])},
+    external: ${JSON.stringify(external)},
+    format: ['esm'],
     assets:[{ input: '.', output: '.', glob: 'README.md'}],
   }, {
     // Provide additional rollup configuration here. See: https://rollupjs.org/configuration-options
@@ -73,7 +74,7 @@ module.exports = withNx(
                 tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
                 project: `${options.projectRoot}/package.json`,
                 entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
-                external: Array.from(external),
+                external,
                 rollupConfig: `@nx/react/plugins/bundle-rollup`,
                 compiler: options.compiler ?? 'babel',
                 assets: [

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

@@ -43,8 +43,7 @@ function createFiles(host, options) {
         });
     }
     if ((options.publishable || options.buildable) &&
-        !options.isUsingTsSolutionConfig &&
-        options.useProjectJson) {
+        !options.isUsingTsSolutionConfig) {
         if (options.bundler === 'vite') {
             (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
                 name: options.importPath,

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

@@ -7,7 +7,7 @@ const assertion_1 = require("../../../utils/assertion");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -41,26 +41,23 @@ async function normalizeOptions(host, options) {
         bundler,
         fileName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
+        name: isUsingTsSolutionConfig ? importPath : projectName,
         projectRoot,
         parsedTags,
         importPath,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     // Libraries with a bundler or is publishable must also be buildable.
     normalized.buildable = Boolean(normalized.bundler !== 'none' || options.buildable || options.publishable);
     normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
     if (options.appProject) {
         const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
-        const appProjectType = (0, ts_solution_setup_1.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
-        if (appProjectType !== 'application') {
-            throw new Error(`appProject expected type of "application" but got "${appProjectType}"`);
+        if (appProjectConfig.projectType !== 'application') {
+            throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
         }
-        const appSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(host, appProjectConfig.sourceRoot, appProjectConfig.root);
         normalized.appMain =
             appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);
-        normalized.appSourceRoot = (0, devkit_1.normalizePath)(appSourceRoot);
+        normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
         // TODO(jack): We should use appEntryFile instead of appProject so users can directly set it rather than us inferring it.
         if (!normalized.appMain) {
             throw new Error(`Could not locate project main for ${options.appProject}`);

package/src/generators/library/library.js

@@ -27,7 +27,6 @@ const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-re
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
-        useProjectJson: true,
         ...schema,
     });
 }
@@ -39,6 +38,9 @@ async function libraryGeneratorInternal(host, schema) {
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.isUsingTsSolutionConfig) {
+        (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)`);
     }
@@ -50,20 +52,18 @@ async function libraryGeneratorInternal(host, schema) {
         skipFormat: true,
     });
     tasks.push(initTask);
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        ...(0, determine_entry_fields_1.determineEntryFields)(options),
-        files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
-    };
-    if (!options.useProjectJson) {
-        if (options.name !== options.importPath) {
-            packageJson.nx = { name: options.name };
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+            name: options.importPath ?? options.name,
+            version: '0.0.1',
+            ...(0, determine_entry_fields_1.determineEntryFields)(options),
+            nx: options.parsedTags?.length
+                ? {
+                    tags: options.parsedTags,
+                }
+                : undefined,
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, {
@@ -74,13 +74,7 @@ async function libraryGeneratorInternal(host, schema) {
             targets: {},
         });
     }
-    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-        (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/generators/library/schema.d.ts

@@ -27,7 +27,6 @@ export interface Schema {
   minimal?: boolean;
   simpleName?: boolean;
   addPlugin?: boolean;
-  useProjectJson?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
@@ -37,7 +36,6 @@ export interface NormalizedSchema extends Schema {
   projectRoot: string;
   routePath: string;
   parsedTags: string[];
-  importPath: string;
   appMain?: string;
   appSourceRoot?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';

package/src/generators/library/schema.json

@@ -190,10 +190,6 @@
       "description": "Don't include the directory in the name of the module of the library.",
       "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"]

package/src/generators/remote/remote.js

@@ -48,10 +48,7 @@ function addModuleFederationFiles(host, options) {
 async function remoteGenerator(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, {
-            ...schema,
-            useProjectJson: true,
-        })),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         // when js is set to true, we want to use the js configuration
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
@@ -65,29 +62,29 @@ async function remoteGenerator(host, schema) {
     if (options.dynamic) {
         // Dynamic remotes generate with library { type: 'var' } by default.
         // We need to ensure that the remote name is a valid variable name.
-        const isValidRemote = (0, js_1.isValidVariable)(options.projectName);
+        const isValidRemote = (0, js_1.isValidVariable)(options.name);
         if (!isValidRemote.isValid) {
-            throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
+            throw new Error(`Invalid remote name provided: ${options.name}. ${isValidRemote.message}`);
         }
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
     const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
-    if (!remoteNameRegex.test(options.projectName)) {
-        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${options.projectName}. Remote project names must:
+    if (!remoteNameRegex.test(options.name)) {
+        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${options.name}. Remote project names must:
       - Start with a letter, dollar sign ($) or underscore (_)
       - Followed by any valid character (letters, digits, underscores, or dollar signs)
       The regular expression used is ${REMOTE_NAME_REGEX}.`);
     }
     const initAppTask = await (0, application_1.default)(host, {
         ...options,
-        name: options.projectName,
+        name: options.name,
         skipFormat: true,
-        useProjectJson: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initAppTask);
     if (options.host) {
-        (0, update_host_with_remote_1.updateHostWithRemote)(host, options.host, options.projectName);
+        (0, update_host_with_remote_1.updateHostWithRemote)(host, options.host, options.name);
     }
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in

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>
-  );
-});

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

@@ -1,74 +0,0 @@
-/**
- * By default, React Router will handle generating the HTTP Response 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 remix reveal` ✨
- * For more information, see https://reactrouter.com/explanation/special-files#entryservertsx
- */
-
-import { PassThrough } from "node:stream";
-
-import type { AppLoadContext, EntryContext } from "react-router";
-import { createReadableStreamFromReadable } from "@react-router/node";
-import { ServerRouter } from "react-router";
-import { isbot } from "isbot";
-import type { RenderToPipeableStreamOptions } from "react-dom/server";
-import { renderToPipeableStream } from "react-dom/server";
-
-export const streamTimeout = 5_000;
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  routerContext: EntryContext,
-  loadContext: AppLoadContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
-    const userAgent = request.headers.get("user-agent");
-
-    // Ensure requests from bots and SPA Mode renders wait for all content to load before responding
-    // https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
-    const readyOption: keyof RenderToPipeableStreamOptions =
-      (userAgent && isbot(userAgent)) || routerContext.isSpaMode
-        ? "onAllReady"
-        : "onShellReady";
-
-    const { pipe, abort } = renderToPipeableStream(
-      <ServerRouter context={routerContext} url={request.url} />,
-      {
-        [readyOption]() {
-          shellRendered = true;
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          responseHeaders.set("Content-Type", "text/html");
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
-        },
-      }
-    );
-
-    // Abort the rendering stream after the `streamTimeout` so it has time to
-    // flush down the rejected boundaries
-    setTimeout(abort, streamTimeout + 1000);
-  });
-}

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

@@ -1,51 +0,0 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-  type MetaFunction, 
-  type LinksFunction
-} from "react-router";
-
-import { AppNav } from './app-nav'
-
-export const meta: MetaFunction = () => ([{
-  title: "New Nx React Router App",
-}]);
-
-export const links: LinksFunction = () => [
-  { rel: "preconnect", href: "https://fonts.googleapis.com" },
-  {
-    rel: "preconnect",
-    href: "https://fonts.gstatic.com",
-    crossOrigin: "anonymous",
-  },
-  {
-    rel: "stylesheet",
-    href: "https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap",
-  },
-];
-
-export function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <AppNav />
-        {children}
-        <ScrollRestoration />
-        <Scripts />
-      </body>
-    </html>
-  );
-}
-
-export default function App() {
-    return <Outlet />;
-}

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

@@ -1,7 +0,0 @@
-export default function AboutComponent() {
-  return (
-    <div>
-      <h1>About!!!</h1>
-    </div>
-  );
-}

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

@@ -1,6 +0,0 @@
-import { type RouteConfig, index, route } from "@react-router/dev/routes";
-
-export default [
-  index('<%- js ? `./${fileName}.jsx` : `./${fileName}.tsx` %>'),
-  route('about', './routes/about.tsx')
-  ] satisfies RouteConfig;

package/src/generators/application/files/react-router-ssr/common/react-router.config.ts__tmpl__

@@ -1,5 +0,0 @@
-import type { Config } from "@react-router/dev/config";
-
-export default {
-  ssr: true,
-} satisfies Config;

package/src/generators/application/files/react-router-ssr/common/tests/routes/_index.spec.tsx__tmpl__

@@ -1,16 +0,0 @@
-import { createRoutesStub } from 'react-router';
-import { render, screen, waitFor } from '@testing-library/react';
-import App from '../../app/app';
-
-test('renders loader data', async () => {
-  const ReactRouterStub = createRoutesStub([
-    {
-      path: '/',
-      Component: App,
-    },
-  ]);
-
-  render(<ReactRouterStub />);
-
-  await waitFor(() => screen.findByText('Hello there,'));
-});

package/src/generators/application/files/react-router-ssr/common/tsconfig.app.json__tmpl__

@@ -1,23 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": [
-    "app/**/*.ts",
-    "app/**/*.tsx",
-    "app/**/*.js",
-    "app/**/*.jsx",
-    "**/.server/**/*.ts",
-    "**/.server/**/*.tsx",
-    "**/.client/**/*.ts",
-    "**/.client/**/*.tsx"
-  ],
-  "exclude": [
-    "tests/**/*.spec.ts",
-    "tests/**/*.test.ts",
-    "tests/**/*.spec.tsx",
-    "tests/**/*.test.tsx",
-    "tests/**/*.spec.js",
-    "tests/**/*.test.js",
-    "tests/**/*.spec.jsx",
-    "tests/**/*.test.jsx"
-  ]
-}