Migrate react-router to v7.0.0

trilitech · Jan 7, 2025 · dcf265b · dcf265b
1 parent 7616340
commit dcf265b
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 37 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/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");
+            return navigate("/operations");
           }}
           size="lg"
         >

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");
+            return navigate("/activity");
           }}
           size="lg"
           variant="primary"

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