Hello!
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx
index 2a6bf16c37..20b07c41cc 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/universe')({
+export const Route = createFileRoute({
component: () =>
,
})
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx
index 03edc7f484..4af11357a2 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/world')({
+export const Route = createFileRoute({
component: () =>
,
})
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx
index bdfb4c7676..510db79b73 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: Home,
})
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx
index 5c77421bb2..c549175638 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_first')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx
index 9ab147de5e..efeca5ce86 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_first/_second')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx
index 990f473ae8..ef413c1be0 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx
@@ -1,4 +1,4 @@
-import { ErrorComponent, createFileRoute } from '@tanstack/solid-router'
+import { ErrorComponent } from '@tanstack/solid-router'
import { fetchPost } from '../../posts'
import type { ErrorComponentProps } from '@tanstack/solid-router'
@@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) {
return
}
-export const Route = createFileRoute('/posts/$postId')({
+export const Route = createFileRoute({
loader: async ({ params: { postId } }) => fetchPost(postId),
errorComponent: PostErrorComponent as any,
notFoundComponent: () => {
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx
index 33d0386c19..13529228bb 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/posts/')({
+export const Route = createFileRoute({
component: PostsIndexComponent,
})
diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx
index 9ae6dfc747..46203594d1 100644
--- a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx
+++ b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx
@@ -1,7 +1,7 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
import { fetchPosts } from '../../posts'
-export const Route = createFileRoute('/posts')({
+export const Route = createFileRoute({
loader: fetchPosts,
component: PostsComponent,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx
index 055cba1e6f..a190b24202 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_first/_second/layout-a')({
+export const Route = createFileRoute({
component: LayoutAComponent,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx
index c5bb8051af..505f8f6fbf 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_first/_second/layout-b')({
+export const Route = createFileRoute({
component: LayoutBComponent,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx
index f7ff537916..f86335e291 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/')({
+export const Route = createFileRoute({
component: () =>
,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx
index f4f30d8425..5b95eea555 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/classic/hello')({
+export const Route = createFileRoute({
component: () => (
Hello!
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx
index 2a6bf16c37..20b07c41cc 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/universe')({
+export const Route = createFileRoute({
component: () =>
Hello /classic/hello/universe!
,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx
index 03edc7f484..4af11357a2 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/world')({
+export const Route = createFileRoute({
component: () =>
Hello /classic/hello/world!
,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx
index bdfb4c7676..510db79b73 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: Home,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx
index 5c77421bb2..c549175638 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_first')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx
index 9ab147de5e..efeca5ce86 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_first/_second')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx
index 990f473ae8..ef413c1be0 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx
@@ -1,4 +1,4 @@
-import { ErrorComponent, createFileRoute } from '@tanstack/solid-router'
+import { ErrorComponent } from '@tanstack/solid-router'
import { fetchPost } from '../../posts'
import type { ErrorComponentProps } from '@tanstack/solid-router'
@@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) {
return
}
-export const Route = createFileRoute('/posts/$postId')({
+export const Route = createFileRoute({
loader: async ({ params: { postId } }) => fetchPost(postId),
errorComponent: PostErrorComponent as any,
notFoundComponent: () => {
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx
index 33d0386c19..13529228bb 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/posts/')({
+export const Route = createFileRoute({
component: PostsIndexComponent,
})
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx
index 9ae6dfc747..46203594d1 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx
@@ -1,7 +1,7 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
import { fetchPosts } from '../../posts'
-export const Route = createFileRoute('/posts')({
+export const Route = createFileRoute({
loader: fetchPosts,
component: PostsComponent,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx
index d43b4ef5f5..c549175638 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_layout')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx
index 7a5a3623a0..efeca5ce86 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_layout/_layout-2')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx
index b69951b246..a190b24202 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_layout/_layout-2/layout-a')({
+export const Route = createFileRoute({
component: LayoutAComponent,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx
index 30dbcce90f..505f8f6fbf 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_layout/_layout-2/layout-b')({
+export const Route = createFileRoute({
component: LayoutBComponent,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx
index bdfb4c7676..510db79b73 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: Home,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx
index 55f8871d03..12f48f498d 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx
@@ -1,4 +1,4 @@
-import { ErrorComponent, createFileRoute } from '@tanstack/solid-router'
+import { ErrorComponent } from '@tanstack/solid-router'
import { fetchPost } from '../posts'
import type { ErrorComponentProps } from '@tanstack/solid-router'
@@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) {
return
}
-export const Route = createFileRoute('/posts/$postId')({
+export const Route = createFileRoute({
loader: async ({ params: { postId } }) => fetchPost(postId),
errorComponent: PostErrorComponent,
notFoundComponent: () => {
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx
index 33d0386c19..13529228bb 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/posts/')({
+export const Route = createFileRoute({
component: PostsIndexComponent,
})
diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx
index 11a999f50a..2e28f9beb3 100644
--- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx
+++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx
@@ -1,7 +1,7 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
import { fetchPosts } from '../posts'
-export const Route = createFileRoute('/posts')({
+export const Route = createFileRoute({
loader: fetchPosts,
component: PostsComponent,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx
index 055cba1e6f..a190b24202 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_first/_second/layout-a')({
+export const Route = createFileRoute({
component: LayoutAComponent,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx
index c5bb8051af..505f8f6fbf 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_first/_second/layout-b')({
+export const Route = createFileRoute({
component: LayoutBComponent,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx
index f7ff537916..f86335e291 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/')({
+export const Route = createFileRoute({
component: () =>
This is the index
,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx
index f4f30d8425..5b95eea555 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/classic/hello')({
+export const Route = createFileRoute({
component: () => (
Hello!
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx
index 2a6bf16c37..20b07c41cc 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/universe')({
+export const Route = createFileRoute({
component: () =>
Hello /classic/hello/universe!
,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx
index 03edc7f484..4af11357a2 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx
@@ -1,5 +1,3 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/classic/hello/world')({
+export const Route = createFileRoute({
component: () =>
Hello /classic/hello/world!
,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx
index bdfb4c7676..510db79b73 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: Home,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx
index 5c77421bb2..c549175638 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_first')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx
index 9ab147de5e..efeca5ce86 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_first/_second')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx
index 990f473ae8..ef413c1be0 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx
@@ -1,4 +1,4 @@
-import { ErrorComponent, createFileRoute } from '@tanstack/solid-router'
+import { ErrorComponent } from '@tanstack/solid-router'
import { fetchPost } from '../../posts'
import type { ErrorComponentProps } from '@tanstack/solid-router'
@@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) {
return
}
-export const Route = createFileRoute('/posts/$postId')({
+export const Route = createFileRoute({
loader: async ({ params: { postId } }) => fetchPost(postId),
errorComponent: PostErrorComponent as any,
notFoundComponent: () => {
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx
index 33d0386c19..13529228bb 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/posts/')({
+export const Route = createFileRoute({
component: PostsIndexComponent,
})
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx
index 9ae6dfc747..46203594d1 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx
@@ -1,7 +1,7 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
import { fetchPosts } from '../../posts'
-export const Route = createFileRoute('/posts')({
+export const Route = createFileRoute({
loader: fetchPosts,
component: PostsComponent,
})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts
index 03f257bbfa..00acddbffb 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts
@@ -12,26 +12,29 @@ import { createFileRoute } from '@tanstack/solid-router'
// Import Routes
+import type { FileRoutesByPath, CreateFileRoute } from '@tanstack/solid-router'
import { Route as rootRoute } from './routes/__root'
-import { Route as IndexImport } from './routes/index'
-import { Route as testsPageWithSearchImport } from './routes/(tests)/page-with-search'
-import { Route as testsNormalPageImport } from './routes/(tests)/normal-page'
-import { Route as testsLazyWithLoaderPageImport } from './routes/(tests)/lazy-with-loader-page'
-import { Route as testsLazyPageImport } from './routes/(tests)/lazy-page'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as testsPageWithSearchRouteImport } from './routes/(tests)/page-with-search'
+import { Route as testsNormalPageRouteImport } from './routes/(tests)/normal-page'
+import { Route as testsLazyWithLoaderPageRouteImport } from './routes/(tests)/lazy-with-loader-page'
+import { Route as testsLazyPageRouteImport } from './routes/(tests)/lazy-page'
// Create Virtual Routes
-const testsVirtualPageLazyImport = createFileRoute('/(tests)/virtual-page')()
+const testsVirtualPageLazyRouteImport = createFileRoute(
+ '/(tests)/virtual-page',
+)()
// Create/Update Routes
-const IndexRoute = IndexImport.update({
+const IndexRoute = IndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => rootRoute,
} as any)
-const testsVirtualPageLazyRoute = testsVirtualPageLazyImport
+const testsVirtualPageLazyRoute = testsVirtualPageLazyRouteImport
.update({
id: '/(tests)/virtual-page',
path: '/virtual-page',
@@ -39,19 +42,19 @@ const testsVirtualPageLazyRoute = testsVirtualPageLazyImport
} as any)
.lazy(() => import('./routes/(tests)/virtual-page.lazy').then((d) => d.Route))
-const testsPageWithSearchRoute = testsPageWithSearchImport.update({
+const testsPageWithSearchRoute = testsPageWithSearchRouteImport.update({
id: '/(tests)/page-with-search',
path: '/page-with-search',
getParentRoute: () => rootRoute,
} as any)
-const testsNormalPageRoute = testsNormalPageImport.update({
+const testsNormalPageRoute = testsNormalPageRouteImport.update({
id: '/(tests)/normal-page',
path: '/normal-page',
getParentRoute: () => rootRoute,
} as any)
-const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageImport
+const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageRouteImport
.update({
id: '/(tests)/lazy-with-loader-page',
path: '/lazy-with-loader-page',
@@ -61,7 +64,7 @@ const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageImport
import('./routes/(tests)/lazy-with-loader-page.lazy').then((d) => d.Route),
)
-const testsLazyPageRoute = testsLazyPageImport
+const testsLazyPageRoute = testsLazyPageRouteImport
.update({
id: '/(tests)/lazy-page',
path: '/lazy-page',
@@ -77,47 +80,131 @@ declare module '@tanstack/solid-router' {
id: '/'
path: '/'
fullPath: '/'
- preLoaderRoute: typeof IndexImport
+ preLoaderRoute: typeof IndexRouteImport
parentRoute: typeof rootRoute
}
'/(tests)/lazy-page': {
id: '/(tests)/lazy-page'
path: '/lazy-page'
fullPath: '/lazy-page'
- preLoaderRoute: typeof testsLazyPageImport
+ preLoaderRoute: typeof testsLazyPageRouteImport
parentRoute: typeof rootRoute
}
'/(tests)/lazy-with-loader-page': {
id: '/(tests)/lazy-with-loader-page'
path: '/lazy-with-loader-page'
fullPath: '/lazy-with-loader-page'
- preLoaderRoute: typeof testsLazyWithLoaderPageImport
+ preLoaderRoute: typeof testsLazyWithLoaderPageRouteImport
parentRoute: typeof rootRoute
}
'/(tests)/normal-page': {
id: '/(tests)/normal-page'
path: '/normal-page'
fullPath: '/normal-page'
- preLoaderRoute: typeof testsNormalPageImport
+ preLoaderRoute: typeof testsNormalPageRouteImport
parentRoute: typeof rootRoute
}
'/(tests)/page-with-search': {
id: '/(tests)/page-with-search'
path: '/page-with-search'
fullPath: '/page-with-search'
- preLoaderRoute: typeof testsPageWithSearchImport
+ preLoaderRoute: typeof testsPageWithSearchRouteImport
parentRoute: typeof rootRoute
}
'/(tests)/virtual-page': {
id: '/(tests)/virtual-page'
path: '/virtual-page'
fullPath: '/virtual-page'
- preLoaderRoute: typeof testsVirtualPageLazyImport
+ preLoaderRoute: typeof testsVirtualPageLazyRouteImport
parentRoute: typeof rootRoute
}
}
}
+// Add type-safety to the createFileRoute function across the route tree
+
+declare module './routes/index' {
+ const createFileRoute: CreateFileRoute<
+ '/',
+ FileRoutesByPath['/']['parentRoute'],
+ FileRoutesByPath['/']['id'],
+ FileRoutesByPath['/']['path'],
+ FileRoutesByPath['/']['fullPath']
+ >
+}
+declare module './routes/(tests)/lazy-page' {
+ const createFileRoute: CreateFileRoute<
+ '/(tests)/lazy-page',
+ FileRoutesByPath['/(tests)/lazy-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/lazy-page']['id'],
+ FileRoutesByPath['/(tests)/lazy-page']['path'],
+ FileRoutesByPath['/(tests)/lazy-page']['fullPath']
+ >
+}
+declare module './routes/(tests)/lazy-page.lazy' {
+ const createLazyFileRoute: CreateFileRoute<
+ '/(tests)/lazy-page',
+ FileRoutesByPath['/(tests)/lazy-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/lazy-page']['id'],
+ FileRoutesByPath['/(tests)/lazy-page']['path'],
+ FileRoutesByPath['/(tests)/lazy-page']['fullPath']
+ >
+}
+declare module './routes/(tests)/lazy-with-loader-page' {
+ const createFileRoute: CreateFileRoute<
+ '/(tests)/lazy-with-loader-page',
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['id'],
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['path'],
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['fullPath']
+ >
+}
+declare module './routes/(tests)/lazy-with-loader-page.lazy' {
+ const createLazyFileRoute: CreateFileRoute<
+ '/(tests)/lazy-with-loader-page',
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['id'],
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['path'],
+ FileRoutesByPath['/(tests)/lazy-with-loader-page']['fullPath']
+ >
+}
+declare module './routes/(tests)/normal-page' {
+ const createFileRoute: CreateFileRoute<
+ '/(tests)/normal-page',
+ FileRoutesByPath['/(tests)/normal-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/normal-page']['id'],
+ FileRoutesByPath['/(tests)/normal-page']['path'],
+ FileRoutesByPath['/(tests)/normal-page']['fullPath']
+ >
+}
+declare module './routes/(tests)/page-with-search' {
+ const createFileRoute: CreateFileRoute<
+ '/(tests)/page-with-search',
+ FileRoutesByPath['/(tests)/page-with-search']['parentRoute'],
+ FileRoutesByPath['/(tests)/page-with-search']['id'],
+ FileRoutesByPath['/(tests)/page-with-search']['path'],
+ FileRoutesByPath['/(tests)/page-with-search']['fullPath']
+ >
+}
+declare module './routes/(tests)/virtual-page.lazy' {
+ const createFileRoute: CreateFileRoute<
+ '/(tests)/virtual-page',
+ FileRoutesByPath['/(tests)/virtual-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/virtual-page']['id'],
+ FileRoutesByPath['/(tests)/virtual-page']['path'],
+ FileRoutesByPath['/(tests)/virtual-page']['fullPath']
+ >
+}
+declare module './routes/(tests)/virtual-page.lazy' {
+ const createLazyFileRoute: CreateFileRoute<
+ '/(tests)/virtual-page',
+ FileRoutesByPath['/(tests)/virtual-page']['parentRoute'],
+ FileRoutesByPath['/(tests)/virtual-page']['id'],
+ FileRoutesByPath['/(tests)/virtual-page']['path'],
+ FileRoutesByPath['/(tests)/virtual-page']['fullPath']
+ >
+}
+
// Create and export the route tree
export interface FileRoutesByFullPath {
@@ -198,6 +285,9 @@ export const routeTree = rootRoute
._addFileChildren(rootRouteChildren)
._addFileTypes
()
+// @ts-ignore
+import type * as ServerTypes from '../.tanstack-start/server-routes/routeTree.gen.ts'
+
/* ROUTE_MANIFEST_START
{
"routes": {
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx
index 2e7b3306d2..ff772de0f5 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx
@@ -1,7 +1,6 @@
-import { createLazyFileRoute } from '@tanstack/solid-router'
import { ScrollBlock } from '../-components/scroll-block'
-export const Route = createLazyFileRoute('/(tests)/lazy-page')({
+export const Route = createLazyFileRoute({
component: Component,
})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx
index 042a053765..79405e27e7 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx
@@ -1,3 +1 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/(tests)/lazy-page')({})
+export const Route = createFileRoute({})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx
index 2079777df0..7f5f91be43 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx
@@ -1,7 +1,6 @@
-import { createLazyFileRoute } from '@tanstack/solid-router'
import { ScrollBlock } from '../-components/scroll-block'
-export const Route = createLazyFileRoute('/(tests)/lazy-with-loader-page')({
+export const Route = createLazyFileRoute({
component: Component,
})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx
index 6f2cf280a4..5463a153af 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx
@@ -1,7 +1,6 @@
-import { createFileRoute } from '@tanstack/solid-router'
import { sleep } from '../../posts'
-export const Route = createFileRoute('/(tests)/lazy-with-loader-page')({
+export const Route = createFileRoute({
loader: async () => {
await sleep(1000)
return { foo: 'bar' }
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx
index 6151049c35..af14b9d095 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx
@@ -1,7 +1,6 @@
-import { createFileRoute } from '@tanstack/solid-router'
import { ScrollBlock } from '../-components/scroll-block'
-export const Route = createFileRoute('/(tests)/normal-page')({
+export const Route = createFileRoute({
component: Component,
})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx
index 4d5953ed67..073dd2501c 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx
@@ -1,9 +1,8 @@
-import { createFileRoute } from '@tanstack/solid-router'
import { z } from 'zod'
import { zodValidator } from '@tanstack/zod-adapter'
import { ScrollBlock } from '../-components/scroll-block'
-export const Route = createFileRoute('/(tests)/page-with-search')({
+export const Route = createFileRoute({
validateSearch: zodValidator(z.object({ where: z.string() })),
component: Component,
})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx
index 8c6c8ef353..4e79a19cd9 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx
@@ -1,7 +1,6 @@
-import { createLazyFileRoute } from '@tanstack/solid-router'
import { ScrollBlock } from '../-components/scroll-block'
-export const Route = createLazyFileRoute('/(tests)/virtual-page')({
+export const Route = createLazyFileRoute({
component: Component,
})
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx
index 991ecc3435..da8f31fe34 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx
@@ -1,6 +1,6 @@
-import { Link, createFileRoute, linkOptions } from '@tanstack/solid-router'
+import { Link, linkOptions } from '@tanstack/solid-router'
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: HomeComponent,
})
diff --git a/e2e/solid-start/basic-tsr-config/.gitignore b/e2e/solid-start/basic-tsr-config/.gitignore
index 2b76174be5..14577724eb 100644
--- a/e2e/solid-start/basic-tsr-config/.gitignore
+++ b/e2e/solid-start/basic-tsr-config/.gitignore
@@ -7,13 +7,11 @@ yarn.lock
.env
.vercel
.output
-.vinxi
/build/
/api/
/server/build
/public/build
-.vinxi
# Sentry Config File
.env.sentry-build-plugin
/test-results/
diff --git a/e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts
new file mode 100644
index 0000000000..2dc6bfc4bd
--- /dev/null
+++ b/e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts
@@ -0,0 +1,70 @@
+/* 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 Routes
+
+import type {
+ FileRoutesByPath,
+ CreateServerFileRoute,
+} from '@tanstack/solid-start/server'
+import {
+ createServerRoute,
+ createServerFileRoute,
+} from '@tanstack/solid-start/server'
+
+// Create/Update Routes
+
+const rootRoute = createServerRoute()
+
+// Populate the FileRoutesByPath interface
+
+declare module '@tanstack/solid-start/server' {
+ interface FileRoutesByPath {}
+}
+
+// Add type-safety to the createFileRoute function across the route tree
+
+// Create and export the route tree
+
+export interface FileRoutesByFullPath {}
+
+export interface FileRoutesByTo {}
+
+export interface FileRoutesById {
+ __root__: typeof rootRoute
+}
+
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: never
+ fileRoutesByTo: FileRoutesByTo
+ to: never
+ id: '__root__'
+ fileRoutesById: FileRoutesById
+}
+
+export interface RootRouteChildren {}
+
+const rootRouteChildren: RootRouteChildren = {}
+
+export const routeTree = rootRoute
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
+
+/* ROUTE_MANIFEST_START
+{
+ "routes": {
+ "__root__": {
+ "filePath": "__root.tsx",
+ "children": []
+ }
+ }
+}
+ROUTE_MANIFEST_END */
diff --git a/e2e/solid-start/basic-tsr-config/app.config.ts b/e2e/solid-start/basic-tsr-config/app.config.ts
deleted file mode 100644
index d798414e98..0000000000
--- a/e2e/solid-start/basic-tsr-config/app.config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// app.config.ts
-import { defineConfig } from '@tanstack/solid-start/config'
-
-export default defineConfig({
- tsr: {
- appDirectory: './src/app',
- },
-})
diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json
index 475a1d746b..635a898525 100644
--- a/e2e/solid-start/basic-tsr-config/package.json
+++ b/e2e/solid-start/basic-tsr-config/package.json
@@ -4,22 +4,22 @@
"sideEffects": false,
"type": "module",
"scripts": {
- "dev": "vinxi dev --port 3000",
- "dev:e2e": "vinxi dev",
- "build": "rimraf ./count.txt && vinxi build && tsc --noEmit",
- "start": "vinxi start",
+ "dev": "vite dev --port 3000",
+ "dev:e2e": "vite dev",
+ "build": "rimraf ./count.txt && vite build && tsc --noEmit",
+ "start": "node .output/server/index.mjs",
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "^1.9.5",
- "vinxi": "0.5.3"
+ "solid-js": "^1.9.5"
},
"devDependencies": {
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
- "typescript": "^5.7.2"
+ "typescript": "^5.7.2",
+ "vite-tsconfig-paths": "^5.1.4"
}
}
diff --git a/e2e/solid-start/basic-tsr-config/playwright.config.ts b/e2e/solid-start/basic-tsr-config/playwright.config.ts
index bb77d0cf70..e834d88cf4 100644
--- a/e2e/solid-start/basic-tsr-config/playwright.config.ts
+++ b/e2e/solid-start/basic-tsr-config/playwright.config.ts
@@ -4,6 +4,7 @@ import packageJson from './package.json' with { type: 'json' }
const PORT = derivePort(packageJson.name)
const baseURL = `http://localhost:${PORT}`
+
/**
* See https://playwright.dev/docs/test-configuration.
*/
@@ -19,7 +20,7 @@ export default defineConfig({
},
webServer: {
- command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`,
+ command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`,
url: baseURL,
reuseExistingServer: !process.env.CI,
stdout: 'pipe',
diff --git a/e2e/solid-start/basic-tsr-config/src/app/client.tsx b/e2e/solid-start/basic-tsr-config/src/app/client.tsx
deleted file mode 100644
index ba0f02fac0..0000000000
--- a/e2e/solid-start/basic-tsr-config/src/app/client.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-///
-import { hydrate } from 'solid-js/web'
-import { StartClient } from '@tanstack/solid-start'
-import { createRouter } from './router'
-
-const router = createRouter()
-
-hydrate(() => , document.body)
diff --git a/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts b/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts
index c260510053..3fc31644ee 100644
--- a/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts
+++ b/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts
@@ -10,12 +10,13 @@
// Import Routes
+import type { FileRoutesByPath, CreateFileRoute } from '@tanstack/solid-router'
import { Route as rootRoute } from './routes/__root'
-import { Route as IndexImport } from './routes/index'
+import { Route as IndexRouteImport } from './routes/index'
// Create/Update Routes
-const IndexRoute = IndexImport.update({
+const IndexRoute = IndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => rootRoute,
@@ -29,12 +30,24 @@ declare module '@tanstack/solid-router' {
id: '/'
path: '/'
fullPath: '/'
- preLoaderRoute: typeof IndexImport
+ preLoaderRoute: typeof IndexRouteImport
parentRoute: typeof rootRoute
}
}
}
+// Add type-safety to the createFileRoute function across the route tree
+
+declare module './routes/index' {
+ const createFileRoute: CreateFileRoute<
+ '/',
+ FileRoutesByPath['/']['parentRoute'],
+ FileRoutesByPath['/']['id'],
+ FileRoutesByPath['/']['path'],
+ FileRoutesByPath['/']['fullPath']
+ >
+}
+
// Create and export the route tree
export interface FileRoutesByFullPath {
@@ -71,6 +84,9 @@ export const routeTree = rootRoute
._addFileChildren(rootRouteChildren)
._addFileTypes()
+// @ts-ignore
+import type * as ServerTypes from '../../.tanstack-start/server-routes/routeTree.gen.ts'
+
/* ROUTE_MANIFEST_START
{
"routes": {
diff --git a/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx b/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx
index 4d15620109..32e530dbbf 100644
--- a/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx
+++ b/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx
@@ -1,5 +1,5 @@
import fs from 'node:fs'
-import { createFileRoute, useRouter } from '@tanstack/solid-router'
+import { useRouter } from '@tanstack/solid-router'
import { createServerFn } from '@tanstack/solid-start'
const filePath = 'count.txt'
@@ -17,7 +17,7 @@ const updateCount = createServerFn({ method: 'POST' })
const count = await getCount()
await fs.promises.writeFile(filePath, `${count + data}`)
})
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: Home,
loader: async () => await getCount(),
})
diff --git a/e2e/solid-start/basic-tsr-config/src/app/ssr.tsx b/e2e/solid-start/basic-tsr-config/src/app/ssr.tsx
deleted file mode 100644
index ebd14c8120..0000000000
--- a/e2e/solid-start/basic-tsr-config/src/app/ssr.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-///
-import {
- createStartHandler,
- defaultStreamHandler,
-} from '@tanstack/solid-start/server'
-import { getRouterManifest } from '@tanstack/solid-start/router-manifest'
-
-import { createRouter } from './router'
-
-export default createStartHandler({
- createRouter,
- getRouterManifest,
-})(defaultStreamHandler)
diff --git a/e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts b/e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts
new file mode 100644
index 0000000000..0b2af560d6
--- /dev/null
+++ b/e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts
@@ -0,0 +1,4 @@
+declare module '*?url' {
+ const url: string
+ export default url
+}
diff --git a/e2e/solid-start/basic-tsr-config/vite.config.ts b/e2e/solid-start/basic-tsr-config/vite.config.ts
new file mode 100644
index 0000000000..788ee479b5
--- /dev/null
+++ b/e2e/solid-start/basic-tsr-config/vite.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'vite'
+import tsConfigPaths from 'vite-tsconfig-paths'
+import { TanStackStartVitePlugin } from '@tanstack/solid-start/plugin'
+
+export default defineConfig({
+ server: {
+ port: 3000,
+ },
+ plugins: [
+ tsConfigPaths({
+ projects: ['./tsconfig.json'],
+ }),
+ TanStackStartVitePlugin({
+ tsr: {
+ srcDirectory: './src/app',
+ },
+ }),
+ ],
+})
diff --git a/e2e/solid-start/basic/.gitignore b/e2e/solid-start/basic/.gitignore
index be342025da..a79d5cf129 100644
--- a/e2e/solid-start/basic/.gitignore
+++ b/e2e/solid-start/basic/.gitignore
@@ -7,13 +7,11 @@ yarn.lock
.env
.vercel
.output
-.vinxi
/build/
/api/
/server/build
/public/build
-.vinxi
# Sentry Config File
.env.sentry-build-plugin
/test-results/
diff --git a/e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts
new file mode 100644
index 0000000000..e36fccb479
--- /dev/null
+++ b/e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts
@@ -0,0 +1,155 @@
+/* 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 Routes
+
+import type {
+ FileRoutesByPath,
+ CreateServerFileRoute,
+} from '@tanstack/solid-start/server'
+import {
+ createServerRoute,
+ createServerFileRoute,
+} from '@tanstack/solid-start/server'
+
+import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api/users'
+import { ServerRoute as ApiUsersUserIdRouteImport } from './../../src/routes/api/users.$userId'
+
+// Create/Update Routes
+
+const rootRoute = createServerRoute()
+
+const ApiUsersRoute = ApiUsersRouteImport.update({
+ id: '/api/users',
+ path: '/api/users',
+ getParentRoute: () => rootRoute,
+} as any)
+
+const ApiUsersUserIdRoute = ApiUsersUserIdRouteImport.update({
+ id: '/$userId',
+ path: '/$userId',
+ getParentRoute: () => ApiUsersRoute,
+} as any)
+
+// Populate the FileRoutesByPath interface
+
+declare module '@tanstack/solid-start/server' {
+ interface FileRoutesByPath {
+ '/api/users': {
+ id: '/api/users'
+ path: '/api/users'
+ fullPath: '/api/users'
+ preLoaderRoute: typeof ApiUsersRouteImport
+ parentRoute: typeof rootRoute
+ }
+ '/api/users/$userId': {
+ id: '/api/users/$userId'
+ path: '/$userId'
+ fullPath: '/api/users/$userId'
+ preLoaderRoute: typeof ApiUsersUserIdRouteImport
+ parentRoute: typeof ApiUsersRouteImport
+ }
+ }
+}
+
+// Add type-safety to the createFileRoute function across the route tree
+
+declare module './../../src/routes/api/users' {
+ const createServerFileRoute: CreateServerFileRoute<
+ FileRoutesByPath['/api/users']['parentRoute'],
+ FileRoutesByPath['/api/users']['id'],
+ FileRoutesByPath['/api/users']['path'],
+ FileRoutesByPath['/api/users']['fullPath'],
+ ApiUsersRouteChildren
+ >
+}
+declare module './../../src/routes/api/users.$userId' {
+ const createServerFileRoute: CreateServerFileRoute<
+ FileRoutesByPath['/api/users/$userId']['parentRoute'],
+ FileRoutesByPath['/api/users/$userId']['id'],
+ FileRoutesByPath['/api/users/$userId']['path'],
+ FileRoutesByPath['/api/users/$userId']['fullPath'],
+ unknown
+ >
+}
+
+// Create and export the route tree
+
+interface ApiUsersRouteChildren {
+ ApiUsersUserIdRoute: typeof ApiUsersUserIdRoute
+}
+
+const ApiUsersRouteChildren: ApiUsersRouteChildren = {
+ ApiUsersUserIdRoute: ApiUsersUserIdRoute,
+}
+
+const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren(
+ ApiUsersRouteChildren,
+)
+
+export interface FileRoutesByFullPath {
+ '/api/users': typeof ApiUsersRouteWithChildren
+ '/api/users/$userId': typeof ApiUsersUserIdRoute
+}
+
+export interface FileRoutesByTo {
+ '/api/users': typeof ApiUsersRouteWithChildren
+ '/api/users/$userId': typeof ApiUsersUserIdRoute
+}
+
+export interface FileRoutesById {
+ __root__: typeof rootRoute
+ '/api/users': typeof ApiUsersRouteWithChildren
+ '/api/users/$userId': typeof ApiUsersUserIdRoute
+}
+
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/api/users' | '/api/users/$userId'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/api/users' | '/api/users/$userId'
+ id: '__root__' | '/api/users' | '/api/users/$userId'
+ fileRoutesById: FileRoutesById
+}
+
+export interface RootRouteChildren {
+ ApiUsersRoute: typeof ApiUsersRouteWithChildren
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ ApiUsersRoute: ApiUsersRouteWithChildren,
+}
+
+export const routeTree = rootRoute
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
+
+/* ROUTE_MANIFEST_START
+{
+ "routes": {
+ "__root__": {
+ "filePath": "__root.tsx",
+ "children": [
+ "/api/users"
+ ]
+ },
+ "/api/users": {
+ "filePath": "api/users.ts",
+ "children": [
+ "/api/users/$userId"
+ ]
+ },
+ "/api/users/$userId": {
+ "filePath": "api/users.$userId.ts",
+ "parent": "/api/users"
+ }
+ }
+}
+ROUTE_MANIFEST_END */
diff --git a/e2e/solid-start/basic/app.config.ts b/e2e/solid-start/basic/app.config.ts
deleted file mode 100644
index 2a06e3d3f0..0000000000
--- a/e2e/solid-start/basic/app.config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { defineConfig } from '@tanstack/solid-start/config'
-import tsConfigPaths from 'vite-tsconfig-paths'
-
-export default defineConfig({
- tsr: {
- appDirectory: 'src',
- },
- vite: {
- plugins: [
- tsConfigPaths({
- projects: ['./tsconfig.json'],
- }),
- ],
- },
-})
diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json
index a10fb47d62..01167c343d 100644
--- a/e2e/solid-start/basic/package.json
+++ b/e2e/solid-start/basic/package.json
@@ -4,10 +4,10 @@
"sideEffects": false,
"type": "module",
"scripts": {
- "dev": "vinxi dev --port 3000",
- "dev:e2e": "vinxi dev",
- "build": "vinxi build && tsc --noEmit",
- "start": "vinxi start",
+ "dev": "vite dev --port 3000",
+ "dev:e2e": "vite dev",
+ "build": "vite build && tsc --noEmit",
+ "start": "node .output/server/index.mjs",
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
@@ -17,7 +17,6 @@
"solid-js": "^1.9.5",
"redaxios": "^0.5.1",
"tailwind-merge": "^2.6.0",
- "vinxi": "0.5.3",
"zod": "^3.24.2"
},
"devDependencies": {
diff --git a/e2e/solid-start/basic/playwright.config.ts b/e2e/solid-start/basic/playwright.config.ts
index 95d043d48b..e834d88cf4 100644
--- a/e2e/solid-start/basic/playwright.config.ts
+++ b/e2e/solid-start/basic/playwright.config.ts
@@ -20,7 +20,7 @@ export default defineConfig({
},
webServer: {
- command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`,
+ command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`,
url: baseURL,
reuseExistingServer: !process.env.CI,
stdout: 'pipe',
diff --git a/e2e/solid-start/basic/src/api.ts b/e2e/solid-start/basic/src/api.ts
deleted file mode 100644
index ed511bcd26..0000000000
--- a/e2e/solid-start/basic/src/api.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {
- createStartAPIHandler,
- defaultAPIFileRouteHandler,
-} from '@tanstack/solid-start/api'
-
-export default createStartAPIHandler(defaultAPIFileRouteHandler)
diff --git a/e2e/solid-start/basic/src/client.tsx b/e2e/solid-start/basic/src/client.tsx
deleted file mode 100644
index ba0f02fac0..0000000000
--- a/e2e/solid-start/basic/src/client.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-///
-import { hydrate } from 'solid-js/web'
-import { StartClient } from '@tanstack/solid-start'
-import { createRouter } from './router'
-
-const router = createRouter()
-
-hydrate(() => , document.body)
diff --git a/e2e/solid-start/basic/src/routeTree.gen.ts b/e2e/solid-start/basic/src/routeTree.gen.ts
index db7101d5f5..a097c9a713 100644
--- a/e2e/solid-start/basic/src/routeTree.gen.ts
+++ b/e2e/solid-start/basic/src/routeTree.gen.ts
@@ -10,218 +10,219 @@
// Import Routes
+import type { FileRoutesByPath, CreateFileRoute } from '@tanstack/solid-router'
import { Route as rootRoute } from './routes/__root'
-import { Route as UsersImport } from './routes/users'
-import { Route as StreamImport } from './routes/stream'
-import { Route as SearchParamsImport } from './routes/search-params'
-import { Route as ScriptsImport } from './routes/scripts'
-import { Route as PostsImport } from './routes/posts'
-import { Route as LinksImport } from './routes/links'
-import { Route as DeferredImport } from './routes/deferred'
-import { Route as LayoutImport } from './routes/_layout'
-import { Route as NotFoundRouteImport } from './routes/not-found/route'
-import { Route as IndexImport } from './routes/index'
-import { Route as UsersIndexImport } from './routes/users.index'
-import { Route as RedirectIndexImport } from './routes/redirect/index'
-import { Route as PostsIndexImport } from './routes/posts.index'
-import { Route as NotFoundIndexImport } from './routes/not-found/index'
-import { Route as UsersUserIdImport } from './routes/users.$userId'
-import { Route as RedirectTargetImport } from './routes/redirect/$target'
-import { Route as PostsPostIdImport } from './routes/posts.$postId'
-import { Route as NotFoundViaLoaderImport } from './routes/not-found/via-loader'
-import { Route as NotFoundViaBeforeLoadImport } from './routes/not-found/via-beforeLoad'
-import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
-import { Route as RedirectTargetIndexImport } from './routes/redirect/$target/index'
-import { Route as RedirectTargetViaLoaderImport } from './routes/redirect/$target/via-loader'
-import { Route as RedirectTargetViaBeforeLoadImport } from './routes/redirect/$target/via-beforeLoad'
-import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep'
-import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
-import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'
-import { Route as RedirectTargetServerFnIndexImport } from './routes/redirect/$target/serverFn/index'
-import { Route as RedirectTargetServerFnViaUseServerFnImport } from './routes/redirect/$target/serverFn/via-useServerFn'
-import { Route as RedirectTargetServerFnViaLoaderImport } from './routes/redirect/$target/serverFn/via-loader'
-import { Route as RedirectTargetServerFnViaBeforeLoadImport } from './routes/redirect/$target/serverFn/via-beforeLoad'
+import { Route as UsersRouteImport } from './routes/users'
+import { Route as StreamRouteImport } from './routes/stream'
+import { Route as SearchParamsRouteImport } from './routes/search-params'
+import { Route as ScriptsRouteImport } from './routes/scripts'
+import { Route as PostsRouteImport } from './routes/posts'
+import { Route as LinksRouteImport } from './routes/links'
+import { Route as DeferredRouteImport } from './routes/deferred'
+import { Route as LayoutRouteImport } from './routes/_layout'
+import { Route as NotFoundRouteRouteImport } from './routes/not-found/route'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as UsersIndexRouteImport } from './routes/users.index'
+import { Route as RedirectIndexRouteImport } from './routes/redirect/index'
+import { Route as PostsIndexRouteImport } from './routes/posts.index'
+import { Route as NotFoundIndexRouteImport } from './routes/not-found/index'
+import { Route as UsersUserIdRouteImport } from './routes/users.$userId'
+import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
+import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
+import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
+import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
+import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2'
+import { Route as RedirectTargetIndexRouteImport } from './routes/redirect/$target/index'
+import { Route as RedirectTargetViaLoaderRouteImport } from './routes/redirect/$target/via-loader'
+import { Route as RedirectTargetViaBeforeLoadRouteImport } from './routes/redirect/$target/via-beforeLoad'
+import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep'
+import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b'
+import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a'
+import { Route as RedirectTargetServerFnIndexRouteImport } from './routes/redirect/$target/serverFn/index'
+import { Route as RedirectTargetServerFnViaUseServerFnRouteImport } from './routes/redirect/$target/serverFn/via-useServerFn'
+import { Route as RedirectTargetServerFnViaLoaderRouteImport } from './routes/redirect/$target/serverFn/via-loader'
+import { Route as RedirectTargetServerFnViaBeforeLoadRouteImport } from './routes/redirect/$target/serverFn/via-beforeLoad'
// Create/Update Routes
-const UsersRoute = UsersImport.update({
+const UsersRoute = UsersRouteImport.update({
id: '/users',
path: '/users',
getParentRoute: () => rootRoute,
} as any)
-const StreamRoute = StreamImport.update({
+const StreamRoute = StreamRouteImport.update({
id: '/stream',
path: '/stream',
getParentRoute: () => rootRoute,
} as any)
-const SearchParamsRoute = SearchParamsImport.update({
+const SearchParamsRoute = SearchParamsRouteImport.update({
id: '/search-params',
path: '/search-params',
getParentRoute: () => rootRoute,
} as any)
-const ScriptsRoute = ScriptsImport.update({
+const ScriptsRoute = ScriptsRouteImport.update({
id: '/scripts',
path: '/scripts',
getParentRoute: () => rootRoute,
} as any)
-const PostsRoute = PostsImport.update({
+const PostsRoute = PostsRouteImport.update({
id: '/posts',
path: '/posts',
getParentRoute: () => rootRoute,
} as any)
-const LinksRoute = LinksImport.update({
+const LinksRoute = LinksRouteImport.update({
id: '/links',
path: '/links',
getParentRoute: () => rootRoute,
} as any)
-const DeferredRoute = DeferredImport.update({
+const DeferredRoute = DeferredRouteImport.update({
id: '/deferred',
path: '/deferred',
getParentRoute: () => rootRoute,
} as any)
-const LayoutRoute = LayoutImport.update({
+const LayoutRoute = LayoutRouteImport.update({
id: '/_layout',
getParentRoute: () => rootRoute,
} as any)
-const NotFoundRouteRoute = NotFoundRouteImport.update({
+const NotFoundRouteRoute = NotFoundRouteRouteImport.update({
id: '/not-found',
path: '/not-found',
getParentRoute: () => rootRoute,
} as any)
-const IndexRoute = IndexImport.update({
+const IndexRoute = IndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => rootRoute,
} as any)
-const UsersIndexRoute = UsersIndexImport.update({
+const UsersIndexRoute = UsersIndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => UsersRoute,
} as any)
-const RedirectIndexRoute = RedirectIndexImport.update({
+const RedirectIndexRoute = RedirectIndexRouteImport.update({
id: '/redirect/',
path: '/redirect/',
getParentRoute: () => rootRoute,
} as any)
-const PostsIndexRoute = PostsIndexImport.update({
+const PostsIndexRoute = PostsIndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => PostsRoute,
} as any)
-const NotFoundIndexRoute = NotFoundIndexImport.update({
+const NotFoundIndexRoute = NotFoundIndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => NotFoundRouteRoute,
} as any)
-const UsersUserIdRoute = UsersUserIdImport.update({
+const UsersUserIdRoute = UsersUserIdRouteImport.update({
id: '/$userId',
path: '/$userId',
getParentRoute: () => UsersRoute,
} as any)
-const RedirectTargetRoute = RedirectTargetImport.update({
+const RedirectTargetRoute = RedirectTargetRouteImport.update({
id: '/redirect/$target',
path: '/redirect/$target',
getParentRoute: () => rootRoute,
} as any)
-const PostsPostIdRoute = PostsPostIdImport.update({
+const PostsPostIdRoute = PostsPostIdRouteImport.update({
id: '/$postId',
path: '/$postId',
getParentRoute: () => PostsRoute,
} as any)
-const NotFoundViaLoaderRoute = NotFoundViaLoaderImport.update({
+const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
id: '/via-loader',
path: '/via-loader',
getParentRoute: () => NotFoundRouteRoute,
} as any)
-const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadImport.update({
+const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
id: '/via-beforeLoad',
path: '/via-beforeLoad',
getParentRoute: () => NotFoundRouteRoute,
} as any)
-const LayoutLayout2Route = LayoutLayout2Import.update({
+const LayoutLayout2Route = LayoutLayout2RouteImport.update({
id: '/_layout-2',
getParentRoute: () => LayoutRoute,
} as any)
-const RedirectTargetIndexRoute = RedirectTargetIndexImport.update({
+const RedirectTargetIndexRoute = RedirectTargetIndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => RedirectTargetRoute,
} as any)
-const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderImport.update({
+const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderRouteImport.update({
id: '/via-loader',
path: '/via-loader',
getParentRoute: () => RedirectTargetRoute,
} as any)
const RedirectTargetViaBeforeLoadRoute =
- RedirectTargetViaBeforeLoadImport.update({
+ RedirectTargetViaBeforeLoadRouteImport.update({
id: '/via-beforeLoad',
path: '/via-beforeLoad',
getParentRoute: () => RedirectTargetRoute,
} as any)
-const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({
+const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({
id: '/posts_/$postId/deep',
path: '/posts/$postId/deep',
getParentRoute: () => rootRoute,
} as any)
-const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
+const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({
id: '/layout-b',
path: '/layout-b',
getParentRoute: () => LayoutLayout2Route,
} as any)
-const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
+const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({
id: '/layout-a',
path: '/layout-a',
getParentRoute: () => LayoutLayout2Route,
} as any)
const RedirectTargetServerFnIndexRoute =
- RedirectTargetServerFnIndexImport.update({
+ RedirectTargetServerFnIndexRouteImport.update({
id: '/serverFn/',
path: '/serverFn/',
getParentRoute: () => RedirectTargetRoute,
} as any)
const RedirectTargetServerFnViaUseServerFnRoute =
- RedirectTargetServerFnViaUseServerFnImport.update({
+ RedirectTargetServerFnViaUseServerFnRouteImport.update({
id: '/serverFn/via-useServerFn',
path: '/serverFn/via-useServerFn',
getParentRoute: () => RedirectTargetRoute,
} as any)
const RedirectTargetServerFnViaLoaderRoute =
- RedirectTargetServerFnViaLoaderImport.update({
+ RedirectTargetServerFnViaLoaderRouteImport.update({
id: '/serverFn/via-loader',
path: '/serverFn/via-loader',
getParentRoute: () => RedirectTargetRoute,
} as any)
const RedirectTargetServerFnViaBeforeLoadRoute =
- RedirectTargetServerFnViaBeforeLoadImport.update({
+ RedirectTargetServerFnViaBeforeLoadRouteImport.update({
id: '/serverFn/via-beforeLoad',
path: '/serverFn/via-beforeLoad',
getParentRoute: () => RedirectTargetRoute,
@@ -235,215 +236,488 @@ declare module '@tanstack/solid-router' {
id: '/'
path: '/'
fullPath: '/'
- preLoaderRoute: typeof IndexImport
+ preLoaderRoute: typeof IndexRouteImport
parentRoute: typeof rootRoute
}
'/not-found': {
id: '/not-found'
path: '/not-found'
fullPath: '/not-found'
- preLoaderRoute: typeof NotFoundRouteImport
+ preLoaderRoute: typeof NotFoundRouteRouteImport
parentRoute: typeof rootRoute
}
'/_layout': {
id: '/_layout'
path: ''
fullPath: ''
- preLoaderRoute: typeof LayoutImport
+ preLoaderRoute: typeof LayoutRouteImport
parentRoute: typeof rootRoute
}
'/deferred': {
id: '/deferred'
path: '/deferred'
fullPath: '/deferred'
- preLoaderRoute: typeof DeferredImport
+ preLoaderRoute: typeof DeferredRouteImport
parentRoute: typeof rootRoute
}
'/links': {
id: '/links'
path: '/links'
fullPath: '/links'
- preLoaderRoute: typeof LinksImport
+ preLoaderRoute: typeof LinksRouteImport
parentRoute: typeof rootRoute
}
'/posts': {
id: '/posts'
path: '/posts'
fullPath: '/posts'
- preLoaderRoute: typeof PostsImport
+ preLoaderRoute: typeof PostsRouteImport
parentRoute: typeof rootRoute
}
'/scripts': {
id: '/scripts'
path: '/scripts'
fullPath: '/scripts'
- preLoaderRoute: typeof ScriptsImport
+ preLoaderRoute: typeof ScriptsRouteImport
parentRoute: typeof rootRoute
}
'/search-params': {
id: '/search-params'
path: '/search-params'
fullPath: '/search-params'
- preLoaderRoute: typeof SearchParamsImport
+ preLoaderRoute: typeof SearchParamsRouteImport
parentRoute: typeof rootRoute
}
'/stream': {
id: '/stream'
path: '/stream'
fullPath: '/stream'
- preLoaderRoute: typeof StreamImport
+ preLoaderRoute: typeof StreamRouteImport
parentRoute: typeof rootRoute
}
'/users': {
id: '/users'
path: '/users'
fullPath: '/users'
- preLoaderRoute: typeof UsersImport
+ preLoaderRoute: typeof UsersRouteImport
parentRoute: typeof rootRoute
}
'/_layout/_layout-2': {
id: '/_layout/_layout-2'
path: ''
fullPath: ''
- preLoaderRoute: typeof LayoutLayout2Import
- parentRoute: typeof LayoutImport
+ preLoaderRoute: typeof LayoutLayout2RouteImport
+ parentRoute: typeof LayoutRouteImport
}
'/not-found/via-beforeLoad': {
id: '/not-found/via-beforeLoad'
path: '/via-beforeLoad'
fullPath: '/not-found/via-beforeLoad'
- preLoaderRoute: typeof NotFoundViaBeforeLoadImport
- parentRoute: typeof NotFoundRouteImport
+ preLoaderRoute: typeof NotFoundViaBeforeLoadRouteImport
+ parentRoute: typeof NotFoundRouteRouteImport
}
'/not-found/via-loader': {
id: '/not-found/via-loader'
path: '/via-loader'
fullPath: '/not-found/via-loader'
- preLoaderRoute: typeof NotFoundViaLoaderImport
- parentRoute: typeof NotFoundRouteImport
+ preLoaderRoute: typeof NotFoundViaLoaderRouteImport
+ parentRoute: typeof NotFoundRouteRouteImport
}
'/posts/$postId': {
id: '/posts/$postId'
path: '/$postId'
fullPath: '/posts/$postId'
- preLoaderRoute: typeof PostsPostIdImport
- parentRoute: typeof PostsImport
+ preLoaderRoute: typeof PostsPostIdRouteImport
+ parentRoute: typeof PostsRouteImport
}
'/redirect/$target': {
id: '/redirect/$target'
path: '/redirect/$target'
fullPath: '/redirect/$target'
- preLoaderRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetRouteImport
parentRoute: typeof rootRoute
}
'/users/$userId': {
id: '/users/$userId'
path: '/$userId'
fullPath: '/users/$userId'
- preLoaderRoute: typeof UsersUserIdImport
- parentRoute: typeof UsersImport
+ preLoaderRoute: typeof UsersUserIdRouteImport
+ parentRoute: typeof UsersRouteImport
}
'/not-found/': {
id: '/not-found/'
path: '/'
fullPath: '/not-found/'
- preLoaderRoute: typeof NotFoundIndexImport
- parentRoute: typeof NotFoundRouteImport
+ preLoaderRoute: typeof NotFoundIndexRouteImport
+ parentRoute: typeof NotFoundRouteRouteImport
}
'/posts/': {
id: '/posts/'
path: '/'
fullPath: '/posts/'
- preLoaderRoute: typeof PostsIndexImport
- parentRoute: typeof PostsImport
+ preLoaderRoute: typeof PostsIndexRouteImport
+ parentRoute: typeof PostsRouteImport
}
'/redirect/': {
id: '/redirect/'
path: '/redirect'
fullPath: '/redirect'
- preLoaderRoute: typeof RedirectIndexImport
+ preLoaderRoute: typeof RedirectIndexRouteImport
parentRoute: typeof rootRoute
}
'/users/': {
id: '/users/'
path: '/'
fullPath: '/users/'
- preLoaderRoute: typeof UsersIndexImport
- parentRoute: typeof UsersImport
+ preLoaderRoute: typeof UsersIndexRouteImport
+ parentRoute: typeof UsersRouteImport
}
'/_layout/_layout-2/layout-a': {
id: '/_layout/_layout-2/layout-a'
path: '/layout-a'
fullPath: '/layout-a'
- preLoaderRoute: typeof LayoutLayout2LayoutAImport
- parentRoute: typeof LayoutLayout2Import
+ preLoaderRoute: typeof LayoutLayout2LayoutARouteImport
+ parentRoute: typeof LayoutLayout2RouteImport
}
'/_layout/_layout-2/layout-b': {
id: '/_layout/_layout-2/layout-b'
path: '/layout-b'
fullPath: '/layout-b'
- preLoaderRoute: typeof LayoutLayout2LayoutBImport
- parentRoute: typeof LayoutLayout2Import
+ preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport
+ parentRoute: typeof LayoutLayout2RouteImport
}
'/posts_/$postId/deep': {
id: '/posts_/$postId/deep'
path: '/posts/$postId/deep'
fullPath: '/posts/$postId/deep'
- preLoaderRoute: typeof PostsPostIdDeepImport
+ preLoaderRoute: typeof PostsPostIdDeepRouteImport
parentRoute: typeof rootRoute
}
'/redirect/$target/via-beforeLoad': {
id: '/redirect/$target/via-beforeLoad'
path: '/via-beforeLoad'
fullPath: '/redirect/$target/via-beforeLoad'
- preLoaderRoute: typeof RedirectTargetViaBeforeLoadImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetViaBeforeLoadRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
'/redirect/$target/via-loader': {
id: '/redirect/$target/via-loader'
path: '/via-loader'
fullPath: '/redirect/$target/via-loader'
- preLoaderRoute: typeof RedirectTargetViaLoaderImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetViaLoaderRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
'/redirect/$target/': {
id: '/redirect/$target/'
path: '/'
fullPath: '/redirect/$target/'
- preLoaderRoute: typeof RedirectTargetIndexImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetIndexRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
'/redirect/$target/serverFn/via-beforeLoad': {
id: '/redirect/$target/serverFn/via-beforeLoad'
path: '/serverFn/via-beforeLoad'
fullPath: '/redirect/$target/serverFn/via-beforeLoad'
- preLoaderRoute: typeof RedirectTargetServerFnViaBeforeLoadImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetServerFnViaBeforeLoadRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
'/redirect/$target/serverFn/via-loader': {
id: '/redirect/$target/serverFn/via-loader'
path: '/serverFn/via-loader'
fullPath: '/redirect/$target/serverFn/via-loader'
- preLoaderRoute: typeof RedirectTargetServerFnViaLoaderImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetServerFnViaLoaderRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
'/redirect/$target/serverFn/via-useServerFn': {
id: '/redirect/$target/serverFn/via-useServerFn'
path: '/serverFn/via-useServerFn'
fullPath: '/redirect/$target/serverFn/via-useServerFn'
- preLoaderRoute: typeof RedirectTargetServerFnViaUseServerFnImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetServerFnViaUseServerFnRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
'/redirect/$target/serverFn/': {
id: '/redirect/$target/serverFn/'
path: '/serverFn'
fullPath: '/redirect/$target/serverFn'
- preLoaderRoute: typeof RedirectTargetServerFnIndexImport
- parentRoute: typeof RedirectTargetImport
+ preLoaderRoute: typeof RedirectTargetServerFnIndexRouteImport
+ parentRoute: typeof RedirectTargetRouteImport
}
}
}
+// Add type-safety to the createFileRoute function across the route tree
+
+declare module './routes/index' {
+ const createFileRoute: CreateFileRoute<
+ '/',
+ FileRoutesByPath['/']['parentRoute'],
+ FileRoutesByPath['/']['id'],
+ FileRoutesByPath['/']['path'],
+ FileRoutesByPath['/']['fullPath']
+ >
+}
+declare module './routes/not-found/route' {
+ const createFileRoute: CreateFileRoute<
+ '/not-found',
+ FileRoutesByPath['/not-found']['parentRoute'],
+ FileRoutesByPath['/not-found']['id'],
+ FileRoutesByPath['/not-found']['path'],
+ FileRoutesByPath['/not-found']['fullPath']
+ >
+}
+declare module './routes/_layout' {
+ const createFileRoute: CreateFileRoute<
+ '/_layout',
+ FileRoutesByPath['/_layout']['parentRoute'],
+ FileRoutesByPath['/_layout']['id'],
+ FileRoutesByPath['/_layout']['path'],
+ FileRoutesByPath['/_layout']['fullPath']
+ >
+}
+declare module './routes/deferred' {
+ const createFileRoute: CreateFileRoute<
+ '/deferred',
+ FileRoutesByPath['/deferred']['parentRoute'],
+ FileRoutesByPath['/deferred']['id'],
+ FileRoutesByPath['/deferred']['path'],
+ FileRoutesByPath['/deferred']['fullPath']
+ >
+}
+declare module './routes/links' {
+ const createFileRoute: CreateFileRoute<
+ '/links',
+ FileRoutesByPath['/links']['parentRoute'],
+ FileRoutesByPath['/links']['id'],
+ FileRoutesByPath['/links']['path'],
+ FileRoutesByPath['/links']['fullPath']
+ >
+}
+declare module './routes/posts' {
+ const createFileRoute: CreateFileRoute<
+ '/posts',
+ FileRoutesByPath['/posts']['parentRoute'],
+ FileRoutesByPath['/posts']['id'],
+ FileRoutesByPath['/posts']['path'],
+ FileRoutesByPath['/posts']['fullPath']
+ >
+}
+declare module './routes/scripts' {
+ const createFileRoute: CreateFileRoute<
+ '/scripts',
+ FileRoutesByPath['/scripts']['parentRoute'],
+ FileRoutesByPath['/scripts']['id'],
+ FileRoutesByPath['/scripts']['path'],
+ FileRoutesByPath['/scripts']['fullPath']
+ >
+}
+declare module './routes/search-params' {
+ const createFileRoute: CreateFileRoute<
+ '/search-params',
+ FileRoutesByPath['/search-params']['parentRoute'],
+ FileRoutesByPath['/search-params']['id'],
+ FileRoutesByPath['/search-params']['path'],
+ FileRoutesByPath['/search-params']['fullPath']
+ >
+}
+declare module './routes/stream' {
+ const createFileRoute: CreateFileRoute<
+ '/stream',
+ FileRoutesByPath['/stream']['parentRoute'],
+ FileRoutesByPath['/stream']['id'],
+ FileRoutesByPath['/stream']['path'],
+ FileRoutesByPath['/stream']['fullPath']
+ >
+}
+declare module './routes/users' {
+ const createFileRoute: CreateFileRoute<
+ '/users',
+ FileRoutesByPath['/users']['parentRoute'],
+ FileRoutesByPath['/users']['id'],
+ FileRoutesByPath['/users']['path'],
+ FileRoutesByPath['/users']['fullPath']
+ >
+}
+declare module './routes/_layout/_layout-2' {
+ const createFileRoute: CreateFileRoute<
+ '/_layout/_layout-2',
+ FileRoutesByPath['/_layout/_layout-2']['parentRoute'],
+ FileRoutesByPath['/_layout/_layout-2']['id'],
+ FileRoutesByPath['/_layout/_layout-2']['path'],
+ FileRoutesByPath['/_layout/_layout-2']['fullPath']
+ >
+}
+declare module './routes/not-found/via-beforeLoad' {
+ const createFileRoute: CreateFileRoute<
+ '/not-found/via-beforeLoad',
+ FileRoutesByPath['/not-found/via-beforeLoad']['parentRoute'],
+ FileRoutesByPath['/not-found/via-beforeLoad']['id'],
+ FileRoutesByPath['/not-found/via-beforeLoad']['path'],
+ FileRoutesByPath['/not-found/via-beforeLoad']['fullPath']
+ >
+}
+declare module './routes/not-found/via-loader' {
+ const createFileRoute: CreateFileRoute<
+ '/not-found/via-loader',
+ FileRoutesByPath['/not-found/via-loader']['parentRoute'],
+ FileRoutesByPath['/not-found/via-loader']['id'],
+ FileRoutesByPath['/not-found/via-loader']['path'],
+ FileRoutesByPath['/not-found/via-loader']['fullPath']
+ >
+}
+declare module './routes/posts.$postId' {
+ const createFileRoute: CreateFileRoute<
+ '/posts/$postId',
+ FileRoutesByPath['/posts/$postId']['parentRoute'],
+ FileRoutesByPath['/posts/$postId']['id'],
+ FileRoutesByPath['/posts/$postId']['path'],
+ FileRoutesByPath['/posts/$postId']['fullPath']
+ >
+}
+declare module './routes/redirect/$target' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target',
+ FileRoutesByPath['/redirect/$target']['parentRoute'],
+ FileRoutesByPath['/redirect/$target']['id'],
+ FileRoutesByPath['/redirect/$target']['path'],
+ FileRoutesByPath['/redirect/$target']['fullPath']
+ >
+}
+declare module './routes/users.$userId' {
+ const createFileRoute: CreateFileRoute<
+ '/users/$userId',
+ FileRoutesByPath['/users/$userId']['parentRoute'],
+ FileRoutesByPath['/users/$userId']['id'],
+ FileRoutesByPath['/users/$userId']['path'],
+ FileRoutesByPath['/users/$userId']['fullPath']
+ >
+}
+declare module './routes/not-found/index' {
+ const createFileRoute: CreateFileRoute<
+ '/not-found/',
+ FileRoutesByPath['/not-found/']['parentRoute'],
+ FileRoutesByPath['/not-found/']['id'],
+ FileRoutesByPath['/not-found/']['path'],
+ FileRoutesByPath['/not-found/']['fullPath']
+ >
+}
+declare module './routes/posts.index' {
+ const createFileRoute: CreateFileRoute<
+ '/posts/',
+ FileRoutesByPath['/posts/']['parentRoute'],
+ FileRoutesByPath['/posts/']['id'],
+ FileRoutesByPath['/posts/']['path'],
+ FileRoutesByPath['/posts/']['fullPath']
+ >
+}
+declare module './routes/redirect/index' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/',
+ FileRoutesByPath['/redirect/']['parentRoute'],
+ FileRoutesByPath['/redirect/']['id'],
+ FileRoutesByPath['/redirect/']['path'],
+ FileRoutesByPath['/redirect/']['fullPath']
+ >
+}
+declare module './routes/users.index' {
+ const createFileRoute: CreateFileRoute<
+ '/users/',
+ FileRoutesByPath['/users/']['parentRoute'],
+ FileRoutesByPath['/users/']['id'],
+ FileRoutesByPath['/users/']['path'],
+ FileRoutesByPath['/users/']['fullPath']
+ >
+}
+declare module './routes/_layout/_layout-2/layout-a' {
+ const createFileRoute: CreateFileRoute<
+ '/_layout/_layout-2/layout-a',
+ FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'],
+ FileRoutesByPath['/_layout/_layout-2/layout-a']['id'],
+ FileRoutesByPath['/_layout/_layout-2/layout-a']['path'],
+ FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath']
+ >
+}
+declare module './routes/_layout/_layout-2/layout-b' {
+ const createFileRoute: CreateFileRoute<
+ '/_layout/_layout-2/layout-b',
+ FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'],
+ FileRoutesByPath['/_layout/_layout-2/layout-b']['id'],
+ FileRoutesByPath['/_layout/_layout-2/layout-b']['path'],
+ FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath']
+ >
+}
+declare module './routes/posts_.$postId.deep' {
+ const createFileRoute: CreateFileRoute<
+ '/posts_/$postId/deep',
+ FileRoutesByPath['/posts_/$postId/deep']['parentRoute'],
+ FileRoutesByPath['/posts_/$postId/deep']['id'],
+ FileRoutesByPath['/posts_/$postId/deep']['path'],
+ FileRoutesByPath['/posts_/$postId/deep']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/via-beforeLoad' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/via-beforeLoad',
+ FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'],
+ FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'],
+ FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/via-loader' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/via-loader',
+ FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/via-loader']['id'],
+ FileRoutesByPath['/redirect/$target/via-loader']['path'],
+ FileRoutesByPath['/redirect/$target/via-loader']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/index' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/',
+ FileRoutesByPath['/redirect/$target/']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/']['id'],
+ FileRoutesByPath['/redirect/$target/']['path'],
+ FileRoutesByPath['/redirect/$target/']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/serverFn/via-beforeLoad' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/serverFn/via-beforeLoad',
+ FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['id'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['path'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/serverFn/via-loader' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/serverFn/via-loader',
+ FileRoutesByPath['/redirect/$target/serverFn/via-loader']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-loader']['id'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-loader']['path'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-loader']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/serverFn/via-useServerFn' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/serverFn/via-useServerFn',
+ FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['id'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['path'],
+ FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['fullPath']
+ >
+}
+declare module './routes/redirect/$target/serverFn/index' {
+ const createFileRoute: CreateFileRoute<
+ '/redirect/$target/serverFn/',
+ FileRoutesByPath['/redirect/$target/serverFn/']['parentRoute'],
+ FileRoutesByPath['/redirect/$target/serverFn/']['id'],
+ FileRoutesByPath['/redirect/$target/serverFn/']['path'],
+ FileRoutesByPath['/redirect/$target/serverFn/']['fullPath']
+ >
+}
+
// Create and export the route tree
interface NotFoundRouteRouteChildren {
@@ -761,6 +1035,9 @@ export const routeTree = rootRoute
._addFileChildren(rootRouteChildren)
._addFileTypes()
+// @ts-ignore
+import type * as ServerTypes from '../.tanstack-start/server-routes/routeTree.gen.ts'
+
/* ROUTE_MANIFEST_START
{
"routes": {
diff --git a/e2e/solid-start/basic/src/routes/__root.tsx b/e2e/solid-start/basic/src/routes/__root.tsx
index 5ef4d4653b..89c60f9113 100644
--- a/e2e/solid-start/basic/src/routes/__root.tsx
+++ b/e2e/solid-start/basic/src/routes/__root.tsx
@@ -1,9 +1,9 @@
import { Link, Outlet, createRootRoute } from '@tanstack/solid-router'
+import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools'
import { NotFound } from '~/components/NotFound'
import appCss from '~/styles/app.css?url'
import { seo } from '~/utils/seo'
-import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools'
export const Route = createRootRoute({
head: () => ({
diff --git a/e2e/solid-start/basic/src/routes/_layout.tsx b/e2e/solid-start/basic/src/routes/_layout.tsx
index d43b4ef5f5..c549175638 100644
--- a/e2e/solid-start/basic/src/routes/_layout.tsx
+++ b/e2e/solid-start/basic/src/routes/_layout.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_layout')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx b/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx
index 7a5a3623a0..efeca5ce86 100644
--- a/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx
+++ b/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx
@@ -1,6 +1,6 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
-export const Route = createFileRoute('/_layout/_layout-2')({
+export const Route = createFileRoute({
component: LayoutComponent,
})
diff --git a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx
index b69951b246..a190b24202 100644
--- a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx
+++ b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_layout/_layout-2/layout-a')({
+export const Route = createFileRoute({
component: LayoutAComponent,
})
diff --git a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx
index 30dbcce90f..505f8f6fbf 100644
--- a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx
+++ b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/_layout/_layout-2/layout-b')({
+export const Route = createFileRoute({
component: LayoutBComponent,
})
diff --git a/e2e/solid-start/basic/src/routes/api.users.ts b/e2e/solid-start/basic/src/routes/api.users.ts
deleted file mode 100644
index 45ac83b2f0..0000000000
--- a/e2e/solid-start/basic/src/routes/api.users.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { json } from '@tanstack/solid-start'
-import { createAPIFileRoute } from '@tanstack/solid-start/api'
-import axios from 'redaxios'
-
-import type { User } from '~/utils/users'
-
-export const APIRoute = createAPIFileRoute('/api/users')({
- GET: async ({ request }) => {
- console.info('Fetching users... @', request.url)
- const res = await axios.get>(
- 'https://jsonplaceholder.typicode.com/users',
- )
-
- const list = res.data.slice(0, 10)
-
- return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email })))
- },
-})
diff --git a/e2e/solid-start/basic/src/routes/api/users.$id.ts b/e2e/solid-start/basic/src/routes/api/users.$id.ts
deleted file mode 100644
index 7ee1fccbb4..0000000000
--- a/e2e/solid-start/basic/src/routes/api/users.$id.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { json } from '@tanstack/solid-start'
-import { createAPIFileRoute } from '@tanstack/solid-start/api'
-import axios from 'redaxios'
-
-import type { User } from '~/utils/users'
-
-export const APIRoute = createAPIFileRoute('/api/users/$id')({
- GET: async ({ request, params }) => {
- console.info(`Fetching users by id=${params.id}... @`, request.url)
- try {
- const res = await axios.get(
- 'https://jsonplaceholder.typicode.com/users/' + params.id,
- )
-
- return json({
- id: res.data.id,
- name: res.data.name,
- email: res.data.email,
- })
- } catch (e) {
- console.error(e)
- return json({ error: 'User not found' }, { status: 404 })
- }
- },
-})
diff --git a/e2e/solid-start/basic/src/routes/api/users.$userId.ts b/e2e/solid-start/basic/src/routes/api/users.$userId.ts
new file mode 100644
index 0000000000..69d966d982
--- /dev/null
+++ b/e2e/solid-start/basic/src/routes/api/users.$userId.ts
@@ -0,0 +1,27 @@
+import { json } from '@tanstack/solid-start'
+import type { User } from '~/utils/users'
+
+export const ServerRoute = createServerFileRoute().methods({
+ GET: async ({ params, request }) => {
+ console.info(`Fetching users by id=${params.userId}... @`, request.url)
+ try {
+ const res = await fetch(
+ 'https://jsonplaceholder.typicode.com/users/' + params.userId,
+ )
+ if (!res.ok) {
+ throw new Error('Failed to fetch user')
+ }
+
+ const user = (await res.json()) as User
+
+ return json({
+ id: user.id,
+ name: user.name,
+ email: user.email,
+ })
+ } catch (e) {
+ console.error(e)
+ return json({ error: 'User not found' }, { status: 404 })
+ }
+ },
+})
diff --git a/e2e/solid-start/basic/src/routes/api/users.ts b/e2e/solid-start/basic/src/routes/api/users.ts
new file mode 100644
index 0000000000..c0a6a1a6a2
--- /dev/null
+++ b/e2e/solid-start/basic/src/routes/api/users.ts
@@ -0,0 +1,58 @@
+import { createMiddleware, json } from '@tanstack/solid-start'
+import type { User } from '~/utils/users'
+
+const userLoggerMiddleware = createMiddleware({ type: 'request' }).server(
+ async ({ next, request }) => {
+ console.info('In: /users')
+ const result = await next()
+ result.response.headers.set('x-users', 'true')
+ console.info('Out: /users')
+ return result
+ },
+)
+
+const testParentMiddleware = createMiddleware({ type: 'request' }).server(
+ async ({ next, request }) => {
+ console.info('In: testParentMiddleware')
+ const result = await next()
+ result.response.headers.set('x-test-parent', 'true')
+ console.info('Out: testParentMiddleware')
+ return result
+ },
+)
+
+const testMiddleware = createMiddleware({ type: 'request' })
+ .middleware([testParentMiddleware])
+ .server(async ({ next, request }) => {
+ console.info('In: testMiddleware')
+ const result = await next()
+ result.response.headers.set('x-test', 'true')
+
+ // if (Math.random() > 0.5) {
+ // throw new Response(null, {
+ // status: 302,
+ // headers: { Location: 'https://www.google.com' },
+ // })
+ // }
+
+ console.info('Out: testMiddleware')
+ return result
+ })
+
+export const ServerRoute = createServerFileRoute()
+ .middleware([testMiddleware, userLoggerMiddleware, testParentMiddleware])
+ .methods({
+ GET: async ({ request }) => {
+ console.info('Fetching users... @', request.url)
+ const res = await fetch('https://jsonplaceholder.typicode.com/users')
+ if (!res.ok) {
+ throw new Error('Failed to fetch users')
+ }
+
+ const data = (await res.json()) as Array
+
+ const list = data.slice(0, 10)
+
+ return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email })))
+ },
+ })
diff --git a/e2e/solid-start/basic/src/routes/deferred.tsx b/e2e/solid-start/basic/src/routes/deferred.tsx
index 2a53643453..5bb96ca571 100644
--- a/e2e/solid-start/basic/src/routes/deferred.tsx
+++ b/e2e/solid-start/basic/src/routes/deferred.tsx
@@ -1,4 +1,4 @@
-import { Await, createFileRoute } from '@tanstack/solid-router'
+import { Await } from '@tanstack/solid-router'
import { createServerFn } from '@tanstack/solid-start'
import { Suspense, createSignal } from 'solid-js'
@@ -15,7 +15,7 @@ const slowServerFn = createServerFn({ method: 'GET' })
return { name: data.name, randomNumber: Math.floor(Math.random() * 100) }
})
-export const Route = createFileRoute('/deferred')({
+export const Route = createFileRoute({
loader: async () => {
return {
deferredStuff: new Promise((r) =>
diff --git a/e2e/solid-start/basic/src/routes/index.tsx b/e2e/solid-start/basic/src/routes/index.tsx
index 6b23caf87b..4024800b8e 100644
--- a/e2e/solid-start/basic/src/routes/index.tsx
+++ b/e2e/solid-start/basic/src/routes/index.tsx
@@ -1,7 +1,6 @@
-import { createFileRoute } from '@tanstack/solid-router'
import { CustomMessage } from '~/components/CustomMessage'
-export const Route = createFileRoute('/')({
+export const Route = createFileRoute({
component: Home,
})
diff --git a/e2e/solid-start/basic/src/routes/links.tsx b/e2e/solid-start/basic/src/routes/links.tsx
index d6ce6a449b..05fd8f0494 100644
--- a/e2e/solid-start/basic/src/routes/links.tsx
+++ b/e2e/solid-start/basic/src/routes/links.tsx
@@ -1,6 +1,6 @@
-import { Link, createFileRoute } from '@tanstack/solid-router'
+import { Link } from '@tanstack/solid-router'
-export const Route = createFileRoute('/links')({
+export const Route = createFileRoute({
component: () => {
const navigate = Route.useNavigate()
return (
diff --git a/e2e/solid-start/basic/src/routes/not-found/index.tsx b/e2e/solid-start/basic/src/routes/not-found/index.tsx
index 34c8ef6146..79e7b5ae56 100644
--- a/e2e/solid-start/basic/src/routes/not-found/index.tsx
+++ b/e2e/solid-start/basic/src/routes/not-found/index.tsx
@@ -1,6 +1,6 @@
-import { Link, createFileRoute } from '@tanstack/solid-router'
+import { Link } from '@tanstack/solid-router'
-export const Route = createFileRoute('/not-found/')({
+export const Route = createFileRoute({
component: () => {
const preload = Route.useSearch({ select: (s) => s.preload })
return (
diff --git a/e2e/solid-start/basic/src/routes/not-found/route.tsx b/e2e/solid-start/basic/src/routes/not-found/route.tsx
index 84f5ef81a5..b8343167f5 100644
--- a/e2e/solid-start/basic/src/routes/not-found/route.tsx
+++ b/e2e/solid-start/basic/src/routes/not-found/route.tsx
@@ -1,7 +1,6 @@
-import { createFileRoute } from '@tanstack/solid-router'
import z from 'zod'
-export const Route = createFileRoute('/not-found')({
+export const Route = createFileRoute({
validateSearch: z.object({
preload: z.literal(false).optional(),
}),
diff --git a/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx b/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx
index 5badde63bd..5277edd901 100644
--- a/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx
+++ b/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx
@@ -1,6 +1,6 @@
-import { createFileRoute, notFound } from '@tanstack/solid-router'
+import { notFound } from '@tanstack/solid-router'
-export const Route = createFileRoute('/not-found/via-beforeLoad')({
+export const Route = createFileRoute({
beforeLoad: () => {
throw notFound()
},
diff --git a/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx b/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx
index 20956cc43d..bc0fad6c58 100644
--- a/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx
+++ b/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx
@@ -1,6 +1,6 @@
-import { createFileRoute, notFound } from '@tanstack/solid-router'
+import { notFound } from '@tanstack/solid-router'
-export const Route = createFileRoute('/not-found/via-loader')({
+export const Route = createFileRoute({
loader: () => {
throw notFound()
},
diff --git a/e2e/solid-start/basic/src/routes/posts.$postId.tsx b/e2e/solid-start/basic/src/routes/posts.$postId.tsx
index c6b2fcf5f9..cefc75cdf1 100644
--- a/e2e/solid-start/basic/src/routes/posts.$postId.tsx
+++ b/e2e/solid-start/basic/src/routes/posts.$postId.tsx
@@ -1,11 +1,11 @@
-import { ErrorComponent, Link, createFileRoute } from '@tanstack/solid-router'
+import { ErrorComponent, Link } from '@tanstack/solid-router'
import type { ErrorComponentProps } from '@tanstack/solid-router'
import { fetchPost } from '~/utils/posts'
import { NotFound } from '~/components/NotFound'
import { PostErrorComponent } from '~/components/PostErrorComponent'
-export const Route = createFileRoute('/posts/$postId')({
+export const Route = createFileRoute({
loader: async ({ params: { postId } }) => fetchPost({ data: postId }),
errorComponent: PostErrorComponent,
component: PostComponent,
diff --git a/e2e/solid-start/basic/src/routes/posts.index.tsx b/e2e/solid-start/basic/src/routes/posts.index.tsx
index c7d8cfe19c..07e41d1b0b 100644
--- a/e2e/solid-start/basic/src/routes/posts.index.tsx
+++ b/e2e/solid-start/basic/src/routes/posts.index.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute } from '@tanstack/solid-router'
-
-export const Route = createFileRoute('/posts/')({
+export const Route = createFileRoute({
component: PostsIndexComponent,
})
diff --git a/e2e/solid-start/basic/src/routes/posts.tsx b/e2e/solid-start/basic/src/routes/posts.tsx
index 0e94cd4d2c..c053d0de56 100644
--- a/e2e/solid-start/basic/src/routes/posts.tsx
+++ b/e2e/solid-start/basic/src/routes/posts.tsx
@@ -1,9 +1,9 @@
-import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { Link, Outlet } from '@tanstack/solid-router'
import { For } from 'solid-js'
import { fetchPosts } from '~/utils/posts'
-export const Route = createFileRoute('/posts')({
+export const Route = createFileRoute({
head: () => ({
meta: [
{
diff --git a/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx b/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx
index f8d4627914..4133a9ade9 100644
--- a/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx
+++ b/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx
@@ -1,9 +1,9 @@
-import { Link, createFileRoute } from '@tanstack/solid-router'
+import { Link } from '@tanstack/solid-router'
import { PostErrorComponent } from '~/components/PostErrorComponent'
import { fetchPost } from '~/utils/posts'
-export const Route = createFileRoute('/posts_/$postId/deep')({
+export const Route = createFileRoute({
loader: async ({ params: { postId } }) => fetchPost({ data: postId }),
errorComponent: PostErrorComponent,
component: PostDeepComponent,
diff --git a/e2e/solid-start/basic/src/routes/redirect/$target.tsx b/e2e/solid-start/basic/src/routes/redirect/$target.tsx
index 525dd9da25..c4c78070d3 100644
--- a/e2e/solid-start/basic/src/routes/redirect/$target.tsx
+++ b/e2e/solid-start/basic/src/routes/redirect/$target.tsx
@@ -1,7 +1,7 @@
-import { createFileRoute, retainSearchParams } from '@tanstack/solid-router'
+import { retainSearchParams } from '@tanstack/solid-router'
import z from 'zod'
-export const Route = createFileRoute('/redirect/$target')({
+export const Route = createFileRoute({
params: {
parse: (p) =>
z
diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx
index 916afd450b..0dde05d9e1 100644
--- a/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx
+++ b/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx
@@ -1,6 +1,6 @@
-import { Link, createFileRoute } from '@tanstack/solid-router'
+import { Link } from '@tanstack/solid-router'
-export const Route = createFileRoute('/redirect/$target/')({
+export const Route = createFileRoute({
component: () => {
const preload = Route.useSearch({ select: (s) => s.preload })
return (
diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx
index d404672372..6be32366eb 100644
--- a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx
+++ b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx
@@ -1,6 +1,6 @@
-import { Link, createFileRoute } from '@tanstack/solid-router'
+import { Link } from '@tanstack/solid-router'
-export const Route = createFileRoute('/redirect/$target/serverFn/')({
+export const Route = createFileRoute({
component: () => (