Master -> staging

app/[locale]/layer-2/networks/page.tsx

@@ -90,8 +90,13 @@ const Page = async ({ params }: { params: PageParams }) => {
         emerging: 1,
       }
 
-      const maturityDiff =
-        maturityOrder[b.networkMaturity] - maturityOrder[a.networkMaturity]
+      const aMaturityValue = a.networkMaturity
+        ? maturityOrder[a.networkMaturity]
+        : 0
+      const bMaturityValue = b.networkMaturity
+        ? maturityOrder[b.networkMaturity]
+        : 0
+      const maturityDiff = bMaturityValue - aMaturityValue
 
       if (maturityDiff === 0) {
         return (b.tvl || 0) - (a.tvl || 0)

i18n.config.json

@@ -377,24 +377,6 @@
     "dateFormat": "MM/DD/YYYY",
     "validISO639_1": true
   },
-  {
-    "code": "pcm",
-    "crowdinCode": "pcm",
-    "name": "Nigerian Pidgin",
-    "localName": "Nigerian Pidgin",
-    "langDir": "ltr",
-    "dateFormat": "DD/MM/YYYY",
-    "validISO639_1": false
-  },
-  {
-    "code": "fil",
-    "crowdinCode": "fil",
-    "name": "Filipino",
-    "localName": "Filipino",
-    "langDir": "ltr",
-    "dateFormat": "MM/DD/YYYY",
-    "validISO639_1": false
-  },
   {
     "code": "pl",
     "crowdinCode": "pl",

middleware.ts

@@ -3,18 +3,44 @@ import createMiddleware from "next-intl/middleware"
 
 import { routing } from "./src/i18n/routing"
 import { DEFAULT_LOCALE } from "./src/lib/constants"
+import { getFirstSegment } from "./src/lib/utils/url"
 
 const handleI18nRouting = createMiddleware(routing)
 
+// Locales that have been removed but may have external links pointing to them
+const DEPRECATED_LOCALES = new Set(["pcm", "fil", "ph"])
+
+// Legacy locale codes that should redirect to their current equivalents
+const LOCALE_ALIASES: Record<string, string> = { no: "nb" }
+
+function redirectTo(request: NextRequest, pathname: string, status: number) {
+  const url = request.nextUrl.clone()
+  url.pathname = pathname
+  return NextResponse.redirect(url, status)
+}
+
 export default function middleware(request: NextRequest) {
-  // Normalize to lowercase paths site-wide (URLs are case-insensitive by spec,
-  // but our routes are defined in lowercase). Do this BEFORE i18n routing.
-  const originalPath = request.nextUrl.pathname
-  const lowerPath = originalPath.toLowerCase()
-  if (originalPath !== lowerPath) {
-    const url = request.nextUrl.clone()
-    url.pathname = lowerPath
-    return NextResponse.redirect(url, 301)
+  const { pathname } = request.nextUrl
+
+  const lowerPath = pathname.toLowerCase()
+  if (pathname !== lowerPath) {
+    return redirectTo(request, lowerPath, 301)
+  }
+
+  const firstSegment = getFirstSegment(lowerPath)
+
+  if (firstSegment && DEPRECATED_LOCALES.has(firstSegment)) {
+    // Strip deprecated locale and redirect to default locale version
+    const rest = lowerPath.slice(firstSegment.length + 1)
+    const newPath = !rest ? "/" : rest
+    return redirectTo(request, newPath, 302)
+  }
+
+  if (firstSegment && firstSegment in LOCALE_ALIASES) {
+    // Replace legacy locale code with current one
+    const newLocale = LOCALE_ALIASES[firstSegment]
+    const newPath = `/${newLocale}${lowerPath.slice(firstSegment.length + 1)}`
+    return redirectTo(request, newPath, 301)
   }
 
   // Handle i18n routing

next.config.js

@@ -162,10 +162,6 @@ module.exports = (phase, { defaultConfig }) => {
       }
 
       return [
-        // Custom locale aliases redirects
-        { source: "/no/:path*", destination: "/nb/:path*", permanent: true },
-        { source: "/ph/:path*", destination: "/fil/:path*", permanent: true },
-
         // All primary redirects
         ...redirects.flatMap(([source, destination, permanent]) =>
           createRedirect(source, destination, permanent)