Chore: 更新框架到 React Router 7

修复迁移到 Tailwind 4 之后的样式差异
修复 404 页面的异常并调整样式
优化分页器组件的无障碍化,Span 标签替换成 Button
This commit is contained in:
2026-05-20 16:07:04 +08:00
parent 0a9ae15732
commit 13a09d6995
34 changed files with 2076 additions and 6941 deletions
+62 -54
View File
@@ -1,82 +1,90 @@
import type { LinksFunction } from "@remix-run/node";
import {
isRouteErrorResponse,
Links,
Meta,
Outlet,
Scripts,
ScrollRestoration,
isRouteErrorResponse,
useNavigate,
useRouteError,
} from "@remix-run/react";
import Header from "./components/layout/header";
import Spinner from "./components/common/spinner";
import Footer from "./components/layout/footer";
} from "react-router";
import type { Route } from "./+types/root";
import { siteTitle } from "~/utils";
import "./index.css";
import "./app.css";
export function ErrorBoundary() {
const error = useRouteError();
const isRouteError = isRouteErrorResponse(error);
const [statusCode, message] = (() => {
if (isRouteError) {
return [error.status, error.statusText];
}
if (error instanceof Error) {
return [500, error.message];
}
return [500, "未知异常"];
})();
return (
<html lang="zh-cmn-hans">
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>{siteTitle(statusCode)}</title>
<Meta />
<Links />
</head>
<body className="font-mi pt-16 bg-orange-50 text-neutral-600">
<Header />
<main className="px-2 py-24 max-w-3xl mx-auto">
<h1 className="text-center text-5xl/tight md:text-7xl/tight mb-4">
{statusCode}
</h1>
<p className="text-center opacity-60">{message}</p>
</main>
<Footer />
<Scripts />
</body>
</html>
);
}
export const links: LinksFunction = () => [
export const links: Route.LinksFunction = () => [
{ rel: "icon", href: "/icon.png" },
{ rel: "stylesheet", href: "https://cdn-font.hyperos.mi.com/font/css?family=MiSans:100,200,300,400,450,500,600,650,700,900:Chinese_Simplify,Latin&display=swap" },
{
rel: "stylesheet",
href: "https://cdn-font.hyperos.mi.com/font/css?family=MiSans:100,200,300,400,450,500,600,650,700,900:Chinese_Simplify,Latin&display=swap",
},
];
export default function App() {
export function Layout({ children }: { children: React.ReactNode }) {
const error = useRouteError();
return (
<html lang="zh-cmn-hans">
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
{isRouteErrorResponse(error) && error.status === 404 && <title>{siteTitle(error.status)}</title>}
<Meta />
<Links />
</head>
<body className="font-mi pt-16 bg-orange-50 text-neutral-600">
<Spinner />
<Header />
<Outlet />
<Footer />
{children}
<ScrollRestoration />
<Scripts />
</body>
</html>
);
}
export default function App() {
return <Outlet />;
}
export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
const navigate = useNavigate();
let message = "啊哦";
let details = "发生了未知的异常";
let stack: string | undefined;
if (isRouteErrorResponse(error)) {
if (error.status === 404) {
message = "404";
details = "页面不存在";
} else {
details = error.statusText || details;
}
} else if (import.meta.env.DEV && error && error instanceof Error) {
details = error.message;
stack = error.stack;
}
return (
<main className="px-2 py-24 max-w-3xl mx-auto">
<h1 className="text-center text-5xl/tight md:text-7xl/tight mb-2">
{message}
</h1>
<p className="text-center opacity-60 mb-8">{details}</p>
<p className="text-center">
<button
className="inline-block py-3 px-5 bg-pink-400 text-white rounded-xl cursor-pointer"
onClick={() => navigate("/")}
>
返回首页
</button>
</p>
{stack && (
<pre className="w-full p-4 overflow-x-auto">
<code>{stack}</code>
</pre>
)}
</main>
);
}