next-intlayer 5.5.0-canary.0 → 5.5.1

package/README.md

@@ -75,7 +75,7 @@ By default, Intlayer scans for files with the extension `.content.{json,ts,tsx,j
 
 Here’s an example of content declaration:
 
-```tsx filePath="src/ClientComponent/index.content.ts" codeFormat="typescript"
+```tsx fileName="src/ClientComponent/index.content.ts" codeFormat="typescript"
 import { t, type Dictionary } from "intlayer";
 
 const clientComponentContent = {

package/dist/cjs/middleware/intlayerMiddleware.cjs

@@ -44,10 +44,21 @@ const {
   serverSetCookie,
   noPrefix
 } = middleware;
+const isPrefetchRequest = (request) => {
+  const purpose = request.headers.get("purpose");
+  const nextRouterPrefetch = request.headers.get("next-router-prefetch");
+  const nextUrl = request.headers.get("next-url");
+  const xNextjsData = request.headers.get("x-nextjs-data");
+  return purpose === "prefetch" || nextRouterPrefetch === "1" || !!nextUrl || !!xNextjsData;
+};
 const intlayerMiddleware = (request, _event, _response) => {
   const pathname = request.nextUrl.pathname;
-  const cookieLocale = getCookieLocale(request);
+  const isPrefetch = isPrefetchRequest(request);
+  const cookieLocale = isPrefetch ? void 0 : getCookieLocale(request);
   const basePathTrailingSlash = basePath.endsWith("/");
+  if (isPrefetch) {
+    console.log("Prefetch request detected - ignoring cookie locale");
+  }
   if (noPrefix) {
     return handleNoPrefix(
       request,
@@ -57,6 +68,14 @@ const intlayerMiddleware = (request, _event, _response) => {
     );
   }
   const pathLocale = getPathLocale(pathname);
+  console.log("--------------------------------");
+  console.log("intlayerMiddleware", {
+    pathname,
+    cookieLocale,
+    pathLocale,
+    basePathTrailingSlash,
+    isPrefetch
+  });
   return handlePrefix(
     request,
     cookieLocale,
@@ -111,6 +130,13 @@ const handleMissingPathLocale = (request, cookieLocale, pathname, basePathTraili
     );
     locale = defaultLocale;
   }
+  console.log("handleMissingPathLocale", {
+    locale,
+    pathname,
+    basePath,
+    basePathTrailingSlash,
+    search: request.nextUrl.search
+  });
   const newPath = constructPath(
     locale,
     pathname,
@@ -125,6 +151,11 @@ const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, b
     // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie
     cookieLocale && cookieLocale !== pathLocale && serverSetCookie !== "always"
   ) {
+    console.log("handleExistingPathLocale", {
+      pathname,
+      pathLocale,
+      cookieLocale
+    });
     const newPath = handleCookieLocaleMismatch(
       request,
       pathname,
@@ -144,6 +175,11 @@ const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, b
 };
 const handleCookieLocaleMismatch = (request, pathname, pathLocale, cookieLocale, basePath2, basePathTrailingSlash) => {
   const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);
+  console.log("handleCookieLocaleMismatch", {
+    newPath,
+    pathLocale,
+    cookieLocale
+  });
   return constructPath(
     cookieLocale,
     newPath,
@@ -164,6 +200,11 @@ const handleDefaultLocaleRedirect = (request, pathLocale, pathname, basePathTrai
     if (request.nextUrl.search) {
       pathWithoutLocale += request.nextUrl.search;
     }
+    console.log("handleDefaultLocaleRedirect", {
+      pathWithoutLocale,
+      basePath,
+      pathLocale
+    });
     return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);
   }
   return rewriteUrl(request, pathname, pathLocale);
@@ -178,10 +219,14 @@ const constructPath = (locale, path, basePath2, basePathTrailingSlash, search) =
 };
 const rewriteUrl = (request, newPath, locale) => {
   const response = import_server.NextResponse.rewrite(new URL(newPath, request.url));
+  console.log("rewriteUrl", { newPath, url: request.url });
   response.headers.set(headerName, locale);
   return response;
 };
-const redirectUrl = (request, newPath) => import_server.NextResponse.redirect(new URL(newPath, request.url));
+const redirectUrl = (request, newPath) => {
+  console.log("redirectUrl", { newPath, url: request.url });
+  return import_server.NextResponse.redirect(new URL(newPath, request.url));
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   intlayerMiddleware

package/dist/cjs/middleware/intlayerMiddleware.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/middleware/intlayerMiddleware.ts"],"sourcesContent":["import { type Locales } from '@intlayer/config/client';\nimport configuration from '@intlayer/config/built';\n\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\nconst { internationalization, middleware } = configuration;\nconst { locales, defaultLocale } = internationalization;\nconst {\n  headerName,\n  cookieName,\n  prefixDefault,\n  basePath,\n  serverSetCookie,\n  noPrefix,\n} = middleware;\n\n/**\n * Middleware that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/middleware.ts\n *\n * export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';\n *\n * // applies this middleware only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main middleware function for handling internationalization.\n *\n * @param request - The incoming Next.js request object.\n * @param event - The Next.js fetch event (optional).\n * @param response - The Next.js response object (optional).\n * @returns - The response to be returned to the client.\n */\nexport const intlayerMiddleware = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n  const cookieLocale = getCookieLocale(request);\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Retrieves the locale from the request cookies if available and valid.\n *\n * @param request - The incoming Next.js request object.\n * @returns - The locale found in the cookies, or undefined if not found or invalid.\n */\nconst getCookieLocale = (request: NextRequest): Locales | undefined => {\n  if (!cookieName) return undefined;\n  const cookieValue = request.cookies.get(cookieName)?.value as Locales;\n  if (cookieValue && locales.includes(cookieValue)) {\n    return cookieValue;\n  }\n};\n\n/**\n * Handles the case where URLs do not have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  const locale = cookieLocale ?? defaultLocale;\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n  return rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Extracts the locale from the URL pathname if present.\n *\n * @param pathname - The pathname from the request URL.\n * @returns - The locale found in the pathname, or undefined if not found.\n */\nconst getPathLocale = (pathname: string): Locales | undefined =>\n  locales.find(\n    (locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`\n  );\n\n/**\n * Handles the case where URLs have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handlePrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    return handleMissingPathLocale(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles requests where the locale is missing from the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleMissingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  let locale = (cookieLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locales;\n  if (!locales.includes(locale)) {\n    console.warn(\n      'The localeDetector callback must return a locale included in your locales array. Reverting to using defaultLocale.'\n    );\n    locale = defaultLocale;\n  }\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n\n  return prefixDefault || locale !== defaultLocale\n    ? redirectUrl(request, newPath)\n    : rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Handles requests where the locale exists in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie\n    cookieLocale &&\n    cookieLocale !== pathLocale &&\n    serverSetCookie !== 'always'\n  ) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      cookieLocale,\n      basePath,\n      basePathTrailingSlash\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // If the cookie locale matches the path locale, or cookie locale is not set, or serverSetCookie is 'always'\n  return handleDefaultLocaleRedirect(\n    request,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param pathname - The pathname from the request URL.\n * @param pathLocale - The locale extracted from the pathname.\n * @param cookieLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locales,\n  cookieLocale: Locales,\n  basePath: string,\n  basePathTrailingSlash: boolean\n): string => {\n  // Replace the pathLocale in the pathname with the cookieLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);\n\n  return constructPath(\n    cookieLocale,\n    newPath,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n};\n\n/**\n * Handles redirection when the default locale is used and prefixing is not required.\n *\n * @param request - The incoming Next.js request object.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If default locale should not be prefixed and the pathLocale is the defaultLocale\n    !prefixDefault &&\n    pathLocale === defaultLocale\n  ) {\n    let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? '/';\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    if (request.nextUrl.search) {\n      pathWithoutLocale += request.nextUrl.search;\n    }\n\n    return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);\n  }\n\n  // If prefixing default locale is required or pathLocale is not the defaultLocale\n\n  return rewriteUrl(request, pathname, pathLocale);\n};\n\n/**\n * Constructs a new path by combining the locale, path, basePath, and search parameters.\n *\n * @param locale - The locale to include in the path.\n * @param path - The original path from the request.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @param [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locales,\n  path: string,\n  basePath: string,\n  basePathTrailingSlash: boolean,\n  search?: string\n): string => {\n  let newPath = `${locale}${path}`;\n\n  newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${newPath}`;\n  if (search) {\n    newPath += search;\n  }\n  return newPath;\n};\n\n/**\n * Rewrites the URL to the new path and sets the locale header.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to rewrite to.\n * @param locale - The locale to set in the response header.\n * @returns - The rewritten response.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: Locales\n): NextResponse => {\n  const response = NextResponse.rewrite(new URL(newPath, request.url));\n  response.headers.set(headerName, locale);\n  return response;\n};\n\n/**\n * Redirects the request to the new path.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to redirect to.\n * @returns - The redirect response.\n */\nconst redirectUrl = (request: NextRequest, newPath: string): NextResponse =>\n  NextResponse.redirect(new URL(newPath, request.url));\n"],"mappings":"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","names":["configuration","basePath"]}
+{"version":3,"sources":["../../../src/middleware/intlayerMiddleware.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { type Locales } from '@intlayer/config/client';\n\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\nconst { internationalization, middleware } = configuration;\nconst { locales, defaultLocale } = internationalization;\nconst {\n  headerName,\n  cookieName,\n  prefixDefault,\n  basePath,\n  serverSetCookie,\n  noPrefix,\n} = middleware;\n\n/**\n * Detects if the request is a prefetch request from Next.js.\n *\n * Next.js prefetch requests can be identified by several headers:\n * - purpose: 'prefetch' (standard prefetch header)\n * - next-router-prefetch: '1' (Next.js router prefetch)\n * - next-url: present (Next.js internal navigation)\n *\n * During prefetch, we should ignore cookie-based locale detection\n * to prevent unwanted redirects when users are switching locales.\n *\n * @param request - The incoming Next.js request object.\n * @returns - True if the request is a prefetch request, false otherwise.\n */\nconst isPrefetchRequest = (request: NextRequest): boolean => {\n  const purpose = request.headers.get('purpose');\n  const nextRouterPrefetch = request.headers.get('next-router-prefetch');\n  const nextUrl = request.headers.get('next-url');\n  const xNextjsData = request.headers.get('x-nextjs-data');\n\n  return (\n    purpose === 'prefetch' ||\n    nextRouterPrefetch === '1' ||\n    !!nextUrl ||\n    !!xNextjsData\n  );\n};\n\n/**\n * Middleware that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/middleware.ts\n *\n * export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';\n *\n * // applies this middleware only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main middleware function for handling internationalization.\n *\n * @param request - The incoming Next.js request object.\n * @param event - The Next.js fetch event (optional).\n * @param response - The Next.js response object (optional).\n * @returns - The response to be returned to the client.\n */\nexport const intlayerMiddleware = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n  const isPrefetch = isPrefetchRequest(request);\n  const cookieLocale = isPrefetch ? undefined : getCookieLocale(request);\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  if (isPrefetch) {\n    console.log('Prefetch request detected - ignoring cookie locale');\n  }\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  console.log('--------------------------------');\n  console.log('intlayerMiddleware', {\n    pathname,\n    cookieLocale,\n    pathLocale,\n    basePathTrailingSlash,\n    isPrefetch,\n  });\n\n  return handlePrefix(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Retrieves the locale from the request cookies if available and valid.\n *\n * @param request - The incoming Next.js request object.\n * @returns - The locale found in the cookies, or undefined if not found or invalid.\n */\nconst getCookieLocale = (request: NextRequest): Locales | undefined => {\n  if (!cookieName) return undefined;\n  const cookieValue = request.cookies.get(cookieName)?.value as Locales;\n  if (cookieValue && locales.includes(cookieValue)) {\n    return cookieValue;\n  }\n};\n\n/**\n * Handles the case where URLs do not have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  const locale = cookieLocale ?? defaultLocale;\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n  return rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Extracts the locale from the URL pathname if present.\n *\n * @param pathname - The pathname from the request URL.\n * @returns - The locale found in the pathname, or undefined if not found.\n */\nconst getPathLocale = (pathname: string): Locales | undefined =>\n  locales.find(\n    (locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`\n  );\n\n/**\n * Handles the case where URLs have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handlePrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    return handleMissingPathLocale(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles requests where the locale is missing from the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleMissingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  let locale = (cookieLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locales;\n  if (!locales.includes(locale)) {\n    console.warn(\n      'The localeDetector callback must return a locale included in your locales array. Reverting to using defaultLocale.'\n    );\n    locale = defaultLocale;\n  }\n\n  console.log('handleMissingPathLocale', {\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    search: request.nextUrl.search,\n  });\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n\n  return prefixDefault || locale !== defaultLocale\n    ? redirectUrl(request, newPath)\n    : rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Handles requests where the locale exists in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie\n    cookieLocale &&\n    cookieLocale !== pathLocale &&\n    serverSetCookie !== 'always'\n  ) {\n    console.log('handleExistingPathLocale', {\n      pathname,\n      pathLocale,\n      cookieLocale,\n    });\n\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      cookieLocale,\n      basePath,\n      basePathTrailingSlash\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // If the cookie locale matches the path locale, or cookie locale is not set, or serverSetCookie is 'always'\n  return handleDefaultLocaleRedirect(\n    request,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param pathname - The pathname from the request URL.\n * @param pathLocale - The locale extracted from the pathname.\n * @param cookieLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locales,\n  cookieLocale: Locales,\n  basePath: string,\n  basePathTrailingSlash: boolean\n): string => {\n  // Replace the pathLocale in the pathname with the cookieLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);\n\n  console.log('handleCookieLocaleMismatch', {\n    newPath,\n    pathLocale,\n    cookieLocale,\n  });\n\n  return constructPath(\n    cookieLocale,\n    newPath,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n};\n\n/**\n * Handles redirection when the default locale is used and prefixing is not required.\n *\n * @param request - The incoming Next.js request object.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If default locale should not be prefixed and the pathLocale is the defaultLocale\n    !prefixDefault &&\n    pathLocale === defaultLocale\n  ) {\n    let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? '/';\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    if (request.nextUrl.search) {\n      pathWithoutLocale += request.nextUrl.search;\n    }\n\n    console.log('handleDefaultLocaleRedirect', {\n      pathWithoutLocale,\n      basePath,\n      pathLocale,\n    });\n\n    return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);\n  }\n\n  // If prefixing default locale is required or pathLocale is not the defaultLocale\n\n  return rewriteUrl(request, pathname, pathLocale);\n};\n\n/**\n * Constructs a new path by combining the locale, path, basePath, and search parameters.\n *\n * @param locale - The locale to include in the path.\n * @param path - The original path from the request.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @param [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locales,\n  path: string,\n  basePath: string,\n  basePathTrailingSlash: boolean,\n  search?: string\n): string => {\n  let newPath = `${locale}${path}`;\n\n  newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${newPath}`;\n  if (search) {\n    newPath += search;\n  }\n  return newPath;\n};\n\n/**\n * Rewrites the URL to the new path and sets the locale header.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to rewrite to.\n * @param locale - The locale to set in the response header.\n * @returns - The rewritten response.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: Locales\n): NextResponse => {\n  const response = NextResponse.rewrite(new URL(newPath, request.url));\n  console.log('rewriteUrl', { newPath, url: request.url });\n  response.headers.set(headerName, locale);\n  return response;\n};\n\n/**\n * Redirects the request to the new path.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to redirect to.\n * @returns - The redirect response.\n */\nconst redirectUrl = (request: NextRequest, newPath: string): NextResponse => {\n  console.log('redirectUrl', { newPath, url: request.url });\n  return NextResponse.redirect(new URL(newPath, request.url));\n};\n"],"mappings":"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","names":["configuration","basePath"]}

package/dist/cjs/server/index.cjs

@@ -24,6 +24,7 @@ __export(server_exports, {
   t: () => import_server.t,
   useDictionary: () => import_server.useDictionary,
   useIntlayer: () => import_server.useIntlayer,
+  useLocale: () => import_server.useLocale,
   withIntlayer: () => import_withIntlayer.withIntlayer
 });
 module.exports = __toCommonJS(server_exports);
@@ -37,6 +38,7 @@ var import_withIntlayer = require('./withIntlayer.cjs');
   t,
   useDictionary,
   useIntlayer,
+  useLocale,
   withIntlayer
 });
 //# sourceMappingURL=index.cjs.map

package/dist/cjs/server/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/server/index.ts"],"sourcesContent":["export {\n  useDictionary,\n  IntlayerServer,\n  IntlayerServerProvider,\n  locale,\n  useIntlayer,\n  t,\n} from 'react-intlayer/server';\nexport { withIntlayer } from './withIntlayer';\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAOO;AACP,0BAA6B;","names":[]}
+{"version":3,"sources":["../../../src/server/index.ts"],"sourcesContent":["export {\n  IntlayerServer,\n  IntlayerServerProvider,\n  locale,\n  t,\n  useDictionary,\n  useIntlayer,\n  useLocale,\n} from 'react-intlayer/server';\nexport { withIntlayer } from './withIntlayer';\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAQO;AACP,0BAA6B;","names":[]}

package/dist/esm/middleware/intlayerMiddleware.mjs

@@ -13,10 +13,21 @@ const {
   serverSetCookie,
   noPrefix
 } = middleware;
+const isPrefetchRequest = (request) => {
+  const purpose = request.headers.get("purpose");
+  const nextRouterPrefetch = request.headers.get("next-router-prefetch");
+  const nextUrl = request.headers.get("next-url");
+  const xNextjsData = request.headers.get("x-nextjs-data");
+  return purpose === "prefetch" || nextRouterPrefetch === "1" || !!nextUrl || !!xNextjsData;
+};
 const intlayerMiddleware = (request, _event, _response) => {
   const pathname = request.nextUrl.pathname;
-  const cookieLocale = getCookieLocale(request);
+  const isPrefetch = isPrefetchRequest(request);
+  const cookieLocale = isPrefetch ? void 0 : getCookieLocale(request);
   const basePathTrailingSlash = basePath.endsWith("/");
+  if (isPrefetch) {
+    console.log("Prefetch request detected - ignoring cookie locale");
+  }
   if (noPrefix) {
     return handleNoPrefix(
       request,
@@ -26,6 +37,14 @@ const intlayerMiddleware = (request, _event, _response) => {
     );
   }
   const pathLocale = getPathLocale(pathname);
+  console.log("--------------------------------");
+  console.log("intlayerMiddleware", {
+    pathname,
+    cookieLocale,
+    pathLocale,
+    basePathTrailingSlash,
+    isPrefetch
+  });
   return handlePrefix(
     request,
     cookieLocale,
@@ -80,6 +99,13 @@ const handleMissingPathLocale = (request, cookieLocale, pathname, basePathTraili
     );
     locale = defaultLocale;
   }
+  console.log("handleMissingPathLocale", {
+    locale,
+    pathname,
+    basePath,
+    basePathTrailingSlash,
+    search: request.nextUrl.search
+  });
   const newPath = constructPath(
     locale,
     pathname,
@@ -94,6 +120,11 @@ const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, b
     // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie
     cookieLocale && cookieLocale !== pathLocale && serverSetCookie !== "always"
   ) {
+    console.log("handleExistingPathLocale", {
+      pathname,
+      pathLocale,
+      cookieLocale
+    });
     const newPath = handleCookieLocaleMismatch(
       request,
       pathname,
@@ -113,6 +144,11 @@ const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, b
 };
 const handleCookieLocaleMismatch = (request, pathname, pathLocale, cookieLocale, basePath2, basePathTrailingSlash) => {
   const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);
+  console.log("handleCookieLocaleMismatch", {
+    newPath,
+    pathLocale,
+    cookieLocale
+  });
   return constructPath(
     cookieLocale,
     newPath,
@@ -133,6 +169,11 @@ const handleDefaultLocaleRedirect = (request, pathLocale, pathname, basePathTrai
     if (request.nextUrl.search) {
       pathWithoutLocale += request.nextUrl.search;
     }
+    console.log("handleDefaultLocaleRedirect", {
+      pathWithoutLocale,
+      basePath,
+      pathLocale
+    });
     return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);
   }
   return rewriteUrl(request, pathname, pathLocale);
@@ -147,10 +188,14 @@ const constructPath = (locale, path, basePath2, basePathTrailingSlash, search) =
 };
 const rewriteUrl = (request, newPath, locale) => {
   const response = NextResponse.rewrite(new URL(newPath, request.url));
+  console.log("rewriteUrl", { newPath, url: request.url });
   response.headers.set(headerName, locale);
   return response;
 };
-const redirectUrl = (request, newPath) => NextResponse.redirect(new URL(newPath, request.url));
+const redirectUrl = (request, newPath) => {
+  console.log("redirectUrl", { newPath, url: request.url });
+  return NextResponse.redirect(new URL(newPath, request.url));
+};
 export {
   intlayerMiddleware
 };

package/dist/esm/middleware/intlayerMiddleware.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/middleware/intlayerMiddleware.ts"],"sourcesContent":["import { type Locales } from '@intlayer/config/client';\nimport configuration from '@intlayer/config/built';\n\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\nconst { internationalization, middleware } = configuration;\nconst { locales, defaultLocale } = internationalization;\nconst {\n  headerName,\n  cookieName,\n  prefixDefault,\n  basePath,\n  serverSetCookie,\n  noPrefix,\n} = middleware;\n\n/**\n * Middleware that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/middleware.ts\n *\n * export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';\n *\n * // applies this middleware only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main middleware function for handling internationalization.\n *\n * @param request - The incoming Next.js request object.\n * @param event - The Next.js fetch event (optional).\n * @param response - The Next.js response object (optional).\n * @returns - The response to be returned to the client.\n */\nexport const intlayerMiddleware = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n  const cookieLocale = getCookieLocale(request);\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Retrieves the locale from the request cookies if available and valid.\n *\n * @param request - The incoming Next.js request object.\n * @returns - The locale found in the cookies, or undefined if not found or invalid.\n */\nconst getCookieLocale = (request: NextRequest): Locales | undefined => {\n  if (!cookieName) return undefined;\n  const cookieValue = request.cookies.get(cookieName)?.value as Locales;\n  if (cookieValue && locales.includes(cookieValue)) {\n    return cookieValue;\n  }\n};\n\n/**\n * Handles the case where URLs do not have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  const locale = cookieLocale ?? defaultLocale;\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n  return rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Extracts the locale from the URL pathname if present.\n *\n * @param pathname - The pathname from the request URL.\n * @returns - The locale found in the pathname, or undefined if not found.\n */\nconst getPathLocale = (pathname: string): Locales | undefined =>\n  locales.find(\n    (locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`\n  );\n\n/**\n * Handles the case where URLs have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handlePrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    return handleMissingPathLocale(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles requests where the locale is missing from the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleMissingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  let locale = (cookieLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locales;\n  if (!locales.includes(locale)) {\n    console.warn(\n      'The localeDetector callback must return a locale included in your locales array. Reverting to using defaultLocale.'\n    );\n    locale = defaultLocale;\n  }\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n\n  return prefixDefault || locale !== defaultLocale\n    ? redirectUrl(request, newPath)\n    : rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Handles requests where the locale exists in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie\n    cookieLocale &&\n    cookieLocale !== pathLocale &&\n    serverSetCookie !== 'always'\n  ) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      cookieLocale,\n      basePath,\n      basePathTrailingSlash\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // If the cookie locale matches the path locale, or cookie locale is not set, or serverSetCookie is 'always'\n  return handleDefaultLocaleRedirect(\n    request,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param pathname - The pathname from the request URL.\n * @param pathLocale - The locale extracted from the pathname.\n * @param cookieLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locales,\n  cookieLocale: Locales,\n  basePath: string,\n  basePathTrailingSlash: boolean\n): string => {\n  // Replace the pathLocale in the pathname with the cookieLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);\n\n  return constructPath(\n    cookieLocale,\n    newPath,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n};\n\n/**\n * Handles redirection when the default locale is used and prefixing is not required.\n *\n * @param request - The incoming Next.js request object.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If default locale should not be prefixed and the pathLocale is the defaultLocale\n    !prefixDefault &&\n    pathLocale === defaultLocale\n  ) {\n    let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? '/';\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    if (request.nextUrl.search) {\n      pathWithoutLocale += request.nextUrl.search;\n    }\n\n    return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);\n  }\n\n  // If prefixing default locale is required or pathLocale is not the defaultLocale\n\n  return rewriteUrl(request, pathname, pathLocale);\n};\n\n/**\n * Constructs a new path by combining the locale, path, basePath, and search parameters.\n *\n * @param locale - The locale to include in the path.\n * @param path - The original path from the request.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @param [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locales,\n  path: string,\n  basePath: string,\n  basePathTrailingSlash: boolean,\n  search?: string\n): string => {\n  let newPath = `${locale}${path}`;\n\n  newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${newPath}`;\n  if (search) {\n    newPath += search;\n  }\n  return newPath;\n};\n\n/**\n * Rewrites the URL to the new path and sets the locale header.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to rewrite to.\n * @param locale - The locale to set in the response header.\n * @returns - The rewritten response.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: Locales\n): NextResponse => {\n  const response = NextResponse.rewrite(new URL(newPath, request.url));\n  response.headers.set(headerName, locale);\n  return response;\n};\n\n/**\n * Redirects the request to the new path.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to redirect to.\n * @returns - The redirect response.\n */\nconst redirectUrl = (request: NextRequest, newPath: string): NextResponse =>\n  NextResponse.redirect(new URL(newPath, request.url));\n"],"mappings":"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","names":["basePath"]}
+{"version":3,"sources":["../../../src/middleware/intlayerMiddleware.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { type Locales } from '@intlayer/config/client';\n\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\nconst { internationalization, middleware } = configuration;\nconst { locales, defaultLocale } = internationalization;\nconst {\n  headerName,\n  cookieName,\n  prefixDefault,\n  basePath,\n  serverSetCookie,\n  noPrefix,\n} = middleware;\n\n/**\n * Detects if the request is a prefetch request from Next.js.\n *\n * Next.js prefetch requests can be identified by several headers:\n * - purpose: 'prefetch' (standard prefetch header)\n * - next-router-prefetch: '1' (Next.js router prefetch)\n * - next-url: present (Next.js internal navigation)\n *\n * During prefetch, we should ignore cookie-based locale detection\n * to prevent unwanted redirects when users are switching locales.\n *\n * @param request - The incoming Next.js request object.\n * @returns - True if the request is a prefetch request, false otherwise.\n */\nconst isPrefetchRequest = (request: NextRequest): boolean => {\n  const purpose = request.headers.get('purpose');\n  const nextRouterPrefetch = request.headers.get('next-router-prefetch');\n  const nextUrl = request.headers.get('next-url');\n  const xNextjsData = request.headers.get('x-nextjs-data');\n\n  return (\n    purpose === 'prefetch' ||\n    nextRouterPrefetch === '1' ||\n    !!nextUrl ||\n    !!xNextjsData\n  );\n};\n\n/**\n * Middleware that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/middleware.ts\n *\n * export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';\n *\n * // applies this middleware only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main middleware function for handling internationalization.\n *\n * @param request - The incoming Next.js request object.\n * @param event - The Next.js fetch event (optional).\n * @param response - The Next.js response object (optional).\n * @returns - The response to be returned to the client.\n */\nexport const intlayerMiddleware = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n  const isPrefetch = isPrefetchRequest(request);\n  const cookieLocale = isPrefetch ? undefined : getCookieLocale(request);\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  if (isPrefetch) {\n    console.log('Prefetch request detected - ignoring cookie locale');\n  }\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  console.log('--------------------------------');\n  console.log('intlayerMiddleware', {\n    pathname,\n    cookieLocale,\n    pathLocale,\n    basePathTrailingSlash,\n    isPrefetch,\n  });\n\n  return handlePrefix(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Retrieves the locale from the request cookies if available and valid.\n *\n * @param request - The incoming Next.js request object.\n * @returns - The locale found in the cookies, or undefined if not found or invalid.\n */\nconst getCookieLocale = (request: NextRequest): Locales | undefined => {\n  if (!cookieName) return undefined;\n  const cookieValue = request.cookies.get(cookieName)?.value as Locales;\n  if (cookieValue && locales.includes(cookieValue)) {\n    return cookieValue;\n  }\n};\n\n/**\n * Handles the case where URLs do not have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  const locale = cookieLocale ?? defaultLocale;\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n  return rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Extracts the locale from the URL pathname if present.\n *\n * @param pathname - The pathname from the request URL.\n * @returns - The locale found in the pathname, or undefined if not found.\n */\nconst getPathLocale = (pathname: string): Locales | undefined =>\n  locales.find(\n    (locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`\n  );\n\n/**\n * Handles the case where URLs have locale prefixes.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handlePrefix = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    return handleMissingPathLocale(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles requests where the locale is missing from the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleMissingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  let locale = (cookieLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locales;\n  if (!locales.includes(locale)) {\n    console.warn(\n      'The localeDetector callback must return a locale included in your locales array. Reverting to using defaultLocale.'\n    );\n    locale = defaultLocale;\n  }\n\n  console.log('handleMissingPathLocale', {\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    search: request.nextUrl.search,\n  });\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n\n  return prefixDefault || locale !== defaultLocale\n    ? redirectUrl(request, newPath)\n    : rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Handles requests where the locale exists in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locales | undefined,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie\n    cookieLocale &&\n    cookieLocale !== pathLocale &&\n    serverSetCookie !== 'always'\n  ) {\n    console.log('handleExistingPathLocale', {\n      pathname,\n      pathLocale,\n      cookieLocale,\n    });\n\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      cookieLocale,\n      basePath,\n      basePathTrailingSlash\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // If the cookie locale matches the path locale, or cookie locale is not set, or serverSetCookie is 'always'\n  return handleDefaultLocaleRedirect(\n    request,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param pathname - The pathname from the request URL.\n * @param pathLocale - The locale extracted from the pathname.\n * @param cookieLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locales,\n  cookieLocale: Locales,\n  basePath: string,\n  basePathTrailingSlash: boolean\n): string => {\n  // Replace the pathLocale in the pathname with the cookieLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);\n\n  console.log('handleCookieLocaleMismatch', {\n    newPath,\n    pathLocale,\n    cookieLocale,\n  });\n\n  return constructPath(\n    cookieLocale,\n    newPath,\n    basePath,\n    basePathTrailingSlash,\n    request.nextUrl.search\n  );\n};\n\n/**\n * Handles redirection when the default locale is used and prefixing is not required.\n *\n * @param request - The incoming Next.js request object.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locales,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If default locale should not be prefixed and the pathLocale is the defaultLocale\n    !prefixDefault &&\n    pathLocale === defaultLocale\n  ) {\n    let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? '/';\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    if (request.nextUrl.search) {\n      pathWithoutLocale += request.nextUrl.search;\n    }\n\n    console.log('handleDefaultLocaleRedirect', {\n      pathWithoutLocale,\n      basePath,\n      pathLocale,\n    });\n\n    return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);\n  }\n\n  // If prefixing default locale is required or pathLocale is not the defaultLocale\n\n  return rewriteUrl(request, pathname, pathLocale);\n};\n\n/**\n * Constructs a new path by combining the locale, path, basePath, and search parameters.\n *\n * @param locale - The locale to include in the path.\n * @param path - The original path from the request.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @param [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locales,\n  path: string,\n  basePath: string,\n  basePathTrailingSlash: boolean,\n  search?: string\n): string => {\n  let newPath = `${locale}${path}`;\n\n  newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${newPath}`;\n  if (search) {\n    newPath += search;\n  }\n  return newPath;\n};\n\n/**\n * Rewrites the URL to the new path and sets the locale header.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to rewrite to.\n * @param locale - The locale to set in the response header.\n * @returns - The rewritten response.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: Locales\n): NextResponse => {\n  const response = NextResponse.rewrite(new URL(newPath, request.url));\n  console.log('rewriteUrl', { newPath, url: request.url });\n  response.headers.set(headerName, locale);\n  return response;\n};\n\n/**\n * Redirects the request to the new path.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to redirect to.\n * @returns - The redirect response.\n */\nconst redirectUrl = (request: NextRequest, newPath: string): NextResponse => {\n  console.log('redirectUrl', { newPath, url: request.url });\n  return NextResponse.redirect(new URL(newPath, request.url));\n};\n"],"mappings":"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","names":["basePath"]}

package/dist/esm/server/index.mjs

@@ -1,10 +1,11 @@
 import {
-  useDictionary,
   IntlayerServer,
   IntlayerServerProvider,
   locale,
+  t,
+  useDictionary,
   useIntlayer,
-  t
+  useLocale
 } from "react-intlayer/server";
 import { withIntlayer } from "./withIntlayer.mjs";
 export {
@@ -14,6 +15,7 @@ export {
   t,
   useDictionary,
   useIntlayer,
+  useLocale,
   withIntlayer
 };
 //# sourceMappingURL=index.mjs.map

package/dist/esm/server/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/server/index.ts"],"sourcesContent":["export {\n  useDictionary,\n  IntlayerServer,\n  IntlayerServerProvider,\n  locale,\n  useIntlayer,\n  t,\n} from 'react-intlayer/server';\nexport { withIntlayer } from './withIntlayer';\n"],"mappings":"AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,oBAAoB;","names":[]}
+{"version":3,"sources":["../../../src/server/index.ts"],"sourcesContent":["export {\n  IntlayerServer,\n  IntlayerServerProvider,\n  locale,\n  t,\n  useDictionary,\n  useIntlayer,\n  useLocale,\n} from 'react-intlayer/server';\nexport { withIntlayer } from './withIntlayer';\n"],"mappings":"AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,oBAAoB;","names":[]}

package/dist/types/client/useLocale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocale.d.ts","sourceRoot":"","sources":["../../../src/client/useLocale.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,eAAO,MAAM,SAAS;;;0BAClB,UAAU;6BACD,UAAU;;CAyBtB,CAAC"}
+{"version":3,"file":"useLocale.d.ts","sourceRoot":"","sources":["../../../src/client/useLocale.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,eAAO,MAAM,SAAS;;;;;;CA2BrB,CAAC"}

package/dist/types/client/useLocalePageRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalePageRouter.d.ts","sourceRoot":"","sources":["../../../src/client/useLocalePageRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD,eAAO,MAAM,mBAAmB;;;0BAChB,UAAU;6BACV,UAAU;;CAwBzB,CAAC"}
+{"version":3,"file":"useLocalePageRouter.d.ts","sourceRoot":"","sources":["../../../src/client/useLocalePageRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD,eAAO,MAAM,mBAAmB;;;;;;CA0B/B,CAAC"}

package/dist/types/middleware/intlayerMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intlayerMiddleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/intlayerMiddleware.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,YAAY,EACb,MAAM,aAAa,CAAC;AAcrB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,kBAAkB,GAC7B,SAAS,WAAW,EACpB,SAAS,cAAc,EACvB,YAAY,YAAY,KACvB,YAyBF,CAAC"}
+{"version":3,"file":"intlayerMiddleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/intlayerMiddleware.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,YAAY,EACb,MAAM,aAAa,CAAC;AA0CrB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,kBAAkB,GAC7B,SAAS,WAAW,EACpB,SAAS,cAAc,EACvB,YAAY,YAAY,KACvB,YAuCF,CAAC"}

package/dist/types/server/index.d.ts

@@ -1,3 +1,3 @@
-export { useDictionary, IntlayerServer, IntlayerServerProvider, locale, useIntlayer, t, } from 'react-intlayer/server';
+export { IntlayerServer, IntlayerServerProvider, locale, t, useDictionary, useIntlayer, useLocale, } from 'react-intlayer/server';
 export { withIntlayer } from './withIntlayer';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EACd,sBAAsB,EACtB,MAAM,EACN,WAAW,EACX,CAAC,GACF,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,MAAM,EACN,CAAC,EACD,aAAa,EACb,WAAW,EACX,SAAS,GACV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intlayer",
-  "version": "5.5.0-canary.0",
+  "version": "5.5.1",
   "private": false,
   "description": "Simplify internationalization i18n in Next.js with context providers, hooks, locale detection, and multilingual content integration.",
   "keywords": [
@@ -69,12 +69,12 @@
   "dependencies": {
     "deepmerge": "^4.3.1",
     "node-loader": "^2.1.0",
-    "@intlayer/core": "5.5.0-canary.0",
-    "@intlayer/chokidar": "5.5.0-canary.0",
-    "@intlayer/dictionaries-entry": "5.5.0-canary.0",
-    "@intlayer/config": "5.5.0-canary.0",
-    "@intlayer/webpack": "5.5.0-canary.0",
-    "react-intlayer": "5.5.0-canary.0"
+    "@intlayer/chokidar": "5.5.1",
+    "@intlayer/config": "5.5.1",
+    "@intlayer/dictionaries-entry": "5.5.1",
+    "@intlayer/core": "5.5.1",
+    "@intlayer/webpack": "5.5.1",
+    "react-intlayer": "5.5.1"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
@@ -91,19 +91,19 @@
     "@utils/ts-config": "1.0.4",
     "@utils/eslint-config": "1.0.4",
     "@utils/tsup-config": "1.0.4",
-    "@utils/ts-config-types": "1.0.4",
-    "intlayer": "5.5.0-canary.0"
+    "intlayer": "5.5.1",
+    "@utils/ts-config-types": "1.0.4"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
     "react": ">=16.0.0",
     "react-dom": ">=16.0.0",
-    "@intlayer/config": "5.5.0-canary.0",
-    "@intlayer/core": "5.5.0-canary.0",
-    "@intlayer/dictionaries-entry": "5.5.0-canary.0",
-    "@intlayer/webpack": "5.5.0-canary.0",
-    "react-intlayer": "5.5.0-canary.0",
-    "intlayer": "5.5.0-canary.0"
+    "@intlayer/config": "5.5.1",
+    "@intlayer/core": "5.5.1",
+    "@intlayer/dictionaries-entry": "5.5.1",
+    "intlayer": "5.5.1",
+    "@intlayer/webpack": "5.5.1",
+    "react-intlayer": "5.5.1"
   },
   "engines": {
     "node": ">=14.18"