next-intlayer 7.5.6 → 7.5.12

package/README.md

@@ -5,8 +5,11 @@
 </p>
 
 <h1 align="center">
-  <strong> Intlayer : an Open-source, per-component i18n toolkit with AI-powered translation & CMS.</strong>
+  <strong>Per-component i18n</strong>
 </h1>
+<h2 align="center">
+  <strong>AI-powered translation. Visual Editor. Multilingual CMS.</strong>
+</h2>
 
 <br />
 
@@ -24,6 +27,8 @@
   <a href="https://github.com/aymericzip/intlayer/blob/main/LICENSE" target="_blank" rel="noopener noreferrer nofollow"><img src="https://img.shields.io/github/license/aymericzip/intlayer?style=for-the-badge&labelColor=000000&color=FFFFFF&logoColor=000000&cacheSeconds=86400" alt="license"/></a>
   <a href="https://github.com/aymericzip/intlayer/commits/main" target="_blank" rel="noopener noreferrer nofollow"><img src="https://img.shields.io/github/last-commit/aymericzip/intlayer?style=for-the-badge&labelColor=000000&color=FFFFFF&logoColor=000000&cacheSeconds=86400" alt="last commit"/>
   </a>
+  <a href="https://www.bountyhub.dev/en/bounty/view/a2f24259-80ae-4a19-82e7-288718fba449/adapt-markdown-parser-in-a-custom-packages" target="_blank" rel="noopener noreferrer nofollow"><img src="https://img.shields.io/badge/Bounties-on%20BountyHub-yellow?style=for-the-badge&labelColor=000000&color=FFFFFF&logoColor=000000&cacheSeconds=86400" alt="Bounties on BountyHub"/>
+  </a>
 </p>
 
 ![Watch the video](https://github.com/aymericzip/intlayer/blob/main/docs/assets/demo_video.gif)
@@ -46,7 +51,7 @@ With **per-locale content files**, **TypeScript autocompletion**, **tree-shakabl
 | Feature                                                                                                                                             | Description                                                                                                                                                                                                                                                                                                                                                                                    |
 | --------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | <img src="https://github.com/aymericzip/intlayer/blob/main/docs/assets/frameworks.png?raw=true" alt="Feature" width="700">                          | **Cross-Frameworks Support**<br><br>Intlayer is compatible with all major frameworks and libraries, including Next.js, React, Vite, Vue.js, Nuxt, Preact, Express, and more.                                                                                                                                                                                                                   |
-| <img src="https://github.com/aymericzip/intlayer/blob/main/docs/assets/javascript_content_management.png?raw=true" alt="Feature" width="700">       | **JavaScript-Powered Content Management**<br><br>Harness the flexibility of JavaScript to define and manage your content efficiently. <br><br> - [Content declaration](https://intlayer.org/doc/concept/content)                                                                                                                                                                               |
+| <img src="https://github.com/aymericzip/intlayer/blob/main/docs/assets/javascript_content_management.jpg?raw=true" alt="Feature" width="700">       | **JavaScript-Powered Content Management**<br><br>Harness the flexibility of JavaScript to define and manage your content efficiently. <br><br> - [Content declaration](https://intlayer.org/doc/concept/content)                                                                                                                                                                               |
 | <img src="https://github.com/aymericzip/intlayer/blob/main/docs/assets/per_locale_content_declaration_file.png?raw=true" alt="Feature" width="700"> | **Per-Locale Content Declaration File**<br><br>Speed up your development by declaring your content once, before auto generation.<br><br> - [Per-Locale Content Declaration File](https://intlayer.org/doc/concept/per-locale-file)                                                                                                                                                             |
 | <img src="https://github.com/aymericzip/intlayer/blob/main/docs/assets/autocompletion.png?raw=true" alt="Feature" width="700">                      | **Type-Safe Environment**<br><br>Leverage TypeScript to ensure your content definitions and code are error-free, while also benefiting from IDE autocompletion.<br><br> - [TypeScript configuration](https://intlayer.org/doc/environment/vite-and-react#configure-typescript)                                                                                                                 |
 | <img src="https://github.com/aymericzip/intlayer/blob/main/docs/assets/config_file.png?raw=true" alt="Feature" width="700">                         | **Simplified Setup**<br><br>Get up and running quickly with minimal configuration. Adjust settings for internationalization, routing, AI, build, and content handling with ease. <br><br> - [Explore Next.js integration](https://intlayer.org/doc/environment/nextjs)                                                                                                                         |
@@ -268,6 +273,8 @@ You can also follow us on :
 
 For more detailed guidelines on contributing to this project, please refer to the [`CONTRIBUTING.md`](https://github.com/aymericzip/intlayer/blob/main/CONTRIBUTING.md) file. It contains essential information on our development process, commit message conventions, and release procedures. Your contributions are valuable to us, and we appreciate your efforts in making this project better!
 
+Contribute on [GitHub](https://github.com/aymericzip/intlayer), [GitLab](https://gitlab.com/ay.pineau/intlayer), or [Bitbucket](https://bitbucket.org/intlayer/intlayer/).
+
 ### Thank You for the Support
 
 If you like Intlayer, give us a ⭐ on GitHub. It helps others discover the project! [See why GitHub Stars matter](https://github.com/aymericzip/intlayer/blob/main/CONTRIBUTING.md#why-github-stars-matter-).

package/dist/cjs/proxy/intlayerProxy.cjs

@@ -81,28 +81,15 @@ const getLocalLocale = (request) => (0, _intlayer_core.getLocaleFromStorage)({
 });
 /**
 * Handles the case where URLs do not have locale prefixes.
-*
-* @param request - The incoming Next.js request object.
-* @param localLocale - The locale from the cookie.
-* @param pathname - The pathname from the request URL.
-* @returns - The rewritten response with the locale applied.
 */
 const handleNoPrefix = (request, localLocale, pathname) => {
 	const pathLocale = getPathLocale(pathname);
-	if (pathLocale) {
-		const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || "/";
-		const search$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
-		return redirectUrl(request, search$1 ? `${pathWithoutLocale}${search$1}` : `${pathWithoutLocale}${request.nextUrl.search ?? ""}`);
-	}
 	const locale = localLocale ?? defaultLocale;
+	if (pathLocale) return redirectUrl(request, `${pathname.slice(`/${pathLocale}`.length) || "/"}${appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale)}`);
 	if (effectiveMode === "search-params") {
-		if (new URLSearchParams(request.nextUrl.search).get("locale") === locale) return rewriteUrl(request, `${`/${locale}${pathname}`}${request.nextUrl.search ?? ""}`, locale);
-		const search$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);
-		return redirectUrl(request, search$1 ? `${pathname}${search$1}` : `${pathname}${request.nextUrl.search ?? ""}`);
+		if (request.nextUrl.searchParams.get("locale") !== locale) return redirectUrl(request, `${pathname}${appendLocaleSearchIfNeeded(request.nextUrl.search, locale)}`);
 	}
-	const internalPath = `/${locale}${pathname}`;
-	const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);
-	return rewriteUrl(request, search ? `${internalPath}${search}` : `${internalPath}${request.nextUrl.search ?? ""}`, locale);
+	return rewriteUrl(request, pathname, locale);
 };
 /**
 * Extracts the locale from the URL pathname if present.
@@ -140,8 +127,8 @@ const handlePrefix = (request, localLocale, pathLocale, pathname) => {
 const handleMissingPathLocale = (request, localLocale, pathname) => {
 	let locale = localLocale ?? require_proxy_localeDetector.localeDetector?.(request) ?? defaultLocale;
 	if (!locales.includes(locale)) locale = defaultLocale;
-	const newPath = constructPath(locale, pathname, basePath, appendLocaleSearchIfNeeded(request.nextUrl.search, locale));
-	return prefixDefault || locale !== defaultLocale ? redirectUrl(request, newPath) : rewriteUrl(request, newPath, locale);
+	if (prefixDefault || locale !== defaultLocale) return redirectUrl(request, constructPath(locale, pathname, basePath, appendLocaleSearchIfNeeded(request.nextUrl.search, locale)));
+	return rewriteUrl(request, pathname, locale);
 };
 /**
 * Handles requests where the locale exists in the URL pathname.
@@ -152,11 +139,23 @@ const handleMissingPathLocale = (request, localLocale, pathname) => {
 * @param pathname - The pathname from the request URL.
 * @returns - The response to be returned to the client.
 */
+/**
+* Handles requests where the locale exists in the URL pathname.
+*/
 const handleExistingPathLocale = (request, localLocale, pathLocale, pathname) => {
 	if (localLocale && localLocale !== pathLocale) return redirectUrl(request, handleCookieLocaleMismatch(request, pathname, pathLocale, localLocale, basePath));
 	return handleDefaultLocaleRedirect(request, pathLocale, pathname);
 };
 /**
+* The key fix for 404s without [locale] folders
+*/
+const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
+	if (!prefixDefault && pathLocale === defaultLocale) return redirectUrl(request, `${basePath}${pathname.slice(`/${pathLocale}`.length) || "/"}`);
+	const internalPathname = pathname.slice(`/${pathLocale}`.length) || "/";
+	const searchWithLocale = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
+	return rewriteUrl(request, searchWithLocale ? `${internalPathname}${searchWithLocale}` : internalPathname, pathLocale);
+};
+/**
 * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.
 *
 * @param request - The incoming Next.js request object.
@@ -170,26 +169,6 @@ const handleCookieLocaleMismatch = (request, pathname, pathLocale, localLocale,
 	return constructPath(localLocale, pathname.replace(`/${pathLocale}`, `/${localLocale}`), basePath$1, appendLocaleSearchIfNeeded(request.nextUrl.search, localLocale));
 };
 /**
-* Handles redirection when the default locale is used and prefixing is not required.
-*
-* @param request - The incoming Next.js request object.
-* @param pathLocale - The locale extracted from the pathname.
-* @param pathname - The pathname from the request URL.
-* @returns - The rewritten response without the locale prefix.
-*/
-const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
-	if (!prefixDefault && pathLocale === defaultLocale) {
-		let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || "/";
-		if (basePath.endsWith("/")) pathWithoutLocale = pathWithoutLocale.slice(1);
-		const searchWithLocale$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
-		if (searchWithLocale$1) pathWithoutLocale += searchWithLocale$1;
-		else if (request.nextUrl.search) pathWithoutLocale += request.nextUrl.search;
-		return redirectUrl(request, `${basePath}${pathWithoutLocale}`);
-	}
-	const searchWithLocale = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
-	return rewriteUrl(request, searchWithLocale ? `${pathname}${searchWithLocale}` : pathname, pathLocale);
-};
-/**
 * Constructs a new path by combining the locale, path, basePath, and search parameters.
 *
 * @param locale - The locale to include in the path.
@@ -199,31 +178,36 @@ const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
 * @returns - The constructed new path.
 */
 const constructPath = (locale, path, basePath$1, search) => {
-	const pathWithoutPrefix = path.startsWith(`/${locale}`) ? path.slice(`/${locale}`.length) || "/" : path;
-	if (effectiveMode === "no-prefix") {
-		if (search) return `${pathWithoutPrefix}?${search}`;
-		return pathWithoutPrefix;
-	}
-	if (effectiveMode === "search-params") {
-		if (search) return `${pathWithoutPrefix}?${search}`;
-		return pathWithoutPrefix;
-	}
-	const pathWithLocalePrefix = path.startsWith(`/${locale}`) ? path : `${locale}${path}`;
-	return `${basePath$1}${basePath$1.endsWith("/") ? "" : "/"}${pathWithLocalePrefix}`;
+	const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+	let finalPath = normalizedPath;
+	if (effectiveMode === "no-prefix" || effectiveMode === "search-params") {
+		for (const loc of locales) if (normalizedPath.startsWith(`/${loc}/`) || normalizedPath === `/${loc}`) {
+			finalPath = normalizedPath.slice(`/${loc}`.length) || "/";
+			break;
+		}
+	} else finalPath = normalizedPath.startsWith(`/${locale}`) ? normalizedPath : `/${locale}${normalizedPath}`;
+	const result = `${basePath$1.replace(/\/$/, "")}${finalPath}`;
+	return search ? `${result}${search.startsWith("?") ? "" : "?"}${search}` : result;
 };
 /**
-* Rewrites the URL to the new path and sets the locale header.
-*
-* @param request - The incoming Next.js request object.
-* @param newPath - The new path to rewrite to.
-* @param locale - The locale to set in the response header.
-* @returns - The rewritten response.
+* This handles the internal path Next.js sees.
+* To support optional [locale] folders, we need to decide if we
+* keep the locale prefix or strip it.
 */
 const rewriteUrl = (request, newPath, locale) => {
-	const search = request.nextUrl.search;
-	const pathWithSearch = search && !newPath.includes("?") ? `${newPath}${search}` : newPath;
-	const response = next_server.NextResponse.rewrite(new URL(pathWithSearch, request.url));
-	(0, _intlayer_core.setLocaleInStorage)(locale, { setHeader: (name, value) => response.headers.set(name, value) });
+	const url = request.nextUrl.clone();
+	const pathname = newPath.split("?")[0];
+	if (effectiveMode !== "no-prefix" && effectiveMode !== "search-params") if (!getPathLocale(pathname)) url.pathname = `/${locale}${pathname === "/" ? "" : pathname}`;
+	else url.pathname = pathname;
+	else {
+		const pathLocale = getPathLocale(pathname);
+		if (pathLocale) url.pathname = pathname.slice(`/${pathLocale}`.length) || "/";
+		else url.pathname = pathname;
+	}
+	const response = next_server.NextResponse.rewrite(url);
+	(0, _intlayer_core.setLocaleInStorage)(locale, { setHeader: (name, value) => {
+		response.headers.set(name, value);
+	} });
 	return response;
 };
 /**

package/dist/cjs/proxy/intlayerProxy.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"intlayerProxy.cjs","names":["configuration","DefaultValues","search","localeDetector","basePath","searchWithLocale","NextResponse"],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { DefaultValues } from '@intlayer/config/client';\nimport { getLocaleFromStorage, setLocaleInStorage } from '@intlayer/core';\nimport type { Locale } from '@intlayer/types';\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\n/**\n * Controls whether locale detection occurs during Next.js prefetch requests\n * - true: Detect and apply locale during prefetch\n * - false: Use default locale during prefetch (recommended)\n *\n * This setting affects how Next.js handles locale prefetching:\n *\n * Example scenario:\n * - User's browser language is 'fr'\n * - Current page is /fr/about\n * - Link prefetches /about\n *\n * With `detectLocaleOnPrefetchNoPrefix:true`\n * - Prefetch detects 'fr' locale from browser\n * - Redirects prefetch to /fr/about\n *\n * With `detectLocaleOnPrefetchNoPrefix:false` (default)\n * - Prefetch uses default locale\n * - Redirects prefetch to /en/about (assuming 'en' is default)\n *\n * When to use true:\n * - Your app uses non-localized internal links (e.g. <a href=\"/about\">)\n * - You want consistent locale detection behavior between regular and prefetch requests\n *\n * When to use false (default):\n * - Your app uses locale-prefixed links (e.g. <a href=\"/fr/about\">)\n * - You want to optimize prefetching performance\n * - You want to avoid potential redirect loops\n */\nconst DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX = false;\n\nconst { internationalization, routing } = configuration ?? {};\nconst { locales, defaultLocale } = internationalization ?? {};\nconst { basePath, mode } = routing ?? {};\n// Note: cookie names are resolved inside LocaleStorage based on configuration\n\n// Derived flags from routing.mode\nconst effectiveMode = mode ?? DefaultValues.Routing.ROUTING_MODE;\nconst noPrefix =\n  effectiveMode === 'no-prefix' || effectiveMode === 'search-params';\nconst prefixDefault = effectiveMode === 'prefix-all';\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// Ensure locale is reflected in search params when routing mode is 'search-params'\nconst appendLocaleSearchIfNeeded = (\n  search: string | undefined,\n  locale: Locale\n): string | undefined => {\n  if (effectiveMode !== 'search-params') return search;\n\n  const params = new URLSearchParams(search ?? '');\n\n  params.set('locale', locale);\n\n  return `?${params.toString()}`;\n};\n\n/**\n * Proxy that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/proxy.ts\n *\n * export { intlayerProxy as proxy } from '@intlayer/next/proxy';\n *\n * // applies this proxy only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main proxy 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 intlayerProxy = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n\n  const localLocale = getLocalLocale(request);\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(request, localLocale, pathname);\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(request, localLocale, pathLocale, pathname);\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 getLocalLocale = (request: NextRequest): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => request.cookies.get(name)?.value ?? null,\n    getHeader: (name: string) => request.headers.get(name) ?? null,\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 localLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  // Check if pathname has a locale prefix (even though we're in no-prefix mode)\n  const pathLocale = getPathLocale(pathname);\n\n  // If a locale prefix is detected in the URL, redirect to remove it\n  if (pathLocale) {\n    // Strip the locale prefix from the pathname\n    const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || '/';\n\n    // Build redirect URL without locale prefix but with search params if needed\n    const search = appendLocaleSearchIfNeeded(\n      request.nextUrl.search,\n      pathLocale\n    );\n    const redirectPath = search\n      ? `${pathWithoutLocale}${search}`\n      : `${pathWithoutLocale}${request.nextUrl.search ?? ''}`;\n\n    // Redirect to the path without locale prefix (URL changes in browser)\n    return redirectUrl(request, redirectPath);\n  }\n\n  // If no locale prefix in URL, determine locale and rewrite internally\n  const locale = localLocale ?? defaultLocale;\n\n  // In search-params mode, we need to redirect to add the locale search param\n  if (effectiveMode === 'search-params') {\n    // Check if locale search param already exists and matches the detected locale\n    const existingSearchParams = new URLSearchParams(request.nextUrl.search);\n    const existingLocale = existingSearchParams.get('locale');\n\n    // If the existing locale matches the detected locale, no redirect needed\n    if (existingLocale === locale) {\n      // For internal routing, we need to add the locale prefix so Next.js can match [locale] param\n      const internalPath = `/${locale}${pathname}`;\n      const rewritePath = `${internalPath}${request.nextUrl.search ?? ''}`;\n\n      // Rewrite internally (URL stays the same in browser, but Next.js routes to /[locale]/path)\n      return rewriteUrl(request, rewritePath, locale);\n    }\n\n    const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);\n    const redirectPath = search\n      ? `${pathname}${search}`\n      : `${pathname}${request.nextUrl.search ?? ''}`;\n\n    // Redirect to add/update the locale search param (URL changes in browser)\n    return redirectUrl(request, redirectPath);\n  }\n\n  // For internal routing, we need to add the locale prefix so Next.js can match [locale] param\n  const internalPath = `/${locale}${pathname}`;\n\n  // Add search params if needed\n  const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);\n  const rewritePath = search\n    ? `${internalPath}${search}`\n    : `${internalPath}${request.nextUrl.search ?? ''}`;\n\n  // Rewrite internally (URL stays the same in browser, but Next.js routes to /[locale]/path)\n  return rewriteUrl(request, rewritePath, 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): Locale | 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 localLocale - 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  localLocale: Locale | undefined,\n  pathLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    const isPrefetch = isPrefetchRequest(request);\n\n    if (isPrefetch && !DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX) {\n      return handleMissingPathLocale(request, defaultLocale, pathname);\n    }\n\n    return handleMissingPathLocale(request, localLocale, pathname);\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(request, localLocale, pathLocale, pathname);\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 localLocale - 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  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  let locale = (localLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locale;\n  if (!locales.includes(locale)) {\n    locale = defaultLocale;\n  }\n\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, locale)\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 localLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathLocale: Locale,\n  pathname: string\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL\n    localLocale &&\n    localLocale !== pathLocale\n  ) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      localLocale,\n      basePath\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(request, pathLocale, pathname);\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 localLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locale,\n  localLocale: Locale,\n  basePath: string\n): string => {\n  // Replace the pathLocale in the pathname with the localLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${localLocale}`);\n\n  return constructPath(\n    localLocale,\n    newPath,\n    basePath,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, localLocale)\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 * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locale,\n  pathname: string\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    const basePathTrailingSlash = basePath.endsWith('/');\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    const searchWithLocale = appendLocaleSearchIfNeeded(\n      request.nextUrl.search,\n      pathLocale\n    );\n    if (searchWithLocale) {\n      pathWithoutLocale += searchWithLocale;\n    } else if (request.nextUrl.search) {\n      pathWithoutLocale += request.nextUrl.search;\n    }\n\n    return redirectUrl(request, `${basePath}${pathWithoutLocale}`);\n  }\n\n  // If prefixing default locale is required or pathLocale is not the defaultLocale\n\n  const searchWithLocale = appendLocaleSearchIfNeeded(\n    request.nextUrl.search,\n    pathLocale\n  );\n  const newPath = searchWithLocale\n    ? `${pathname}${searchWithLocale}`\n    : pathname;\n  return rewriteUrl(request, newPath, 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 [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locale,\n  path: string,\n  basePath: string,\n  search?: string\n): string => {\n  // In 'search-params' and 'no-prefix' modes, do not prefix the path with the locale\n  // Also, strip any incoming locale prefix if present\n  const pathWithoutPrefix = path.startsWith(`/${locale}`)\n    ? path.slice(`/${locale}`.length) || '/'\n    : path;\n\n  if (effectiveMode === 'no-prefix') {\n    if (search) {\n      return `${pathWithoutPrefix}?${search}`;\n    }\n\n    return pathWithoutPrefix;\n  }\n\n  if (effectiveMode === 'search-params') {\n    if (search) {\n      return `${pathWithoutPrefix}?${search}`;\n    }\n\n    return pathWithoutPrefix;\n  }\n\n  const pathWithLocalePrefix = path.startsWith(`/${locale}`)\n    ? path\n    : `${locale}${path}`;\n\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  const newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${pathWithLocalePrefix}`;\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: Locale\n): NextResponse => {\n  // Ensure we preserve the original search params if they were present and not explicitly included in newPath\n  const search = request.nextUrl.search;\n  const pathWithSearch =\n    search && !newPath.includes('?') ? `${newPath}${search}` : newPath;\n\n  const response = NextResponse.rewrite(new URL(pathWithSearch, request.url));\n\n  setLocaleInStorage(locale, {\n    setHeader: (name: string, value: string) =>\n      response.headers.set(name, value),\n  });\n\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  // Ensure we preserve the original search params if they were present and not explicitly included in newPath\n  const search = request.nextUrl.search;\n  const pathWithSearch =\n    search && !newPath.includes('?') ? `${newPath}${search}` : newPath;\n\n  return NextResponse.redirect(new URL(pathWithSearch, request.url));\n};\n"],"mappings":"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"}
+{"version":3,"file":"intlayerProxy.cjs","names":["configuration","DefaultValues","localeDetector","basePath","NextResponse"],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { DefaultValues } from '@intlayer/config/client';\nimport { getLocaleFromStorage, setLocaleInStorage } from '@intlayer/core';\nimport type { Locale } from '@intlayer/types';\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\n/**\n * Controls whether locale detection occurs during Next.js prefetch requests\n * - true: Detect and apply locale during prefetch\n * - false: Use default locale during prefetch (recommended)\n *\n * This setting affects how Next.js handles locale prefetching:\n *\n * Example scenario:\n * - User's browser language is 'fr'\n * - Current page is /fr/about\n * - Link prefetches /about\n *\n * With `detectLocaleOnPrefetchNoPrefix:true`\n * - Prefetch detects 'fr' locale from browser\n * - Redirects prefetch to /fr/about\n *\n * With `detectLocaleOnPrefetchNoPrefix:false` (default)\n * - Prefetch uses default locale\n * - Redirects prefetch to /en/about (assuming 'en' is default)\n *\n * When to use true:\n * - Your app uses non-localized internal links (e.g. <a href=\"/about\">)\n * - You want consistent locale detection behavior between regular and prefetch requests\n *\n * When to use false (default):\n * - Your app uses locale-prefixed links (e.g. <a href=\"/fr/about\">)\n * - You want to optimize prefetching performance\n * - You want to avoid potential redirect loops\n */\nconst DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX = false;\n\nconst { internationalization, routing } = configuration ?? {};\nconst { locales, defaultLocale } = internationalization ?? {};\nconst { basePath, mode } = routing ?? {};\n\n// Note: cookie names are resolved inside LocaleStorage based on configuration\n\n// Derived flags from routing.mode\nconst effectiveMode = mode ?? DefaultValues.Routing.ROUTING_MODE;\nconst noPrefix =\n  effectiveMode === 'no-prefix' || effectiveMode === 'search-params';\nconst prefixDefault = effectiveMode === 'prefix-all';\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// Ensure locale is reflected in search params when routing mode is 'search-params'\nconst appendLocaleSearchIfNeeded = (\n  search: string | undefined,\n  locale: Locale\n): string | undefined => {\n  if (effectiveMode !== 'search-params') return search;\n\n  const params = new URLSearchParams(search ?? '');\n\n  params.set('locale', locale);\n\n  return `?${params.toString()}`;\n};\n\n/**\n * Proxy that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/proxy.ts\n *\n * export { intlayerProxy as proxy } from '@intlayer/next/proxy';\n *\n * // applies this proxy only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main proxy 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 intlayerProxy = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n\n  const localLocale = getLocalLocale(request);\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(request, localLocale, pathname);\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(request, localLocale, pathLocale, pathname);\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 getLocalLocale = (request: NextRequest): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => request.cookies.get(name)?.value ?? null,\n    getHeader: (name: string) => request.headers.get(name) ?? null,\n  });\n\n/**\n * Handles the case where URLs do not have locale prefixes.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  const pathLocale = getPathLocale(pathname);\n  const locale = localLocale ?? defaultLocale;\n\n  // If user typed /fr/about but mode is no-prefix,\n  // we REDIRECT to /about (clean URL)\n  if (pathLocale) {\n    const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || '/';\n    const search = appendLocaleSearchIfNeeded(\n      request.nextUrl.search,\n      pathLocale\n    );\n    return redirectUrl(request, `${pathWithoutLocale}${search}`);\n  }\n\n  // Handle search-params redirect if locale is missing from URL\n  if (effectiveMode === 'search-params') {\n    const currentParam = request.nextUrl.searchParams.get('locale');\n    if (currentParam !== locale) {\n      const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);\n      return redirectUrl(request, `${pathname}${search}`);\n    }\n  }\n\n  // INTERNAL REWRITE\n  // We rewrite to the clean pathname.\n  // If they have a [locale] folder, rewriteUrl (above) will handle adding it back.\n  return rewriteUrl(request, pathname, 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): Locale | 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 localLocale - 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  localLocale: Locale | undefined,\n  pathLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    const isPrefetch = isPrefetchRequest(request);\n\n    if (isPrefetch && !DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX) {\n      return handleMissingPathLocale(request, defaultLocale, pathname);\n    }\n\n    return handleMissingPathLocale(request, localLocale, pathname);\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(request, localLocale, pathLocale, pathname);\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 localLocale - 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  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  let locale = (localLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locale;\n\n  if (!locales.includes(locale)) {\n    locale = defaultLocale;\n  }\n\n  // Determine if we should redirect or rewrite\n  // If we are in 'prefix-all', we MUST redirect / -> /en/\n  // If we are in 'prefix-no-default' and locale is NOT default, redirect / -> /fr/\n  const shouldRedirect = prefixDefault || locale !== defaultLocale;\n\n  if (shouldRedirect) {\n    const newPath = constructPath(\n      locale,\n      pathname,\n      basePath,\n      appendLocaleSearchIfNeeded(request.nextUrl.search, locale)\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // --- THE FIX FOR / 404 ---\n  // If we are at the root (or any path) and it's the default locale\n  // (or we are in no-prefix mode), rewrite to the actual physical pathname.\n  return rewriteUrl(request, pathname, locale);\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 localLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @returns - The response to be returned to the client.\n */\n/**\n * Handles requests where the locale exists in the URL pathname.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathLocale: Locale,\n  pathname: string\n): NextResponse => {\n  // 1. If cookie locale differs from path locale, redirect to the cookie locale\n  // (Standard Intlayer behavior)\n  if (localLocale && localLocale !== pathLocale) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      localLocale,\n      basePath\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // 2. Handle the rewrite logic\n  return handleDefaultLocaleRedirect(request, pathLocale, pathname);\n};\n\n/**\n * The key fix for 404s without [locale] folders\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locale,\n  pathname: string\n): NextResponse => {\n  // Determine if we need to remove the prefix for the default locale\n  const isDefaultAndNoPrefix = !prefixDefault && pathLocale === defaultLocale;\n\n  if (isDefaultAndNoPrefix) {\n    const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || '/';\n    // ... (rest of your existing search param logic)\n    return redirectUrl(request, `${basePath}${pathWithoutLocale}`);\n  }\n\n  // --- THE FIX ---\n  // If the path contains a locale (like /fr) but we DON'T have a [locale] folder,\n  // we rewrite the path to its \"clean\" version internally.\n\n  // Strip the /fr prefix from the pathname for the internal rewrite\n  const internalPathname = pathname.slice(`/${pathLocale}`.length) || '/';\n\n  const searchWithLocale = appendLocaleSearchIfNeeded(\n    request.nextUrl.search,\n    pathLocale\n  );\n\n  const rewritePath = searchWithLocale\n    ? `${internalPathname}${searchWithLocale}`\n    : internalPathname;\n\n  // Internal rewrite: Next.js sees / (or /path), user sees /fr/path\n  return rewriteUrl(request, rewritePath, pathLocale);\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 localLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locale,\n  localLocale: Locale,\n  basePath: string\n): string => {\n  // Replace the pathLocale in the pathname with the localLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${localLocale}`);\n\n  return constructPath(\n    localLocale,\n    newPath,\n    basePath,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, localLocale)\n  );\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 [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locale,\n  path: string,\n  basePath: string,\n  search?: string\n): string => {\n  const normalizedPath = path.startsWith('/') ? path : `/${path}`;\n  let finalPath = normalizedPath;\n\n  // If we are in a mode that doesn't want prefixes in the URL\n  if (effectiveMode === 'no-prefix' || effectiveMode === 'search-params') {\n    // Strip the locale from the path if it exists\n    // This allows /fr/about to be treated as /about internally\n    for (const loc of locales) {\n      if (\n        normalizedPath.startsWith(`/${loc}/`) ||\n        normalizedPath === `/${loc}`\n      ) {\n        finalPath = normalizedPath.slice(`/${loc}`.length) || '/';\n        break;\n      }\n    }\n  } else {\n    // Prefix modes: ensure the locale IS there\n    finalPath = normalizedPath.startsWith(`/${locale}`)\n      ? normalizedPath\n      : `/${locale}${normalizedPath}`;\n  }\n\n  const cleanBasePath = basePath.replace(/\\/$/, '');\n  const result = `${cleanBasePath}${finalPath}`;\n\n  return search\n    ? `${result}${search.startsWith('?') ? '' : '?'}${search}`\n    : result;\n};\n\n/**\n * This handles the internal path Next.js sees.\n * To support optional [locale] folders, we need to decide if we\n * keep the locale prefix or strip it.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: Locale\n): NextResponse => {\n  const url = request.nextUrl.clone();\n  const pathname = newPath.split('?')[0];\n\n  // We determine if we should internally prefix based on the routing mode.\n  // If user has [locale] folder, 'prefix-all' or 'prefix-no-default' usually works.\n  // If user does NOT have [locale] folder, they usually use 'no-prefix'.\n\n  const shouldInternallyPrefix =\n    effectiveMode !== 'no-prefix' && effectiveMode !== 'search-params';\n\n  if (shouldInternallyPrefix) {\n    // If the path doesn't already have the locale, we add it for internal routing\n    if (!getPathLocale(pathname)) {\n      url.pathname = `/${locale}${pathname === '/' ? '' : pathname}`;\n    } else {\n      url.pathname = pathname;\n    }\n  } else {\n    // For no-prefix or search-params, we ensure the internal path is CLEAN\n    const pathLocale = getPathLocale(pathname);\n    if (pathLocale) {\n      url.pathname = pathname.slice(`/${pathLocale}`.length) || '/';\n    } else {\n      url.pathname = pathname;\n    }\n  }\n\n  const response = NextResponse.rewrite(url);\n\n  // CRITICAL: Set the locale in a header.\n  // If the [locale] folder is missing, the Intlayer server-component\n  // will read this header as a fallback to prevent \"Missing Tags\"\n  setLocaleInStorage(locale, {\n    setHeader: (name: string, value: string) => {\n      response.headers.set(name, value);\n    },\n  });\n\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  // Ensure we preserve the original search params if they were present and not explicitly included in newPath\n  const search = request.nextUrl.search;\n  const pathWithSearch =\n    search && !newPath.includes('?') ? `${newPath}${search}` : newPath;\n\n  return NextResponse.redirect(new URL(pathWithSearch, request.url));\n};\n"],"mappings":"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"}

package/dist/cjs/server/getLocale.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"getLocale.cjs","names":["configuration","Locales","negotiatorHeaders: Record<string, string>"],"sources":["../../../src/server/getLocale.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { getLocaleFromStorage, localeDetector } from '@intlayer/core';\nimport { type Locale, Locales } from '@intlayer/types';\nimport { cookies, headers } from 'next/headers.js';\n\n// Helper function to extract locale from headers/cookies\nexport const getLocale = async (): Promise<Locale> => {\n  const defaultLocale =\n    configuration?.internationalization?.defaultLocale ?? Locales.ENGLISH;\n\n  // 1 - Try locale from header\n  const headersList = await headers();\n  const cookiesList = await cookies();\n\n  const storedLocale = getLocaleFromStorage({\n    getCookie: (name: string) => cookiesList.get(name)?.value ?? null,\n    getHeader: (name: string) => headersList.get(name) ?? null,\n  });\n\n  if (storedLocale) return storedLocale as Locale;\n\n  // 3 - Fallback to Accept-Language negotiation\n  const negotiatorHeaders: Record<string, string> = {};\n  headersList.forEach((value, key) => {\n    negotiatorHeaders[key] = value;\n  });\n\n  const userFallbackLocale = localeDetector(negotiatorHeaders);\n  if (userFallbackLocale) return userFallbackLocale as Locale;\n\n  // 4 - Default locale\n  return defaultLocale;\n};\n"],"mappings":";;;;;;;;AAMA,MAAa,YAAY,YAA6B;CACpD,MAAM,gBACJA,gCAAe,sBAAsB,iBAAiBC,wBAAQ;CAGhE,MAAM,cAAc,oCAAe;CACnC,MAAM,cAAc,oCAAe;CAEnC,MAAM,wDAAoC;EACxC,YAAY,SAAiB,YAAY,IAAI,KAAK,EAAE,SAAS;EAC7D,YAAY,SAAiB,YAAY,IAAI,KAAK,IAAI;EACvD,CAAC;AAEF,KAAI,aAAc,QAAO;CAGzB,MAAMC,oBAA4C,EAAE;AACpD,aAAY,SAAS,OAAO,QAAQ;AAClC,oBAAkB,OAAO;GACzB;CAEF,MAAM,wDAAoC,kBAAkB;AAC5D,KAAI,mBAAoB,QAAO;AAG/B,QAAO"}
+{"version":3,"file":"getLocale.cjs","names":["configuration","Locales","negotiatorHeaders: Record<string, string>"],"sources":["../../../src/server/getLocale.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { getLocaleFromStorage, localeDetector } from '@intlayer/core';\nimport { type Locale, Locales } from '@intlayer/types';\nimport { cookies, headers } from 'next/headers.js';\n\n// Helper function to extract locale from headers/cookies\nexport const getLocale = async (): Promise<Locale> => {\n  const defaultLocale =\n    configuration?.internationalization?.defaultLocale ?? Locales.ENGLISH;\n\n  // Try locale from header\n  const headersList = await headers();\n  const cookiesList = await cookies();\n\n  const storedLocale = getLocaleFromStorage({\n    getCookie: (name: string) => cookiesList.get(name)?.value ?? null,\n    getHeader: (name: string) => headersList.get(name) ?? null,\n  });\n\n  if (storedLocale) return storedLocale as Locale;\n\n  // Fallback to Accept-Language negotiation\n  const negotiatorHeaders: Record<string, string> = {};\n  headersList.forEach((value, key) => {\n    negotiatorHeaders[key] = value;\n  });\n\n  const userFallbackLocale = localeDetector(negotiatorHeaders);\n  if (userFallbackLocale) return userFallbackLocale as Locale;\n\n  // Default locale\n  return defaultLocale;\n};\n"],"mappings":";;;;;;;;AAMA,MAAa,YAAY,YAA6B;CACpD,MAAM,gBACJA,gCAAe,sBAAsB,iBAAiBC,wBAAQ;CAGhE,MAAM,cAAc,oCAAe;CACnC,MAAM,cAAc,oCAAe;CAEnC,MAAM,wDAAoC;EACxC,YAAY,SAAiB,YAAY,IAAI,KAAK,EAAE,SAAS;EAC7D,YAAY,SAAiB,YAAY,IAAI,KAAK,IAAI;EACvD,CAAC;AAEF,KAAI,aAAc,QAAO;CAGzB,MAAMC,oBAA4C,EAAE;AACpD,aAAY,SAAS,OAAO,QAAQ;AAClC,oBAAkB,OAAO;GACzB;CAEF,MAAM,wDAAoC,kBAAkB;AAC5D,KAAI,mBAAoB,QAAO;AAG/B,QAAO"}

package/dist/esm/proxy/intlayerProxy.mjs

@@ -79,28 +79,15 @@ const getLocalLocale = (request) => getLocaleFromStorage({
 });
 /**
 * Handles the case where URLs do not have locale prefixes.
-*
-* @param request - The incoming Next.js request object.
-* @param localLocale - The locale from the cookie.
-* @param pathname - The pathname from the request URL.
-* @returns - The rewritten response with the locale applied.
 */
 const handleNoPrefix = (request, localLocale, pathname) => {
 	const pathLocale = getPathLocale(pathname);
-	if (pathLocale) {
-		const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || "/";
-		const search$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
-		return redirectUrl(request, search$1 ? `${pathWithoutLocale}${search$1}` : `${pathWithoutLocale}${request.nextUrl.search ?? ""}`);
-	}
 	const locale = localLocale ?? defaultLocale;
+	if (pathLocale) return redirectUrl(request, `${pathname.slice(`/${pathLocale}`.length) || "/"}${appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale)}`);
 	if (effectiveMode === "search-params") {
-		if (new URLSearchParams(request.nextUrl.search).get("locale") === locale) return rewriteUrl(request, `${`/${locale}${pathname}`}${request.nextUrl.search ?? ""}`, locale);
-		const search$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);
-		return redirectUrl(request, search$1 ? `${pathname}${search$1}` : `${pathname}${request.nextUrl.search ?? ""}`);
+		if (request.nextUrl.searchParams.get("locale") !== locale) return redirectUrl(request, `${pathname}${appendLocaleSearchIfNeeded(request.nextUrl.search, locale)}`);
 	}
-	const internalPath = `/${locale}${pathname}`;
-	const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);
-	return rewriteUrl(request, search ? `${internalPath}${search}` : `${internalPath}${request.nextUrl.search ?? ""}`, locale);
+	return rewriteUrl(request, pathname, locale);
 };
 /**
 * Extracts the locale from the URL pathname if present.
@@ -138,8 +125,8 @@ const handlePrefix = (request, localLocale, pathLocale, pathname) => {
 const handleMissingPathLocale = (request, localLocale, pathname) => {
 	let locale = localLocale ?? localeDetector$1?.(request) ?? defaultLocale;
 	if (!locales.includes(locale)) locale = defaultLocale;
-	const newPath = constructPath(locale, pathname, basePath, appendLocaleSearchIfNeeded(request.nextUrl.search, locale));
-	return prefixDefault || locale !== defaultLocale ? redirectUrl(request, newPath) : rewriteUrl(request, newPath, locale);
+	if (prefixDefault || locale !== defaultLocale) return redirectUrl(request, constructPath(locale, pathname, basePath, appendLocaleSearchIfNeeded(request.nextUrl.search, locale)));
+	return rewriteUrl(request, pathname, locale);
 };
 /**
 * Handles requests where the locale exists in the URL pathname.
@@ -150,11 +137,23 @@ const handleMissingPathLocale = (request, localLocale, pathname) => {
 * @param pathname - The pathname from the request URL.
 * @returns - The response to be returned to the client.
 */
+/**
+* Handles requests where the locale exists in the URL pathname.
+*/
 const handleExistingPathLocale = (request, localLocale, pathLocale, pathname) => {
 	if (localLocale && localLocale !== pathLocale) return redirectUrl(request, handleCookieLocaleMismatch(request, pathname, pathLocale, localLocale, basePath));
 	return handleDefaultLocaleRedirect(request, pathLocale, pathname);
 };
 /**
+* The key fix for 404s without [locale] folders
+*/
+const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
+	if (!prefixDefault && pathLocale === defaultLocale) return redirectUrl(request, `${basePath}${pathname.slice(`/${pathLocale}`.length) || "/"}`);
+	const internalPathname = pathname.slice(`/${pathLocale}`.length) || "/";
+	const searchWithLocale = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
+	return rewriteUrl(request, searchWithLocale ? `${internalPathname}${searchWithLocale}` : internalPathname, pathLocale);
+};
+/**
 * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.
 *
 * @param request - The incoming Next.js request object.
@@ -168,26 +167,6 @@ const handleCookieLocaleMismatch = (request, pathname, pathLocale, localLocale,
 	return constructPath(localLocale, pathname.replace(`/${pathLocale}`, `/${localLocale}`), basePath$1, appendLocaleSearchIfNeeded(request.nextUrl.search, localLocale));
 };
 /**
-* Handles redirection when the default locale is used and prefixing is not required.
-*
-* @param request - The incoming Next.js request object.
-* @param pathLocale - The locale extracted from the pathname.
-* @param pathname - The pathname from the request URL.
-* @returns - The rewritten response without the locale prefix.
-*/
-const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
-	if (!prefixDefault && pathLocale === defaultLocale) {
-		let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || "/";
-		if (basePath.endsWith("/")) pathWithoutLocale = pathWithoutLocale.slice(1);
-		const searchWithLocale$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
-		if (searchWithLocale$1) pathWithoutLocale += searchWithLocale$1;
-		else if (request.nextUrl.search) pathWithoutLocale += request.nextUrl.search;
-		return redirectUrl(request, `${basePath}${pathWithoutLocale}`);
-	}
-	const searchWithLocale = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
-	return rewriteUrl(request, searchWithLocale ? `${pathname}${searchWithLocale}` : pathname, pathLocale);
-};
-/**
 * Constructs a new path by combining the locale, path, basePath, and search parameters.
 *
 * @param locale - The locale to include in the path.
@@ -197,31 +176,36 @@ const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
 * @returns - The constructed new path.
 */
 const constructPath = (locale, path, basePath$1, search) => {
-	const pathWithoutPrefix = path.startsWith(`/${locale}`) ? path.slice(`/${locale}`.length) || "/" : path;
-	if (effectiveMode === "no-prefix") {
-		if (search) return `${pathWithoutPrefix}?${search}`;
-		return pathWithoutPrefix;
-	}
-	if (effectiveMode === "search-params") {
-		if (search) return `${pathWithoutPrefix}?${search}`;
-		return pathWithoutPrefix;
-	}
-	const pathWithLocalePrefix = path.startsWith(`/${locale}`) ? path : `${locale}${path}`;
-	return `${basePath$1}${basePath$1.endsWith("/") ? "" : "/"}${pathWithLocalePrefix}`;
+	const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+	let finalPath = normalizedPath;
+	if (effectiveMode === "no-prefix" || effectiveMode === "search-params") {
+		for (const loc of locales) if (normalizedPath.startsWith(`/${loc}/`) || normalizedPath === `/${loc}`) {
+			finalPath = normalizedPath.slice(`/${loc}`.length) || "/";
+			break;
+		}
+	} else finalPath = normalizedPath.startsWith(`/${locale}`) ? normalizedPath : `/${locale}${normalizedPath}`;
+	const result = `${basePath$1.replace(/\/$/, "")}${finalPath}`;
+	return search ? `${result}${search.startsWith("?") ? "" : "?"}${search}` : result;
 };
 /**
-* Rewrites the URL to the new path and sets the locale header.
-*
-* @param request - The incoming Next.js request object.
-* @param newPath - The new path to rewrite to.
-* @param locale - The locale to set in the response header.
-* @returns - The rewritten response.
+* This handles the internal path Next.js sees.
+* To support optional [locale] folders, we need to decide if we
+* keep the locale prefix or strip it.
 */
 const rewriteUrl = (request, newPath, locale) => {
-	const search = request.nextUrl.search;
-	const pathWithSearch = search && !newPath.includes("?") ? `${newPath}${search}` : newPath;
-	const response = NextResponse.rewrite(new URL(pathWithSearch, request.url));
-	setLocaleInStorage(locale, { setHeader: (name, value) => response.headers.set(name, value) });
+	const url = request.nextUrl.clone();
+	const pathname = newPath.split("?")[0];
+	if (effectiveMode !== "no-prefix" && effectiveMode !== "search-params") if (!getPathLocale(pathname)) url.pathname = `/${locale}${pathname === "/" ? "" : pathname}`;
+	else url.pathname = pathname;
+	else {
+		const pathLocale = getPathLocale(pathname);
+		if (pathLocale) url.pathname = pathname.slice(`/${pathLocale}`.length) || "/";
+		else url.pathname = pathname;
+	}
+	const response = NextResponse.rewrite(url);
+	setLocaleInStorage(locale, { setHeader: (name, value) => {
+		response.headers.set(name, value);
+	} });
 	return response;
 };
 /**

package/dist/esm/proxy/intlayerProxy.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"intlayerProxy.mjs","names":["search","localeDetector","basePath","searchWithLocale"],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { DefaultValues } from '@intlayer/config/client';\nimport { getLocaleFromStorage, setLocaleInStorage } from '@intlayer/core';\nimport type { Locale } from '@intlayer/types';\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\n/**\n * Controls whether locale detection occurs during Next.js prefetch requests\n * - true: Detect and apply locale during prefetch\n * - false: Use default locale during prefetch (recommended)\n *\n * This setting affects how Next.js handles locale prefetching:\n *\n * Example scenario:\n * - User's browser language is 'fr'\n * - Current page is /fr/about\n * - Link prefetches /about\n *\n * With `detectLocaleOnPrefetchNoPrefix:true`\n * - Prefetch detects 'fr' locale from browser\n * - Redirects prefetch to /fr/about\n *\n * With `detectLocaleOnPrefetchNoPrefix:false` (default)\n * - Prefetch uses default locale\n * - Redirects prefetch to /en/about (assuming 'en' is default)\n *\n * When to use true:\n * - Your app uses non-localized internal links (e.g. <a href=\"/about\">)\n * - You want consistent locale detection behavior between regular and prefetch requests\n *\n * When to use false (default):\n * - Your app uses locale-prefixed links (e.g. <a href=\"/fr/about\">)\n * - You want to optimize prefetching performance\n * - You want to avoid potential redirect loops\n */\nconst DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX = false;\n\nconst { internationalization, routing } = configuration ?? {};\nconst { locales, defaultLocale } = internationalization ?? {};\nconst { basePath, mode } = routing ?? {};\n// Note: cookie names are resolved inside LocaleStorage based on configuration\n\n// Derived flags from routing.mode\nconst effectiveMode = mode ?? DefaultValues.Routing.ROUTING_MODE;\nconst noPrefix =\n  effectiveMode === 'no-prefix' || effectiveMode === 'search-params';\nconst prefixDefault = effectiveMode === 'prefix-all';\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// Ensure locale is reflected in search params when routing mode is 'search-params'\nconst appendLocaleSearchIfNeeded = (\n  search: string | undefined,\n  locale: Locale\n): string | undefined => {\n  if (effectiveMode !== 'search-params') return search;\n\n  const params = new URLSearchParams(search ?? '');\n\n  params.set('locale', locale);\n\n  return `?${params.toString()}`;\n};\n\n/**\n * Proxy that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/proxy.ts\n *\n * export { intlayerProxy as proxy } from '@intlayer/next/proxy';\n *\n * // applies this proxy only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main proxy 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 intlayerProxy = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n\n  const localLocale = getLocalLocale(request);\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(request, localLocale, pathname);\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(request, localLocale, pathLocale, pathname);\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 getLocalLocale = (request: NextRequest): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => request.cookies.get(name)?.value ?? null,\n    getHeader: (name: string) => request.headers.get(name) ?? null,\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 localLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  // Check if pathname has a locale prefix (even though we're in no-prefix mode)\n  const pathLocale = getPathLocale(pathname);\n\n  // If a locale prefix is detected in the URL, redirect to remove it\n  if (pathLocale) {\n    // Strip the locale prefix from the pathname\n    const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || '/';\n\n    // Build redirect URL without locale prefix but with search params if needed\n    const search = appendLocaleSearchIfNeeded(\n      request.nextUrl.search,\n      pathLocale\n    );\n    const redirectPath = search\n      ? `${pathWithoutLocale}${search}`\n      : `${pathWithoutLocale}${request.nextUrl.search ?? ''}`;\n\n    // Redirect to the path without locale prefix (URL changes in browser)\n    return redirectUrl(request, redirectPath);\n  }\n\n  // If no locale prefix in URL, determine locale and rewrite internally\n  const locale = localLocale ?? defaultLocale;\n\n  // In search-params mode, we need to redirect to add the locale search param\n  if (effectiveMode === 'search-params') {\n    // Check if locale search param already exists and matches the detected locale\n    const existingSearchParams = new URLSearchParams(request.nextUrl.search);\n    const existingLocale = existingSearchParams.get('locale');\n\n    // If the existing locale matches the detected locale, no redirect needed\n    if (existingLocale === locale) {\n      // For internal routing, we need to add the locale prefix so Next.js can match [locale] param\n      const internalPath = `/${locale}${pathname}`;\n      const rewritePath = `${internalPath}${request.nextUrl.search ?? ''}`;\n\n      // Rewrite internally (URL stays the same in browser, but Next.js routes to /[locale]/path)\n      return rewriteUrl(request, rewritePath, locale);\n    }\n\n    const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);\n    const redirectPath = search\n      ? `${pathname}${search}`\n      : `${pathname}${request.nextUrl.search ?? ''}`;\n\n    // Redirect to add/update the locale search param (URL changes in browser)\n    return redirectUrl(request, redirectPath);\n  }\n\n  // For internal routing, we need to add the locale prefix so Next.js can match [locale] param\n  const internalPath = `/${locale}${pathname}`;\n\n  // Add search params if needed\n  const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);\n  const rewritePath = search\n    ? `${internalPath}${search}`\n    : `${internalPath}${request.nextUrl.search ?? ''}`;\n\n  // Rewrite internally (URL stays the same in browser, but Next.js routes to /[locale]/path)\n  return rewriteUrl(request, rewritePath, 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): Locale | 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 localLocale - 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  localLocale: Locale | undefined,\n  pathLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    const isPrefetch = isPrefetchRequest(request);\n\n    if (isPrefetch && !DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX) {\n      return handleMissingPathLocale(request, defaultLocale, pathname);\n    }\n\n    return handleMissingPathLocale(request, localLocale, pathname);\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(request, localLocale, pathLocale, pathname);\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 localLocale - 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  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  let locale = (localLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locale;\n  if (!locales.includes(locale)) {\n    locale = defaultLocale;\n  }\n\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, locale)\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 localLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathLocale: Locale,\n  pathname: string\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL\n    localLocale &&\n    localLocale !== pathLocale\n  ) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      localLocale,\n      basePath\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(request, pathLocale, pathname);\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 localLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locale,\n  localLocale: Locale,\n  basePath: string\n): string => {\n  // Replace the pathLocale in the pathname with the localLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${localLocale}`);\n\n  return constructPath(\n    localLocale,\n    newPath,\n    basePath,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, localLocale)\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 * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locale,\n  pathname: string\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    const basePathTrailingSlash = basePath.endsWith('/');\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    const searchWithLocale = appendLocaleSearchIfNeeded(\n      request.nextUrl.search,\n      pathLocale\n    );\n    if (searchWithLocale) {\n      pathWithoutLocale += searchWithLocale;\n    } else if (request.nextUrl.search) {\n      pathWithoutLocale += request.nextUrl.search;\n    }\n\n    return redirectUrl(request, `${basePath}${pathWithoutLocale}`);\n  }\n\n  // If prefixing default locale is required or pathLocale is not the defaultLocale\n\n  const searchWithLocale = appendLocaleSearchIfNeeded(\n    request.nextUrl.search,\n    pathLocale\n  );\n  const newPath = searchWithLocale\n    ? `${pathname}${searchWithLocale}`\n    : pathname;\n  return rewriteUrl(request, newPath, 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 [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locale,\n  path: string,\n  basePath: string,\n  search?: string\n): string => {\n  // In 'search-params' and 'no-prefix' modes, do not prefix the path with the locale\n  // Also, strip any incoming locale prefix if present\n  const pathWithoutPrefix = path.startsWith(`/${locale}`)\n    ? path.slice(`/${locale}`.length) || '/'\n    : path;\n\n  if (effectiveMode === 'no-prefix') {\n    if (search) {\n      return `${pathWithoutPrefix}?${search}`;\n    }\n\n    return pathWithoutPrefix;\n  }\n\n  if (effectiveMode === 'search-params') {\n    if (search) {\n      return `${pathWithoutPrefix}?${search}`;\n    }\n\n    return pathWithoutPrefix;\n  }\n\n  const pathWithLocalePrefix = path.startsWith(`/${locale}`)\n    ? path\n    : `${locale}${path}`;\n\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  const newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${pathWithLocalePrefix}`;\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: Locale\n): NextResponse => {\n  // Ensure we preserve the original search params if they were present and not explicitly included in newPath\n  const search = request.nextUrl.search;\n  const pathWithSearch =\n    search && !newPath.includes('?') ? `${newPath}${search}` : newPath;\n\n  const response = NextResponse.rewrite(new URL(pathWithSearch, request.url));\n\n  setLocaleInStorage(locale, {\n    setHeader: (name: string, value: string) =>\n      response.headers.set(name, value),\n  });\n\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  // Ensure we preserve the original search params if they were present and not explicitly included in newPath\n  const search = request.nextUrl.search;\n  const pathWithSearch =\n    search && !newPath.includes('?') ? `${newPath}${search}` : newPath;\n\n  return NextResponse.redirect(new URL(pathWithSearch, request.url));\n};\n"],"mappings":"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"}
+{"version":3,"file":"intlayerProxy.mjs","names":["localeDetector","basePath"],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { DefaultValues } from '@intlayer/config/client';\nimport { getLocaleFromStorage, setLocaleInStorage } from '@intlayer/core';\nimport type { Locale } from '@intlayer/types';\nimport {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\nimport { localeDetector } from './localeDetector';\n\n/**\n * Controls whether locale detection occurs during Next.js prefetch requests\n * - true: Detect and apply locale during prefetch\n * - false: Use default locale during prefetch (recommended)\n *\n * This setting affects how Next.js handles locale prefetching:\n *\n * Example scenario:\n * - User's browser language is 'fr'\n * - Current page is /fr/about\n * - Link prefetches /about\n *\n * With `detectLocaleOnPrefetchNoPrefix:true`\n * - Prefetch detects 'fr' locale from browser\n * - Redirects prefetch to /fr/about\n *\n * With `detectLocaleOnPrefetchNoPrefix:false` (default)\n * - Prefetch uses default locale\n * - Redirects prefetch to /en/about (assuming 'en' is default)\n *\n * When to use true:\n * - Your app uses non-localized internal links (e.g. <a href=\"/about\">)\n * - You want consistent locale detection behavior between regular and prefetch requests\n *\n * When to use false (default):\n * - Your app uses locale-prefixed links (e.g. <a href=\"/fr/about\">)\n * - You want to optimize prefetching performance\n * - You want to avoid potential redirect loops\n */\nconst DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX = false;\n\nconst { internationalization, routing } = configuration ?? {};\nconst { locales, defaultLocale } = internationalization ?? {};\nconst { basePath, mode } = routing ?? {};\n\n// Note: cookie names are resolved inside LocaleStorage based on configuration\n\n// Derived flags from routing.mode\nconst effectiveMode = mode ?? DefaultValues.Routing.ROUTING_MODE;\nconst noPrefix =\n  effectiveMode === 'no-prefix' || effectiveMode === 'search-params';\nconst prefixDefault = effectiveMode === 'prefix-all';\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// Ensure locale is reflected in search params when routing mode is 'search-params'\nconst appendLocaleSearchIfNeeded = (\n  search: string | undefined,\n  locale: Locale\n): string | undefined => {\n  if (effectiveMode !== 'search-params') return search;\n\n  const params = new URLSearchParams(search ?? '');\n\n  params.set('locale', locale);\n\n  return `?${params.toString()}`;\n};\n\n/**\n * Proxy that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/proxy.ts\n *\n * export { intlayerProxy as proxy } from '@intlayer/next/proxy';\n *\n * // applies this proxy only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main proxy 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 intlayerProxy = (\n  request: NextRequest,\n  _event?: NextFetchEvent,\n  _response?: NextResponse\n): NextResponse => {\n  const pathname = request.nextUrl.pathname;\n\n  const localLocale = getLocalLocale(request);\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(request, localLocale, pathname);\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(request, localLocale, pathLocale, pathname);\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 getLocalLocale = (request: NextRequest): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => request.cookies.get(name)?.value ?? null,\n    getHeader: (name: string) => request.headers.get(name) ?? null,\n  });\n\n/**\n * Handles the case where URLs do not have locale prefixes.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  const pathLocale = getPathLocale(pathname);\n  const locale = localLocale ?? defaultLocale;\n\n  // If user typed /fr/about but mode is no-prefix,\n  // we REDIRECT to /about (clean URL)\n  if (pathLocale) {\n    const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || '/';\n    const search = appendLocaleSearchIfNeeded(\n      request.nextUrl.search,\n      pathLocale\n    );\n    return redirectUrl(request, `${pathWithoutLocale}${search}`);\n  }\n\n  // Handle search-params redirect if locale is missing from URL\n  if (effectiveMode === 'search-params') {\n    const currentParam = request.nextUrl.searchParams.get('locale');\n    if (currentParam !== locale) {\n      const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);\n      return redirectUrl(request, `${pathname}${search}`);\n    }\n  }\n\n  // INTERNAL REWRITE\n  // We rewrite to the clean pathname.\n  // If they have a [locale] folder, rewriteUrl (above) will handle adding it back.\n  return rewriteUrl(request, pathname, 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): Locale | 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 localLocale - 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  localLocale: Locale | undefined,\n  pathLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  if (\n    !pathLocale // If the URL does not contain a locale prefix\n  ) {\n    const isPrefetch = isPrefetchRequest(request);\n\n    if (isPrefetch && !DEFAULT_DETECT_LOCALE_ON_PREFETCH_NO_PREFIX) {\n      return handleMissingPathLocale(request, defaultLocale, pathname);\n    }\n\n    return handleMissingPathLocale(request, localLocale, pathname);\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(request, localLocale, pathLocale, pathname);\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 localLocale - 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  localLocale: Locale | undefined,\n  pathname: string\n): NextResponse => {\n  let locale = (localLocale ??\n    localeDetector?.(request) ??\n    defaultLocale) as Locale;\n\n  if (!locales.includes(locale)) {\n    locale = defaultLocale;\n  }\n\n  // Determine if we should redirect or rewrite\n  // If we are in 'prefix-all', we MUST redirect / -> /en/\n  // If we are in 'prefix-no-default' and locale is NOT default, redirect / -> /fr/\n  const shouldRedirect = prefixDefault || locale !== defaultLocale;\n\n  if (shouldRedirect) {\n    const newPath = constructPath(\n      locale,\n      pathname,\n      basePath,\n      appendLocaleSearchIfNeeded(request.nextUrl.search, locale)\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // --- THE FIX FOR / 404 ---\n  // If we are at the root (or any path) and it's the default locale\n  // (or we are in no-prefix mode), rewrite to the actual physical pathname.\n  return rewriteUrl(request, pathname, locale);\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 localLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @returns - The response to be returned to the client.\n */\n/**\n * Handles requests where the locale exists in the URL pathname.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  localLocale: Locale | undefined,\n  pathLocale: Locale,\n  pathname: string\n): NextResponse => {\n  // 1. If cookie locale differs from path locale, redirect to the cookie locale\n  // (Standard Intlayer behavior)\n  if (localLocale && localLocale !== pathLocale) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      localLocale,\n      basePath\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // 2. Handle the rewrite logic\n  return handleDefaultLocaleRedirect(request, pathLocale, pathname);\n};\n\n/**\n * The key fix for 404s without [locale] folders\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locale,\n  pathname: string\n): NextResponse => {\n  // Determine if we need to remove the prefix for the default locale\n  const isDefaultAndNoPrefix = !prefixDefault && pathLocale === defaultLocale;\n\n  if (isDefaultAndNoPrefix) {\n    const pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) || '/';\n    // ... (rest of your existing search param logic)\n    return redirectUrl(request, `${basePath}${pathWithoutLocale}`);\n  }\n\n  // --- THE FIX ---\n  // If the path contains a locale (like /fr) but we DON'T have a [locale] folder,\n  // we rewrite the path to its \"clean\" version internally.\n\n  // Strip the /fr prefix from the pathname for the internal rewrite\n  const internalPathname = pathname.slice(`/${pathLocale}`.length) || '/';\n\n  const searchWithLocale = appendLocaleSearchIfNeeded(\n    request.nextUrl.search,\n    pathLocale\n  );\n\n  const rewritePath = searchWithLocale\n    ? `${internalPathname}${searchWithLocale}`\n    : internalPathname;\n\n  // Internal rewrite: Next.js sees / (or /path), user sees /fr/path\n  return rewriteUrl(request, rewritePath, pathLocale);\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 localLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locale,\n  localLocale: Locale,\n  basePath: string\n): string => {\n  // Replace the pathLocale in the pathname with the localLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${localLocale}`);\n\n  return constructPath(\n    localLocale,\n    newPath,\n    basePath,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, localLocale)\n  );\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 [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locale,\n  path: string,\n  basePath: string,\n  search?: string\n): string => {\n  const normalizedPath = path.startsWith('/') ? path : `/${path}`;\n  let finalPath = normalizedPath;\n\n  // If we are in a mode that doesn't want prefixes in the URL\n  if (effectiveMode === 'no-prefix' || effectiveMode === 'search-params') {\n    // Strip the locale from the path if it exists\n    // This allows /fr/about to be treated as /about internally\n    for (const loc of locales) {\n      if (\n        normalizedPath.startsWith(`/${loc}/`) ||\n        normalizedPath === `/${loc}`\n      ) {\n        finalPath = normalizedPath.slice(`/${loc}`.length) || '/';\n        break;\n      }\n    }\n  } else {\n    // Prefix modes: ensure the locale IS there\n    finalPath = normalizedPath.startsWith(`/${locale}`)\n      ? normalizedPath\n      : `/${locale}${normalizedPath}`;\n  }\n\n  const cleanBasePath = basePath.replace(/\\/$/, '');\n  const result = `${cleanBasePath}${finalPath}`;\n\n  return search\n    ? `${result}${search.startsWith('?') ? '' : '?'}${search}`\n    : result;\n};\n\n/**\n * This handles the internal path Next.js sees.\n * To support optional [locale] folders, we need to decide if we\n * keep the locale prefix or strip it.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: Locale\n): NextResponse => {\n  const url = request.nextUrl.clone();\n  const pathname = newPath.split('?')[0];\n\n  // We determine if we should internally prefix based on the routing mode.\n  // If user has [locale] folder, 'prefix-all' or 'prefix-no-default' usually works.\n  // If user does NOT have [locale] folder, they usually use 'no-prefix'.\n\n  const shouldInternallyPrefix =\n    effectiveMode !== 'no-prefix' && effectiveMode !== 'search-params';\n\n  if (shouldInternallyPrefix) {\n    // If the path doesn't already have the locale, we add it for internal routing\n    if (!getPathLocale(pathname)) {\n      url.pathname = `/${locale}${pathname === '/' ? '' : pathname}`;\n    } else {\n      url.pathname = pathname;\n    }\n  } else {\n    // For no-prefix or search-params, we ensure the internal path is CLEAN\n    const pathLocale = getPathLocale(pathname);\n    if (pathLocale) {\n      url.pathname = pathname.slice(`/${pathLocale}`.length) || '/';\n    } else {\n      url.pathname = pathname;\n    }\n  }\n\n  const response = NextResponse.rewrite(url);\n\n  // CRITICAL: Set the locale in a header.\n  // If the [locale] folder is missing, the Intlayer server-component\n  // will read this header as a fallback to prevent \"Missing Tags\"\n  setLocaleInStorage(locale, {\n    setHeader: (name: string, value: string) => {\n      response.headers.set(name, value);\n    },\n  });\n\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  // Ensure we preserve the original search params if they were present and not explicitly included in newPath\n  const search = request.nextUrl.search;\n  const pathWithSearch =\n    search && !newPath.includes('?') ? `${newPath}${search}` : newPath;\n\n  return NextResponse.redirect(new URL(pathWithSearch, request.url));\n};\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"getLocale.mjs","names":["negotiatorHeaders: Record<string, string>"],"sources":["../../../src/server/getLocale.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { getLocaleFromStorage, localeDetector } from '@intlayer/core';\nimport { type Locale, Locales } from '@intlayer/types';\nimport { cookies, headers } from 'next/headers.js';\n\n// Helper function to extract locale from headers/cookies\nexport const getLocale = async (): Promise<Locale> => {\n  const defaultLocale =\n    configuration?.internationalization?.defaultLocale ?? Locales.ENGLISH;\n\n  // 1 - Try locale from header\n  const headersList = await headers();\n  const cookiesList = await cookies();\n\n  const storedLocale = getLocaleFromStorage({\n    getCookie: (name: string) => cookiesList.get(name)?.value ?? null,\n    getHeader: (name: string) => headersList.get(name) ?? null,\n  });\n\n  if (storedLocale) return storedLocale as Locale;\n\n  // 3 - Fallback to Accept-Language negotiation\n  const negotiatorHeaders: Record<string, string> = {};\n  headersList.forEach((value, key) => {\n    negotiatorHeaders[key] = value;\n  });\n\n  const userFallbackLocale = localeDetector(negotiatorHeaders);\n  if (userFallbackLocale) return userFallbackLocale as Locale;\n\n  // 4 - Default locale\n  return defaultLocale;\n};\n"],"mappings":";;;;;;AAMA,MAAa,YAAY,YAA6B;CACpD,MAAM,gBACJ,eAAe,sBAAsB,iBAAiB,QAAQ;CAGhE,MAAM,cAAc,MAAM,SAAS;CACnC,MAAM,cAAc,MAAM,SAAS;CAEnC,MAAM,eAAe,qBAAqB;EACxC,YAAY,SAAiB,YAAY,IAAI,KAAK,EAAE,SAAS;EAC7D,YAAY,SAAiB,YAAY,IAAI,KAAK,IAAI;EACvD,CAAC;AAEF,KAAI,aAAc,QAAO;CAGzB,MAAMA,oBAA4C,EAAE;AACpD,aAAY,SAAS,OAAO,QAAQ;AAClC,oBAAkB,OAAO;GACzB;CAEF,MAAM,qBAAqB,eAAe,kBAAkB;AAC5D,KAAI,mBAAoB,QAAO;AAG/B,QAAO"}
+{"version":3,"file":"getLocale.mjs","names":["negotiatorHeaders: Record<string, string>"],"sources":["../../../src/server/getLocale.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { getLocaleFromStorage, localeDetector } from '@intlayer/core';\nimport { type Locale, Locales } from '@intlayer/types';\nimport { cookies, headers } from 'next/headers.js';\n\n// Helper function to extract locale from headers/cookies\nexport const getLocale = async (): Promise<Locale> => {\n  const defaultLocale =\n    configuration?.internationalization?.defaultLocale ?? Locales.ENGLISH;\n\n  // Try locale from header\n  const headersList = await headers();\n  const cookiesList = await cookies();\n\n  const storedLocale = getLocaleFromStorage({\n    getCookie: (name: string) => cookiesList.get(name)?.value ?? null,\n    getHeader: (name: string) => headersList.get(name) ?? null,\n  });\n\n  if (storedLocale) return storedLocale as Locale;\n\n  // Fallback to Accept-Language negotiation\n  const negotiatorHeaders: Record<string, string> = {};\n  headersList.forEach((value, key) => {\n    negotiatorHeaders[key] = value;\n  });\n\n  const userFallbackLocale = localeDetector(negotiatorHeaders);\n  if (userFallbackLocale) return userFallbackLocale as Locale;\n\n  // Default locale\n  return defaultLocale;\n};\n"],"mappings":";;;;;;AAMA,MAAa,YAAY,YAA6B;CACpD,MAAM,gBACJ,eAAe,sBAAsB,iBAAiB,QAAQ;CAGhE,MAAM,cAAc,MAAM,SAAS;CACnC,MAAM,cAAc,MAAM,SAAS;CAEnC,MAAM,eAAe,qBAAqB;EACxC,YAAY,SAAiB,YAAY,IAAI,KAAK,EAAE,SAAS;EAC7D,YAAY,SAAiB,YAAY,IAAI,KAAK,IAAI;EACvD,CAAC;AAEF,KAAI,aAAc,QAAO;CAGzB,MAAMA,oBAA4C,EAAE;AACpD,aAAY,SAAS,OAAO,QAAQ;AAClC,oBAAkB,OAAO;GACzB;CAEF,MAAM,qBAAqB,eAAe,kBAAkB;AAC5D,KAAI,mBAAoB,QAAO;AAG/B,QAAO"}

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

@@ -1,4 +1,4 @@
-import * as _intlayer_types3 from "@intlayer/types";
+import * as _intlayer_types0 from "@intlayer/types";
 import { LocalesValues } from "@intlayer/types";
 
 //#region src/client/useLocale.d.ts
@@ -9,9 +9,9 @@ declare const useLocale: ({
   onChange
 }?: UseLocaleProps) => {
   pathWithoutLocale: string;
-  locale: _intlayer_types3.DeclaredLocales;
-  defaultLocale: _intlayer_types3.DeclaredLocales;
-  availableLocales: _intlayer_types3.DeclaredLocales[];
+  locale: _intlayer_types0.DeclaredLocales;
+  defaultLocale: _intlayer_types0.DeclaredLocales;
+  availableLocales: _intlayer_types0.DeclaredLocales[];
   setLocale: (locale: LocalesValues) => void;
 };
 //#endregion

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

@@ -1,12 +1,12 @@
-import * as _intlayer_types0 from "@intlayer/types";
+import * as _intlayer_types2 from "@intlayer/types";
 import { LocalesValues } from "@intlayer/types";
 
 //#region src/client/useLocalePageRouter.d.ts
 declare const useLocalePageRouter: () => {
   pathWithoutLocale: string;
-  locale: _intlayer_types0.DeclaredLocales;
-  defaultLocale: _intlayer_types0.DeclaredLocales;
-  availableLocales: _intlayer_types0.DeclaredLocales[];
+  locale: _intlayer_types2.DeclaredLocales;
+  defaultLocale: _intlayer_types2.DeclaredLocales;
+  availableLocales: _intlayer_types2.DeclaredLocales[];
   setLocale: (locale: LocalesValues) => void;
 };
 //#endregion

package/dist/types/generateStaticParams.d.ts

@@ -1,8 +1,8 @@
-import * as _intlayer_types0 from "@intlayer/types";
+import * as _intlayer_types5 from "@intlayer/types";
 
 //#region src/generateStaticParams.d.ts
 declare const generateStaticParams: () => {
-  locale: _intlayer_types0.Locale;
+  locale: _intlayer_types5.Locale;
 }[];
 //#endregion
 export { generateStaticParams };

package/dist/types/proxy/intlayerProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intlayerProxy.d.ts","names":[],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":[],"mappings":";;;;;;AAsHA;;;;;;;;;;;;;;;;;;;;;cAAa,yBACF,sBACA,4BACG,iBACX"}
+{"version":3,"file":"intlayerProxy.d.ts","names":[],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":[],"mappings":";;;;;;AAuHA;;;;;;;;;;;;;;;;;;;;;cAAa,yBACF,sBACA,4BACG,iBACX"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intlayer",
-  "version": "7.5.6",
+  "version": "7.5.12",
   "private": false,
   "description": "Simplify internationalization i18n in Next.js with context providers, hooks, locale detection, and multilingual content integration.",
   "keywords": [
@@ -118,15 +118,15 @@
     "typecheck": "tsc --noEmit --project tsconfig.types.json"
   },
   "dependencies": {
-    "@intlayer/chokidar": "7.5.6",
-    "@intlayer/config": "7.5.6",
-    "@intlayer/core": "7.5.6",
-    "@intlayer/dictionaries-entry": "7.5.6",
-    "@intlayer/types": "7.5.6",
-    "@intlayer/webpack": "7.5.6",
+    "@intlayer/chokidar": "7.5.12",
+    "@intlayer/config": "7.5.12",
+    "@intlayer/core": "7.5.12",
+    "@intlayer/dictionaries-entry": "7.5.12",
+    "@intlayer/types": "7.5.12",
+    "@intlayer/webpack": "7.5.12",
     "defu": "6.1.4",
     "node-loader": "2.1.0",
-    "react-intlayer": "7.5.6"
+    "react-intlayer": "7.5.12"
   },
   "devDependencies": {
     "@types/node": "25.0.3",