Updated to react-router v7

skaut · Nov 25, 2024 · 9c31da7 · 9c31da7
1 parent abf5907
commit 9c31da7
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 52 deletions.
diff --git a/packages/frontend/__tests__/App.test.tsx b/packages/frontend/__tests__/App.test.tsx
@@ -1,6 +1,6 @@
 import { render } from "@testing-library/react";
 import { mocked } from "jest-mock";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 import * as swr from "swr";
 
 import { App } from "../src/App";

diff --git a/packages/frontend/__tests__/components/AppNavigation.test.tsx b/packages/frontend/__tests__/components/AppNavigation.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { AppNavigation } from "../../src/components/AppNavigation";
 

diff --git a/packages/frontend/__tests__/components/Issue.test.tsx b/packages/frontend/__tests__/components/Issue.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { Issue } from "../../src/components/Issue";
 import { getIssueWithProject } from "../../src/utils/getIssueWithProject";

diff --git a/packages/frontend/__tests__/components/IssuesList.test.tsx b/packages/frontend/__tests__/components/IssuesList.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { IssuesList } from "../../src/components/IssuesList";
 import { testData } from "../testData";

diff --git a/packages/frontend/__tests__/components/Navigation.test.tsx b/packages/frontend/__tests__/components/Navigation.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { Navigation } from "../../src/components/Navigation";
 

diff --git a/packages/frontend/__tests__/components/Project.test.tsx b/packages/frontend/__tests__/components/Project.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { Project } from "../../src/components/Project";
 import { testData } from "../testData";

diff --git a/packages/frontend/__tests__/components/ProjectLinks.test.tsx b/packages/frontend/__tests__/components/ProjectLinks.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { ProjectLinks } from "../../src/components/ProjectLinks";
 import { testData } from "../testData";

diff --git a/packages/frontend/__tests__/components/ScrollToTop.test.tsx b/packages/frontend/__tests__/components/ScrollToTop.test.tsx
@@ -1,6 +1,6 @@
 import { render } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { Link, MemoryRouter, Route, Routes } from "react-router-dom";
+import { Link, MemoryRouter, Route, Routes } from "react-router";
 
 import { ScrollToTop } from "../../src/components/ScrollToTop";
 

diff --git a/packages/frontend/__tests__/pages/IssueDetail.test.tsx b/packages/frontend/__tests__/pages/IssueDetail.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter, Route, Routes } from "react-router-dom";
+import { MemoryRouter, Route, Routes } from "react-router";
 
 import { IssueDetail } from "../../src/pages/IssueDetail";
 import { testData } from "../testData";

diff --git a/packages/frontend/__tests__/pages/IssuesList.test.tsx b/packages/frontend/__tests__/pages/IssuesList.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { IssuesList } from "../../src/pages/IssuesList";
 import { testData } from "../testData";

diff --git a/packages/frontend/__tests__/pages/ProjectDetail.test.tsx b/packages/frontend/__tests__/pages/ProjectDetail.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter, Route, Routes } from "react-router-dom";
+import { MemoryRouter, Route, Routes } from "react-router";
 
 import { ProjectDetail } from "../../src/pages/ProjectDetail";
 import { testData } from "../testData";

diff --git a/packages/frontend/__tests__/pages/ProjectsList.test.tsx b/packages/frontend/__tests__/pages/ProjectsList.test.tsx
@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
 
 import { ProjectsList } from "../../src/pages/ProjectsList";
 import { testData } from "../testData";

diff --git a/packages/frontend/package-lock.json b/packages/frontend/package-lock.json
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -35,7 +35,7 @@
     "react-dom": "^18.3.1",
     "react-icons": "^5.2.1",
     "react-markdown": "^9.0.1",
-    "react-router-dom": "^6.28.0",
+    "react-router": "^7.0.1",
     "remark-gfm": "^4.0.0",
     "string-to-color": "^2.2.2",
     "swr": "^2.2.5"

diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
@@ -1,7 +1,7 @@
 /** @jsxImportSource @emotion/react */
 import type React from "react";
 
-import { Route, Routes } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import useSWR from "swr";
 
 import type { ProjectListings } from "./interfaces/ProjectListings";

diff --git a/packages/frontend/src/components/ArticleBox.tsx b/packages/frontend/src/components/ArticleBox.tsx
@@ -2,7 +2,7 @@ import type React from "react";
 
 import styled from "@emotion/styled";
 import ReactMarkdown from "react-markdown";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import remarkGfm from "remark-gfm";
 
 import { ColoredTag } from "./ColoredTag";

diff --git a/packages/frontend/src/components/Container.tsx b/packages/frontend/src/components/Container.tsx
@@ -2,7 +2,7 @@ import type React from "react";
 
 import { Global } from "@emotion/react";
 import styled from "@emotion/styled";
-import { Link, Outlet } from "react-router-dom";
+import { Link, Outlet } from "react-router";
 
 import { globalStyles } from "../globalStyles";
 import logo from "../images/logo.svg";

diff --git a/packages/frontend/src/components/IssuesList.tsx b/packages/frontend/src/components/IssuesList.tsx
@@ -3,7 +3,7 @@ import type React from "react";
 
 import { css } from "@emotion/react";
 import ReactMarkdown from "react-markdown";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import remarkGfm from "remark-gfm";
 
 import type { Project } from "../interfaces/Project";

diff --git a/packages/frontend/src/components/Navigation.tsx b/packages/frontend/src/components/Navigation.tsx
@@ -1,7 +1,7 @@
 import type React from "react";
 
 import styled from "@emotion/styled";
-import { NavLink } from "react-router-dom";
+import { NavLink } from "react-router";
 
 import { theme } from "../theme";
 

diff --git a/packages/frontend/src/components/ScrollToTop.tsx b/packages/frontend/src/components/ScrollToTop.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 
 export const ScrollToTop = (): null => {
   const location = useLocation();

diff --git a/packages/frontend/src/index.tsx b/packages/frontend/src/index.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { createRoot } from "react-dom/client";
-import { BrowserRouter as Router } from "react-router-dom";
+import { BrowserRouter as Router } from "react-router";
 
 import { App } from "./App";
 

diff --git a/packages/frontend/src/pages/IssueDetail.tsx b/packages/frontend/src/pages/IssueDetail.tsx
@@ -4,7 +4,7 @@ import type React from "react";
 import { css } from "@emotion/react";
 import { AiFillGithub } from "react-icons/ai";
 import ReactMarkdown from "react-markdown";
-import { Link, useParams } from "react-router-dom";
+import { Link, useParams } from "react-router";
 import remarkGfm from "remark-gfm";
 
 import type { ProjectListings } from "../interfaces/ProjectListings";

diff --git a/packages/frontend/src/pages/ProjectDetail.tsx b/packages/frontend/src/pages/ProjectDetail.tsx
@@ -3,7 +3,7 @@ import type React from "react";
 
 import { css } from "@emotion/react";
 import ReactMarkdown from "react-markdown";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import remarkGfm from "remark-gfm";
 
 import type { ProjectListings } from "../interfaces/ProjectListings";