Merge pull request #15183 from ethereum/patch-intl-md

Patch - remove cache function

Author: wackerow

app/[locale]/[...slug]/page.tsx

@@ -6,6 +6,7 @@ import I18nProvider from "@/components/I18nProvider"
 import mdComponents from "@/components/MdComponents"
 
 import { dataLoader } from "@/lib/utils/data/dataLoader"
+import { dateToString } from "@/lib/utils/date"
 import { getPostSlugs } from "@/lib/utils/md"
 import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
@@ -18,6 +19,18 @@ import { getMdMetadata } from "@/lib/md/metadata"
 
 const loadData = dataLoader([["gfissues", fetchGFIs]])
 
+function getLayoutFromSlug(slug: string) {
+  if (slug.includes("developers/docs")) {
+    return "docs"
+  }
+
+  if (slug.includes("developers/tutorials")) {
+    return "tutorial"
+  }
+
+  return "static"
+}
+
 export default async function Page({
   params,
 }: {
@@ -49,6 +62,7 @@ export default async function Page({
     tocItems,
     lastEditLocaleTimestamp,
     isTranslated,
+    contributors,
   } = await getPageData({
     locale,
     slug,
@@ -61,9 +75,14 @@ export default async function Page({
   })
 
   // Determine the actual layout after we have the frontmatter
-  const layout = frontmatter.template || "static"
+  const layout = frontmatter.template || getLayoutFromSlug(slug)
   const Layout = layoutMapping[layout]
 
+  // If the page has a published date, format it
+  if ("published" in frontmatter) {
+    frontmatter.published = dateToString(frontmatter.published)
+  }
+
   // Get i18n messages
   const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(slug, layout)
@@ -77,6 +96,9 @@ export default async function Page({
         tocItems={tocItems}
         lastEditLocaleTimestamp={lastEditLocaleTimestamp}
         contentNotTranslated={!isTranslated}
+        contributors={contributors}
+        // TODO: Remove this once we have a real timeToRead value
+        timeToRead={2}
       >
         {content}
       </Layout>
@@ -85,7 +107,7 @@ export default async function Page({
 }
 
 export async function generateStaticParams() {
-  const slugs = await getPostSlugs("/", /\/developers/)
+  const slugs = await getPostSlugs("/")
 
   return LOCALES_CODES.flatMap((locale) =>
     slugs.map((slug) => ({
@@ -95,6 +117,8 @@ export async function generateStaticParams() {
   )
 }
 
+export const dynamicParams = false
+
 export async function generateMetadata({
   params,
 }: {

app/[locale]/developers/docs/[[...doc]]/page.tsx

@@ -124,7 +124,6 @@ module.exports = (phase, { defaultConfig }) => {
             "node_modules/@swc/core-linux-x64-musl",
             "node_modules/@esbuild/linux-x64",
             "src/data",
-            "src/intl",
             "public/**/*.jpg",
             "public/**/*.png",
             "public/**/*.webp",

app/[locale]/developers/tutorials/[...tutorial]/page.tsx

@@ -1,8 +1,6 @@
 import fs from "fs"
 import path from "path"
 
-import { cache } from "react"
-
 function getNamespaces(localePath: string): string[] {
   return fs
     .readdirSync(localePath)
@@ -12,7 +10,7 @@ function getNamespaces(localePath: string): string[] {
 
 const messagesCache: Record<string, Record<string, string>> = {}
 
-async function loadMessages(locale: string) {
+export async function loadMessages(locale: string) {
   if (messagesCache[locale]) {
     return messagesCache[locale]
   }
@@ -32,6 +30,3 @@ async function loadMessages(locale: string) {
   messagesCache[locale] = messages
   return messages
 }
-
-// Keep the React cache wrapper as well for RSC optimization
-export const getMessages = cache(loadMessages)

next.config.js

@@ -3,7 +3,7 @@ import { getRequestConfig } from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
-import { getMessages } from "./loadMessages"
+import { loadMessages } from "./loadMessages"
 import { routing } from "./routing"
 
 export default getRequestConfig(async ({ requestLocale }) => {
@@ -15,8 +15,8 @@ export default getRequestConfig(async ({ requestLocale }) => {
     locale = routing.defaultLocale
   }
 
-  const allLocaleMessages = await getMessages(locale)
-  const allDefaultMessages = await getMessages(routing.defaultLocale)
+  const allLocaleMessages = await loadMessages(locale)
+  const allDefaultMessages = await loadMessages(routing.defaultLocale)
   const messages = merge(allDefaultMessages, allLocaleMessages)
 
   return {

src/i18n/loadMessages.ts

@@ -1,5 +1,7 @@
+import { docsComponents, DocsLayout } from "./Docs"
 import * as mdLayouts from "./md"
 import { staticComponents, StaticLayout } from "./Static"
+import { TutorialLayout, tutorialsComponents } from "./Tutorial"
 
 export * from "./BaseLayout"
 export * from "./Docs"
@@ -14,6 +16,8 @@ export const layoutMapping = {
   roadmap: mdLayouts.RoadmapLayout,
   upgrade: mdLayouts.UpgradeLayout,
   translatathon: mdLayouts.TranslatathonLayout,
+  docs: DocsLayout,
+  tutorial: TutorialLayout,
 }
 
 export const componentsMapping = {
@@ -23,4 +27,6 @@ export const componentsMapping = {
   ...mdLayouts.roadmapComponents,
   ...mdLayouts.upgradeComponents,
   ...mdLayouts.translatathonComponents,
+  ...docsComponents,
+  ...tutorialsComponents,
 } as const