setStaticParamsLocale build fixes

adambarath · adambarath · commit cc389c0691ae · 2024-09-19T13:37:13.000+02:00
diff --git a/src/app/[countryCode]/(checkout)/checkout/page.tsx b/src/app/[countryCode]/(checkout)/checkout/page.tsx
@@ -3,7 +3,7 @@ import { cookies } from "next/headers"
 import { notFound } from "next/navigation"
 import { Cart, LineItem } from "@medusajs/medusa"
 
-import { getI18n } from "../../../../locales/server"
+import { getI18n, setStaticParams, getCurrentLocale } from "../../../../locales/server"
 
 import { enrichLineItems } from "@modules/cart/actions"
 import Wrapper from "@modules/checkout/components/payment-wrapper"
@@ -15,6 +15,10 @@ export const metadata: Metadata = {
   title: "checkout.title",
 }
 
+type Props = {
+  params: { countryCode: string; }
+}
+
 const fetchCart = async () => {
   const cartId = cookies().get("_medusa_cart_id")?.value
 
@@ -32,7 +36,8 @@ const fetchCart = async () => {
   return cart
 }
 
-export default async function Checkout() {
+export default async function Checkout({ params }: Props) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("checkout.title")
 
diff --git a/src/app/[countryCode]/(checkout)/layout.tsx b/src/app/[countryCode]/(checkout)/layout.tsx
@@ -2,13 +2,14 @@ import LocalizedClientLink from "@modules/common/components/localized-client-lin
 import ChevronDown from "@modules/common/icons/chevron-down"
 import MedusaCTA from "@modules/layout/components/medusa-cta"
 
-import { getI18n } from "../../../locales/server"
+import { getI18n, getCurrentLocale, setStaticParams, getStaticParams } from "../../../locales/server"
 
 export default async function CheckoutLayout({
   children,
 }: {
   children: React.ReactNode
 }) {
+  setStaticParams(getCurrentLocale());
   const t = await getI18n()
 
   return (
diff --git a/src/app/[countryCode]/(checkout)/not-found.tsx b/src/app/[countryCode]/(checkout)/not-found.tsx
@@ -1,4 +1,5 @@
-import { getI18n } from "../../../locales/server"
+import { getI18n, getCurrentLocale, getStaticParams, setStaticParams } from "../../../locales/server"
+
 import InteractiveLink from "@modules/common/components/interactive-link"
 import { Metadata } from "next"
 
@@ -8,6 +9,7 @@ export const metadata: Metadata = {
 }
 
 export default async function NotFound() {
+  setStaticParams(getCurrentLocale())
   const t = await getI18n()
 
   metadata.description = t("generic.somethingwrong")
diff --git a/src/app/[countryCode]/(main)/account/@dashboard/addresses/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/addresses/page.tsx
@@ -1,7 +1,7 @@
 import { Metadata } from "next"
 import { notFound } from "next/navigation"
 
-import { getI18n } from "../../../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../../../locales/server"
 
 import AddressBook from "@modules/account/components/address-book"
 
@@ -14,7 +14,12 @@ export const metadata: Metadata = {
   description: "page.adresses.desc",
 }
 
-export default async function Addresses() {
+type Props = {
+  params: { countryCode: string; }
+}
+
+export default async function Addresses({ params }: Props) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("page.adresses.title")
   metadata.description = t("page.adresses.desc")
diff --git a/src/app/[countryCode]/(main)/account/@dashboard/orders/details/[id]/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/orders/details/[id]/page.tsx
@@ -1,16 +1,17 @@
 import { Metadata } from "next"
 import { notFound } from "next/navigation"
 
-import { getI18n } from "../../../../../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../../../../../locales/server"
 
 import { retrieveOrder } from "@lib/data"
 import OrderDetailsTemplate from "@modules/order/templates/order-details-template"
 
 type Props = {
-  params: { id: string }
+  params: { countryCode: string; id: string }
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   const order = await retrieveOrder(params.id).catch(() => null)
 
diff --git a/src/app/[countryCode]/(main)/account/@dashboard/orders/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/orders/page.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from "next"
 
-import { getI18n } from "../../../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../../../locales/server"
 
 import OrderOverview from "@modules/account/components/order-overview"
 import { listCustomerOrders } from "@lib/data"
@@ -11,7 +11,12 @@ export const metadata: Metadata = {
   description: "page.orders.desc",
 }
 
-export default async function Orders() {
+type Props = {
+  params: { countryCode: string; }
+}
+
+export default async function Orders({ params }: Props) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("page.orders.title")
   metadata.description = t("page.orders.desc")
diff --git a/src/app/[countryCode]/(main)/account/@dashboard/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/page.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from "next"
 
-import { getI18n } from "../../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../../locales/server"
 
 import { getCustomer, listCustomerOrders } from "@lib/data"
 import Overview from "@modules/account/components/overview"
@@ -11,7 +11,12 @@ export const metadata: Metadata = {
   description: "page.account.desc",
 }
 
-export default async function OverviewTemplate() {
+type Props = {
+  params: { countryCode: string; }
+}
+
+export default async function OverviewTemplate({ params }: Props) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("page.account.title")
   metadata.description = t("page.account.desc")
diff --git a/src/app/[countryCode]/(main)/account/@dashboard/profile/page.tsx b/src/app/[countryCode]/(main)/account/@dashboard/profile/page.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from "next"
 
-import { getI18n } from "../../../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../../../locales/server"
 
 import ProfilePhone from "@modules/account//components/profile-phone"
 import ProfileBillingAddress from "@modules/account/components/profile-billing-address"
@@ -16,7 +16,12 @@ export const metadata: Metadata = {
   description: "page.profile.desc",
 }
 
-export default async function Profile() {
+type Props = {
+  params: { countryCode: string; }
+}
+
+export default async function Profile({ params }: Props) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("page.profile.title")
   metadata.description = t("page.profile.desc")
diff --git a/src/app/[countryCode]/(main)/account/layout.tsx b/src/app/[countryCode]/(main)/account/layout.tsx
@@ -1,13 +1,17 @@
 import { getCustomer } from "@lib/data"
 import AccountLayout from "@modules/account/templates/account-layout"
 
+import { getCurrentLocale, getStaticParams, setStaticParams } from "../../../../locales/server"
+
 export default async function AccountPageLayout({
   dashboard,
   login,
 }: {
   dashboard?: React.ReactNode
   login?: React.ReactNode
 }) {
+  setStaticParams(getCurrentLocale())
+
   const customer = await getCustomer().catch(() => null)
 
   return (
diff --git a/src/app/[countryCode]/(main)/cart/not-found.tsx b/src/app/[countryCode]/(main)/cart/not-found.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from "next"
 
-import { getI18n } from "../../../../locales/server"
+import { getI18n, getCurrentLocale, getStaticParams, setStaticParams } from "../../../../locales/server"
 
 import InteractiveLink from "@modules/common/components/interactive-link"
 
@@ -10,6 +10,7 @@ export const metadata: Metadata = {
 }
 
 export default async function NotFound() {
+  setStaticParams(getCurrentLocale())
   const t = await getI18n()
 
   metadata.description = t("generic.somethingwrong")
diff --git a/src/app/[countryCode]/(main)/cart/page.tsx b/src/app/[countryCode]/(main)/cart/page.tsx
@@ -2,7 +2,7 @@ import { LineItem } from "@medusajs/medusa"
 import { Metadata } from "next"
 import { cookies } from "next/headers"
 
-import { getI18n } from "../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../locales/server"
 
 import CartTemplate from "@modules/cart/templates"
 
@@ -16,6 +16,10 @@ export const metadata: Metadata = {
   description: "cart.desc",
 }
 
+type Props = {
+  params: { countryCode: string; }
+}
+
 const fetchCart = async () => {
   const cartId = cookies().get("_medusa_cart_id")?.value
 
@@ -41,7 +45,8 @@ const fetchCart = async () => {
   return cart
 }
 
-export default async function Cart() {
+export default async function Cart({ params }: Props) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("cart.title")
   metadata.description = t("cart.desc")
diff --git a/src/app/[countryCode]/(main)/categories/[...category]/page.tsx b/src/app/[countryCode]/(main)/categories/[...category]/page.tsx
@@ -1,7 +1,7 @@
 import { Metadata } from "next"
 import { notFound } from "next/navigation"
 
-import { getI18n } from "../../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../../locales/server"
 
 import { getCategoryByHandle, listCategories, listRegions } from "@lib/data"
 import CategoryTemplate from "@modules/categories/templates"
@@ -70,6 +70,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 }
 
 export default async function CategoryPage({ params, searchParams }: Props) {
+  setStaticParams(params.countryCode)
   const { sortBy, page } = searchParams
 
   const { product_categories } = await getCategoryByHandle(
diff --git a/src/app/[countryCode]/(main)/layout.tsx b/src/app/[countryCode]/(main)/layout.tsx
@@ -1,5 +1,7 @@
 import { Metadata } from "next"
 
+import { getCurrentLocale, getStaticParams, setStaticParams } from "../../../locales/server"
+
 import Footer from "@modules/layout/templates/footer"
 import Nav from "@modules/layout/templates/nav"
 
@@ -10,6 +12,8 @@ export const metadata: Metadata = {
 }
 
 export default async function PageLayout(props: { children: React.ReactNode }) {
+  setStaticParams(getCurrentLocale());
+
   return (
     <>
       <Nav />
diff --git a/src/app/[countryCode]/(main)/not-found.tsx b/src/app/[countryCode]/(main)/not-found.tsx
@@ -1,4 +1,5 @@
-import { getI18n } from "../../../locales/server"
+import { getI18n, getCurrentLocale, setStaticParams } from "../../../locales/server"
+
 import { Metadata } from "next"
 
 import InteractiveLink from "@modules/common/components/interactive-link"
@@ -9,6 +10,7 @@ export const metadata: Metadata = {
 }
 
 export default async function NotFound() {
+  setStaticParams(getCurrentLocale())
   const t = await getI18n()
 
   metadata.description = t("generic.somethingwrong")
diff --git a/src/app/[countryCode]/(main)/page.tsx b/src/app/[countryCode]/(main)/page.tsx
@@ -1,7 +1,7 @@
 import { Product } from "@medusajs/medusa"
 import { Metadata } from "next"
 
-import { getI18n } from "../../../locales/server"
+import { getI18n, setStaticParams } from "../../../locales/server"
 
 import { getCollectionsList, getProductsList, getRegion } from "@lib/data"
 import FeaturedProducts from "@modules/home/components/featured-products"
@@ -60,6 +60,7 @@ export default async function Home({
 }: {
   params: { countryCode: string }
 }) {
+  setStaticParams(countryCode)
   const t = await getI18n()
   metadata.title = t("store.title")
   metadata.description = t("store.desc")
diff --git a/src/app/[countryCode]/(main)/products/[handle]/page.tsx b/src/app/[countryCode]/(main)/products/[handle]/page.tsx
@@ -1,5 +1,6 @@
 import { Metadata } from "next"
 import { notFound } from "next/navigation"
+import { getI18n, setStaticParams } from "../../../../../locales/server"
 
 import {
   getProductByHandle,
@@ -84,6 +85,7 @@ const getPricedProductByHandle = async (handle: string, region: Region) => {
 }
 
 export default async function ProductPage({ params }: Props) {
+  setStaticParams(params.countryCode)
   const region = await getRegion(params.countryCode)
 
   if (!region) {
diff --git a/src/app/[countryCode]/(main)/search/page.tsx b/src/app/[countryCode]/(main)/search/page.tsx
@@ -1,5 +1,11 @@
 import SearchModal from "@modules/search/templates/search-modal"
+import { setStaticParams, getCurrentLocale } from "locales/server"
 
-export default function SearchModalRoute() {
+type Props = {
+  params: { countryCode: string; }
+}
+
+export default function SearchModalRoute({ params }: Props) {
+  setStaticParams(params.countryCode)
   return <SearchModal />
 }
diff --git a/src/app/[countryCode]/(main)/store/page.tsx b/src/app/[countryCode]/(main)/store/page.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from "next"
 
-import { getI18n } from "../../../../locales/server"
+import { getI18n, setStaticParams } from "../../../../locales/server"
 
 import { SortOptions } from "@modules/store/components/refinement-list/sort-products"
 import StoreTemplate from "@modules/store/templates"
@@ -21,6 +21,7 @@ type Params = {
 }
 
 export default async function StorePage({ searchParams, params }: Params) {
+  setStaticParams(params.countryCode)
   const t = await getI18n()
   metadata.title = t("store.products.title")
   metadata.description = t("store.products.desc")
diff --git a/src/app/[countryCode]/layout.tsx b/src/app/[countryCode]/layout.tsx
@@ -1,8 +1,8 @@
 import { Metadata } from "next"
 import "styles/globals.css"
 
-import { I18nProviderClient } from "../locales/client"
-import { getCurrentLocale } from "../locales/server"
+import { I18nProviderClient } from "../../locales/client"
+import { getCurrentLocale, setStaticParams } from "../../locales/server"
 
 const BASE_URL = process.env.NEXT_PUBLIC_BASE_URL || "https://localhost:8000"
 
@@ -11,8 +11,10 @@ export const metadata: Metadata = {
 }
 
 export default function RootLayout(props: { children: React.ReactNode }) {
+  setStaticParams(getCurrentLocale());
+
   return (
-    <html lang="en" data-mode="light">
+    <html lang={getCurrentLocale()} data-mode="light">
       <body>
         <I18nProviderClient locale={getCurrentLocale()}>
           <main className="relative">{props.children}</main>
diff --git a/src/app/[countryCode]/not-found.tsx b/src/app/[countryCode]/not-found.tsx
@@ -2,14 +2,15 @@ import { ArrowUpRightMini } from "@medusajs/icons"
 import { Text } from "@medusajs/ui"
 import { Metadata } from "next"
 import Link from "next/link"
-import { getI18n } from "../locales/server"
+import { getI18n, getCurrentLocale, setStaticParams } from "../../locales/server"
 
 export const metadata: Metadata = {
   title: "404",
-  description: "Something went wrong",
+  description: "generic.somethingwrong",
 }
 
 export default async function NotFound() {
+  setStaticParams(getCurrentLocale());
   const t = await getI18n()
 
   metadata.description = t("generic.somethingwrong")
