@better-i18n/use-intl 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-i18n/use-intl",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Better i18n integration for use-intl (React, TanStack Start)",
   "license": "MIT",
   "repository": {
@@ -44,7 +44,7 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@better-i18n/core": "0.1.7"
+    "@better-i18n/core": "0.1.8"
   },
   "peerDependencies": {
     "react": ">=18.0.0",

package/src/middleware/index.ts

@@ -5,7 +5,7 @@ import { detectLocale, getLocales } from "@better-i18n/core";
 import type { I18nMiddlewareConfig } from "@better-i18n/core";
 
 export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
-  const { project, defaultLocale, detection = {} } = config;
+  const { project, defaultLocale, localePrefix = "as-needed", detection = {} } = config;
 
   const {
     cookie = true,
@@ -27,7 +27,9 @@ export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
 
       // 2. Extract locale indicators
       const url = new URL(request.url);
-      const pathLocale = url.pathname.split("/")[1];
+      const pathSegment = url.pathname.split("/")[1];
+      const hasLocaleInPath =
+        !!pathSegment && availableLocales.includes(pathSegment);
 
       // Dynamic imports for TanStack Start server functions to avoid bundling them in client
       const {
@@ -54,13 +56,49 @@ export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
       const result = detectLocale({
         project,
         defaultLocale,
-        pathLocale,
+        pathLocale: pathSegment,
         cookieLocale,
         headerLocale,
         availableLocales,
       });
 
-      // 4. Set cookie if needed (if enabled and changed)
+      // 4. Redirect if locale prefix is needed but missing
+      //    Skip API routes and paths that already have a locale prefix
+      const isApiRoute = url.pathname.startsWith("/api/");
+      if (
+        localePrefix !== "never" &&
+        !hasLocaleInPath &&
+        !isApiRoute &&
+        result.detectedFrom !== "path"
+      ) {
+        const shouldRedirect =
+          localePrefix === "always" ||
+          (localePrefix === "as-needed" && result.locale !== defaultLocale);
+
+        if (shouldRedirect) {
+          const redirectUrl = new URL(
+            `/${result.locale}${url.pathname}`,
+            url.origin,
+          );
+          redirectUrl.search = url.search;
+
+          // Build redirect response with locale cookie
+          const headers = new Headers({
+            Location: redirectUrl.toString(),
+          });
+
+          if (cookie && result.shouldSetCookie) {
+            headers.set(
+              "Set-Cookie",
+              `${cookieName}=${result.locale}; Path=/; Max-Age=${cookieMaxAge}; SameSite=Lax`,
+            );
+          }
+
+          return new Response(null, { status: 302, headers });
+        }
+      }
+
+      // 5. Set cookie if needed (non-redirect path)
       if (cookie && result.shouldSetCookie) {
         setCookie(cookieName, result.locale, {
           path: "/",
@@ -69,7 +107,7 @@ export function createBetterI18nMiddleware(config: I18nMiddlewareConfig) {
         });
       }
 
-      // 5. Pass locale to route context
+      // 6. Pass locale to route context
       return next({ context: { locale: result.locale } });
     },
   );