diff --git a/package.json b/package.json index d6f1f11..7ab480c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "prettier": "^3.5.3", "react": "^18.3.1", "react-dom": "^18.2.0", - "react-router-dom": "^7.4.1", + "react-router": "^7.4.1", "ts-jest": "^29.3.1", "ts-loader": "^9.5.2", "typescript": "^5.7.2", diff --git a/src/client/components/Header.tsx b/src/client/components/Header.tsx index 1810569..97b16d0 100644 --- a/src/client/components/Header.tsx +++ b/src/client/components/Header.tsx @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { useState } from "react"; -import { useNavigate } from "react-router-dom"; +import { useNavigate } from "react-router"; import { apiItemsUpdatePath, itemsShowPath } from "../../lib/qiita-cli-url"; import { breakpoint, pointerFine } from "../lib/mixins"; import { Colors, Typography, Weight, getSpace } from "../lib/variables"; diff --git a/src/client/components/Layout.tsx b/src/client/components/Layout.tsx index 09f3c04..8693fa5 100644 --- a/src/client/components/Layout.tsx +++ b/src/client/components/Layout.tsx @@ -1,4 +1,4 @@ -import { Outlet, ScrollRestoration } from "react-router-dom"; +import { Outlet, ScrollRestoration } from "react-router"; export const Layout = () => { return ( diff --git a/src/client/components/Router.tsx b/src/client/components/Router.tsx index 47ddd84..dfbd4c9 100644 --- a/src/client/components/Router.tsx +++ b/src/client/components/Router.tsx @@ -1,4 +1,4 @@ -import { createBrowserRouter, RouterProvider } from "react-router-dom"; +import { createBrowserRouter, RouterProvider } from "react-router"; import { ItemsIndex } from "../pages/items"; import { ItemsShow } from "../pages/items/show"; import { Layout } from "./Layout"; diff --git a/src/client/components/SidebarArticles.tsx b/src/client/components/SidebarArticles.tsx index 19212ed..eacabb4 100644 --- a/src/client/components/SidebarArticles.tsx +++ b/src/client/components/SidebarArticles.tsx @@ -1,7 +1,7 @@ import { css } from "@emotion/react"; import { useState, useEffect } from "react"; import { MaterialSymbol } from "./MaterialSymbol"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { pointerFine } from "../lib/mixins"; import { Colors, diff --git a/src/client/components/SidebarContents.tsx b/src/client/components/SidebarContents.tsx index f2bbdb6..16767c3 100644 --- a/src/client/components/SidebarContents.tsx +++ b/src/client/components/SidebarContents.tsx @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { useState } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { itemsIndexPath } from "../../lib/qiita-cli-url"; import { ItemsIndexViewModel } from "../../lib/view-models/items"; import { breakpoint, pointerFine, viewport } from "../lib/mixins"; diff --git a/src/client/pages/items/show.tsx b/src/client/pages/items/show.tsx index 3fd9d43..579a52b 100644 --- a/src/client/pages/items/show.tsx +++ b/src/client/pages/items/show.tsx @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { useState } from "react"; -import { useParams, useSearchParams } from "react-router-dom"; +import { useParams, useSearchParams } from "react-router"; import { apiItemsShowPath } from "../../../lib/qiita-cli-url"; import type { ItemsShowViewModel } from "../../../lib/view-models/items"; import { Article } from "../../components/Article"; diff --git a/yarn.lock b/yarn.lock index e416f5f..127dfa1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5305,14 +5305,7 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react-router-dom@^7.4.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.4.1.tgz#fd913abb488364859c343881ecb7b7bc84b902f2" - integrity sha512-L3/4tig0Lvs6m6THK0HRV4eHUdpx0dlJasgCxXKnavwhh4tKYgpuZk75HRYNoRKDyDWi9QgzGXsQ1oQSBlWpAA== - dependencies: - react-router "7.4.1" - -react-router@7.4.1: +react-router@^7.4.1: version "7.4.1" resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.4.1.tgz#0e6af1eefb8370d2cd79c961b87708afdb50fe64" integrity sha512-Vmizn9ZNzxfh3cumddqv3kLOKvc7AskUT0dC1prTabhiEi0U4A33LmkDOJ79tXaeSqCqMBXBU/ySX88W85+EUg==