diff --git a/package-lock.json b/package-lock.json index 6d0f749..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": "^6.27.0", + "react-router": "^7.0.0", "swr": "^2.2.5" }, "devDependencies": { @@ -951,15 +951,6 @@ "node": ">= 8" } }, - "node_modules/@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.27.3", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.3.tgz", @@ -1971,6 +1962,12 @@ "@swc/counter": "^0.1.3" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" + }, "node_modules/@types/debug": { "version": "4.1.12", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", @@ -2666,6 +2663,15 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "license": "MIT" }, + "node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -4716,35 +4722,27 @@ } }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.0.tgz", + "integrity": "sha512-1xf+yMVhUjAzZGY90ZnYJ9KVe1R8FggpugzRBkh+p6vl4cC1sHDe3nO+r5rxWTAgCMf8uN5hfoV2M7rLVTWPUA==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" - } - }, - "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", - "license": "MIT", - "dependencies": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react": ">=18", + "react-dom": ">=18" }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, "node_modules/readdirp": { @@ -4893,6 +4891,12 @@ "semver": "bin/semver.js" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -5049,6 +5053,12 @@ "typescript": ">=4.2.0" } }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 3f724c5..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": "^6.27.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";