@better-i18n/next 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-i18n/next",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Better-i18n Next.js integration",
   "license": "MIT",
   "repository": {
@@ -57,7 +57,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@better-i18n/core": "0.1.3"
+    "@better-i18n/core": "0.1.5"
   },
   "peerDependencies": {
     "next": ">=15.0.0",

package/src/middleware.ts

@@ -32,9 +32,13 @@ export const createI18nProxy = createI18nMiddleware;
 
 /**
  * Modern composable middleware for Better i18n
+ *
+ * Delegates to next-intl's middleware internally to ensure full compatibility
+ * with `getRequestConfig({ requestLocale })` while keeping our compose-friendly
+ * API and custom locale detection options.
  */
 export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
-  const { project, defaultLocale, detection = {} } = config;
+  const { project, defaultLocale, localePrefix = "as-needed", detection = {} } = config;
 
   const {
     cookie = true,
@@ -46,18 +50,32 @@ export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
   // Create i18n core instance for CDN operations
   const i18nCore = createI18nCore({ project, defaultLocale });
 
+  // Cache for next-intl middleware instance (recreate only when locales change)
+  let cachedMiddleware: ReturnType<typeof createMiddleware> | null = null;
+  let cachedLocalesKey: string | null = null;
+
   return async (request: NextRequest): Promise<NextResponse> => {
     // 1. Fetch available locales from CDN
     const availableLocales = await i18nCore.getLocales();
 
-    // 2. Extract locale indicators
+    // 2. Create/reuse next-intl middleware (only recreate if locales changed)
+    const localesKey = availableLocales.join(",");
+    if (!cachedMiddleware || cachedLocalesKey !== localesKey) {
+      cachedMiddleware = createMiddleware({
+        locales: availableLocales,
+        defaultLocale,
+        localePrefix,
+      });
+      cachedLocalesKey = localesKey;
+    }
+
+    // 3. Our custom locale detection (for cookie logic)
     const pathLocale = request.nextUrl.pathname.split("/")[1];
     const cookieLocale = cookie ? request.cookies.get(cookieName)?.value : null;
     const headerLocale = browserLanguage
       ? request.headers.get("accept-language")?.split(",")[0]?.split("-")[0]
       : null;
 
-    // 3. Detect locale using core logic
     const result = detectLocale({
       project,
       defaultLocale,
@@ -67,14 +85,13 @@ export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
       availableLocales,
     });
 
-    // 4. Create response with locale header for Server Components
-    const response = NextResponse.next({
-      headers: {
-        "x-locale": result.locale,
-      },
-    });
+    // 4. Call next-intl middleware (sets x-middleware-request-x-next-intl-locale header)
+    const response = cachedMiddleware(request);
+
+    // 5. Add x-locale header for backwards compatibility
+    response.headers.set("x-locale", result.locale);
 
-    // 5. Set cookie if needed
+    // 6. Set our custom cookie if needed
     if (cookie && result.shouldSetCookie) {
       response.cookies.set(cookieName, result.locale, {
         path: "/",