Migrate react-router to v7.0.0

trilitech · Jan 8, 2025 · c36d64a · c36d64a
1 parent 70ebc41
commit c36d64a
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 51 deletions.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -138,7 +138,7 @@
     "react-refresh": "^0.16.0",
     "react-remove-scroll": "^2.6.2",
     "react-responsive-carousel": "^3.2.23",
-    "react-router-dom": "^6.28.1",
+    "react-router-dom": "^7.0.0",
     "react-test-renderer": "^18.3.1",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",

diff --git a/apps/desktop/src/components/AccountDrawer/RenameRemoveMenuSwitch.tsx b/apps/desktop/src/components/AccountDrawer/RenameRemoveMenuSwitch.tsx
@@ -26,7 +26,7 @@ export const RenameRemoveMenuSwitch = ({ account }: { account: Account }) => {
             onSubmit={() => {
               removeAccount(account);
               closeModal();
-              navigate("/");
+              void navigate("/");
             }}
             title={title}
           />

diff --git a/apps/desktop/src/components/SendFlow/SuccessStep.tsx b/apps/desktop/src/components/SendFlow/SuccessStep.tsx
@@ -40,7 +40,7 @@ export const SuccessStep = ({ hash }: { hash: string }) => {
           width="100%"
           onClick={() => {
             onClose();
-            navigate("/operations");
+            void navigate("/operations");
           }}
           size="lg"
         >

diff --git a/apps/desktop/src/views/home/AccountListWithDrawer.tsx b/apps/desktop/src/views/home/AccountListWithDrawer.tsx
@@ -33,7 +33,7 @@ export const AccountListWithDrawer = () => {
   const closeDrawer = useCallback(() => {
     setSelectedAccount(null);
     onClose();
-    navigate("/home");
+    void navigate("/home");
   }, [onClose, navigate]);
 
   // For some reason the drawer doesn't close on esc for this particular component

diff --git a/apps/embed-iframe-mainnet/package.json b/apps/embed-iframe-mainnet/package.json
@@ -13,7 +13,7 @@
     "@umami/embed-iframe": "workspace:^",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.28.1"
+    "react-router-dom": "^7.0.0"
   },
   "devDependencies": {
     "@umami/eslint-config": "workspace:^",

diff --git a/apps/embed-iframe/package.json b/apps/embed-iframe/package.json
@@ -42,7 +42,7 @@
     "framer-motion": "^11.15.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.28.1"
+    "react-router-dom": "^7.0.0"
   },
   "devDependencies": {
     "@umami/eslint-config": "workspace:^",

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -77,8 +77,8 @@
     "react-redux": "^9.2.0",
     "react-remove-scroll": "^2.6.2",
     "react-responsive-carousel": "^3.2.23",
-    "react-router": "^6.28.1",
-    "react-router-dom": "^6.28.1",
+    "react-router": "^7.0.0",
+    "react-router-dom": "^7.0.0",
     "react-test-renderer": "^18.3.1",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",

diff --git a/apps/web/src/components/SendFlow/SuccessStep.tsx b/apps/web/src/components/SendFlow/SuccessStep.tsx
@@ -51,7 +51,7 @@ export const SuccessStep = ({ hash }: { hash: string }) => {
           width="100%"
           onClick={() => {
             onClose();
-            navigate("/activity");
+            void navigate("/activity");
           }}
           size="lg"
           variant="primary"

diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
@@ -30,12 +30,7 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
         <PersistGate loading={<div>loading</div>} persistor={persistor}>
           <ErrorBoundary fallback={<ErrorPage />} onError={logError}>
             <ReactQueryProvider>
-              <BrowserRouter
-                future={{
-                  v7_relativeSplatPath: true,
-                  v7_startTransition: true,
-                }}
-              >
+              <BrowserRouter>
                 <DynamicDisclosureProvider>
                   <App />
                 </DynamicDisclosureProvider>

diff --git a/apps/web/src/testUtils.tsx b/apps/web/src/testUtils.tsx
@@ -79,12 +79,7 @@ const makeWrapper =
     });
 
     return (
-      <BrowserRouter
-        future={{
-          v7_relativeSplatPath: true,
-          v7_startTransition: true,
-        }}
-      >
+      <BrowserRouter>
         <QueryClientProvider client={new QueryClient()}>
           <Provider store={store}>
             <DynamicModalContext.Provider value={dynamicModal}>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml