From cc1f406213ae08f8b1b8d51688674c232302ed80 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 28 Nov 2024 06:53:20 +0100 Subject: [PATCH] refactor(react-router): upgrade to v7 --- package-lock.json | 18 +----------------- package.json | 2 +- src/App.tsx | 2 +- src/Login.tsx | 2 +- src/NavBar.tsx | 2 +- src/NotFound.tsx | 2 +- src/main.tsx | 2 +- 7 files changed, 7 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index d05d63f..62d0fcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "react-dom": "^18.3.1", "react-markdown": "^9.0.1", "react-oidc-context": "^3.2.0", - "react-router-dom": "^7.0.0", + "react-router": "^7.0.0", "swr": "^2.2.5" }, "devDependencies": { @@ -4745,22 +4745,6 @@ } } }, - "node_modules/react-router-dom": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.0.tgz", - "integrity": "sha512-2QAxXpwgQuh423C64oZiV2cCKPCNUgZxcvZaS8O0PAHPZ/z8kTq7YbGD4KTNZm6Yj66d+HAfGkWPp8MCpdtD+Q==", - "license": "MIT", - "dependencies": { - "react-router": "7.0.0" - }, - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - } - }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", diff --git a/package.json b/package.json index 5e75aa7..99c120e 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "react-dom": "^18.3.1", "react-markdown": "^9.0.1", "react-oidc-context": "^3.2.0", - "react-router-dom": "^7.0.0", + "react-router": "^7.0.0", "swr": "^2.2.5" }, "devDependencies": { diff --git a/src/App.tsx b/src/App.tsx index 7c6c501..9c4afc6 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ import './App.css' import Login from "./Login.tsx"; -import {Route, Routes} from "react-router-dom"; +import {Route, Routes} from "react-router"; import Home from "./Home.tsx"; import NavBar from "./NavBar.tsx"; import {hasAuthParams, useAuth} from "react-oidc-context"; diff --git a/src/Login.tsx b/src/Login.tsx index 77251fc..58e0089 100644 --- a/src/Login.tsx +++ b/src/Login.tsx @@ -1,6 +1,6 @@ import flipdotLogo from './assets/flipdot.svg' import './App.css' -import {useNavigate} from "react-router-dom"; +import {useNavigate} from "react-router"; import {useEffect} from "react"; import {useAuth} from "react-oidc-context"; diff --git a/src/NavBar.tsx b/src/NavBar.tsx index 74503c8..b1b8c65 100644 --- a/src/NavBar.tsx +++ b/src/NavBar.tsx @@ -1,6 +1,6 @@ import fdLogo from './assets/fd.svg'; import "./NavBar.css"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import Spinner from "./Spinner.tsx"; import {useAuth} from "react-oidc-context"; diff --git a/src/NotFound.tsx b/src/NotFound.tsx index 8ef6603..ccaed5a 100644 --- a/src/NotFound.tsx +++ b/src/NotFound.tsx @@ -1,4 +1,4 @@ -import {useNavigate} from "react-router-dom"; +import {useNavigate} from "react-router"; import {useEffect} from "react"; import {useAuth} from "react-oidc-context"; diff --git a/src/main.tsx b/src/main.tsx index 2b95446..3eed7c5 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -4,7 +4,7 @@ import './main.css' import App from './App.tsx' import * as Sentry from "@sentry/react"; -import {BrowserRouter} from "react-router-dom"; +import {BrowserRouter} from "react-router"; import {AuthProvider, AuthProviderProps} from "react-oidc-context"; import AuthenticatedSWRConfig from "./AuthenticatedSWRConfig.tsx"; import {WebStorageStateStore} from "oidc-client-ts";