fixed resolveRoute.ts

src/modules/content/resolveRoute.ts

@@ -82,14 +82,28 @@ export async function resolveRoute({
   })) as Record<string, unknown>
 
   // Locale root → Homepage from System Pages.
+  // settings.homepage is a shallow relation (depth: 1 above) — it identifies
+  // WHICH page is the homepage, but its nested block relations (e.g. Hero
+  // images) aren't populated. Re-fetch that page from the pages collection at
+  // the same depth as every other page, so the frontend gets one consistent
+  // shape. Uses pagesSlug/locale from args — no hard-coded collection or locale.
   if (!segments?.length) {
     const homepage = settings.homepage
-    if (homepage && typeof homepage === 'object') {
+    if (!homepage || typeof homepage !== 'object') {
-      return { type: 'home', doc: homepage as Record<string, unknown> }
-    }
       return null
     }
 
+    const homepageId = (homepage as { id: number | string }).id
+    const doc = await payload.findByID({
+      id: homepageId,
+      collection: pagesSlug,
+      depth: 2,
+      locale: locale as never,
+    })
+
+    return doc ? { type: 'home', doc: doc as Record<string, unknown> } : null
+  }
+
   const [first, ...rest] = segments
 
   // Does the first segment name an archive page?