From bcf8b14f3834aea98824f8b4688e2cdf5fbb6672 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Wed, 18 Feb 2026 09:39:38 -0800
Subject: [PATCH] move

---
 apps/web/src/App.tsx           | 22 -------------
 apps/web/src/main.tsx          | 37 +++++++++++++++++++--
 apps/web/src/router.tsx        | 18 ----------
 apps/web/src/routes/__root.tsx | 60 ++++++++++++++++++----------------
 apps/web/vite.config.ts        |  4 +--
 5 files changed, 68 insertions(+), 73 deletions(-)
 delete mode 100644 apps/web/src/App.tsx
 delete mode 100644 apps/web/src/router.tsx

diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
deleted file mode 100644
index e1bcc719b51827377ef98a059fec48f1628c0a3c..0000000000000000000000000000000000000000
--- a/apps/web/src/App.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { RouterProvider } from "@tanstack/react-router";
-
-import { AnchoredToastProvider, ToastProvider } from "./components/ui/toast";
-import { router } from "./router";
-import { StoreProvider } from "./store";
-
-const queryClient = new QueryClient();
-
-export default function App() {
-  return (
-    <QueryClientProvider client={queryClient}>
-      <StoreProvider>
-        <ToastProvider>
-          <AnchoredToastProvider>
-            <RouterProvider router={router} />
-          </AnchoredToastProvider>
-        </ToastProvider>
-      </StoreProvider>
-    </QueryClientProvider>
-  );
-}
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index aced1f7d4f73938703280222355748d4f5aa1b6f..e11b2d8c35464196935df63622e5289993b46cb6 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -1,11 +1,44 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { RouterProvider } from "@tanstack/react-router";
+import { AnchoredToastProvider, ToastProvider } from "./components/ui/toast";
+import { createHashHistory, createRouter, createBrowserHistory } from "@tanstack/react-router";
+import { StoreProvider } from "./store";
+
 import "@xterm/xterm/css/xterm.css";
 import "highlight.js/styles/github-dark.css";
-
-import App from "./App";
 import "./index.css";
 
+import { isElectron } from "./env";
+import { routeTree } from "./routeTree.gen";
+
+const history = isElectron ? createHashHistory() : createBrowserHistory();
+
+const queryClient = new QueryClient();
+
+const router = createRouter({
+  routeTree,
+  history,
+  context: {
+    queryClient,
+  },
+});
+
+function App() {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <StoreProvider>
+        <ToastProvider>
+          <AnchoredToastProvider>
+            <RouterProvider router={router} />
+          </AnchoredToastProvider>
+        </ToastProvider>
+      </StoreProvider>
+    </QueryClientProvider>
+  );
+}
+
 ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
   <React.StrictMode>
     <App />
diff --git a/apps/web/src/router.tsx b/apps/web/src/router.tsx
deleted file mode 100644
index 84438e650a8d9c48b3292806ba569e6c90950cde..0000000000000000000000000000000000000000
--- a/apps/web/src/router.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createHashHistory, createRouter } from "@tanstack/react-router";
-
-import { isElectron } from "./env";
-import { routeTree } from "./routeTree.gen";
-
-const useHashHistory =
-  isElectron && typeof window !== "undefined" && window.location.protocol === "file:";
-
-export const router = createRouter({
-  routeTree,
-  ...(useHashHistory ? { history: createHashHistory() } : {}),
-});
-
-declare module "@tanstack/react-router" {
-  interface Register {
-    router: typeof router;
-  }
-}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index ef87602769777f1f384a87ab5e629c34e5741a1a..a80424217fca556288d8040ddbfdc7a4a3e57fde 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createRootRoute } from "@tanstack/react-router";
+import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";
 import { useEffect, useRef } from "react";
-import { useQueryClient } from "@tanstack/react-query";
+import { QueryClient, useQueryClient } from "@tanstack/react-query";
 
 import { isElectron } from "../env";
 import { useNativeApi } from "../hooks/useNativeApi";
@@ -10,6 +10,35 @@ import { createThread } from "../threadFactory";
 import { useStore } from "../store";
 import { onServerWelcome } from "../wsNativeApi";
 
+export const Route = createRootRouteWithContext<{
+  queryClient: QueryClient;
+}>()({
+  component: RootRouteView,
+});
+
+function RootRouteView() {
+  const api = useNativeApi();
+
+  if (!api) {
+    return (
+      <div className="flex h-screen flex-col bg-background text-foreground">
+        <div className="flex flex-1 items-center justify-center">
+          <p className="text-sm text-muted-foreground">Connecting to T3 Code server...</p>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <>
+      <EventRouter />
+      <AutoProjectBootstrap />
+      <DesktopProjectBootstrap />
+      <Outlet />
+    </>
+  );
+}
+
 function EventRouter() {
   const api = useNativeApi();
   const { dispatch } = useStore();
@@ -148,30 +177,3 @@ function DesktopProjectBootstrap() {
 
   return null;
 }
-
-function RootRouteView() {
-  const api = useNativeApi();
-
-  if (!api) {
-    return (
-      <div className="flex h-screen flex-col bg-background text-foreground">
-        <div className="flex flex-1 items-center justify-center">
-          <p className="text-sm text-muted-foreground">Connecting to T3 Code server...</p>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <EventRouter />
-      <AutoProjectBootstrap />
-      <DesktopProjectBootstrap />
-      <Outlet />
-    </>
-  );
-}
-
-export const Route = createRootRoute({
-  component: RootRouteView,
-});
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 62632e5e1982fc9a6ff0c1dff7380e7042313f76..6027d50e291dacc7246e667a1fd3b6148f77ac5c 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -1,13 +1,13 @@
 import tailwindcss from "@tailwindcss/vite";
 import react from "@vitejs/plugin-react";
-import { TanStackRouterVite } from "@tanstack/router-plugin/vite";
+import { tanstackRouter } from "@tanstack/router-plugin/vite";
 import { defineConfig } from "vite";
 
 const port = Number(process.env.PORT ?? 5173);
 
 export default defineConfig({
   plugins: [
-    TanStackRouterVite(),
+    tanstackRouter(),
     react({
       babel: {
         plugins: [["babel-plugin-react-compiler", { target: "19" }]],
-- 
2.54.0