Merge 4425860418f66a5aefabb4d9f46cba3e1589de4c into d5c291c8fee66280e901f258cd308c2a151b3baa

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.0 to 3.0.2.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.2)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

apps/stage1-clk-transfer/package.json

@@ -52,7 +52,7 @@
     "react-resizable-panels": "^2.1.7",
     "recharts": "^2.15.1",
     "sonner": "^1.7.2",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.0.2",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^1.1.2",
     "zod": "^3.24.1"

apps/stage2-clk-transfer/package.json

@@ -52,7 +52,7 @@
     "react-resizable-panels": "^2.1.7",
     "recharts": "^2.15.1",
     "sonner": "^1.7.3",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.0.2",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^1.1.2",
     "zod": "^3.24.1"

apps/www/next-sitemap.config.js

@@ -29,7 +29,7 @@
  */
 
 /** @type {import('next-sitemap').IConfig} */
-module.exports = {
+export default {
 	siteUrl: "https://mhsf.app",
-    generateRobotsTxt: true
+	generateRobotsTxt: true,
-}
+};

apps/www/next.config.js

@@ -0,0 +1,29 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+	images: {
+		remotePatterns: [
+			{
+				protocol: "https",
+				hostname: "img.clerk.com",
+			},
+		],
+	},
+	async redirects() {
+		return [
+			{
+				source: "/docs",
+				destination: "/docs/getting-started",
+				permanent: true,
+			},
+		];
+	},
+	eslint: {
+		ignoreDuringBuilds: true,
+	},
+	typescript: {
+		ignoreBuildErrors: true,
+	},
+	output: "standalone",
+}; //
+
+export default nextConfig;

apps/www/next.config.mjs

@@ -53,6 +53,12 @@ const nextConfig = {
 	typescript: {
 		ignoreBuildErrors: true,
 	},
+	output: "standalone",
+	experimental: {
+		serverActions: {
+			allowedOrigins: ["localhost:3000", "mhsf.app"],
+		},
+	},
 };
 
 export default nextConfig;

apps/www/package.json

@@ -13,6 +13,7 @@
 		"inngest": "npx inngest-cli@latest dev",
 		"postbuild": "next-sitemap"
 	},
+	"type": "module",
 	"dependencies": {
 		"@babel/parser": "^7.24.7",
 		"@biomejs/biome": "^1.8.3",
@@ -31,6 +32,8 @@
 		"@radix-ui/react-primitive": "^2.0.0",
 		"@radix-ui/react-select": "^2.1.2",
 		"@radix-ui/react-switch": "^1.1.0",
+		"@types/react": "^19.0.10",
+		"@types/react-dom": "^19.0.4",
 		"@unocss/eslint-plugin": "^0.61.5",
 		"@unocss/postcss": "^0.61.5",
 		"@unocss/transformer-directives": "^0.61.5",
@@ -54,8 +57,8 @@
 		"nprogress": "^0.2.0",
 		"postcss-obfuscator": "^1.6.1",
 		"prettier": "^3.3.1",
-		"react": "^18.2.0",
+		"react": "^19.0.0",
-		"react-dom": "^18.2.0",
+		"react-dom": "^19.0.0",
 		"react-fade-in": "^2.0.1",
 		"react-fast-marquee": "^1.6.5",
 		"react-hot-toast": "^2.4.1",
@@ -66,7 +69,7 @@
 		"remark-gfm": "^4.0.0",
 		"sonner": "^1.7.0",
 		"stripe-gradient": "^1.0.1",
-		"tailwind-merge": "^2.3.0",
+		"tailwind-merge": "^3.0.2",
 		"tailwindcss-animate": "^1.0.7",
 		"tailwindcss-patch": "^4.0.0",
 		"turbo": "^2.4.0",

apps/www/public/sitemap-0.xml

@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
-<url><loc>https://mhsf.app/dashboard</loc><lastmod>2025-02-14T18:54:35.340Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://mhsf.app/account/favorites</loc><lastmod>2025-03-02T02:38:03.246Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/account/settings</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://mhsf.app/account/settings/options</loc><lastmod>2025-03-02T02:38:03.250Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/account/settings/options</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://mhsf.app/account/settings</loc><lastmod>2025-03-02T02:38:03.250Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://mhsf.app</loc><lastmod>2025-03-02T02:38:03.250Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/account/favorites</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/advanced%2Fachievements</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/advanced%2Fcommand-bar</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/advanced%2Fexternal</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/advanced%2Ftech-stack</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/getting-started</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/guides%2Fcustomization</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/guides%2Flinking</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/guides%2Fowning-a-server</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/guides%2Freporting-server</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/legal%2Fexternal-content-agreement</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
-<url><loc>https://mhsf.app/docs/reading</loc><lastmod>2025-02-14T18:54:35.389Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
 </urlset>

apps/www/src/app/(main)/layout.tsx

@@ -38,12 +38,11 @@ import { ClerkThemeProvider } from "@/components/clerk/ClerkThemeProvider";
 import NewDomainDialog from "@/components/misc/NewDomainDialog";
 import ThemedToaster from "@/components/misc/ThemedToaster";
 import { TooltipProvider } from "@/components/ui/tooltip";
-import type { Metadata, Viewport } from "next";
+import type { Viewport } from "next";
 import { Inter as interFont } from "next/font/google";
 import LayoutPart from "@/components/feat/LayoutPart";
 import AllBanners from "@/components/feat/AllBanners";
 import Footer from "@/components/misc/Footer";
-import { SwitchEnvPopup } from "@/components/misc/SwitchEnvPopup";
 
 export const viewport: Viewport = {
   themeColor: "black",
@@ -67,7 +66,6 @@ export default async function RootLayout({
           <SpeedInsights />
           <Analytics />
           <NewDomainDialog />
-          <SwitchEnvPopup />
           <Footer />
         </TooltipProvider>
       </ThemeProvider>

apps/www/src/app/(main)/not-found.tsx

@@ -1,46 +0,0 @@
-/*
- * MHSF, Minehut Server List
- * All external content is rather licensed under the ECA Agreement
- * located here: https://mhsf.app/docs/legal/external-content-agreement
- *
- * All code under MHSF is licensed under the MIT License
- * by open source contributors
- *
- * Copyright (c) 2025 dvelo
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-import Link from "next/link";
-
-export default function NotFound() {
-	return (
-		<main>
-			<div className="pt-[60px] p-4">
-				<strong>404 - Page not found</strong>
-				<br />
-				<p>
-					We couldn't find the page you were looking for.{" "}
-					<Link href="/public">Go home</Link>
-				</p>
-			</div>
-		</main>
-	);
-}

apps/www/src/app/global-error.tsx

@@ -0,0 +1,20 @@
+'use client';
+
+export default function GlobalError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  return (
+    <html>
+      <body>
+        <div>
+          <h1>Something went wrong!</h1>
+          <button onClick={() => reset()}>Try again</button>
+        </div>
+      </body>
+    </html>
+  );
+}

apps/www/src/app/not-found.tsx

@@ -1,16 +1,49 @@
-import Footer from "@/components/misc/Footer";
+/*
-import Link from "next/link";
+ * MHSF, Minehut Server List
+ * All external content is rather licensed under the ECA Agreement
+ * located here: https://mhsf.app/docs/legal/external-content-agreement
+ *
+ * All code under MHSF is licensed under the MIT License
+ * by open source contributors
+ *
+ * Copyright (c) 2025 dvelo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
 
-export default function NotFound() {
+export default async function NotFound() {
   return (
-    <>
+    <html>
-      <span className="flex justify-center items-center text-center min-h-screen h-max">
+      <body>
-        <div className="block">
+        <div className="min-h-screen flex items-center justify-center flex-col">
-          That page couldn't be found <br />
+          <div className="text-center">
-          <Link href="/">Go home</Link>
+            <h1 className="text-4xl font-bold mb-4">404 - Page Not Found</h1>
+            <p className="mb-4">
+              The page you are looking for could not be found.
+            </p>
+            <a href="/" className="text-blue-500 hover:underline">
+              Return to Home
+            </a>
           </div>
-      </span>
+        </div>
-      <Footer />
+      </body>
-    </>
+    </html>
   );
 }

package.json

@@ -16,8 +16,5 @@
 		"node": ">=18"
 	},
 	"packageManager": "yarn@1.22.22",
-	"workspaces": [
+	"workspaces": ["apps/*", "packages/*"]
-		"apps/*",
-		"packages/*"
-	]
 }