next-intlayer 7.0.0-canary.3 → 7.0.1

package/dist/cjs/client/useLocale.cjs

@@ -12,10 +12,18 @@ let react = require("react");
 react = require_rolldown_runtime.__toESM(react);
 
 //#region src/client/useLocale.ts
+const usePathWithoutLocale = () => {
+	const pathname = (0, next_navigation_js.usePathname)();
+	const [fullPath, setFullPath] = (0, react.useState)(pathname);
+	(0, react.useEffect)(() => {
+		const search = typeof window !== "undefined" ? window.location.search : "";
+		setFullPath(search ? `${pathname}${search}` : pathname);
+	}, [pathname]);
+	return (0, react.useMemo)(() => (0, __intlayer_core.getPathWithoutLocale)(fullPath), [fullPath]);
+};
 const useLocale = ({ onChange } = {}) => {
 	const { replace, push } = (0, next_navigation_js.useRouter)();
-	const pathname = (0, next_navigation_js.usePathname)();
-	const pathWithoutLocale = (0, react.useMemo)(() => (0, __intlayer_core.getPathWithoutLocale)(pathname), [pathname]);
+	const pathWithoutLocale = usePathWithoutLocale();
 	return {
 		...(0, react_intlayer.useLocale)({ onLocaleChange: (0, react.useCallback)((locale) => {
 			if (!onChange) return;

package/dist/cjs/client/useLocale.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useLocale.cjs","names":[],"sources":["../../../src/client/useLocale.ts"],"sourcesContent":["'use client';\n\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport type { LocalesValues } from '@intlayer/types';\nimport { usePathname, useRouter } from 'next/navigation.js';\nimport { useCallback, useMemo } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\ntype UseLocaleProps = {\n  onChange?: 'replace' | 'push' | ((locale: LocalesValues) => void);\n};\n\nexport const useLocale = ({ onChange }: UseLocaleProps = {}) => {\n  const { replace, push } = useRouter();\n  const pathname = usePathname();\n  const pathWithoutLocale = useMemo(\n    () => getPathWithoutLocale(pathname),\n    [pathname]\n  );\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      if (!onChange) return;\n\n      if (typeof onChange === 'function') {\n        onChange(locale);\n        return;\n      }\n\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      if (onChange === 'replace') {\n        replace(pathWithLocale);\n      }\n      if (onChange === 'push') {\n        push(pathWithLocale);\n      }\n    },\n    [replace, push, pathWithoutLocale, onChange]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";;;;;;;;;;;;;;AAYA,MAAa,aAAa,EAAE,aAA6B,EAAE,KAAK;CAC9D,MAAM,EAAE,SAAS,4CAAoB;CACrC,MAAM,gDAAwB;CAC9B,MAAM,uFACuB,SAAS,EACpC,CAAC,SAAS,CACX;AA2BD,QAAO;EACL,iCALqC,EACrC,wCArBC,WAA0B;AACzB,OAAI,CAAC,SAAU;AAEf,OAAI,OAAO,aAAa,YAAY;AAClC,aAAS,OAAO;AAChB;;GAGF,MAAM,sDAAiC,mBAAmB,OAAO;AAEjE,OAAI,aAAa,UACf,SAAQ,eAAe;AAEzB,OAAI,aAAa,OACf,MAAK,eAAe;KAGxB;GAAC;GAAS;GAAM;GAAmB;GAAS,CAC7C,EAIA,CAAC;EAIA;EACD"}
+{"version":3,"file":"useLocale.cjs","names":[],"sources":["../../../src/client/useLocale.ts"],"sourcesContent":["'use client';\n\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport type { LocalesValues } from '@intlayer/types';\nimport { usePathname, useRouter } from 'next/navigation.js';\nimport { useCallback, useEffect, useMemo, useState } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\ntype UseLocaleProps = {\n  onChange?: 'replace' | 'push' | ((locale: LocalesValues) => void);\n};\n\nconst usePathWithoutLocale = () => {\n  const pathname = usePathname(); // updates on client navigations\n  const [fullPath, setFullPath] = useState(pathname);\n\n  useEffect(() => {\n    // Runs only on client; avoids suspense.\n    const search = typeof window !== 'undefined' ? window.location.search : '';\n    setFullPath(search ? `${pathname}${search}` : pathname);\n  }, [pathname]);\n\n  // Your own helper\n  return useMemo(() => getPathWithoutLocale(fullPath), [fullPath]);\n};\n\nexport const useLocale = ({ onChange }: UseLocaleProps = {}) => {\n  const { replace, push } = useRouter();\n  const pathWithoutLocale = usePathWithoutLocale();\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      if (!onChange) return;\n\n      if (typeof onChange === 'function') {\n        onChange(locale);\n        return;\n      }\n\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      if (onChange === 'replace') {\n        replace(pathWithLocale);\n      }\n      if (onChange === 'push') {\n        push(pathWithLocale);\n      }\n    },\n    [replace, push, pathWithoutLocale, onChange]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";;;;;;;;;;;;;;AAYA,MAAM,6BAA6B;CACjC,MAAM,gDAAwB;CAC9B,MAAM,CAAC,UAAU,mCAAwB,SAAS;AAElD,4BAAgB;EAEd,MAAM,SAAS,OAAO,WAAW,cAAc,OAAO,SAAS,SAAS;AACxE,cAAY,SAAS,GAAG,WAAW,WAAW,SAAS;IACtD,CAAC,SAAS,CAAC;AAGd,2EAA0C,SAAS,EAAE,CAAC,SAAS,CAAC;;AAGlE,MAAa,aAAa,EAAE,aAA6B,EAAE,KAAK;CAC9D,MAAM,EAAE,SAAS,4CAAoB;CACrC,MAAM,oBAAoB,sBAAsB;AA2BhD,QAAO;EACL,iCALqC,EACrC,wCArBC,WAA0B;AACzB,OAAI,CAAC,SAAU;AAEf,OAAI,OAAO,aAAa,YAAY;AAClC,aAAS,OAAO;AAChB;;GAGF,MAAM,sDAAiC,mBAAmB,OAAO;AAEjE,OAAI,aAAa,UACf,SAAQ,eAAe;AAEzB,OAAI,aAAa,OACf,MAAK,eAAe;KAGxB;GAAC;GAAS;GAAM;GAAmB;GAAS,CAC7C,EAIA,CAAC;EAIA;EACD"}

package/dist/cjs/proxy/intlayerProxy.cjs

@@ -4,15 +4,18 @@ let __intlayer_config_built = require("@intlayer/config/built");
 __intlayer_config_built = require_rolldown_runtime.__toESM(__intlayer_config_built);
 let __intlayer_core = require("@intlayer/core");
 __intlayer_core = require_rolldown_runtime.__toESM(__intlayer_core);
+let __intlayer_config = require("@intlayer/config");
+__intlayer_config = require_rolldown_runtime.__toESM(__intlayer_config);
 let next_server = require("next/server");
 next_server = require_rolldown_runtime.__toESM(next_server);
 
 //#region src/proxy/intlayerProxy.ts
 const { internationalization, routing } = __intlayer_config_built.default ?? {};
 const { locales, defaultLocale } = internationalization ?? {};
-const { headerName, basePath, detectLocaleOnPrefetchNoPrefix, mode } = routing ?? {};
-const noPrefix = mode === "no-prefix" || mode === "search-params";
-const prefixDefault = mode === "prefix-all";
+const { basePath, mode } = routing ?? {};
+const effectiveMode = mode ?? __intlayer_config.DefaultValues.Routing.ROUTING_MODE;
+const noPrefix = effectiveMode === "no-prefix" || effectiveMode === "search-params";
+const prefixDefault = effectiveMode === "prefix-all";
 /**
 * Detects if the request is a prefetch request from Next.js.
 *
@@ -35,7 +38,7 @@ const isPrefetchRequest = (request) => {
 	return purpose === "prefetch" || nextRouterPrefetch === "1" || !!nextUrl || !!xNextjsData;
 };
 const appendLocaleSearchIfNeeded = (search, locale) => {
-	if (mode !== "search-params") return search;
+	if (effectiveMode !== "search-params") return search;
 	const params = new URLSearchParams(search ?? "");
 	params.set("locale", locale);
 	return `?${params.toString()}`;
@@ -65,10 +68,9 @@ const appendLocaleSearchIfNeeded = (search, locale) => {
 */
 const intlayerProxy = (request, _event, _response) => {
 	const pathname = request.nextUrl.pathname;
-	const cookieLocale = getCookieLocale(request);
-	const basePathTrailingSlash = basePath.endsWith("/");
-	if (noPrefix) return handleNoPrefix(request, cookieLocale, pathname, basePathTrailingSlash);
-	return handlePrefix(request, cookieLocale, getPathLocale(pathname), pathname, basePathTrailingSlash);
+	const localLocale = getLocalLocale(request);
+	if (noPrefix) return handleNoPrefix(request, localLocale, pathname);
+	return handlePrefix(request, localLocale, getPathLocale(pathname), pathname);
 };
 /**
 * Retrieves the locale from the request cookies if available and valid.
@@ -76,19 +78,34 @@ const intlayerProxy = (request, _event, _response) => {
 * @param request - The incoming Next.js request object.
 * @returns - The locale found in the cookies, or undefined if not found or invalid.
 */
-const getCookieLocale = (request) => (0, __intlayer_core.getLocaleFromStorage)({ getCookie: (name) => request.cookies.get(name)?.value ?? null });
+const getLocalLocale = (request) => (0, __intlayer_core.getLocaleFromStorage)({
+	getCookie: (name) => request.cookies.get(name)?.value ?? null,
+	getHeader: (name) => request.headers.get(name) ?? null
+});
 /**
 * Handles the case where URLs do not have locale prefixes.
 *
 * @param request - The incoming Next.js request object.
-* @param cookieLocale - The locale from the cookie.
+* @param localLocale - The locale from the cookie.
 * @param pathname - The pathname from the request URL.
-* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @returns - The rewritten response with the locale applied.
 */
-const handleNoPrefix = (request, cookieLocale, pathname, basePathTrailingSlash) => {
-	const locale = cookieLocale ?? defaultLocale;
-	return rewriteUrl(request, constructPath(locale, pathname, basePath, basePathTrailingSlash, appendLocaleSearchIfNeeded(request.nextUrl.search, locale)), locale);
+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 (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 ?? ""}`);
+	}
+	const internalPath = `/${locale}${pathname}`;
+	const search = appendLocaleSearchIfNeeded(request.nextUrl.search, locale);
+	return rewriteUrl(request, search ? `${internalPath}${search}` : `${internalPath}${request.nextUrl.search ?? ""}`, locale);
 };
 /**
 * Extracts the locale from the URL pathname if present.
@@ -101,47 +118,46 @@ const getPathLocale = (pathname) => locales.find((locale) => pathname.startsWith
 * Handles the case where URLs have locale prefixes.
 *
 * @param request - The incoming Next.js request object.
-* @param cookieLocale - The locale from the cookie.
+* @param localLocale - The locale from the cookie.
 * @param pathLocale - The locale extracted from the pathname.
 * @param pathname - The pathname from the request URL.
 * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @returns - The response to be returned to the client.
 */
-const handlePrefix = (request, cookieLocale, pathLocale, pathname, basePathTrailingSlash) => {
+const handlePrefix = (request, localLocale, pathLocale, pathname) => {
 	if (!pathLocale) {
-		if (isPrefetchRequest(request) && !detectLocaleOnPrefetchNoPrefix) return handleMissingPathLocale(request, defaultLocale, pathname, basePathTrailingSlash);
-		return handleMissingPathLocale(request, cookieLocale, pathname, basePathTrailingSlash);
+		if (isPrefetchRequest(request) && true) return handleMissingPathLocale(request, defaultLocale, pathname);
+		return handleMissingPathLocale(request, localLocale, pathname);
 	}
-	return handleExistingPathLocale(request, cookieLocale, pathLocale, pathname, basePathTrailingSlash);
+	return handleExistingPathLocale(request, localLocale, pathLocale, pathname);
 };
 /**
 * Handles requests where the locale is missing from the URL pathname.
 *
 * @param request - The incoming Next.js request object.
-* @param cookieLocale - The locale from the cookie.
+* @param localLocale - The locale from the cookie.
 * @param pathname - The pathname from the request URL.
 * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @returns - The response to be returned to the client.
 */
-const handleMissingPathLocale = (request, cookieLocale, pathname, basePathTrailingSlash) => {
-	let locale = cookieLocale ?? require_proxy_localeDetector.localeDetector?.(request) ?? defaultLocale;
+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, basePathTrailingSlash, appendLocaleSearchIfNeeded(request.nextUrl.search, locale));
+	const newPath = constructPath(locale, pathname, basePath, appendLocaleSearchIfNeeded(request.nextUrl.search, locale));
 	return prefixDefault || locale !== defaultLocale ? redirectUrl(request, newPath) : rewriteUrl(request, newPath, locale);
 };
 /**
 * Handles requests where the locale exists in the URL pathname.
 *
 * @param request - The incoming Next.js request object.
-* @param cookieLocale - The locale from the cookie.
+* @param localLocale - The locale from the cookie.
 * @param pathLocale - The locale extracted from the pathname.
 * @param pathname - The pathname from the request URL.
-* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @returns - The response to be returned to the client.
 */
-const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, basePathTrailingSlash) => {
-	if (cookieLocale && cookieLocale !== pathLocale) return redirectUrl(request, handleCookieLocaleMismatch(request, pathname, pathLocale, cookieLocale, basePath, basePathTrailingSlash));
-	return handleDefaultLocaleRedirect(request, pathLocale, pathname, basePathTrailingSlash);
+const handleExistingPathLocale = (request, localLocale, pathLocale, pathname) => {
+	if (localLocale && localLocale !== pathLocale) return redirectUrl(request, handleCookieLocaleMismatch(request, pathname, pathLocale, localLocale, basePath));
+	return handleDefaultLocaleRedirect(request, pathLocale, pathname);
 };
 /**
 * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.
@@ -149,13 +165,12 @@ const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, b
 * @param request - The incoming Next.js request object.
 * @param pathname - The pathname from the request URL.
 * @param pathLocale - The locale extracted from the pathname.
-* @param cookieLocale - The locale from the cookie.
+* @param localLocale - The locale from the cookie.
 * @param basePath - The base path of the application.
-* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @returns - The new URL path with the correct locale.
 */
-const handleCookieLocaleMismatch = (request, pathname, pathLocale, cookieLocale, basePath$1, basePathTrailingSlash) => {
-	return constructPath(cookieLocale, pathname.replace(`/${pathLocale}`, `/${cookieLocale}`), basePath$1, basePathTrailingSlash, appendLocaleSearchIfNeeded(request.nextUrl.search, cookieLocale));
+const handleCookieLocaleMismatch = (request, pathname, pathLocale, localLocale, basePath$1) => {
+	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.
@@ -163,13 +178,12 @@ const handleCookieLocaleMismatch = (request, pathname, pathLocale, cookieLocale,
 * @param request - The incoming Next.js request object.
 * @param pathLocale - The locale extracted from the pathname.
 * @param pathname - The pathname from the request URL.
-* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @returns - The rewritten response without the locale prefix.
 */
-const handleDefaultLocaleRedirect = (request, pathLocale, pathname, basePathTrailingSlash) => {
+const handleDefaultLocaleRedirect = (request, pathLocale, pathname) => {
 	if (!prefixDefault && pathLocale === defaultLocale) {
 		let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? "/";
-		if (basePathTrailingSlash) pathWithoutLocale = pathWithoutLocale.slice(1);
+		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;
@@ -184,15 +198,21 @@ const handleDefaultLocaleRedirect = (request, pathLocale, pathname, basePathTrai
 * @param locale - The locale to include in the path.
 * @param path - The original path from the request.
 * @param basePath - The base path of the application.
-* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
 * @param [search] - The query string from the request URL (optional).
 * @returns - The constructed new path.
 */
-const constructPath = (locale, path, basePath$1, basePathTrailingSlash, search) => {
-	const pathWithLocalePrefix = mode === "search-params" ? path : path.startsWith(`/${locale}`) ? path : `${locale}${path}`;
-	let newPath = `${basePath$1}${basePathTrailingSlash ? "" : "/"}${pathWithLocalePrefix}`;
-	if (search) newPath += search;
-	return newPath;
+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}`;
 };
 /**
 * Rewrites the URL to the new path and sets the locale header.
@@ -206,7 +226,7 @@ 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));
-	response.headers.set(headerName, locale);
+	(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","localeDetector","basePath","searchWithLocale","NextResponse"],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\nimport { getLocaleFromStorage } 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\nconst { internationalization, routing } = configuration ?? {};\nconst { locales, defaultLocale } = internationalization ?? {};\nconst { headerName, basePath, detectLocaleOnPrefetchNoPrefix, mode } =\n  routing ?? {};\n// Note: cookie names are resolved inside LocaleStorage based on configuration\n\n// Derived flags from routing.mode\nconst noPrefix = mode === 'no-prefix' || mode === 'search-params';\nconst prefixDefault = mode === '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 (mode !== 'search-params') return search;\n\n  const params = new URLSearchParams(search ?? '');\n\n  params.set('locale', locale);\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 cookieLocale = getCookieLocale(request);\n  const basePathTrailingSlash = basePath.endsWith('/');\n\n  if (\n    noPrefix // If the application is configured not to use locale prefixes in URLs\n  ) {\n    return handleNoPrefix(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  const pathLocale = getPathLocale(pathname);\n\n  return handlePrefix(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Retrieves the locale from the request cookies if available and valid.\n *\n * @param request - The incoming Next.js request object.\n * @returns - The locale found in the cookies, or undefined if not found or invalid.\n */\nconst getCookieLocale = (request: NextRequest): Locale | undefined =>\n  getLocaleFromStorage({\n    getCookie: (name: string) => request.cookies.get(name)?.value ?? 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 cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response with the locale applied.\n */\nconst handleNoPrefix = (\n  request: NextRequest,\n  cookieLocale: Locale | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  const locale = cookieLocale ?? defaultLocale;\n\n  const newPath = constructPath(\n    locale,\n    pathname,\n    basePath,\n    basePathTrailingSlash,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, locale)\n  );\n  return rewriteUrl(request, newPath, locale);\n};\n\n/**\n * Extracts the locale from the URL pathname if present.\n *\n * @param pathname - The pathname from the request URL.\n * @returns - The locale found in the pathname, or undefined if not found.\n */\nconst getPathLocale = (pathname: string): 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 cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handlePrefix = (\n  request: NextRequest,\n  cookieLocale: Locale | undefined,\n  pathLocale: Locale | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\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 && !detectLocaleOnPrefetchNoPrefix) {\n      return handleMissingPathLocale(\n        request,\n        defaultLocale,\n        pathname,\n        basePathTrailingSlash\n      );\n    }\n\n    return handleMissingPathLocale(\n      request,\n      cookieLocale,\n      pathname,\n      basePathTrailingSlash\n    );\n  }\n\n  // If the URL contains a locale prefix\n  return handleExistingPathLocale(\n    request,\n    cookieLocale,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles requests where the locale is missing from the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param cookieLocale - The locale from the cookie.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleMissingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locale | undefined,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  let locale = (cookieLocale ??\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    basePathTrailingSlash,\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 cookieLocale - The locale from the cookie.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The response to be returned to the client.\n */\nconst handleExistingPathLocale = (\n  request: NextRequest,\n  cookieLocale: Locale | undefined,\n  pathLocale: Locale,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If the cookie locale is set and differs from the locale in the URL\n    cookieLocale &&\n    cookieLocale !== pathLocale\n  ) {\n    const newPath = handleCookieLocaleMismatch(\n      request,\n      pathname,\n      pathLocale,\n      cookieLocale,\n      basePath,\n      basePathTrailingSlash\n    );\n    return redirectUrl(request, newPath);\n  }\n\n  // If the cookie locale matches the path locale, or cookie locale is not set, or serverSetCookie is 'always'\n  return handleDefaultLocaleRedirect(\n    request,\n    pathLocale,\n    pathname,\n    basePathTrailingSlash\n  );\n};\n\n/**\n * Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.\n *\n * @param request - The incoming Next.js request object.\n * @param pathname - The pathname from the request URL.\n * @param pathLocale - The locale extracted from the pathname.\n * @param cookieLocale - The locale from the cookie.\n * @param basePath - The base path of the application.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The new URL path with the correct locale.\n */\nconst handleCookieLocaleMismatch = (\n  request: NextRequest,\n  pathname: string,\n  pathLocale: Locale,\n  cookieLocale: Locale,\n  basePath: string,\n  basePathTrailingSlash: boolean\n): string => {\n  // Replace the pathLocale in the pathname with the cookieLocale\n  const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);\n\n  return constructPath(\n    cookieLocale,\n    newPath,\n    basePath,\n    basePathTrailingSlash,\n    appendLocaleSearchIfNeeded(request.nextUrl.search, cookieLocale)\n  );\n};\n\n/**\n * Handles redirection when the default locale is used and prefixing is not required.\n *\n * @param request - The incoming Next.js request object.\n * @param pathLocale - The locale extracted from the pathname.\n * @param pathname - The pathname from the request URL.\n * @param basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @returns - The rewritten response without the locale prefix.\n */\nconst handleDefaultLocaleRedirect = (\n  request: NextRequest,\n  pathLocale: Locale,\n  pathname: string,\n  basePathTrailingSlash: boolean\n): NextResponse => {\n  if (\n    // If default locale should not be prefixed and the pathLocale is the defaultLocale\n    !prefixDefault &&\n    pathLocale === defaultLocale\n  ) {\n    let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? '/';\n\n    if (basePathTrailingSlash) {\n      pathWithoutLocale = pathWithoutLocale.slice(1);\n    }\n\n    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 rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);\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 basePathTrailingSlash - Indicates if the basePath ends with a slash.\n * @param [search] - The query string from the request URL (optional).\n * @returns - The constructed new path.\n */\nconst constructPath = (\n  locale: Locale,\n  path: string,\n  basePath: string,\n  basePathTrailingSlash: boolean,\n  search?: string\n): string => {\n  // In 'search-params' mode, we do not prefix the path with the locale\n  // If the path is already prefixed with the same locale (e.g. '/fr/...'), avoid double prefixing\n  const pathWithLocalePrefix =\n    mode === 'search-params'\n      ? path\n      : path.startsWith(`/${locale}`)\n        ? path\n        : `${locale}${path}`;\n\n  let newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${pathWithLocalePrefix}`;\n  if (search) {\n    newPath += search;\n  }\n  return newPath;\n};\n\n/**\n * Rewrites the URL to the new path and sets the locale header.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to rewrite to.\n * @param locale - The locale to set in the response header.\n * @returns - The rewritten response.\n */\nconst rewriteUrl = (\n  request: NextRequest,\n  newPath: string,\n  locale: 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  response.headers.set(headerName, locale);\n  return response;\n};\n\n/**\n * Redirects the request to the new path.\n *\n * @param request - The incoming Next.js request object.\n * @param newPath - The new path to redirect to.\n * @returns - The redirect response.\n */\nconst redirectUrl = (request: NextRequest, newPath: string): NextResponse => {\n  // 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\n/**\n * Middleware that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/middleware.ts\n *\n * export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';\n *\n * // applies this middleware only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main middleware function for handling internationalization.\n *\n * @param request - The incoming Next.js request object.\n * @param event - The Next.js fetch event (optional).\n * @param response - The Next.js response object (optional).\n * @returns - The response to be returned to the client.\n */\nexport const intlayerMiddleware = intlayerProxy;\n"],"mappings":"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"}
+{"version":3,"file":"intlayerProxy.cjs","names":["configuration","DefaultValues","search","localeDetector","basePath","searchWithLocale","NextResponse"],"sources":["../../../src/proxy/intlayerProxy.ts"],"sourcesContent":["import { DefaultValues } from '@intlayer/config';\nimport configuration from '@intlayer/config/built';\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 rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);\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\n/**\n * Middleware that handles the internationalization layer\n *\n * Usage:\n *\n * ```ts\n * // ./src/middleware.ts\n *\n * export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';\n *\n * // applies this middleware only to files in the app directory\n * export const config = {\n *   matcher: '/((?!api|static|.*\\\\..*|_next).*)',\n * };\n * ```\n *\n * Main middleware function for handling internationalization.\n *\n * @param request - The incoming Next.js request object.\n * @param event - The Next.js fetch event (optional).\n * @param response - The Next.js response object (optional).\n * @returns - The response to be returned to the client.\n */\nexport const intlayerMiddleware = intlayerProxy;\n"],"mappings":"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"}

package/dist/cjs/proxy/multipleProxies.cjs

@@ -40,15 +40,15 @@ const multipleProxies = (proxies) => async (req, event, response) => {
 	proxyHeader.forEach((header) => {
 		for (const [key, value] of header.entries()) {
 			mergedHeaders.append(key, value);
-			if (key.startsWith("x-proxy-request-")) {
-				const fixedKey = key.replace("x-proxy-request-", "");
+			if (key.startsWith("x-middleware-request-")) {
+				const fixedKey = key.replace("x-middleware-request-", "");
 				transmittedHeaders.append(fixedKey, value);
 			}
 		}
 	});
-	const redirect = mergedHeaders.get("x-proxy-request-redirect");
+	const redirect = mergedHeaders.get("x-middleware-request-redirect");
 	if (redirect) return next_server.NextResponse.redirect(new URL(redirect, req.url), { status: 307 });
-	const rewrite = mergedHeaders.get("x-proxy-rewrite");
+	const rewrite = mergedHeaders.get("x-middleware-rewrite");
 	if (rewrite) return next_server.NextResponse.rewrite(new URL(rewrite, req.url), { request: { headers: transmittedHeaders } });
 	return next_server.NextResponse.next({ request: { headers: transmittedHeaders } });
 };

package/dist/cjs/proxy/multipleProxies.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"multipleProxies.cjs","names":["proxyHeader: Headers[]","NextResponse"],"sources":["../../../src/proxy/multipleProxies.ts"],"sourcesContent":["import {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\n\n/**\n * Utility to combine multiple Next.js proxies into one.\n *\n * It executes proxies in order, merges headers, and correctly handles\n * redirects and rewrites.\n *\n * @example\n * import { multipleProxies, intlayerProxy } from \"next-intlayer/proxy\";\n * import { NextResponse } from \"next/server\";\n *\n * const authMiddleware = (req: NextRequest) => {\n *   if (!req.cookies.get(\"token\")) {\n *     return NextResponse.redirect(new URL(\"/login\", req.url));\n *   }\n *   return NextResponse.next();\n * };\n *\n * export default multipleProxies([\n *   intlayerProxy,\n *   authMiddleware,\n * ]);\n *\n * @param proxies - An array of proxy functions to execute in order.\n * @returns A single proxy function that runs all provided proxies.\n */\nexport const multipleProxies =\n  (\n    proxies: ((\n      req: NextRequest,\n      event?: NextFetchEvent,\n      response?: NextResponse\n    ) => NextResponse | Promise<NextResponse>)[]\n  ) =>\n  async (req: NextRequest, event?: NextFetchEvent, response?: NextResponse) => {\n    // Array to store proxy headers\n    const proxyHeader: Headers[] = [];\n\n    // Loop through proxy functions\n    for (const proxy of proxies) {\n      // Execute proxy function and await the result\n      const result = await proxy(req, event, response);\n\n      // Check if the result is not okay and return it\n      if (!result.ok) {\n        return result;\n      }\n\n      // Push proxy headers to the array\n      proxyHeader.push(result.headers);\n    }\n\n    // Merge all the headers to check if there is a redirection or rewrite\n    const mergedHeaders = new Headers();\n\n    // Merge all the custom headers added by the proxies\n    const transmittedHeaders = new Headers();\n\n    // Merge headers\n    proxyHeader.forEach((header) => {\n      for (const [key, value] of header.entries()) {\n        mergedHeaders.append(key, value);\n\n        // check if it's a custom header added by one of the proxies\n        if (key.startsWith('x-proxy-request-')) {\n          // remove the prefix to get the original key\n          const fixedKey = key.replace('x-proxy-request-', '');\n\n          // add the original key to the transmitted headers\n          transmittedHeaders.append(fixedKey, value);\n        }\n      }\n    });\n\n    // Look for the 'x-proxy-request-redirect' header\n    const redirect = mergedHeaders.get('x-proxy-request-redirect');\n\n    // If a redirection is required based on the proxy headers\n    if (redirect) {\n      // Perform the redirection\n      return NextResponse.redirect(new URL(redirect, req.url), {\n        status: 307, // Temporary redirect\n      });\n    }\n\n    // Look for the 'x-proxy-rewrite' header\n    const rewrite = mergedHeaders.get('x-proxy-rewrite');\n    if (rewrite) {\n      // Perform the rewrite\n      return NextResponse.rewrite(new URL(rewrite, req.url), {\n        request: {\n          headers: transmittedHeaders,\n        },\n      });\n    }\n\n    // Default: continue to next proxy\n    return NextResponse.next({\n      request: {\n        headers: transmittedHeaders,\n      },\n    });\n  };\n\nexport const multipleMiddlewares = multipleProxies;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,MAAa,mBAET,YAMF,OAAO,KAAkB,OAAwB,aAA4B;CAE3E,MAAMA,cAAyB,EAAE;AAGjC,MAAK,MAAM,SAAS,SAAS;EAE3B,MAAM,SAAS,MAAM,MAAM,KAAK,OAAO,SAAS;AAGhD,MAAI,CAAC,OAAO,GACV,QAAO;AAIT,cAAY,KAAK,OAAO,QAAQ;;CAIlC,MAAM,gBAAgB,IAAI,SAAS;CAGnC,MAAM,qBAAqB,IAAI,SAAS;AAGxC,aAAY,SAAS,WAAW;AAC9B,OAAK,MAAM,CAAC,KAAK,UAAU,OAAO,SAAS,EAAE;AAC3C,iBAAc,OAAO,KAAK,MAAM;AAGhC,OAAI,IAAI,WAAW,mBAAmB,EAAE;IAEtC,MAAM,WAAW,IAAI,QAAQ,oBAAoB,GAAG;AAGpD,uBAAmB,OAAO,UAAU,MAAM;;;GAG9C;CAGF,MAAM,WAAW,cAAc,IAAI,2BAA2B;AAG9D,KAAI,SAEF,QAAOC,yBAAa,SAAS,IAAI,IAAI,UAAU,IAAI,IAAI,EAAE,EACvD,QAAQ,KACT,CAAC;CAIJ,MAAM,UAAU,cAAc,IAAI,kBAAkB;AACpD,KAAI,QAEF,QAAOA,yBAAa,QAAQ,IAAI,IAAI,SAAS,IAAI,IAAI,EAAE,EACrD,SAAS,EACP,SAAS,oBACV,EACF,CAAC;AAIJ,QAAOA,yBAAa,KAAK,EACvB,SAAS,EACP,SAAS,oBACV,EACF,CAAC;;AAGN,MAAa,sBAAsB"}
+{"version":3,"file":"multipleProxies.cjs","names":["proxyHeader: Headers[]","NextResponse"],"sources":["../../../src/proxy/multipleProxies.ts"],"sourcesContent":["import {\n  type NextFetchEvent,\n  type NextRequest,\n  NextResponse,\n} from 'next/server';\n\n/**\n * Utility to combine multiple Next.js proxies into one.\n *\n * It executes proxies in order, merges headers, and correctly handles\n * redirects and rewrites.\n *\n * @example\n * import { multipleProxies, intlayerProxy } from \"next-intlayer/proxy\";\n * import { NextResponse } from \"next/server\";\n *\n * const authMiddleware = (req: NextRequest) => {\n *   if (!req.cookies.get(\"token\")) {\n *     return NextResponse.redirect(new URL(\"/login\", req.url));\n *   }\n *   return NextResponse.next();\n * };\n *\n * export default multipleProxies([\n *   intlayerProxy,\n *   authMiddleware,\n * ]);\n *\n * @param proxies - An array of proxy functions to execute in order.\n * @returns A single proxy function that runs all provided proxies.\n */\nexport const multipleProxies =\n  (\n    proxies: ((\n      req: NextRequest,\n      event?: NextFetchEvent,\n      response?: NextResponse\n    ) => NextResponse | Promise<NextResponse>)[]\n  ) =>\n  async (req: NextRequest, event?: NextFetchEvent, response?: NextResponse) => {\n    // Array to store proxy headers\n    const proxyHeader: Headers[] = [];\n\n    // Loop through proxy functions\n    for (const proxy of proxies) {\n      // Execute proxy function and await the result\n      const result = await proxy(req, event, response);\n\n      // Check if the result is not okay and return it\n      if (!result.ok) {\n        return result;\n      }\n\n      // Push proxy headers to the array\n      proxyHeader.push(result.headers);\n    }\n\n    // Merge all the headers to check if there is a redirection or rewrite\n    const mergedHeaders = new Headers();\n\n    // Merge all the custom headers added by the proxies\n    const transmittedHeaders = new Headers();\n\n    // Merge headers\n    proxyHeader.forEach((header) => {\n      for (const [key, value] of header.entries()) {\n        mergedHeaders.append(key, value);\n\n        // check if it's a custom header added by one of the proxies\n        if (key.startsWith('x-middleware-request-')) {\n          // remove the prefix to get the original key\n          const fixedKey = key.replace('x-middleware-request-', '');\n\n          // add the original key to the transmitted headers\n          transmittedHeaders.append(fixedKey, value);\n        }\n      }\n    });\n\n    // Look for the 'x-middleware-request-redirect' header\n    const redirect = mergedHeaders.get('x-middleware-request-redirect');\n\n    // If a redirection is required based on the proxy headers\n    if (redirect) {\n      // Perform the redirection\n      return NextResponse.redirect(new URL(redirect, req.url), {\n        status: 307, // Temporary redirect\n      });\n    }\n\n    // Look for the 'x-middleware-rewrite' header\n    const rewrite = mergedHeaders.get('x-middleware-rewrite');\n    if (rewrite) {\n      // Perform the rewrite\n      return NextResponse.rewrite(new URL(rewrite, req.url), {\n        request: {\n          headers: transmittedHeaders,\n        },\n      });\n    }\n\n    // Default: continue to next proxy\n    return NextResponse.next({\n      request: {\n        headers: transmittedHeaders,\n      },\n    });\n  };\n\nexport const multipleMiddlewares = multipleProxies;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,MAAa,mBAET,YAMF,OAAO,KAAkB,OAAwB,aAA4B;CAE3E,MAAMA,cAAyB,EAAE;AAGjC,MAAK,MAAM,SAAS,SAAS;EAE3B,MAAM,SAAS,MAAM,MAAM,KAAK,OAAO,SAAS;AAGhD,MAAI,CAAC,OAAO,GACV,QAAO;AAIT,cAAY,KAAK,OAAO,QAAQ;;CAIlC,MAAM,gBAAgB,IAAI,SAAS;CAGnC,MAAM,qBAAqB,IAAI,SAAS;AAGxC,aAAY,SAAS,WAAW;AAC9B,OAAK,MAAM,CAAC,KAAK,UAAU,OAAO,SAAS,EAAE;AAC3C,iBAAc,OAAO,KAAK,MAAM;AAGhC,OAAI,IAAI,WAAW,wBAAwB,EAAE;IAE3C,MAAM,WAAW,IAAI,QAAQ,yBAAyB,GAAG;AAGzD,uBAAmB,OAAO,UAAU,MAAM;;;GAG9C;CAGF,MAAM,WAAW,cAAc,IAAI,gCAAgC;AAGnE,KAAI,SAEF,QAAOC,yBAAa,SAAS,IAAI,IAAI,UAAU,IAAI,IAAI,EAAE,EACvD,QAAQ,KACT,CAAC;CAIJ,MAAM,UAAU,cAAc,IAAI,uBAAuB;AACzD,KAAI,QAEF,QAAOA,yBAAa,QAAQ,IAAI,IAAI,SAAS,IAAI,IAAI,EAAE,EACrD,SAAS,EACP,SAAS,oBACV,EACF,CAAC;AAIJ,QAAOA,yBAAa,KAAK,EACvB,SAAS,EACP,SAAS,oBACV,EACF,CAAC;;AAGN,MAAa,sBAAsB"}

package/dist/esm/client/useLocale.mjs

@@ -4,13 +4,21 @@
 import { useLocale as useLocale$1 } from "react-intlayer";
 import { getLocalizedUrl, getPathWithoutLocale } from "@intlayer/core";
 import { usePathname, useRouter } from "next/navigation.js";
-import { useCallback, useMemo } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 
 //#region src/client/useLocale.ts
+const usePathWithoutLocale = () => {
+	const pathname = usePathname();
+	const [fullPath, setFullPath] = useState(pathname);
+	useEffect(() => {
+		const search = typeof window !== "undefined" ? window.location.search : "";
+		setFullPath(search ? `${pathname}${search}` : pathname);
+	}, [pathname]);
+	return useMemo(() => getPathWithoutLocale(fullPath), [fullPath]);
+};
 const useLocale = ({ onChange } = {}) => {
 	const { replace, push } = useRouter();
-	const pathname = usePathname();
-	const pathWithoutLocale = useMemo(() => getPathWithoutLocale(pathname), [pathname]);
+	const pathWithoutLocale = usePathWithoutLocale();
 	return {
 		...useLocale$1({ onLocaleChange: useCallback((locale) => {
 			if (!onChange) return;

package/dist/esm/client/useLocale.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useLocale.mjs","names":["useLocaleReact"],"sources":["../../../src/client/useLocale.ts"],"sourcesContent":["'use client';\n\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport type { LocalesValues } from '@intlayer/types';\nimport { usePathname, useRouter } from 'next/navigation.js';\nimport { useCallback, useMemo } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\ntype UseLocaleProps = {\n  onChange?: 'replace' | 'push' | ((locale: LocalesValues) => void);\n};\n\nexport const useLocale = ({ onChange }: UseLocaleProps = {}) => {\n  const { replace, push } = useRouter();\n  const pathname = usePathname();\n  const pathWithoutLocale = useMemo(\n    () => getPathWithoutLocale(pathname),\n    [pathname]\n  );\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      if (!onChange) return;\n\n      if (typeof onChange === 'function') {\n        onChange(locale);\n        return;\n      }\n\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      if (onChange === 'replace') {\n        replace(pathWithLocale);\n      }\n      if (onChange === 'push') {\n        push(pathWithLocale);\n      }\n    },\n    [replace, push, pathWithoutLocale, onChange]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";;;;;;;;;AAYA,MAAa,aAAa,EAAE,aAA6B,EAAE,KAAK;CAC9D,MAAM,EAAE,SAAS,SAAS,WAAW;CACrC,MAAM,WAAW,aAAa;CAC9B,MAAM,oBAAoB,cAClB,qBAAqB,SAAS,EACpC,CAAC,SAAS,CACX;AA2BD,QAAO;EACL,GALsBA,YAAe,EACrC,gBAtB0B,aACzB,WAA0B;AACzB,OAAI,CAAC,SAAU;AAEf,OAAI,OAAO,aAAa,YAAY;AAClC,aAAS,OAAO;AAChB;;GAGF,MAAM,iBAAiB,gBAAgB,mBAAmB,OAAO;AAEjE,OAAI,aAAa,UACf,SAAQ,eAAe;AAEzB,OAAI,aAAa,OACf,MAAK,eAAe;KAGxB;GAAC;GAAS;GAAM;GAAmB;GAAS,CAC7C,EAIA,CAAC;EAIA;EACD"}
+{"version":3,"file":"useLocale.mjs","names":["useLocaleReact"],"sources":["../../../src/client/useLocale.ts"],"sourcesContent":["'use client';\n\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport type { LocalesValues } from '@intlayer/types';\nimport { usePathname, useRouter } from 'next/navigation.js';\nimport { useCallback, useEffect, useMemo, useState } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\ntype UseLocaleProps = {\n  onChange?: 'replace' | 'push' | ((locale: LocalesValues) => void);\n};\n\nconst usePathWithoutLocale = () => {\n  const pathname = usePathname(); // updates on client navigations\n  const [fullPath, setFullPath] = useState(pathname);\n\n  useEffect(() => {\n    // Runs only on client; avoids suspense.\n    const search = typeof window !== 'undefined' ? window.location.search : '';\n    setFullPath(search ? `${pathname}${search}` : pathname);\n  }, [pathname]);\n\n  // Your own helper\n  return useMemo(() => getPathWithoutLocale(fullPath), [fullPath]);\n};\n\nexport const useLocale = ({ onChange }: UseLocaleProps = {}) => {\n  const { replace, push } = useRouter();\n  const pathWithoutLocale = usePathWithoutLocale();\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      if (!onChange) return;\n\n      if (typeof onChange === 'function') {\n        onChange(locale);\n        return;\n      }\n\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      if (onChange === 'replace') {\n        replace(pathWithLocale);\n      }\n      if (onChange === 'push') {\n        push(pathWithLocale);\n      }\n    },\n    [replace, push, pathWithoutLocale, onChange]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";;;;;;;;;AAYA,MAAM,6BAA6B;CACjC,MAAM,WAAW,aAAa;CAC9B,MAAM,CAAC,UAAU,eAAe,SAAS,SAAS;AAElD,iBAAgB;EAEd,MAAM,SAAS,OAAO,WAAW,cAAc,OAAO,SAAS,SAAS;AACxE,cAAY,SAAS,GAAG,WAAW,WAAW,SAAS;IACtD,CAAC,SAAS,CAAC;AAGd,QAAO,cAAc,qBAAqB,SAAS,EAAE,CAAC,SAAS,CAAC;;AAGlE,MAAa,aAAa,EAAE,aAA6B,EAAE,KAAK;CAC9D,MAAM,EAAE,SAAS,SAAS,WAAW;CACrC,MAAM,oBAAoB,sBAAsB;AA2BhD,QAAO;EACL,GALsBA,YAAe,EACrC,gBAtB0B,aACzB,WAA0B;AACzB,OAAI,CAAC,SAAU;AAEf,OAAI,OAAO,aAAa,YAAY;AAClC,aAAS,OAAO;AAChB;;GAGF,MAAM,iBAAiB,gBAAgB,mBAAmB,OAAO;AAEjE,OAAI,aAAa,UACf,SAAQ,eAAe;AAEzB,OAAI,aAAa,OACf,MAAK,eAAe;KAGxB;GAAC;GAAS;GAAM;GAAmB;GAAS,CAC7C,EAIA,CAAC;EAIA;EACD"}