Merge pull request #12332 from ethereum/staging

Staging -> dev
ethereum · Mar 1, 2024 · 914244e · 914244e
2 parents 1a5985a + 3c29e40
commit 914244e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/public/_redirects b/public/_redirects
@@ -72,9 +72,9 @@
 
 /en/dart/ /en/developers/docs/programming-languages/dart/ 301!
 
-/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
+/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
 
-/en/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
+/en/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
 
 /*/beginners /:splat/what-is-ethereum/ 301!
 

diff --git a/src/components/PageMetadata.tsx b/src/components/PageMetadata.tsx
@@ -6,7 +6,7 @@ import { getOgImage } from "@/lib/utils/metadata"
 import { filterRealLocales } from "@/lib/utils/translations"
 import { getFullUrl } from "@/lib/utils/url"
 
-import { SITE_URL } from "@/lib/constants"
+import { DEFAULT_LOCALE, SITE_URL } from "@/lib/constants"
 
 type NameMeta = {
   name: string
@@ -52,6 +52,9 @@ const PageMetadata = ({
   const url = getFullUrl(locale, path)
   const canonical = canonicalUrl || url
 
+  // Set x-default URL for hreflang
+  const xDefault = getFullUrl(DEFAULT_LOCALE, path)
+
   /* Set fallback ogImage based on path */
   const ogImage = image || getOgImage(slug)
 
@@ -85,6 +88,7 @@ const PageMetadata = ({
         />
       ))}
       <link rel="canonical" key={canonical} href={canonical} />
+      <link rel="alternate" hrefLang="x-default" href={xDefault} />
       {locales.map((loc) => (
         <link
           key={loc}

diff --git a/src/data/developer-docs-links.yaml b/src/data/developer-docs-links.yaml
@@ -70,12 +70,12 @@
               to: /developers/docs/consensus-mechanisms/pow/mining/
               items:
                 - id: docs-nav-mining-algorithms
-                  to: /developers/docs/consensus-mechanisms/pow/mining-algorithms/
+                  to: /developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/
                   items:
                     - id: docs-nav-dagger-hashimoto
-                      to: /developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/
+                      to: /developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/
                     - id: docs-nav-ethash
-                      to: /developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/
+                      to: /developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/
         - id: docs-nav-proof-of-stake
           to: /developers/docs/consensus-mechanisms/pos/
           items:

diff --git a/src/lib/utils/md.ts b/src/lib/utils/md.ts
@@ -68,9 +68,9 @@ const getPostSlugs = (dir: string, files: string[] = []) => {
     "/developers/docs/consensus-mechanisms/pos/weak-subjectivity",
     "/developers/docs/consensus-mechanisms/pow/",
     "/developers/docs/consensus-mechanisms/pow/mining",
-    "/developers/docs/consensus-mechanisms/pow/mining-algorithms",
-    "/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto",
-    "/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash",
+    "/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms",
+    "/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto",
+    "/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash",
     "/developers/docs/dapps",
     "/developers/docs/data-and-analytics",
     "/developers/docs/data-and-analytics/block-explorers",

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -33,14 +33,18 @@ export async function middleware(req: NextRequest) {
   }
 
   if (req.nextUrl.locale === FAKE_LOCALE) {
-    // Apparently `localeDetection` does not work when using the faked locale
-    // hack. So, detect the locale manually
+    // Apparently, the built-in `localeDetection`from Next does not work when
+    // using the faked locale hack. So, we need to detect the locale manually
     const localeDetected = detectLocale(req.headers.get("accept-language"))
     const locale = localeDetected || DEFAULT_LOCALE
 
-    return NextResponse.redirect(
-      new URL(`/${locale}${req.nextUrl.pathname}`, req.url),
-      { status: 301 }
-    )
+    const redirectUrl = new URL(`/${locale}${req.nextUrl.pathname}`, req.url)
+
+    // Add trailing slash if it's not present
+    if (!redirectUrl.pathname.endsWith("/")) {
+      redirectUrl.pathname = redirectUrl.pathname + "/"
+    }
+
+    return NextResponse.redirect(redirectUrl, { status: 301 })
   }
 }