Merge branch 'main' into cloudflare

app/(main)/ClientComponents/InteractiveMap.tsx

@@ -64,10 +64,6 @@ export function InteractiveMap({
               feature.properties.iso_a2_eh,
             );
 
-            if (isHighlighted) {
-              console.log(feature.properties.iso_a2_eh);
-            }
-
             const serverCount = serverCounts[feature.properties.iso_a2_eh] || 0;
 
             return (

app/(main)/ClientComponents/MapTooltip.tsx

@@ -12,6 +12,10 @@ const MapTooltip = memo(function MapTooltip() {
 
   if (!tooltipData) return null;
 
+  const sortedServers = tooltipData.servers.sort((a, b) => {
+    return a.status === b.status ? 0 : a.status ? 1 : -1;
+  });
+
   return (
     <AnimatePresence mode="wait">
       <m.div
@@ -46,7 +50,7 @@ const MapTooltip = memo(function MapTooltip() {
             overflowY: "auto",
           }}
         >
-          {tooltipData.servers.map((server, index) => (
+          {sortedServers.map((server, index) => (
             <div key={index} className="flex items-center gap-1.5 py-0.5">
               <span
                 className={`w-1.5 h-1.5 shrink-0 rounded-full ${

app/(main)/ClientComponents/ServerListClient.tsx

@@ -34,7 +34,6 @@ export default function ServerListClient() {
   useEffect(() => {
     const inlineState = localStorage.getItem("inline");
     if (inlineState !== null) {
-      console.log("inlineState", inlineState);
       setInline(inlineState);
     }
   }, []);

next.config.mjs

@@ -22,6 +22,9 @@ const withPWA = withPWAInit({
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  experimental: {
+    inlineCss: true,
+  },
   output: "standalone",
   logging: {
     fetches: {

package.json

@@ -1,9 +1,9 @@
 {
   "name": "nezha-dash",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 3040",
+    "dev": "next dev --turbopack -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/",
@@ -39,7 +39,7 @@
     "framer-motion": "^12.0.0-alpha.2",
     "lucide-react": "^0.454.0",
     "luxon": "^3.5.0",
-    "next": "^15.0.4",
+    "next": "15.0.4-canary.48",
     "next-auth": "^5.0.0-beta.25",
     "next-intl": "^3.26.0",
     "next-runtime-env": "^3.2.2",