feat: support next@15

docs/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@vercel/analytics": "^1.1.1",
     "@vercel/speed-insights": "^1.0.2",
-    "next": "^14.0.4",
+    "next": "^15.0.0",
     "nextra": "^2.13.2",
     "nextra-theme-docs": "^2.13.2",
     "react": "^18.2.0",

examples/next-app/package.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "^14.0.4",
+    "next": "^15.0.0",
     "next-international": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

examples/next-pages/package.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "^14.0.4",
+    "next": "^15.0.0",
     "next-international": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

packages/next-international/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-international",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "Type-safe internationalization (i18n) for Next.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@types/react": "^18.2.45",
-    "next": "^14.0.4",
+    "next": "^15.0.0",
     "react": "^18.2.0",
     "tsup": "^8.0.1"
   },

packages/next-international/src/app/server/create-get-i18n.ts

@@ -8,27 +8,30 @@
   locales: Locales,
   config: I18nServerConfig,
 ) {
-  const localeCache = new Map<string, ReturnType<typeof createT<Locale, undefined>>>();
+  const localeCache = new Map<string, Promise<ReturnType<typeof createT<Locale, undefined>>>>();
 
   return async function getI18n() {
-    const locale = getLocaleCache();
-    const cached = localeCache.get(locale);
+    const locale = await getLocaleCache();
+    let cached = localeCache.get(locale);
 
     if (cached) {
-      return cached;
+      return await cached;
     }
 
-    const localeFn = createT(
-      {
-        localeContent: flattenLocale((await locales[locale]()).default),
-        fallbackLocale: config.fallbackLocale ? flattenLocale(config.fallbackLocale) : undefined,
-        locale,
-      } as LocaleContext<Locale>,
-      undefined,
-    );
+    const localeFnPromise = (async () => {
+      const localeModule = await locales[locale]();
+      return createT(
+        {
+          localeContent: flattenLocale(localeModule.default),
+          fallbackLocale: config.fallbackLocale ? flattenLocale(config.fallbackLocale) : undefined,
+          locale,
+        } as LocaleContext<Locale>,
+        undefined,
+      );
+    })();
 
-    localeCache.set(locale, localeFn);
+    localeCache.set(locale, localeFnPromise);
 
-    return localeFn;
+    return await localeFnPromise;
   };
 }

packages/next-international/src/app/server/create-get-scoped-i18n.ts

@@ -8,30 +8,33 @@
   locales: Locales,
   config: I18nServerConfig,
 ) {
-  const localeCache = new Map<string, ReturnType<typeof createT<Locale, undefined>>>();
+  const localeCache = new Map<string, Promise<ReturnType<typeof createT<Locale, undefined>>>>();
 
   return async function getScopedI18n<Scope extends Scopes<Locale>>(
     scope: Scope,
   ): Promise<ReturnType<typeof createT<Locale, Scope>>> {
-    const locale = getLocaleCache();
+    const locale = await getLocaleCache();
     const cacheKey = `${locale}-${scope}`;
-    const cached = localeCache.get(cacheKey);
+    let cached = localeCache.get(cacheKey);
 
     if (cached) {
-      return cached;
+      return (await cached) as ReturnType<typeof createT<Locale, Scope>>;
     }
 
-    const localeFn = createT(
-      {
-        localeContent: flattenLocale((await locales[locale]()).default),
-        fallbackLocale: config.fallbackLocale ? flattenLocale(config.fallbackLocale) : undefined,
-        locale,
-      } as LocaleContext<Locale>,
-      scope,
-    );
+    const localeFnPromise = (async () => {
+      const localeModule = await locales[locale]();
+      return createT(
+        {
+          localeContent: flattenLocale(localeModule.default),
+          fallbackLocale: config.fallbackLocale ? flattenLocale(config.fallbackLocale) : undefined,
+          locale,
+        } as LocaleContext<Locale>,
+        scope,
+      );
+    })();
 
-    localeCache.set(cacheKey, localeFn);
+    localeCache.set(cacheKey, localeFnPromise);
 
-    return localeFn;
+    return await localeFnPromise;
   };
 }

packages/next-international/src/app/server/get-locale-cache.tsx

@@ -12,17 +12,17 @@ export const setStaticParamsLocale = (value: string) => {
   getLocale().current = value;
 };
 
-export const getLocaleCache = cache(() => {
+export const getLocaleCache = cache(async () => {
   let locale: string | undefined | null;
 
   locale = getStaticParamsLocale();
 
   if (!locale) {
     try {
-      locale = headers().get(LOCALE_HEADER);
+      locale = (await headers()).get(LOCALE_HEADER);
 
       if (!locale) {
-        locale = cookies().get(LOCALE_COOKIE)?.value;
+        locale = (await cookies()).get(LOCALE_COOKIE)?.value;
       }
     } catch (e) {
       throw new Error(