From 151af5c8f803d7e0d92ca3f238cbfe4533b67667 Mon Sep 17 00:00:00 2001 From: LironEr Date: Thu, 15 Jan 2026 15:38:09 +0200 Subject: [PATCH 1/2] fix(website): router cause unhandled exception --- apps/website/package.json | 6 +- apps/website/src/Router.tsx | 2 +- .../Layout/components/UserSection.tsx | 2 +- apps/website/src/components/LinkNoStyles.tsx | 2 +- apps/website/src/main.tsx | 2 +- yarn.lock | 58 ++----------------- 6 files changed, 12 insertions(+), 60 deletions(-) diff --git a/apps/website/package.json b/apps/website/package.json index 2bc92e5..b5b3194 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -5,7 +5,7 @@ "license": "MIT", "scripts": { "build": "yarn --cwd ../../ nx build website --verbose", - "build:analyze": "yarn --cwd ../../ nx build:analyze website --verbose", + "build:analyze": "yarn --cwd ../../ nx react-router website --verbose", "serve": "yarn --cwd ../../ nx serve website --verbose", "lint": "yarn --cwd ../../ nx lint website --verbose", "serve:preview": "yarn --cwd ../../ nx preview website --verbose", @@ -26,14 +26,12 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-query": "^3.39.3", - "react-router": "^6.30.2", - "react-router-dom": "^6.16.0", + "react-router": "^7.12.0", "recharts": "^2.8.0" }, "devDependencies": { "@types/react": "^18.2.28", "@types/react-dom": "^18.2.13", - "@types/react-router-dom": "^5.3.3", "@types/recharts": "^1.8.25", "@vitejs/plugin-basic-ssl": "^1.1.0", "eslint-plugin-jsx-a11y": "^6.8.0", diff --git a/apps/website/src/Router.tsx b/apps/website/src/Router.tsx index 78788f5..4c41731 100644 --- a/apps/website/src/Router.tsx +++ b/apps/website/src/Router.tsx @@ -1,4 +1,4 @@ -import { Routes, Route } from 'react-router-dom'; +import { Routes, Route } from 'react-router'; import { HomePage, CreateProjectPage, ReportPage, ReportsPage, LoginPage } from '@/pages'; const Router = () => ( diff --git a/apps/website/src/components/Layout/components/UserSection.tsx b/apps/website/src/components/Layout/components/UserSection.tsx index 0a3f7cc..962599b 100644 --- a/apps/website/src/components/Layout/components/UserSection.tsx +++ b/apps/website/src/components/Layout/components/UserSection.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { observer } from 'mobx-react-lite'; -import { Link } from 'react-router-dom'; +import { Link } from 'react-router'; import { Button, Divider, IconButton, List, ListItem, ListItemIcon, ListItemText, Popover } from '@mui/material'; import { userStore } from '@/stores/UserStore'; import AccountIcon from '@mui/icons-material/AccountCircle'; diff --git a/apps/website/src/components/LinkNoStyles.tsx b/apps/website/src/components/LinkNoStyles.tsx index 0c7f2d6..fdc77e2 100644 --- a/apps/website/src/components/LinkNoStyles.tsx +++ b/apps/website/src/components/LinkNoStyles.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import { Link } from 'react-router-dom'; +import { Link } from 'react-router'; const LinkNoStyles = styled(Link)` color: inherit; diff --git a/apps/website/src/main.tsx b/apps/website/src/main.tsx index 63d1339..8f01017 100644 --- a/apps/website/src/main.tsx +++ b/apps/website/src/main.tsx @@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client'; import CssBaseline from '@mui/material/CssBaseline'; import { SnackbarProvider } from 'notistack'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { BrowserRouter } from 'react-router-dom'; +import { BrowserRouter } from 'react-router'; import Layout from './components/Layout'; import Router from './Router'; import FetchError from './services/FetchError'; diff --git a/yarn.lock b/yarn.lock index 90acd95..ed75015 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3465,16 +3465,6 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@remix-run/router@1.15.3": - version "1.15.3" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.15.3.tgz#d2509048d69dbb72d5389a14945339f1430b2d3c" - integrity sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w== - -"@remix-run/router@1.23.1": - version "1.23.1" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.23.1.tgz#0ce8857b024e24fc427585316383ad9d295b3a7f" - integrity sha512-vDbaOzF7yT2Qs4vO6XV1MHcJv+3dgR1sT+l3B8xxOVhUC336prMvqrvsLL/9Dnw2xr6Qhz4J0dmS0llNAbnUmQ== - "@rollup/pluginutils@^4.0.0": version "4.2.1" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" @@ -4046,11 +4036,6 @@ dependencies: "@types/node" "*" -"@types/history@^4.7.11": - version "4.7.11" - resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" - integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== - "@types/http-cache-semantics@^4.0.2": version "4.0.4" resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" @@ -4175,23 +4160,6 @@ dependencies: "@types/react" "*" -"@types/react-router-dom@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83" - integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw== - dependencies: - "@types/history" "^4.7.11" - "@types/react" "*" - "@types/react-router" "*" - -"@types/react-router@*": - version "5.1.20" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.20.tgz#88eccaa122a82405ef3efbcaaa5dcdd9f021387c" - integrity sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q== - dependencies: - "@types/history" "^4.7.11" - "@types/react" "*" - "@types/react-transition-group@^4.4.10": version "4.4.10" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac" @@ -12339,27 +12307,13 @@ react-refresh@^0.14.2: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9" integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA== -react-router-dom@^6.16.0: - version "6.22.3" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.22.3.tgz#9781415667fd1361a475146c5826d9f16752a691" - integrity sha512-7ZILI7HjcE+p31oQvwbokjk6OA/bnFxrhJ19n82Ex9Ph8fNAq+Hm/7KchpMGlTgWhUxRHMMCut+vEtNpWpowKw== - dependencies: - "@remix-run/router" "1.15.3" - react-router "6.22.3" - -react-router@6.22.3: - version "6.22.3" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.22.3.tgz#9d9142f35e08be08c736a2082db5f0c9540a885e" - integrity sha512-dr2eb3Mj5zK2YISHK++foM9w4eBnO23eKnZEDs7c880P6oKbrjz/Svg9+nxqtHQK+oMW4OtjZca0RqPglXxguQ== +react-router@^7.12.0: + version "7.12.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.12.0.tgz#459a86862abbedd02e76e686751fe71f9fd73a4f" + integrity sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw== dependencies: - "@remix-run/router" "1.15.3" - -react-router@^6.30.2: - version "6.30.2" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.30.2.tgz#c78a3b40f7011f49a373b1df89492e7d4ec12359" - integrity sha512-H2Bm38Zu1bm8KUE5NVWRMzuIyAV8p/JrOaBJAwVmp37AXG72+CZJlEBw6pdn9i5TBgLMhNDgijS4ZlblpHyWTA== - dependencies: - "@remix-run/router" "1.23.1" + cookie "^1.0.1" + set-cookie-parser "^2.6.0" react-smooth@^4.0.0: version "4.0.1" From b0642166ad769e1ef8a732c35b388c0e7a5bf153 Mon Sep 17 00:00:00 2001 From: LironEr Date: Thu, 15 Jan 2026 15:39:52 +0200 Subject: [PATCH 2/2] fix --- apps/website/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/package.json b/apps/website/package.json index b5b3194..16c2fba 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -5,7 +5,7 @@ "license": "MIT", "scripts": { "build": "yarn --cwd ../../ nx build website --verbose", - "build:analyze": "yarn --cwd ../../ nx react-router website --verbose", + "build:analyze": "yarn --cwd ../../ nx build:analyze website --verbose", "serve": "yarn --cwd ../../ nx serve website --verbose", "lint": "yarn --cwd ../../ nx lint website --verbose", "serve:preview": "yarn --cwd ../../ nx preview website --verbose",