devagrawal09 · Oct 3, 2026 · Oct 3, 2026 · Oct 3, 2026 · Oct 3, 2026 · Oct 3, 2026
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ gt pul
 
 <div align="center">
 
-Fully featured, fully customisable static site generation for [SolidStart](https://start.solidjs.com)
+Fully featured, fully customisable static site generation for [Solid](https://www.solidjs.com)
 
 [![license](https://img.shields.io/badge/license-MIT-1890ff.svg)](https://github.com/kobaltedev/solidbase/blob/main/LICENSE)
 [![checks](https://img.shields.io/github/checks-status/kobaltedev/solidbase/main)](https://github.com/kobaltedev/solidbase/actions)

diff --git a/SOLID2-HANDOFF.md b/SOLID2-HANDOFF.md
@@ -0,0 +1,43 @@
+# Solid 2 Migration Handoff
+
+Updated 2026-10-13. Remove before #174 leaves draft.
+
+## State
+
+- Branch: solid2 on devagrawal09/solidbase. PR #174 remains draft; maintainers decide merge timing, versioning, dist-tags and dependency policy.
+- Runtime pins unchanged: solid-js/@solidjs/web rc.14, router next.37, Vite plugin next.47, meta next.2, Kobalte alpha.2. Primitives fixes remain unreleased as of today's npm check.
+- No vendored runtime patches or new test files. #173 REPL work remains separate.
+- Never merge, publish or post outside devagrawal09/solidbase. Commit as Dev Agrawal <devagrawal09@gmail.com>.
+
+## Completed
+
+- Existing Back/Forward fix preserved: register page data using Vite-root-relative module paths and await undefined before lazy preload. Promise.resolve still hits the hydration Promise stub. Missing page modules return undefined.
+- Native tabs replace Kobalte tabs, avoiding unreleased event-listener/resize-observer owner-count bugs. Preserve selected-tab styling, linked ARIA IDs, roving focus, Home/End, wrapping arrows (including RTL), force-mounted panels and persisted named groups.
+- Persist named selection in the effect's apply phase after the signal commits, deferring initial writes so hydration does not overwrite a saved cookie. BroadcastChannel synchronization and reload persistence verified.
+- The tab-group BroadcastChannel is created only on the client and closed on cleanup (SSR previously leaked one per named group).
+- Native details/summary replaces the dev-only Kobalte accordion preview, with matching displayed snippet. Kobalte's demo used the same server/client ownership mismatch; this does not claim to fix arbitrary consumer Kobalte widgets.
+- Prerender, sitemap and llms respect fileRoutes.dir. Missing directories yield no markdown seeds; other errors propagate. fileRoutes:false does not index default markdown files.
+- Prerender worker exits only after stdout is flushed; child-process isolation retained.
+- Missing-provider diagnostics restored using optional provider helpers/default context values.
+- Docs font preloads restored; obsolete Nitro deployment instructions and config references updated.
+- Dev/docs typechecks exclude generated output and include ambient declarations. DocSearch callable export normalized for differing TypeScript resolution modes.
+- Preferred-language initial effect deferred so a saved JS cookie is not overwritten before onSettled reads it.
+
+## Verification
+
+- 138 tests pass across the existing 29 test files.
+- Library build/typecheck and dev/docs standalone typechecks pass.
+- Production dev: 15 pages plus 404.html. Production docs: 41 pages plus 404.html.
+- Browser direct-load matrix: docs quickstart, add-to-existing, markdown, extending-themes; dev pm, ec, ec-file, preview; both home pages. No hydration/page/console errors in the matrix.
+- Tab clicks, keyboard wrap/Home/End, unique IDs, visible selected panels, cookie reload, cross-tab BroadcastChannel synchronization, RTL keyboard behavior pass.
+- History restores path/content/title/lang on Back/Forward. Locale selection, copy-page enabled state, theme-cookie reload and mobile navigation pass.
+- JS preference cookie restores JS tab labels on reload. TS/JS toggle UI is disabled in current app configurations, so its click path was not verified.
+- Independent read-only review found no verified actionable issues; browser checks cover hydration ownership.
+
+## Remaining
+
+- #174 stays draft until maintainer review and release/dependency decisions. Remove this note before leaving draft.
+- Docs OG generation stays disabled pending Solid 2 support in its dependency.
+- Vite native-config-loader warnings and prerender discovery headers with literal commas remain known limitations.
+- Custom startConfig extensions require leading dots; dotted final URL segments are excluded from link discovery (explicit markdown seeds are still emitted).
+- Existing raw Promise/lazy hydration upstream report remains the user's responsibility; previous detailed handoff is in branch history.
diff --git a/dev/app.config.ts b/dev/app.config.ts
diff --git a/dev/package.json b/dev/package.json
@@ -8,18 +8,18 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@kobalte/core": "2.0.0-alpha.2",
     "@kobalte/solidbase": "workspace:*",
-    "@kobalte/core": "0.13.11",
-    "@solidjs/router": "^0.15.3",
-    "@solidjs/start": "https://pkg.pr.new/solidjs/solid-start/@solidjs/start@2080",
-    "nitro": "3.0.260311-beta",
-    "solid-js": "^1.9.9"
+    "@solidjs/router": "2.0.0-next.37",
+    "@solidjs/web": "2.0.0-rc.14",
+    "solid-js": "2.0.0-rc.14"
   },
   "engines": {
     "node": ">=22.12"
   },
   "devDependencies": {
     "@iconify-json/ri": "^1.2.5",
+    "@solidjs/vite-plugin": "3.0.0-next.47",
     "cross-env": "^7.0.3",
     "vite": "^8.0.0"
   }

diff --git a/dev/src/Document.tsx b/dev/src/Document.tsx
@@ -0,0 +1,21 @@
+import { getHtmlProps } from "@kobalte/solidbase/server";
+import { HydrationScript } from "@solidjs/web";
+import type { ParentProps } from "solid-js";
+
+// Document shell for @solidjs/vite-plugin start mode: the app arrives as children and the
+// client entry script is injected into <head> automatically.
+export default function Document(props: ParentProps) {
+	return (
+		<html {...getHtmlProps()}>
+			<head>
+				<meta charset="utf-8" />
+				<meta name="viewport" content="width=device-width, initial-scale=1" />
+				<link rel="icon" href="/favicon.ico" />
+				<HydrationScript />
+			</head>
+			<body>
+				<div id="app">{props.children}</div>
+			</body>
+		</html>
+	);
+}
diff --git a/dev/src/app.tsx b/dev/src/app.tsx
@@ -1,13 +1,19 @@
+import { pageRoutes } from "virtual:file-routes";
 import { SolidBaseRoot } from "@kobalte/solidbase/client";
-import { Router } from "@solidjs/router";
-import { FileRoutes } from "@solidjs/start/router";
+import { createRouter } from "@solidjs/router";
+import { fileRoutes } from "@solidjs/router/fs";
 
 import "./app.css";
 
+const Router = createRouter({
+	routes: fileRoutes(pageRoutes),
+	base: import.meta.env.BASE_URL,
+});
+
 export default function App() {
 	return (
-		<Router root={SolidBaseRoot}>
-			<FileRoutes />
+		<Router>
+			{(props) => <SolidBaseRoot>{props.children}</SolidBaseRoot>}
 		</Router>
 	);
 }
diff --git a/dev/src/entry-client.tsx b/dev/src/entry-client.tsx
diff --git a/dev/src/entry-server.tsx b/dev/src/entry-server.tsx
diff --git a/dev/src/global.d.ts b/dev/src/global.d.ts
@@ -1 +1,2 @@
-/// <reference types="@solidjs/start/env" />
+/// <reference types="vite/client" />
+/// <reference types="filesystem-routing/types" />
diff --git a/dev/src/preview-demo.tsx b/dev/src/preview-demo.tsx
@@ -1,5 +1,4 @@
-import { Accordion } from "@kobalte/core/accordion";
-import { For } from "solid-js";
+import { createUniqueId, For } from "solid-js";
 
 function ChevronDownIcon(props: { class?: string }) {
 	return (
@@ -23,7 +22,7 @@ const accordionItems = [
 	{
 		value: "item-1",
 		title: "Is it accessible?",
-		body: "Yes. It follows the WAI-ARIA accordion pattern and supports keyboard navigation.",
+		body: "Yes. Native disclosure elements support keyboard and screen reader navigation.",
 	},
 	{
 		value: "item-2",
@@ -38,29 +37,33 @@ const accordionItems = [
 ];
 
 export function PreviewAccordionExample() {
+	const name = createUniqueId();
 	return (
 		<div class="sb-preview-demo-accordion-wrap">
-			<Accordion
-				class="sb-preview-demo-accordion"
-				defaultValue={["item-1"]}
-				collapsible
-			>
+			<style>{`.sb-preview-demo-trigger::-webkit-details-marker { display: none; }
+.sb-preview-demo-trigger .sb-preview-demo-header { display: flex; align-items: center; justify-content: space-between; width: 100%; gap: 1rem; margin: 0; font: inherit; }
+.sb-preview-demo-item[open] > .sb-preview-demo-trigger .chevron-icon { transform: rotate(180deg); }`}</style>
+			<div class="sb-preview-demo-accordion">
 				<For each={accordionItems}>
 					{(item) => (
-						<Accordion.Item class="sb-preview-demo-item" value={item.value}>
-							<Accordion.Header class="sb-preview-demo-header">
-								<Accordion.Trigger class="sb-preview-demo-trigger">
+						<details
+							class="sb-preview-demo-item"
+							name={name}
+							open={item.value === "item-1"}
+						>
+							<summary class="sb-preview-demo-trigger">
+								<h3 class="sb-preview-demo-header">
 									<span>{item.title}</span>
 									<ChevronDownIcon class="chevron-icon" />
-								</Accordion.Trigger>
-							</Accordion.Header>
-							<Accordion.Content class="sb-preview-demo-content">
+								</h3>
+							</summary>
+							<div class="sb-preview-demo-content">
 								<p>{item.body}</p>
-							</Accordion.Content>
-						</Accordion.Item>
+							</div>
+						</details>
 					)}
 				</For>
-			</Accordion>
+			</div>
 		</div>
 	);
 }

diff --git a/dev/src/routes/ec-file.mdx b/dev/src/routes/ec-file.mdx
@@ -16,13 +16,13 @@
 ```file=../app.css tab
 ```
 
-``` file=../entry-client.tsx tab
+``` file=../Document.tsx tab
 ```
 
-```file=../entry-server.tsx tab
+```file=../app.tsx tab
 ```
 
-```file=~/entry-server.tsx title="aliased import"
+```file=@dev/Document.tsx title="aliased import"
 ```
 
 ```file=./to-transform.tsx title=false