fix: deploy

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

@@ -1,7 +1,7 @@
 import { notFound } from 'next/navigation';
 import { MDXRemote } from 'next-mdx-remote/rsc';
 import { Container, Badge, Heading } from '@/components/ui';
-import { getTranslations } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
 import { getPageBySlug, getAllPages } from '@/lib/pages';
 import { mdxComponents } from '@/components/blog/MDXComponents';
@@ -62,6 +62,7 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
 
 export default async function StandardPage({ params }: PageProps) {
   const { locale, slug } = await params;
+  setRequestLocale(locale);
   const pageData = await getPageBySlug(slug, locale);
   const t = await getTranslations('StandardPage');
 

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

@@ -12,6 +12,7 @@ import TableOfContents from '@/components/blog/TableOfContents';
 import { mdxComponents } from '@/components/blog/MDXComponents';
 import { Heading } from '@/components/ui';
 import { getOGImageMetadata } from '@/lib/metadata';
+import { setRequestLocale } from 'next-intl/server';
 
 interface BlogPostProps {
   params: Promise<{
@@ -57,6 +58,7 @@ export async function generateMetadata({ params }: BlogPostProps): Promise<Metad
 
 export default async function BlogPost({ params }: BlogPostProps) {
   const { locale, slug } = await params;
+  setRequestLocale(locale);
   const post = await getPostBySlug(slug, locale);
   const { prev, next } = await getAdjacentPosts(slug, locale);
 

app/[locale]/contact/page.tsx

@@ -3,7 +3,7 @@ import JsonLd from '@/components/JsonLd';
 import Reveal from '@/components/Reveal';
 import { Container, Heading, Section } from '@/components/ui';
 import { Metadata } from 'next';
-import { getTranslations } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { SITE_URL } from '@/lib/schema';
 import { getOGImageMetadata } from '@/lib/metadata';
 import { Suspense } from 'react';
@@ -58,6 +58,7 @@ export async function generateStaticParams() {
 
 export default async function ContactPage({ params }: ContactPageProps) {
   const { locale } = await params;
+  setRequestLocale(locale);
   const t = await getTranslations({ locale, namespace: 'Contact' });
   return (
     <div className="flex flex-col min-h-screen bg-neutral-light">

app/[locale]/layout.tsx

@@ -7,9 +7,11 @@ import { FeedbackOverlay } from '@mintel/next-feedback';
 import { Metadata, Viewport } from 'next';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages } from 'next-intl/server';
+import { Suspense } from 'react';
 import '../../styles/globals.css';
 import { SITE_URL } from '@/lib/schema';
 import { config } from '@/lib/config';
+import { setRequestLocale } from 'next-intl/server';
 
 export const metadata: Metadata = {
   metadataBase: new URL(SITE_URL),
@@ -45,6 +47,8 @@ export default async function LocaleLayout({
   const localeStr = (typeof locale === 'string' ? locale : '').trim();
   const safeLocale = supportedLocales.includes(localeStr) ? localeStr : 'en';
 
+  setRequestLocale(safeLocale);
+
   let messages = {};
   try {
     messages = await getMessages();
@@ -57,21 +61,32 @@ export default async function LocaleLayout({
   const { getServerAppServices } = await import('@/lib/services/create-services.server');
   const serverServices = getServerAppServices();
 
-  const { headers } = await import('next/headers');
-  const requestHeaders = await headers();
+  // We wrap this in a try-catch to allow static rendering during build
+  // headers() and cookies() force dynamic rendering in Next.js
+  try {
+    const { headers } = await import('next/headers');
+    const requestHeaders = await headers();
 
-  if ('setServerContext' in serverServices.analytics) {
-    (serverServices.analytics as any).setServerContext({
-      userAgent: requestHeaders.get('user-agent') || undefined,
-      language: requestHeaders.get('accept-language')?.split(',')[0] || undefined,
-      referrer: requestHeaders.get('referer') || undefined,
-      ip: requestHeaders.get('x-forwarded-for')?.split(',')[0] || undefined,
-    });
+    if ('setServerContext' in serverServices.analytics) {
+      (serverServices.analytics as any).setServerContext({
+        userAgent: requestHeaders.get('user-agent') || undefined,
+        language: requestHeaders.get('accept-language')?.split(',')[0] || undefined,
+        referrer: requestHeaders.get('referer') || undefined,
+        ip: requestHeaders.get('x-forwarded-for')?.split(',')[0] || undefined,
+      });
+    }
+
+    // Track initial server-side pageview
+    serverServices.analytics.trackPageview();
+  } catch (e) {
+    // Falls back to noop or client-side only during static generation
+    if (process.env.NODE_ENV !== 'production' || !process.env.CI) {
+      console.warn(
+        '[Layout] Static generation detected or headers unavailable, skipping server-side analytics context',
+      );
+    }
   }
 
-  // Track initial server-side pageview
-  serverServices.analytics.trackPageview();
-
   return (
     <html lang={safeLocale} className="scroll-smooth overflow-x-hidden">
       <body className="flex flex-col min-h-screen font-sans selection:bg-accent selection:text-primary-dark antialiased overflow-x-hidden">
@@ -82,7 +97,9 @@ export default async function LocaleLayout({
           <Footer />
           <CMSConnectivityNotice />
 
-          <AnalyticsProvider />
+          <Suspense fallback={null}>
+            <AnalyticsProvider />
+          </Suspense>
           {config.feedbackEnabled && <FeedbackOverlay />}
         </NextIntlClientProvider>
       </body>

app/[locale]/page.tsx

@@ -11,16 +11,13 @@ import GallerySection from '@/components/home/GallerySection';
 import VideoSection from '@/components/home/VideoSection';
 import CTA from '@/components/home/CTA';
 import Reveal from '@/components/Reveal';
-import { getTranslations } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
 import { getOGImageMetadata } from '@/lib/metadata';
 
-export default async function HomePage({
-  params,
-}: {
-  params: Promise<{ locale: string }>;
-}) {
+export default async function HomePage({ params }: { params: Promise<{ locale: string }> }) {
   const { locale } = await params;
+  setRequestLocale(locale);
   return (
     <div className="flex flex-col min-h-screen">
       <JsonLd

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

@@ -11,7 +11,7 @@ import { getDatasheetPath } from '@/lib/datasheets';
 import { getAllProducts, getProductBySlug } from '@/lib/mdx';
 import { mapFileSlugToTranslated, mapSlugToFileSlug } from '@/lib/slugs';
 import { Metadata } from 'next';
-import { getTranslations } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { getProductOGImageMetadata } from '@/lib/metadata';
 import { MDXRemote } from 'next-mdx-remote/rsc';
 import Image from 'next/image';
@@ -170,6 +170,7 @@ const components = {
 
 export default async function ProductPage({ params }: ProductPageProps) {
   const { locale, slug } = await params;
+  setRequestLocale(locale);
   const productSlug = slug[slug.length - 1];
   const t = await getTranslations('Products');
 

app/[locale]/products/page.tsx

@@ -1,7 +1,7 @@
 import Reveal from '@/components/Reveal';
 import Scribble from '@/components/Scribble';
 import { Badge, Button, Card, Container, Heading, Section } from '@/components/ui';
-import { getTranslations } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -47,6 +47,7 @@ export async function generateMetadata({ params }: ProductsPageProps): Promise<M
 
 export default async function ProductsPage({ params }: ProductsPageProps) {
   const { locale } = await params;
+  setRequestLocale(locale);
   const t = await getTranslations('Products');
 
   // Get translated category slugs

app/[locale]/team/page.tsx

@@ -1,4 +1,4 @@
-import { getTranslations } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
 import JsonLd from '@/components/JsonLd';
 import { getBreadcrumbSchema, SITE_URL } from '@/lib/schema';
@@ -46,6 +46,7 @@ export async function generateMetadata({ params }: TeamPageProps): Promise<Metad
 
 export default async function TeamPage({ params }: TeamPageProps) {
   const { locale } = await params;
+  setRequestLocale(locale);
   const t = await getTranslations({ locale, namespace: 'Team' });
 
   return (