fix(router-generator): fix layout/index conflict in virtual physical(…

packages/router-generator/src/filesystem/physical/getRouteNodes.ts

@@ -244,15 +244,20 @@ export async function getRouteNodes(
               originalRoutePath = '/'
             }
 
+            // For layout routes, don't use '/' fallback - an empty path means
+            // "layout for the parent path" which is important for physical() mounts
+            // where route.tsx at root should have empty path, not '/'
+            const isLayoutRoute = routeType === 'layout'
+
             routePath =
               routePath.replace(new RegExp(`/${config.indexToken}$`), '/') ||
-              '/'
+              (isLayoutRoute ? '' : '/')
 
             originalRoutePath =
               originalRoutePath.replace(
                 new RegExp(`/${config.indexToken}$`),
                 '/',
-              ) || '/'
+              ) || (isLayoutRoute ? '' : '/')
           }
 
           routeNodes.push({

packages/router-generator/tests/generator/virtual-physical-layout-and-index/routeTree.snapshot.ts

@@ -0,0 +1,104 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as FeatureRouteRouteImport } from './routes/feature/route'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as FeatureIndexRouteImport } from './routes/feature/index'
+
+const FeatureRouteRoute = FeatureRouteRouteImport.update({
+  id: '/feature',
+  path: '/feature',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+  id: '/',
+  path: '/',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const FeatureIndexRoute = FeatureIndexRouteImport.update({
+  id: '/',
+  path: '/',
+  getParentRoute: () => FeatureRouteRoute,
+} as any)
+
+export interface FileRoutesByFullPath {
+  '/': typeof IndexRoute
+  '/feature': typeof FeatureRouteRouteWithChildren
+  '/feature/': typeof FeatureIndexRoute
+}
+export interface FileRoutesByTo {
+  '/': typeof IndexRoute
+  '/feature': typeof FeatureIndexRoute
+}
+export interface FileRoutesById {
+  __root__: typeof rootRouteImport
+  '/': typeof IndexRoute
+  '/feature': typeof FeatureRouteRouteWithChildren
+  '/feature/': typeof FeatureIndexRoute
+}
+export interface FileRouteTypes {
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths: '/' | '/feature' | '/feature/'
+  fileRoutesByTo: FileRoutesByTo
+  to: '/' | '/feature'
+  id: '__root__' | '/' | '/feature' | '/feature/'
+  fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+  IndexRoute: typeof IndexRoute
+  FeatureRouteRoute: typeof FeatureRouteRouteWithChildren
+}
+
+declare module '@tanstack/react-router' {
+  interface FileRoutesByPath {
+    '/feature': {
+      id: '/feature'
+      path: '/feature'
+      fullPath: '/feature'
+      preLoaderRoute: typeof FeatureRouteRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/': {
+      id: '/'
+      path: '/'
+      fullPath: '/'
+      preLoaderRoute: typeof IndexRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/feature/': {
+      id: '/feature/'
+      path: '/'
+      fullPath: '/feature/'
+      preLoaderRoute: typeof FeatureIndexRouteImport
+      parentRoute: typeof FeatureRouteRoute
+    }
+  }
+}
+
+interface FeatureRouteRouteChildren {
+  FeatureIndexRoute: typeof FeatureIndexRoute
+}
+
+const FeatureRouteRouteChildren: FeatureRouteRouteChildren = {
+  FeatureIndexRoute: FeatureIndexRoute,
+}
+
+const FeatureRouteRouteWithChildren = FeatureRouteRoute._addFileChildren(
+  FeatureRouteRouteChildren,
+)
+
+const rootRouteChildren: RootRouteChildren = {
+  IndexRoute: IndexRoute,
+  FeatureRouteRoute: FeatureRouteRouteWithChildren,
+}
+export const routeTree = rootRouteImport
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()

packages/router-generator/tests/generator/virtual-physical-layout-and-index/routes.ts

@@ -0,0 +1,6 @@
+import { index, physical, rootRoute } from '@tanstack/virtual-file-routes'
+
+export const routes = rootRoute('__root.tsx', [
+  index('index.tsx'),
+  physical('/feature', 'feature'),
+])

packages/router-generator/tests/generator/virtual-physical-layout-and-index/routes/__root.tsx

@@ -0,0 +1,5 @@
+import { createRootRoute, Outlet } from '@tanstack/react-router'
+
+export const Route = createRootRoute({
+  component: () => <Outlet />,
+})

packages/router-generator/tests/generator/virtual-physical-layout-and-index/routes/feature/index.tsx

@@ -0,0 +1,5 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/feature/')({
+  component: () => <div>Feature Index</div>,
+})

packages/router-generator/tests/generator/virtual-physical-layout-and-index/routes/feature/route.tsx

@@ -0,0 +1,10 @@
+import { createFileRoute, Outlet } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/feature')({
+  component: () => (
+    <div>
+      <h1>Feature Layout</h1>
+      <Outlet />
+    </div>
+  ),
+})

packages/router-generator/tests/generator/virtual-physical-layout-and-index/routes/index.tsx

@@ -0,0 +1,5 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/')({
+  component: () => <div>Home</div>,
+})

packages/router-generator/tests/generator/virtual-physical-layout-and-index/tsr.config.json

@@ -0,0 +1,5 @@
+{
+  "routesDirectory": "./routes",
+  "generatedRouteTree": "./routeTree.gen.ts",
+  "virtualRouteConfig": "./routes.ts"
+}