Merge branch 'main' into copilot/fix-8038056b-6260-4367-a757-556e9e0d7ff4

Author: tyler-dane

packages/web/src/__tests__/__mocks__/mock.render.tsx

@@ -27,7 +27,12 @@ const AllTheProviders =
         <GoogleOAuthProvider clientId="anyClientId">
           <GlobalStyle />
           <ThemeProvider theme={theme}>
-            <BrowserRouter>
+            <BrowserRouter
+              future={{
+                v7_startTransition: true,
+                v7_relativeSplatPath: true,
+              }}
+            >
               <Provider store={store}>{children}</Provider>
             </BrowserRouter>
           </ThemeProvider>

packages/web/src/routers/index.tsx

@@ -4,32 +4,38 @@ import { ProtectedRoute } from "@web/auth/ProtectedRoute";
 import { UserProvider } from "@web/auth/UserContext";
 import { ROOT_ROUTES } from "@web/common/constants/routes";
 import SocketProvider from "@web/socket/SocketProvider";
-import { LoginView } from "@web/views/Login";
 import { LogoutView } from "@web/views/Logout";
 import { NotFoundView } from "@web/views/NotFound";
 import OnboardingFlow from "@web/views/Onboarding/OnboardingFlow";
 import { RootView } from "@web/views/Root";
 
-const router = createBrowserRouter([
+const router = createBrowserRouter(
+  [
+    {
+      path: ROOT_ROUTES.ROOT,
+      element: (
+        <ProtectedRoute>
+          <UserProvider>
+            <SocketProvider>
+              <RootView />
+            </SocketProvider>
+          </UserProvider>
+        </ProtectedRoute>
+      ),
+    },
+    {
+      path: ROOT_ROUTES.LOGIN,
+      element: <OnboardingFlow />,
+    },
+    { path: ROOT_ROUTES.LOGOUT, element: <LogoutView /> },
+    { path: "*", element: <NotFoundView /> },
+  ],
   {
-    path: ROOT_ROUTES.ROOT,
-    element: (
-      <ProtectedRoute>
-        <UserProvider>
-          <SocketProvider>
-            <RootView />
-          </SocketProvider>
-        </UserProvider>
-      </ProtectedRoute>
-    ),
+    future: {
+      v7_relativeSplatPath: true,
+    },
   },
-  {
-    path: ROOT_ROUTES.LOGIN,
-    element: <OnboardingFlow />,
-  },
-  { path: ROOT_ROUTES.LOGOUT, element: <LogoutView /> },
-  { path: "*", element: <NotFoundView /> },
-]);
+);
 
 export const RootRouter = () => {
   return <RouterProvider router={router} />;