diff --git a/templates/solid-start/bun.lock b/templates/solid-start/bun.lock
index 982917b..1351b38 100644
--- a/templates/solid-start/bun.lock
+++ b/templates/solid-start/bun.lock
@@ -8,7 +8,7 @@
         "@convex-dev/better-auth": "^0.12.5",
         "@convex-dev/stripe": "^0.1.6",
         "@solidjs/meta": "1.0.0-next.2",
-        "@solidjs/router": "2.0.0-next.27",
+        "@solidjs/router": "2.0.0-next.30",
         "@solidjs/web": "2.0.0-rc.9",
         "@stylexjs/stylex": "^0.19.1",
         "better-auth": "~1.6.33",
@@ -28,7 +28,7 @@
         "@types/node": "^26.6.2",
         "eslint-plugin-solid": "^0.18.0",
         "fallow": "^3.28.0",
-        "filesystem-routing": "^0.3.1",
+        "filesystem-routing": "^0.4.0",
         "jsdom": "^30.1.1",
         "playwright-core": "^1.63.0",
         "typescript": "^7.0.2",
@@ -507,7 +507,7 @@
 
     "@solidjs/meta": ["@solidjs/meta@1.0.0-next.2", "", { "peerDependencies": { "@solidjs/web": "^2.0.0-rc.0", "solid-js": "^2.0.0-rc.0" } }, "sha512-4aqPczFqDdep4JTAUXfh4nyfq7InbTgimd7NuN6ZWWE29UPv0uR5dyr53yFcf2YgVXjFdX+JGhXtsE0njGL+fA=="],
 
-    "@solidjs/router": ["@solidjs/router@2.0.0-next.27", "", { "peerDependencies": { "@solidjs/web": "^2.0.0-rc.9", "solid-js": "^2.0.0-rc.9" } }, "sha512-g8eBYAiUCk/wJcMT92NG/rsGBymb3ZrMnnUGS/XG90tpFieISr9atXU0FCfkNy+9mq6m+WcFOSnoIX5jzzX/sg=="],
+    "@solidjs/router": ["@solidjs/router@2.0.0-next.30", "", { "peerDependencies": { "@solidjs/web": "^2.0.0-rc.9", "filesystem-routing": ">=0.4.0", "solid-js": "^2.0.0-rc.9" }, "optionalPeers": ["filesystem-routing"] }, "sha512-Nl7i8Y00yn8HAQBc34WtJYabvzNK6t35lb2sXqBQKCBL6qrBGbSFXFUeakyRA8Toh0gErWcDsKTMEGeyozTJkQ=="],
 
     "@solidjs/signals": ["@solidjs/signals@2.0.0-rc.9", "", {}, "sha512-o3pqiTgpH5NR2DstiKrt9s/6+0YOFtv+MfvLONwLsS247I+EWMMyTu9BkRcgd35UR5Pa1DM16lI1/5uaIMY6Gw=="],
 
@@ -837,7 +837,7 @@
 
     "file-entry-cache": ["file-entry-cache@11.1.5", "", { "dependencies": { "flat-cache": "^6.1.23" } }, "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q=="],
 
-    "filesystem-routing": ["filesystem-routing@0.3.1", "", { "dependencies": { "@babel/core": "^7.29.0", "@types/babel__core": "^7.20.5", "@types/babel__traverse": "^7.28.0", "@types/micromatch": "^4.0.10", "fast-glob": "^3.3.3", "micromatch": "^4.0.8", "oxc-parser": "^0.139.0", "radix3": "^1.1.2" }, "peerDependencies": { "@tsrx/oxc": ">=0.9.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["@tsrx/oxc", "vite"] }, "sha512-MqmhMWu2MDbmfqNaifONEKF2Eo3MFfjLZt+xUyBVuYxAO0rw0xpHJ7ochpu9nk1GNWyjXlS7Hm30wxT0LlqN9A=="],
+    "filesystem-routing": ["filesystem-routing@0.4.0", "", { "dependencies": { "@babel/core": "^7.29.0", "@types/babel__core": "^7.20.5", "@types/babel__traverse": "^7.28.0", "@types/micromatch": "^4.0.10", "fast-glob": "^3.3.3", "micromatch": "^4.0.8", "oxc-parser": "^0.139.0", "radix3": "^1.1.2" }, "peerDependencies": { "@tsrx/oxc": ">=0.9.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["@tsrx/oxc", "vite"] }, "sha512-HSGdLhrkYgF4/E0IKxirCShkrGUfvavQuOOP2Nio0dCxp/PrhiATGWQPUODUJuDavD+N6hIp1K7e/rh347o9nw=="],
 
     "fill-range": ["fill-range@7.1.1", "", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="],
 
diff --git a/templates/solid-start/package.json b/templates/solid-start/package.json
index 9062a50..b0f1dd0 100644
--- a/templates/solid-start/package.json
+++ b/templates/solid-start/package.json
@@ -53,7 +53,7 @@
 		"@convex-dev/better-auth": "^0.12.5",
 		"@convex-dev/stripe": "^0.1.6",
 		"@solidjs/meta": "1.0.0-next.2",
-		"@solidjs/router": "2.0.0-next.27",
+		"@solidjs/router": "2.0.0-next.30",
 		"@solidjs/web": "2.0.0-rc.9",
 		"@stylexjs/stylex": "^0.19.1",
 		"better-auth": "~1.6.33",
@@ -73,7 +73,7 @@
 		"@types/node": "^26.6.2",
 		"eslint-plugin-solid": "^0.18.0",
 		"fallow": "^3.28.0",
-		"filesystem-routing": "^0.3.1",
+		"filesystem-routing": "^0.4.0",
 		"jsdom": "^30.1.1",
 		"playwright-core": "^1.63.0",
 		"typescript": "^7.0.2",
diff --git a/templates/solid-start/web/file-routes.d.ts b/templates/solid-start/web/file-routes.d.ts
index 266f9e1..1a01ab5 100644
--- a/templates/solid-start/web/file-routes.d.ts
+++ b/templates/solid-start/web/file-routes.d.ts
@@ -19,6 +19,8 @@ declare module "virtual:file-routes" {
   export interface FileRouteEntry {
     path: string;
     page?: boolean;
+    /** The page component is a server function; its `$component` is delivered eagerly. */
+    server?: boolean;
     $component?: FileRouteLazyRef<any> | FileRouteEagerRef<any>;
     $$route?: FileRouteEagerRef<any>;
     [key: string]: unknown;
@@ -38,6 +40,14 @@ declare module "virtual:file-routes" {
       $component: FileRouteLazyRef<typeof import("./src/routes/[...404]")>;
       $$route?: undefined;
     },
+    {
+      path: "/api/auth/*all";
+      page: false;
+      $GET: FileRouteLazyRef<typeof import("./src/routes/api/auth/[...all]")>;
+      $POST: FileRouteLazyRef<typeof import("./src/routes/api/auth/[...all]")>;
+      $HEAD: FileRouteLazyRef<typeof import("./src/routes/api/auth/[...all]")>;
+      $$route?: undefined;
+    },
     {
       path: "/";
       page: true;
@@ -49,14 +59,6 @@ declare module "virtual:file-routes" {
       page: true;
       $component: FileRouteLazyRef<typeof import("./src/routes/sign-in")>;
       $$route?: undefined;
-    },
-    {
-      path: "/api/auth/*all";
-      page: false;
-      $GET: FileRouteLazyRef<typeof import("./src/routes/api/auth/[...all]")>;
-      $POST: FileRouteLazyRef<typeof import("./src/routes/api/auth/[...all]")>;
-      $HEAD: FileRouteLazyRef<typeof import("./src/routes/api/auth/[...all]")>;
-      $$route?: undefined;
     }
   ];
   export default routes;