Merge branch 'main' into cloudflare

update sync.arxml for cloudflare

.github/workflows/Deploy.yml

@@ -31,13 +31,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to AliYun Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: registry.cn-guangzhou.aliyuncs.com
-          username: ${{ secrets.ALI_USERNAME }}
-          password: ${{ secrets.ALI_TOKEN }}
-
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5

.github/workflows/sync.yml

@@ -25,8 +25,8 @@ jobs:
         uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
         with:
           upstream_sync_repo: hamster1963/nezha-dash
-          upstream_sync_branch: main
-          target_sync_branch: main
+          upstream_sync_branch: cloudflare
+          target_sync_branch: cloudflare
           target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
 
           # Set test_mode true to run tests instead of the true action!!

app/(main)/ClientComponents/ServerListClient.tsx

@@ -17,6 +17,7 @@ import useSWR from "swr";
 import GlobalLoading from "./GlobalLoading";
 
 const ServerGlobal = dynamic(() => import("./Global"), {
+  ssr: false,
   loading: () => <GlobalLoading />,
 });
 

app/(main)/ClientComponents/ServerOverviewClient.tsx

@@ -48,7 +48,9 @@ export default function ServerOverviewClient() {
             setFilter(false);
             setStatus("all");
           }}
-          className={cn("cursor-pointer hover:border-blue-500 transition-all")}
+          className={cn(
+            "cursor-pointer hover:border-blue-500 transition-all group",
+          )}
         >
           <CardContent className="flex h-full items-center px-6 py-3">
             <section className="flex flex-col gap-1">
@@ -148,7 +150,7 @@ export default function ServerOverviewClient() {
             setFilter(true);
           }}
           className={cn(
-            "cursor-pointer hover:ring-purple-500 ring-1 ring-transparent transition-all",
+            "cursor-pointer hover:ring-purple-500 ring-1 ring-transparent transition-all group",
             {
               "ring-purple-500 ring-2 border-transparent": filter === true,
             },
@@ -190,7 +192,7 @@ export default function ServerOverviewClient() {
             </section>
             {!disableCartoon && (
               <Image
-                className="pointer-events-none absolute right-3 top-[-85px] z-10 w-20 scale-90 md:scale-100"
+                className="absolute right-3 top-[-85px] z-10 w-20 scale-90 group-hover:opacity-50 md:scale-100 transition-all"
                 alt={"Hamster1963"}
                 src={blogMan}
                 priority

app/(main)/page.tsx

@@ -1,6 +1,8 @@
 import ServerList from "@/components/ServerList";
 import ServerOverview from "@/components/ServerOverview";
 
+export const runtime = "edge";
+
 export default async function Home() {
   return (
     <div className="mx-auto grid w-full max-w-5xl gap-4 md:gap-6">

app/(main)/server/[id]/page.tsx

@@ -7,6 +7,8 @@ import TabSwitch from "@/components/TabSwitch";
 import { Separator } from "@/components/ui/separator";
 import { use, useState } from "react";
 
+export const runtime = "edge";
+
 export default function Page(props: { params: Promise<{ id: string }> }) {
   const params = use(props.params);
   const tabs = ["Detail", "Network"];

app/api/auth/[...nextauth]/route.ts

@@ -1,3 +1,7 @@
 import { handlers } from "@/auth";
 
+// Referring to the auth.ts we just created
+
+export const runtime = "edge";
+
 export const { GET, POST } = handlers;

app/api/detail/route.ts

@@ -4,6 +4,8 @@ import { GetServerDetail } from "@/lib/serverFetch";
 import { redirect } from "next/navigation";
 import { NextRequest, NextResponse } from "next/server";
 
+export const runtime = "edge";
+
 export const dynamic = "force-dynamic";
 
 interface ResError extends Error {

app/api/monitor/route.ts

@@ -4,6 +4,8 @@ import { GetServerMonitor } from "@/lib/serverFetch";
 import { redirect } from "next/navigation";
 import { NextRequest, NextResponse } from "next/server";
 
+export const runtime = "edge";
+
 export const dynamic = "force-dynamic";
 
 interface ResError extends Error {

app/api/server/route.ts

@@ -6,6 +6,8 @@ import { NextResponse } from "next/server";
 
 export const dynamic = "force-dynamic";
 
+export const runtime = "edge";
+
 interface ResError extends Error {
   statusCode: number;
   message: string;

app/not-found.tsx

@@ -4,6 +4,8 @@ import Link from "next/link";
 import Footer from "./(main)/footer";
 import Header from "./(main)/header";
 
+export const runtime = "edge";
+
 export default function NotFoundPage() {
   const t = useTranslations("NotFoundPage");
   return (

docker/docker-compose.yml.cn

@@ -1,10 +0,0 @@
-version: "3"
-services:
-  nezha-dash:
-    container_name: nezha-dash
-    image: registry.cn-guangzhou.aliyuncs.com/hamster-home/nezha-dash:latest
-    volumes:
-      - ./.env:/app/.env
-    restart: always
-    ports:
-      - "4123:3000"

package.json

@@ -1,9 +1,9 @@
 {
   "name": "nezha-dash",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "private": true,
   "scripts": {
-    "dev": "next dev --turbopack -p 3040",
+    "dev": "next dev -p 3040",
     "start": "node .next/standalone/server.js",
     "lint": "next lint",
     "build": "next build && cp -r .next/static .next/standalone/.next/ && cp -r public .next/standalone/",
@@ -27,7 +27,7 @@
     "@turf/turf": "^7.1.0",
     "@types/d3-geo": "^3.1.0",
     "@types/luxon": "^3.4.2",
-    "@typescript-eslint/eslint-plugin": "^8.17.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.0",
     "caniuse-lite": "^1.0.30001687",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -39,31 +39,31 @@
     "framer-motion": "^12.0.0-alpha.2",
     "lucide-react": "^0.454.0",
     "luxon": "^3.5.0",
-    "next": "15.0.4-canary.48",
+    "next": "^15.1.0",
     "next-auth": "^5.0.0-beta.25",
     "next-intl": "^3.26.0",
     "next-runtime-env": "^3.2.2",
     "next-themes": "^0.4.4",
-    "react": "19.0.0-rc-02c0e824-20241028",
+    "react": "^19.0.0",
     "react-device-detect": "^2.2.3",
-    "react-dom": "19.0.0-rc-02c0e824-20241028",
+    "react-dom": "^19.0.0",
     "react-intersection-observer": "^9.13.1",
     "react-wrap-balancer": "^1.1.1",
     "recharts": "^2.14.1",
     "sharp": "^0.33.5",
-    "swr": "^2.2.6-beta.4",
+    "swr": "^2.2.6-beta.5",
     "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
-    "typescript-eslint": "^8.17.0"
+    "typescript-eslint": "^8.18.0"
   },
   "devDependencies": {
-    "@next/bundle-analyzer": "^15.0.4",
+    "@next/bundle-analyzer": "^15.1.0",
     "@tailwindcss/postcss": "^4.0.0-beta.6",
     "@types/node": "^22.10.1",
-    "@types/react": "npm:types-react@19.0.0-rc.1",
-    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.2",
     "eslint": "^9.16.0",
-    "eslint-config-next": "^15.0.4",
+    "eslint-config-next": "^15.1.0",
     "eslint-plugin-turbo": "^2.3.3",
     "eslint-plugin-unused-imports": "^4.1.4",
     "postcss": "^8.4.49",
@@ -74,8 +74,8 @@
     "vercel": "39.1.1"
   },
   "overrides": {
-    "@types/react": "npm:types-react@19.0.0-rc.1",
-    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
+    "@types/react": "^npm:types-react@19.0.0-rc.1",
+    "@types/react-dom": "^npm:types-react-dom@19.0.0-rc.1",
     "react-is": "^19.0.0-rc-69d4b800-20241021",
     "vercel": "$vercel"
   },