Update react-router and add useTransition support

jeffvli · Sep 25, 2023 · 3bbe696 · 3bbe696 · vercel · Sep 25, 2023
1 parent f7cacd2
commit 3bbe696
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -305,8 +305,8 @@
         "react-i18next": "^11.16.7",
         "react-icons": "^4.10.1",
         "react-player": "^2.11.0",
-        "react-router": "^6.5.0",
-        "react-router-dom": "^6.5.0",
+        "react-router": "^6.16.0",
+        "react-router-dom": "^6.16.0",
         "react-simple-img": "^3.0.0",
         "react-virtualized-auto-sizer": "^1.0.17",
         "react-window": "^1.8.9",

diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx
@@ -1,10 +1,8 @@
-import isElectron from 'is-electron';
 import { lazy, Suspense } from 'react';
 import {
     Route,
     createRoutesFromElements,
     RouterProvider,
-    createBrowserRouter,
     createHashRouter,
 } from 'react-router-dom';
 import { AppRoute } from './routes';
@@ -68,10 +66,8 @@ const RouteErrorBoundary = lazy(
     () => import('/@/renderer/features/action-required/components/route-error-boundary'),
 );
 
-const dynamicRouter = isElectron() ? createHashRouter : createBrowserRouter;
-
 export const AppRouter = () => {
-    const router = dynamicRouter(
+    const router = createHashRouter(
         createRoutesFromElements(
             <>
                 <Route element={<TitlebarOutlet />}>
@@ -198,7 +194,10 @@ export const AppRouter = () => {
 
     return (
         <Suspense fallback={<></>}>
-            <RouterProvider router={router} />
+            <RouterProvider
+                future={{ v7_startTransition: true }}
+                router={router}
+            />
         </Suspense>
     );
 };