chore: next-intl upgrade

rainbow-me · Jan 13, 2025 · 0720150 · 0720150
1 parent a949426
commit 0720150
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 95 deletions.
diff --git a/examples/with-next-app-i18n/package.json b/examples/with-next-app-i18n/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@rainbow-me/rainbowkit": "workspace:*",
     "next": "^15.1.4",
-    "next-intl": "^3.19.1",
+    "next-intl": "^3.26.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "viem": "2.21.55",

diff --git a/examples/with-next-app-i18n/src/app/[locale]/layout.tsx b/examples/with-next-app-i18n/src/app/[locale]/layout.tsx
@@ -1,4 +1,4 @@
-import { getTranslations, unstable_setRequestLocale } from 'next-intl/server';
+import { getTranslations, setRequestLocale } from 'next-intl/server';
 import type { Locale } from '@rainbow-me/rainbowkit';
 import { Providers } from './providers';
 
@@ -7,23 +7,27 @@ export function generateStaticParams() {
 }
 
 // Dynamic metadata with locale
-export async function generateMetadata(
-  { params: { locale } }: { params: { locale: Locale } }
-) {
+export async function generateMetadata(props: { params: Promise<{ locale: Locale }> }) {
+  const params = await props.params;
+  const { locale } = params;
+
   const t = await getTranslations({ locale, namespace: 'Metadata' });
   return {
     title: t('title')
   };
 }
 
-export default function LocaleLayout({
-  children,
-  params: { locale },
-}: {
-  children: React.ReactNode;
-  params: { locale: Locale };
-}) {
-  unstable_setRequestLocale(locale);
+export default async function LocaleLayout(
+  props: {
+    children: React.ReactNode;
+    params: Promise<{ locale: Locale }>;
+  }
+) {
+  const { children } = props;
+  const params = await props.params;
+  const { locale } = params;
+
+  setRequestLocale(locale);
 
   return (
     <html lang={locale}>

diff --git a/examples/with-next-app-i18n/src/i18n.ts b/examples/with-next-app-i18n/src/i18n.ts
diff --git a/examples/with-next-app-i18n/src/i18n/request.ts b/examples/with-next-app-i18n/src/i18n/request.ts
@@ -0,0 +1,17 @@
+import { getRequestConfig } from 'next-intl/server';
+import { routing } from './routing';
+
+export default getRequestConfig(async ({ requestLocale }) => {
+  // This typically corresponds to the `[locale]` segment
+  let locale = await requestLocale;
+
+  // Ensure that the incoming locale is valid
+  if (!locale || !routing.locales.includes(locale as any)) {
+    locale = routing.defaultLocale;
+  }
+
+  return {
+    locale,
+    messages: (await import(`../../messages/${locale}.json`)).default
+  };
+});
diff --git a/examples/with-next-app-i18n/src/i18n/routing.ts b/examples/with-next-app-i18n/src/i18n/routing.ts
@@ -0,0 +1,8 @@
+import {defineRouting} from 'next-intl/routing';
+
+export const routing = defineRouting({
+  // A list of all locales that are supported
+  locales: ['en-US', 'zh-CN'],
+  // Used when no locale matches
+  defaultLocale: 'en-US',
+});
diff --git a/examples/with-next-app-i18n/src/middleware.ts b/examples/with-next-app-i18n/src/middleware.ts
@@ -1,13 +1,9 @@
 import createMiddleware from 'next-intl/middleware';
-
-export default createMiddleware({
-  // A list of all locales that are supported
-  locales: ['en-US', 'zh-CN'],
-  // Used when no locale matches
-  defaultLocale: 'en-US'
-});
-
+import {routing} from './i18n/routing';
+
 export const config = {
   // Match only internationalized pathnames
   matcher: ['/', '/(de|en)/:path*']
 };
+
+export default createMiddleware(routing);