gt-next 11.2.0 → 11.3.0

package/dist/provider/GTProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"GTProvider.mjs","names":[],"sources":["../../src/provider/GTProvider.tsx"],"sourcesContent":["import { getLocale } from '../request/getLocale';\nimport { getRegion } from '../request/getRegion';\nimport type { GTProviderProps } from '../utils/types';\nimport { Client_GTProvider } from '../utils/client-boundary';\nimport { getNextI18nCache } from '../i18n-cache/NextI18nCache';\nimport { getI18nConfig } from 'gt-i18n/internal';\nimport { getEnableI18n } from '../request/getEnableI18n';\n\nexport async function GTProvider({ children }: GTProviderProps) {\n  // ---------- SETUP ---------- //\n  const i18nCache = getNextI18nCache();\n  const i18nConfig = getI18nConfig();\n  const locale = await getLocale();\n  const region = await getRegion();\n  const enableI18n = await getEnableI18n();\n  const translationRequired = i18nConfig.requiresTranslation(locale);\n\n  // ----- FETCH TRANSLATIONS FROM CACHE ----- //\n\n  const translationsSnapshotPromise = translationRequired\n    ? i18nCache.loadTranslations(locale)\n    : Promise.resolve({});\n\n  const dictionariesSnapshotPromise = i18nCache.loadDictionaries(locale);\n\n  // Block until cache check resolves\n  const translationsSnapshot = { [locale]: await translationsSnapshotPromise };\n  const dictionariesSnapshot = await dictionariesSnapshotPromise;\n\n  return (\n    <Client_GTProvider\n      enableI18n={enableI18n}\n      locale={locale}\n      region={region}\n      translations={translationsSnapshot}\n      dictionaries={dictionariesSnapshot}\n    >\n      {children}\n    </Client_GTProvider>\n  );\n}\n"],"mappings":";;;;;;;;AAQA,eAAsB,WAAW,EAAE,YAA6B;CAE9D,MAAM,YAAY,kBAAkB;CACpC,MAAM,aAAa,eAAe;CAClC,MAAM,SAAS,MAAM,WAAW;CAChC,MAAM,SAAS,MAAM,WAAW;CAChC,MAAM,aAAa,MAAM,eAAe;CAKxC,MAAM,8BAJsB,WAAW,oBAAoB,OAIJ,GACnD,UAAU,iBAAiB,OAAO,GAClC,QAAQ,QAAQ,EAAE,CAAC;CAEvB,MAAM,8BAA8B,UAAU,iBAAiB,OAAO;AAMtE,QACE,oBAAC,mBAAD;EACc;EACJ;EACA;EACR,cAAc,GARc,SAAS,MAAM,6BAQT;EAClC,cAAc,MARiB;EAU9B;EACiB,CAAA"}
+{"version":3,"file":"GTProvider.mjs","names":[],"sources":["../../src/provider/GTProvider.tsx"],"sourcesContent":["import { getLocale } from '../request/getLocale';\nimport { getRegion } from '../request/getRegion';\nimport type { GTProviderProps } from '../utils/types';\nimport { Client_GTProvider } from '../utils/client-boundary';\nimport { getNextI18nCache } from '../i18n-cache/NextI18nCache';\nimport { getI18nConfig } from 'gt-i18n/internal';\nimport { getEnableI18n } from '../request/getEnableI18n';\n\nexport async function GTProvider({ children }: GTProviderProps) {\n  // ---------- SETUP ---------- //\n  const i18nCache = getNextI18nCache();\n  const i18nConfig = getI18nConfig();\n  const locale = await getLocale();\n  const region = await getRegion();\n  const enableI18n = await getEnableI18n();\n  const translationRequired = i18nConfig.requiresTranslation(locale);\n\n  // ----- FETCH TRANSLATIONS FROM CACHE ----- //\n\n  const translationsSnapshotPromise = translationRequired\n    ? i18nCache.loadTranslations(locale)\n    : Promise.resolve({});\n\n  const dictionariesSnapshotPromise = i18nCache.loadDictionaries(locale);\n\n  // Block until cache check resolves\n  const translationsSnapshot = { [locale]: await translationsSnapshotPromise };\n  const dictionariesSnapshot = await dictionariesSnapshotPromise;\n\n  return (\n    <Client_GTProvider\n      supportsLocaleRefresh={\n        process.env._GENERALTRANSLATION_LOCALE_REFRESH_SUPPORTED === 'true'\n      }\n      conditions={{ locale, region, enableI18n }}\n      translations={translationsSnapshot}\n      dictionaries={dictionariesSnapshot}\n    >\n      {children}\n    </Client_GTProvider>\n  );\n}\n"],"mappings":";;;;;;;;AAQA,eAAsB,WAAW,EAAE,YAA6B;CAE9D,MAAM,YAAY,kBAAkB;CACpC,MAAM,aAAa,eAAe;CAClC,MAAM,SAAS,MAAM,WAAW;CAChC,MAAM,SAAS,MAAM,WAAW;CAChC,MAAM,aAAa,MAAM,eAAe;CAKxC,MAAM,8BAJsB,WAAW,oBAAoB,OAIJ,GACnD,UAAU,iBAAiB,OAAO,GAClC,QAAQ,QAAQ,EAAE,CAAC;CAEvB,MAAM,8BAA8B,UAAU,iBAAiB,OAAO;CAGtE,MAAM,uBAAuB,GAAG,SAAS,MAAM,6BAA6B;CAC5E,MAAM,uBAAuB,MAAM;AAEnC,QACE,oBAAC,mBAAD;EACE,uBACE,QAAQ,IAAI,iDAAiD;EAE/D,YAAY;GAAE;GAAQ;GAAQ;GAAY;EAC1C,cAAc;EACd,cAAc;EAEb;EACiB,CAAA"}

package/dist/request/localeValidation.js

@@ -15,9 +15,9 @@ function resolveLocaleOrDefault(locale) {
 	const i18nConfig = (0, gt_i18n_internal.getI18nConfig)();
 	const defaultLocale = i18nConfig.getDefaultLocale();
 	const supportedLocale = typeof locale === "string" && locale.length > 0 ? i18nConfig.determineSupportedLocale(locale) : void 0;
-	if (supportedLocale) return i18nConfig.resolveAliasLocale(supportedLocale);
+	if (supportedLocale) return supportedLocale;
 	if (typeof locale === "string" && locale.length > 0) warnInvalidLocale(locale, defaultLocale);
-	return i18nConfig.resolveAliasLocale(defaultLocale);
+	return defaultLocale;
 }
 /**
 * Checks whether a locale is valid and supported by the current gt-next config.

package/dist/request/localeValidation.js.map

@@ -1 +1 @@
-{"version":3,"file":"localeValidation.js","names":["createInvalidRequestLocaleWarning"],"sources":["../../src/request/localeValidation.ts"],"sourcesContent":["import { getI18nConfig } from 'gt-i18n/internal';\nimport { createInvalidRequestLocaleWarning } from '../errors/request';\n\nfunction determineSupportedLocale(locale: unknown): string | undefined {\n  if (typeof locale !== 'string' || locale.length === 0) return undefined;\n  return getI18nConfig().determineSupportedLocale(locale);\n}\n\nfunction warnInvalidLocale(locale: string, defaultLocale: string) {\n  if (\n    process.env._GENERALTRANSLATION_DISABLE_INVALID_LOCALE_WARNING === 'true'\n  ) {\n    return;\n  }\n\n  console.warn(createInvalidRequestLocaleWarning(locale, defaultLocale));\n}\n\nexport function resolveLocaleOrDefault(locale: unknown): string {\n  const i18nConfig = getI18nConfig();\n  const defaultLocale = i18nConfig.getDefaultLocale();\n  const supportedLocale =\n    typeof locale === 'string' && locale.length > 0\n      ? i18nConfig.determineSupportedLocale(locale)\n      : undefined;\n\n  if (supportedLocale) return i18nConfig.resolveAliasLocale(supportedLocale);\n\n  if (typeof locale === 'string' && locale.length > 0) {\n    warnInvalidLocale(locale, defaultLocale);\n  }\n\n  return i18nConfig.resolveAliasLocale(defaultLocale);\n}\n\n/**\n * Checks whether a locale is valid and supported by the current gt-next config.\n *\n * Use this when route params or other request inputs should be rejected instead\n * of falling back to the default locale.\n *\n * @param locale - The locale candidate to validate.\n * @returns True when the locale resolves to one of the configured locales.\n */\nexport function isLocaleSupported(locale: unknown): locale is string {\n  return determineSupportedLocale(locale) !== undefined;\n}\n"],"mappings":";;;;;AAGA,SAAS,yBAAyB,QAAqC;AACrE,KAAI,OAAO,WAAW,YAAY,OAAO,WAAW,EAAG,QAAO,KAAA;AAC9D,SAAA,GAAA,iBAAA,gBAAsB,CAAC,yBAAyB,OAAO;;AAGzD,SAAS,kBAAkB,QAAgB,eAAuB;AAChE,KACE,QAAQ,IAAI,uDAAuD,OAEnE;AAGF,SAAQ,KAAKA,uBAAAA,kCAAkC,QAAQ,cAAc,CAAC;;AAGxE,SAAgB,uBAAuB,QAAyB;CAC9D,MAAM,cAAA,GAAA,iBAAA,gBAA4B;CAClC,MAAM,gBAAgB,WAAW,kBAAkB;CACnD,MAAM,kBACJ,OAAO,WAAW,YAAY,OAAO,SAAS,IAC1C,WAAW,yBAAyB,OAAO,GAC3C,KAAA;AAEN,KAAI,gBAAiB,QAAO,WAAW,mBAAmB,gBAAgB;AAE1E,KAAI,OAAO,WAAW,YAAY,OAAO,SAAS,EAChD,mBAAkB,QAAQ,cAAc;AAG1C,QAAO,WAAW,mBAAmB,cAAc;;;;;;;;;;;AAYrD,SAAgB,kBAAkB,QAAmC;AACnE,QAAO,yBAAyB,OAAO,KAAK,KAAA"}
+{"version":3,"file":"localeValidation.js","names":["createInvalidRequestLocaleWarning"],"sources":["../../src/request/localeValidation.ts"],"sourcesContent":["import { getI18nConfig } from 'gt-i18n/internal';\nimport { createInvalidRequestLocaleWarning } from '../errors/request';\n\nfunction determineSupportedLocale(locale: unknown): string | undefined {\n  if (typeof locale !== 'string' || locale.length === 0) return undefined;\n  return getI18nConfig().determineSupportedLocale(locale);\n}\n\nfunction warnInvalidLocale(locale: string, defaultLocale: string) {\n  if (\n    process.env._GENERALTRANSLATION_DISABLE_INVALID_LOCALE_WARNING === 'true'\n  ) {\n    return;\n  }\n\n  console.warn(createInvalidRequestLocaleWarning(locale, defaultLocale));\n}\n\nexport function resolveLocaleOrDefault(locale: unknown): string {\n  const i18nConfig = getI18nConfig();\n  const defaultLocale = i18nConfig.getDefaultLocale();\n  const supportedLocale =\n    typeof locale === 'string' && locale.length > 0\n      ? i18nConfig.determineSupportedLocale(locale)\n      : undefined;\n\n  if (supportedLocale) return supportedLocale;\n\n  if (typeof locale === 'string' && locale.length > 0) {\n    warnInvalidLocale(locale, defaultLocale);\n  }\n\n  return defaultLocale;\n}\n\n/**\n * Checks whether a locale is valid and supported by the current gt-next config.\n *\n * Use this when route params or other request inputs should be rejected instead\n * of falling back to the default locale.\n *\n * @param locale - The locale candidate to validate.\n * @returns True when the locale resolves to one of the configured locales.\n */\nexport function isLocaleSupported(locale: unknown): locale is string {\n  return determineSupportedLocale(locale) !== undefined;\n}\n"],"mappings":";;;;;AAGA,SAAS,yBAAyB,QAAqC;AACrE,KAAI,OAAO,WAAW,YAAY,OAAO,WAAW,EAAG,QAAO,KAAA;AAC9D,SAAA,GAAA,iBAAA,gBAAsB,CAAC,yBAAyB,OAAO;;AAGzD,SAAS,kBAAkB,QAAgB,eAAuB;AAChE,KACE,QAAQ,IAAI,uDAAuD,OAEnE;AAGF,SAAQ,KAAKA,uBAAAA,kCAAkC,QAAQ,cAAc,CAAC;;AAGxE,SAAgB,uBAAuB,QAAyB;CAC9D,MAAM,cAAA,GAAA,iBAAA,gBAA4B;CAClC,MAAM,gBAAgB,WAAW,kBAAkB;CACnD,MAAM,kBACJ,OAAO,WAAW,YAAY,OAAO,SAAS,IAC1C,WAAW,yBAAyB,OAAO,GAC3C,KAAA;AAEN,KAAI,gBAAiB,QAAO;AAE5B,KAAI,OAAO,WAAW,YAAY,OAAO,SAAS,EAChD,mBAAkB,QAAQ,cAAc;AAG1C,QAAO;;;;;;;;;;;AAYT,SAAgB,kBAAkB,QAAmC;AACnE,QAAO,yBAAyB,OAAO,KAAK,KAAA"}

package/dist/request/localeValidation.mjs

@@ -13,9 +13,9 @@ function resolveLocaleOrDefault(locale) {
 	const i18nConfig = getI18nConfig();
 	const defaultLocale = i18nConfig.getDefaultLocale();
 	const supportedLocale = typeof locale === "string" && locale.length > 0 ? i18nConfig.determineSupportedLocale(locale) : void 0;
-	if (supportedLocale) return i18nConfig.resolveAliasLocale(supportedLocale);
+	if (supportedLocale) return supportedLocale;
 	if (typeof locale === "string" && locale.length > 0) warnInvalidLocale(locale, defaultLocale);
-	return i18nConfig.resolveAliasLocale(defaultLocale);
+	return defaultLocale;
 }
 /**
 * Checks whether a locale is valid and supported by the current gt-next config.

package/dist/request/localeValidation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"localeValidation.mjs","names":[],"sources":["../../src/request/localeValidation.ts"],"sourcesContent":["import { getI18nConfig } from 'gt-i18n/internal';\nimport { createInvalidRequestLocaleWarning } from '../errors/request';\n\nfunction determineSupportedLocale(locale: unknown): string | undefined {\n  if (typeof locale !== 'string' || locale.length === 0) return undefined;\n  return getI18nConfig().determineSupportedLocale(locale);\n}\n\nfunction warnInvalidLocale(locale: string, defaultLocale: string) {\n  if (\n    process.env._GENERALTRANSLATION_DISABLE_INVALID_LOCALE_WARNING === 'true'\n  ) {\n    return;\n  }\n\n  console.warn(createInvalidRequestLocaleWarning(locale, defaultLocale));\n}\n\nexport function resolveLocaleOrDefault(locale: unknown): string {\n  const i18nConfig = getI18nConfig();\n  const defaultLocale = i18nConfig.getDefaultLocale();\n  const supportedLocale =\n    typeof locale === 'string' && locale.length > 0\n      ? i18nConfig.determineSupportedLocale(locale)\n      : undefined;\n\n  if (supportedLocale) return i18nConfig.resolveAliasLocale(supportedLocale);\n\n  if (typeof locale === 'string' && locale.length > 0) {\n    warnInvalidLocale(locale, defaultLocale);\n  }\n\n  return i18nConfig.resolveAliasLocale(defaultLocale);\n}\n\n/**\n * Checks whether a locale is valid and supported by the current gt-next config.\n *\n * Use this when route params or other request inputs should be rejected instead\n * of falling back to the default locale.\n *\n * @param locale - The locale candidate to validate.\n * @returns True when the locale resolves to one of the configured locales.\n */\nexport function isLocaleSupported(locale: unknown): locale is string {\n  return determineSupportedLocale(locale) !== undefined;\n}\n"],"mappings":";;;AAGA,SAAS,yBAAyB,QAAqC;AACrE,KAAI,OAAO,WAAW,YAAY,OAAO,WAAW,EAAG,QAAO,KAAA;AAC9D,QAAO,eAAe,CAAC,yBAAyB,OAAO;;AAGzD,SAAS,kBAAkB,QAAgB,eAAuB;AAChE,KACE,QAAQ,IAAI,uDAAuD,OAEnE;AAGF,SAAQ,KAAK,kCAAkC,QAAQ,cAAc,CAAC;;AAGxE,SAAgB,uBAAuB,QAAyB;CAC9D,MAAM,aAAa,eAAe;CAClC,MAAM,gBAAgB,WAAW,kBAAkB;CACnD,MAAM,kBACJ,OAAO,WAAW,YAAY,OAAO,SAAS,IAC1C,WAAW,yBAAyB,OAAO,GAC3C,KAAA;AAEN,KAAI,gBAAiB,QAAO,WAAW,mBAAmB,gBAAgB;AAE1E,KAAI,OAAO,WAAW,YAAY,OAAO,SAAS,EAChD,mBAAkB,QAAQ,cAAc;AAG1C,QAAO,WAAW,mBAAmB,cAAc;;;;;;;;;;;AAYrD,SAAgB,kBAAkB,QAAmC;AACnE,QAAO,yBAAyB,OAAO,KAAK,KAAA"}
+{"version":3,"file":"localeValidation.mjs","names":[],"sources":["../../src/request/localeValidation.ts"],"sourcesContent":["import { getI18nConfig } from 'gt-i18n/internal';\nimport { createInvalidRequestLocaleWarning } from '../errors/request';\n\nfunction determineSupportedLocale(locale: unknown): string | undefined {\n  if (typeof locale !== 'string' || locale.length === 0) return undefined;\n  return getI18nConfig().determineSupportedLocale(locale);\n}\n\nfunction warnInvalidLocale(locale: string, defaultLocale: string) {\n  if (\n    process.env._GENERALTRANSLATION_DISABLE_INVALID_LOCALE_WARNING === 'true'\n  ) {\n    return;\n  }\n\n  console.warn(createInvalidRequestLocaleWarning(locale, defaultLocale));\n}\n\nexport function resolveLocaleOrDefault(locale: unknown): string {\n  const i18nConfig = getI18nConfig();\n  const defaultLocale = i18nConfig.getDefaultLocale();\n  const supportedLocale =\n    typeof locale === 'string' && locale.length > 0\n      ? i18nConfig.determineSupportedLocale(locale)\n      : undefined;\n\n  if (supportedLocale) return supportedLocale;\n\n  if (typeof locale === 'string' && locale.length > 0) {\n    warnInvalidLocale(locale, defaultLocale);\n  }\n\n  return defaultLocale;\n}\n\n/**\n * Checks whether a locale is valid and supported by the current gt-next config.\n *\n * Use this when route params or other request inputs should be rejected instead\n * of falling back to the default locale.\n *\n * @param locale - The locale candidate to validate.\n * @returns True when the locale resolves to one of the configured locales.\n */\nexport function isLocaleSupported(locale: unknown): locale is string {\n  return determineSupportedLocale(locale) !== undefined;\n}\n"],"mappings":";;;AAGA,SAAS,yBAAyB,QAAqC;AACrE,KAAI,OAAO,WAAW,YAAY,OAAO,WAAW,EAAG,QAAO,KAAA;AAC9D,QAAO,eAAe,CAAC,yBAAyB,OAAO;;AAGzD,SAAS,kBAAkB,QAAgB,eAAuB;AAChE,KACE,QAAQ,IAAI,uDAAuD,OAEnE;AAGF,SAAQ,KAAK,kCAAkC,QAAQ,cAAc,CAAC;;AAGxE,SAAgB,uBAAuB,QAAyB;CAC9D,MAAM,aAAa,eAAe;CAClC,MAAM,gBAAgB,WAAW,kBAAkB;CACnD,MAAM,kBACJ,OAAO,WAAW,YAAY,OAAO,SAAS,IAC1C,WAAW,yBAAyB,OAAO,GAC3C,KAAA;AAEN,KAAI,gBAAiB,QAAO;AAE5B,KAAI,OAAO,WAAW,YAAY,OAAO,SAAS,EAChD,mBAAkB,QAAQ,cAAc;AAG1C,QAAO;;;;;;;;;;;AAYT,SAAgB,kBAAkB,QAAmC;AACnE,QAAO,yBAAyB,OAAO,KAAK,KAAA"}

package/dist/utils/client-boundary.d.ts

@@ -12,5 +12,8 @@ import { type SharedGTProviderProps } from 'gt-react';
 /**
  * Small wrapper to embed nextjs app router behavior
  */
-export declare function Client_GTProvider(props: SharedGTProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function Client_GTProvider({ conditions, supportsLocaleRefresh, ...props }: Omit<SharedGTProviderProps, 'locale' | 'region' | 'enableI18n' | '_serverConditions'> & {
+    conditions: NonNullable<SharedGTProviderProps['_serverConditions']>;
+    supportsLocaleRefresh: boolean;
+}): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=client-boundary.d.ts.map

package/dist/utils/client-boundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-boundary.d.ts","sourceRoot":"","sources":["../../src/utils/client-boundary.tsx"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGnE,OAAO,EAAc,KAAK,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAsBlE;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,2CA+C7D"}
+{"version":3,"file":"client-boundary.d.ts","sourceRoot":"","sources":["../../src/utils/client-boundary.tsx"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGnE,OAAO,EAAc,KAAK,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAsBlE;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,UAAU,EACV,qBAAqB,EACrB,GAAG,KAAK,EACT,EAAE,IAAI,CACL,qBAAqB,EACrB,QAAQ,GAAG,QAAQ,GAAG,YAAY,GAAG,mBAAmB,CACzD,GAAG;IACF,UAAU,EAAE,WAAW,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACpE,qBAAqB,EAAE,OAAO,CAAC;CAChC,2CA+DA"}

package/dist/utils/client-boundary.js

@@ -20,11 +20,15 @@ if (typeof window !== "undefined") require_setup_initGT_client.initializeGTClien
 /**
 * Small wrapper to embed nextjs app router behavior
 */
-function Client_GTProvider(props) {
+function Client_GTProvider({ conditions, supportsLocaleRefresh, ...props }) {
 	const router = (0, next_navigation_js.useRouter)();
 	const refreshServerComponents = (0, react.useCallback)(() => {
+		if (!supportsLocaleRefresh) {
+			globalThis.location.reload();
+			return;
+		}
 		router.refresh();
-	}, [router]);
+	}, [router, supportsLocaleRefresh]);
 	const reloadBrowserPage = (0, react.useCallback)(() => {
 		globalThis.location.reload();
 	}, []);
@@ -45,10 +49,12 @@ function Client_GTProvider(props) {
 	usePathCheck({
 		reloadBrowserPage,
 		refreshServerComponents,
-		locale: props.locale
+		locale: conditions.locale
 	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(gt_react.GTProvider, {
 		...props,
+		...conditions,
+		_serverConditions: conditions,
 		_reload: syncServerContent
 	});
 }
@@ -61,7 +67,7 @@ function usePathCheck({ reloadBrowserPage, refreshServerComponents, locale, refe
 	const pathname = (0, next_navigation_js.usePathname)();
 	(0, react.useEffect)(() => {
 		const i18nConfig = (0, gt_i18n_internal.getI18nConfig)();
-		document.cookie = `${referrerLocaleCookieName}=${i18nConfig.resolveAliasLocale(locale)};path=/`;
+		document.cookie = `${referrerLocaleCookieName}=${locale};path=/`;
 		const locales = i18nConfig.getLocales();
 		const defaultLocale = i18nConfig.getDefaultLocale();
 		if ((0, gt_i18n_internal.getCookieValue)(document.cookie, localeRoutingEnabledCookieName) === "true" && require_utils_pathRegex.pathnameMatchesRegex(pathname, pathRegex)) {
@@ -82,14 +88,12 @@ function usePathCheck({ reloadBrowserPage, refreshServerComponents, locale, refe
 	]);
 }
 function resolvePathLocale(pathname, i18nConfig, defaultLocale, locales) {
-	const extractedLocale = extractLocale(pathname, i18nConfig);
+	const extractedLocale = extractLocale(pathname);
 	if (!extractedLocale) return defaultLocale;
-	const currentPathLocale = i18nConfig.determineLocale([i18nConfig.isGTServicesEnabled() ? i18nConfig.standardizeLocale(extractedLocale) : extractedLocale], locales);
-	return currentPathLocale ? i18nConfig.resolveAliasLocale(currentPathLocale) : defaultLocale;
+	return i18nConfig.determineLocale([extractedLocale], locales) ?? defaultLocale;
 }
-function extractLocale(pathname, i18nConfig) {
-	const matches = pathname.match(/^\/([^/]+)(?:\/|$)/);
-	return matches ? i18nConfig.resolveAliasLocale(matches[1]) : null;
+function extractLocale(pathname) {
+	return pathname.match(/^\/([^/]+)(?:\/|$)/)?.[1] ?? null;
 }
 //#endregion
 exports.Client_GTProvider = Client_GTProvider;

package/dist/utils/client-boundary.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-boundary.js","names":["compilePathRegex","defaultLocaleRoutingEnabledCookieName","pathnameMatchesRegex","GTProvider","defaultReferrerLocaleCookieName"],"sources":["../../src/utils/client-boundary.tsx"],"sourcesContent":["'use client';\n\n/**\n * This is a small boundary for RSC consumption of client components\n * Cannot be consumed through gt-react/index.rsc as deciding btwn\n * gt-react/index.server and gt-react/index.client can only happen\n * here. This matters for GTProvider, but not for LocaleSelector.\n * This pattern is just good to follow for carrying over different\n * behaviors between client and server from gt-react.\n */\n\nexport { LocaleSelector as Client_LocaleSelector } from 'gt-react';\nexport { RegionSelector as Client_RegionSelector } from 'gt-react';\n\nimport { getCookieValue, getI18nConfig, I18nConfig } from 'gt-i18n/internal';\nimport { GTProvider, type SharedGTProviderProps } from 'gt-react';\nimport { usePathname, useRouter } from 'next/navigation';\nimport { useCallback, useEffect } from 'react';\nimport { initializeGTClient } from '../setup/initGT.client';\nimport {\n  defaultLocaleRoutingEnabledCookieName,\n  defaultReferrerLocaleCookieName,\n} from './cookies';\nimport { compilePathRegex, pathnameMatchesRegex } from './pathRegex';\n\n// withGTConfig exposes this build-time value to both middleware and client code.\nconst pathRegex = compilePathRegex(process.env._GENERALTRANSLATION_PATH_REGEX);\n\n/**\n * Only need to initalize client. We know server was already\n * inialaized by index.rsc.ts. We do not know yet if client\n * has been initialized by index.client.ts.\n */\nif (typeof window !== 'undefined') {\n  initializeGTClient();\n}\n\n/**\n * Small wrapper to embed nextjs app router behavior\n */\nexport function Client_GTProvider(props: SharedGTProviderProps) {\n  const router = useRouter();\n  const refreshServerComponents = useCallback(() => {\n    router.refresh();\n  }, [router]);\n  const reloadBrowserPage = useCallback(() => {\n    globalThis.location.reload();\n  }, []);\n  const syncServerContent = useCallback<\n    NonNullable<SharedGTProviderProps['_reload']>\n  >(\n    ({ locale }) => {\n      const i18nConfig = getI18nConfig();\n      const localeRoutingEnabled =\n        getCookieValue(\n          document.cookie,\n          defaultLocaleRoutingEnabledCookieName\n        ) === 'true';\n      const defaultLocale = i18nConfig.getDefaultLocale();\n      const locales = i18nConfig.getLocales();\n      const currentPathname = globalThis.location.pathname;\n      const localeRoutingApplies =\n        localeRoutingEnabled &&\n        pathnameMatchesRegex(currentPathname, pathRegex);\n      if (localeRoutingApplies && locale === defaultLocale) {\n        const currentPathLocale = resolvePathLocale(\n          currentPathname,\n          i18nConfig,\n          defaultLocale,\n          locales\n        );\n        if (currentPathLocale !== defaultLocale) {\n          reloadBrowserPage();\n          return;\n        }\n      }\n\n      refreshServerComponents();\n    },\n    [refreshServerComponents, reloadBrowserPage]\n  );\n  usePathCheck({\n    reloadBrowserPage,\n    refreshServerComponents,\n    locale: props.locale,\n  });\n  return <GTProvider {...props} _reload={syncServerContent} />;\n}\n\n/**\n * Synchronizes server content if the URL locale does not match the selected\n * locale.\n * TODO: optimize this hook\n */\nfunction usePathCheck({\n  reloadBrowserPage,\n  refreshServerComponents,\n  locale,\n  referrerLocaleCookieName = defaultReferrerLocaleCookieName,\n  localeRoutingEnabledCookieName = defaultLocaleRoutingEnabledCookieName,\n}: {\n  reloadBrowserPage: () => void;\n  refreshServerComponents: () => void;\n  locale: string;\n  referrerLocaleCookieName?: string;\n  localeRoutingEnabledCookieName?: string;\n}) {\n  const pathname = usePathname();\n\n  useEffect(() => {\n    // Track the referrer locale for middleware\n    const i18nConfig = getI18nConfig();\n    document.cookie = `${referrerLocaleCookieName}=${i18nConfig.resolveAliasLocale(locale)};path=/`;\n\n    // Synchronize server content if the pathname changes\n    const locales = i18nConfig.getLocales();\n    const defaultLocale = i18nConfig.getDefaultLocale();\n    const localeRoutingEnabled =\n      getCookieValue(document.cookie, localeRoutingEnabledCookieName) ===\n      'true';\n    if (localeRoutingEnabled && pathnameMatchesRegex(pathname, pathRegex)) {\n      // Extract locale from pathname\n      const currentPathLocale = resolvePathLocale(\n        pathname,\n        i18nConfig,\n        defaultLocale,\n        locales\n      );\n\n      if (\n        currentPathLocale &&\n        locales.includes(currentPathLocale) &&\n        currentPathLocale !== locale\n      ) {\n        // clear cookie (avoids infinite loop when there is no middleware)\n        document.cookie = `${localeRoutingEnabledCookieName}=;path=/`;\n\n        if (locale === defaultLocale) {\n          // A browser navigation follows the middleware redirect that removes\n          // the default locale prefix. Next.js router.refresh() does not.\n          reloadBrowserPage();\n        } else {\n          refreshServerComponents();\n        }\n      }\n    }\n  }, [\n    pathname,\n    locale,\n    referrerLocaleCookieName,\n    localeRoutingEnabledCookieName,\n    reloadBrowserPage,\n    refreshServerComponents,\n  ]);\n}\n\nfunction resolvePathLocale(\n  pathname: string,\n  i18nConfig: I18nConfig,\n  defaultLocale: string,\n  locales: string[]\n): string {\n  const extractedLocale = extractLocale(pathname, i18nConfig);\n  if (!extractedLocale) {\n    return defaultLocale;\n  }\n\n  const currentPathLocale = i18nConfig.determineLocale(\n    [\n      i18nConfig.isGTServicesEnabled()\n        ? i18nConfig.standardizeLocale(extractedLocale)\n        : extractedLocale,\n    ],\n    locales\n  );\n  return currentPathLocale\n    ? i18nConfig.resolveAliasLocale(currentPathLocale)\n    : defaultLocale;\n}\n\nfunction extractLocale(\n  pathname: string,\n  i18nConfig: I18nConfig\n): string | null {\n  const matches = pathname.match(/^\\/([^/]+)(?:\\/|$)/);\n  return matches ? i18nConfig.resolveAliasLocale(matches[1]) : null;\n}\n"],"mappings":";;;;;;;;;;;;AA0BA,MAAM,YAAYA,wBAAAA,iBAAiB,QAAQ,IAAI,+BAA+B;;;;;;AAO9E,IAAI,OAAO,WAAW,YACpB,6BAAA,oBAAoB;;;;AAMtB,SAAgB,kBAAkB,OAA8B;CAC9D,MAAM,UAAA,GAAA,mBAAA,YAAoB;CAC1B,MAAM,2BAAA,GAAA,MAAA,mBAA4C;AAChD,SAAO,SAAS;IACf,CAAC,OAAO,CAAC;CACZ,MAAM,qBAAA,GAAA,MAAA,mBAAsC;AAC1C,aAAW,SAAS,QAAQ;IAC3B,EAAE,CAAC;CACN,MAAM,qBAAA,GAAA,MAAA,cAGH,EAAE,aAAa;EACd,MAAM,cAAA,GAAA,iBAAA,gBAA4B;EAClC,MAAM,wBAAA,GAAA,iBAAA,gBAEF,SAAS,QACTC,sBAAAA,sCACD,KAAK;EACR,MAAM,gBAAgB,WAAW,kBAAkB;EACnD,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,kBAAkB,WAAW,SAAS;AAI5C,MAFE,wBACAC,wBAAAA,qBAAqB,iBAAiB,UAAU,IACtB,WAAW;OACX,kBACxB,iBACA,YACA,eACA,QAEmB,KAAK,eAAe;AACvC,uBAAmB;AACnB;;;AAIJ,2BAAyB;IAE3B,CAAC,yBAAyB,kBAAkB,CAC7C;AACD,cAAa;EACX;EACA;EACA,QAAQ,MAAM;EACf,CAAC;AACF,QAAO,iBAAA,GAAA,kBAAA,KAACC,SAAAA,YAAD;EAAY,GAAI;EAAO,SAAS;EAAqB,CAAA;;;;;;;AAQ9D,SAAS,aAAa,EACpB,mBACA,yBACA,QACA,2BAA2BC,sBAAAA,iCAC3B,iCAAiCH,sBAAAA,yCAOhC;CACD,MAAM,YAAA,GAAA,mBAAA,cAAwB;AAE9B,EAAA,GAAA,MAAA,iBAAgB;EAEd,MAAM,cAAA,GAAA,iBAAA,gBAA4B;AAClC,WAAS,SAAS,GAAG,yBAAyB,GAAG,WAAW,mBAAmB,OAAO,CAAC;EAGvF,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,gBAAgB,WAAW,kBAAkB;AAInD,OAAA,GAAA,iBAAA,gBAFiB,SAAS,QAAQ,+BAA+B,KAC/D,UAC0BC,wBAAAA,qBAAqB,UAAU,UAAU,EAAE;GAErE,MAAM,oBAAoB,kBACxB,UACA,YACA,eACA,QACD;AAED,OACE,qBACA,QAAQ,SAAS,kBAAkB,IACnC,sBAAsB,QACtB;AAEA,aAAS,SAAS,GAAG,+BAA+B;AAEpD,QAAI,WAAW,cAGb,oBAAmB;QAEnB,0BAAyB;;;IAI9B;EACD;EACA;EACA;EACA;EACA;EACA;EACD,CAAC;;AAGJ,SAAS,kBACP,UACA,YACA,eACA,SACQ;CACR,MAAM,kBAAkB,cAAc,UAAU,WAAW;AAC3D,KAAI,CAAC,gBACH,QAAO;CAGT,MAAM,oBAAoB,WAAW,gBACnC,CACE,WAAW,qBAAqB,GAC5B,WAAW,kBAAkB,gBAAgB,GAC7C,gBACL,EACD,QACD;AACD,QAAO,oBACH,WAAW,mBAAmB,kBAAkB,GAChD;;AAGN,SAAS,cACP,UACA,YACe;CACf,MAAM,UAAU,SAAS,MAAM,qBAAqB;AACpD,QAAO,UAAU,WAAW,mBAAmB,QAAQ,GAAG,GAAG"}
+{"version":3,"file":"client-boundary.js","names":["compilePathRegex","defaultLocaleRoutingEnabledCookieName","pathnameMatchesRegex","GTProvider","defaultReferrerLocaleCookieName"],"sources":["../../src/utils/client-boundary.tsx"],"sourcesContent":["'use client';\n\n/**\n * This is a small boundary for RSC consumption of client components\n * Cannot be consumed through gt-react/index.rsc as deciding btwn\n * gt-react/index.server and gt-react/index.client can only happen\n * here. This matters for GTProvider, but not for LocaleSelector.\n * This pattern is just good to follow for carrying over different\n * behaviors between client and server from gt-react.\n */\n\nexport { LocaleSelector as Client_LocaleSelector } from 'gt-react';\nexport { RegionSelector as Client_RegionSelector } from 'gt-react';\n\nimport { getCookieValue, getI18nConfig, I18nConfig } from 'gt-i18n/internal';\nimport { GTProvider, type SharedGTProviderProps } from 'gt-react';\nimport { usePathname, useRouter } from 'next/navigation';\nimport { useCallback, useEffect } from 'react';\nimport { initializeGTClient } from '../setup/initGT.client';\nimport {\n  defaultLocaleRoutingEnabledCookieName,\n  defaultReferrerLocaleCookieName,\n} from './cookies';\nimport { compilePathRegex, pathnameMatchesRegex } from './pathRegex';\n\n// withGTConfig exposes this build-time value to both middleware and client code.\nconst pathRegex = compilePathRegex(process.env._GENERALTRANSLATION_PATH_REGEX);\n\n/**\n * Only need to initalize client. We know server was already\n * inialaized by index.rsc.ts. We do not know yet if client\n * has been initialized by index.client.ts.\n */\nif (typeof window !== 'undefined') {\n  initializeGTClient();\n}\n\n/**\n * Small wrapper to embed nextjs app router behavior\n */\nexport function Client_GTProvider({\n  conditions,\n  supportsLocaleRefresh,\n  ...props\n}: Omit<\n  SharedGTProviderProps,\n  'locale' | 'region' | 'enableI18n' | '_serverConditions'\n> & {\n  conditions: NonNullable<SharedGTProviderProps['_serverConditions']>;\n  supportsLocaleRefresh: boolean;\n}) {\n  const router = useRouter();\n  const refreshServerComponents = useCallback(() => {\n    // Older Next versions can retain a stale layout/provider after a redirect.\n    if (!supportsLocaleRefresh) {\n      globalThis.location.reload();\n      return;\n    }\n    // The server supplies a fresh conditions object even when its accepted\n    // locale is unchanged. For example, switching /en/careers to excluded 'fr'\n    // returns another 'en' snapshot, which resets the browser store to 'en'\n    // without discarding client state through a document reload.\n    router.refresh();\n  }, [router, supportsLocaleRefresh]);\n  const reloadBrowserPage = useCallback(() => {\n    globalThis.location.reload();\n  }, []);\n  const syncServerContent = useCallback<\n    NonNullable<SharedGTProviderProps['_reload']>\n  >(\n    ({ locale }) => {\n      const i18nConfig = getI18nConfig();\n      const localeRoutingEnabled =\n        getCookieValue(\n          document.cookie,\n          defaultLocaleRoutingEnabledCookieName\n        ) === 'true';\n      const defaultLocale = i18nConfig.getDefaultLocale();\n      const locales = i18nConfig.getLocales();\n      const currentPathname = globalThis.location.pathname;\n      const localeRoutingApplies =\n        localeRoutingEnabled &&\n        pathnameMatchesRegex(currentPathname, pathRegex);\n      if (localeRoutingApplies && locale === defaultLocale) {\n        const currentPathLocale = resolvePathLocale(\n          currentPathname,\n          i18nConfig,\n          defaultLocale,\n          locales\n        );\n        if (currentPathLocale !== defaultLocale) {\n          reloadBrowserPage();\n          return;\n        }\n      }\n\n      refreshServerComponents();\n    },\n    [refreshServerComponents, reloadBrowserPage]\n  );\n  usePathCheck({\n    reloadBrowserPage,\n    refreshServerComponents,\n    locale: conditions.locale,\n  });\n  return (\n    <GTProvider\n      {...props}\n      {...conditions}\n      _serverConditions={conditions}\n      _reload={syncServerContent}\n    />\n  );\n}\n\n/**\n * Synchronizes server content if the URL locale does not match the selected\n * locale.\n * TODO: optimize this hook\n */\nfunction usePathCheck({\n  reloadBrowserPage,\n  refreshServerComponents,\n  locale,\n  referrerLocaleCookieName = defaultReferrerLocaleCookieName,\n  localeRoutingEnabledCookieName = defaultLocaleRoutingEnabledCookieName,\n}: {\n  reloadBrowserPage: () => void;\n  refreshServerComponents: () => void;\n  locale: string;\n  referrerLocaleCookieName?: string;\n  localeRoutingEnabledCookieName?: string;\n}) {\n  const pathname = usePathname();\n\n  useEffect(() => {\n    // Track the referrer locale for middleware\n    const i18nConfig = getI18nConfig();\n    document.cookie = `${referrerLocaleCookieName}=${locale};path=/`;\n\n    // Synchronize server content if the pathname changes\n    const locales = i18nConfig.getLocales();\n    const defaultLocale = i18nConfig.getDefaultLocale();\n    const localeRoutingEnabled =\n      getCookieValue(document.cookie, localeRoutingEnabledCookieName) ===\n      'true';\n    if (localeRoutingEnabled && pathnameMatchesRegex(pathname, pathRegex)) {\n      // Extract locale from pathname\n      const currentPathLocale = resolvePathLocale(\n        pathname,\n        i18nConfig,\n        defaultLocale,\n        locales\n      );\n\n      // Both values are resolved to configured identities before comparison.\n      if (\n        currentPathLocale &&\n        locales.includes(currentPathLocale) &&\n        currentPathLocale !== locale\n      ) {\n        // clear cookie (avoids infinite loop when there is no middleware)\n        document.cookie = `${localeRoutingEnabledCookieName}=;path=/`;\n\n        if (locale === defaultLocale) {\n          // A browser navigation follows the middleware redirect that removes\n          // the default locale prefix. Next.js router.refresh() does not.\n          reloadBrowserPage();\n        } else {\n          refreshServerComponents();\n        }\n      }\n    }\n  }, [\n    pathname,\n    locale,\n    referrerLocaleCookieName,\n    localeRoutingEnabledCookieName,\n    reloadBrowserPage,\n    refreshServerComponents,\n  ]);\n}\n\nfunction resolvePathLocale(\n  pathname: string,\n  i18nConfig: I18nConfig,\n  defaultLocale: string,\n  locales: string[]\n): string {\n  const extractedLocale = extractLocale(pathname);\n  if (!extractedLocale) {\n    return defaultLocale;\n  }\n\n  return (\n    i18nConfig.determineLocale([extractedLocale], locales) ?? defaultLocale\n  );\n}\n\nfunction extractLocale(pathname: string): string | null {\n  return pathname.match(/^\\/([^/]+)(?:\\/|$)/)?.[1] ?? null;\n}\n"],"mappings":";;;;;;;;;;;;AA0BA,MAAM,YAAYA,wBAAAA,iBAAiB,QAAQ,IAAI,+BAA+B;;;;;;AAO9E,IAAI,OAAO,WAAW,YACpB,6BAAA,oBAAoB;;;;AAMtB,SAAgB,kBAAkB,EAChC,YACA,uBACA,GAAG,SAOF;CACD,MAAM,UAAA,GAAA,mBAAA,YAAoB;CAC1B,MAAM,2BAAA,GAAA,MAAA,mBAA4C;AAEhD,MAAI,CAAC,uBAAuB;AAC1B,cAAW,SAAS,QAAQ;AAC5B;;AAMF,SAAO,SAAS;IACf,CAAC,QAAQ,sBAAsB,CAAC;CACnC,MAAM,qBAAA,GAAA,MAAA,mBAAsC;AAC1C,aAAW,SAAS,QAAQ;IAC3B,EAAE,CAAC;CACN,MAAM,qBAAA,GAAA,MAAA,cAGH,EAAE,aAAa;EACd,MAAM,cAAA,GAAA,iBAAA,gBAA4B;EAClC,MAAM,wBAAA,GAAA,iBAAA,gBAEF,SAAS,QACTC,sBAAAA,sCACD,KAAK;EACR,MAAM,gBAAgB,WAAW,kBAAkB;EACnD,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,kBAAkB,WAAW,SAAS;AAI5C,MAFE,wBACAC,wBAAAA,qBAAqB,iBAAiB,UAAU,IACtB,WAAW;OACX,kBACxB,iBACA,YACA,eACA,QAEmB,KAAK,eAAe;AACvC,uBAAmB;AACnB;;;AAIJ,2BAAyB;IAE3B,CAAC,yBAAyB,kBAAkB,CAC7C;AACD,cAAa;EACX;EACA;EACA,QAAQ,WAAW;EACpB,CAAC;AACF,QACE,iBAAA,GAAA,kBAAA,KAACC,SAAAA,YAAD;EACE,GAAI;EACJ,GAAI;EACJ,mBAAmB;EACnB,SAAS;EACT,CAAA;;;;;;;AASN,SAAS,aAAa,EACpB,mBACA,yBACA,QACA,2BAA2BC,sBAAAA,iCAC3B,iCAAiCH,sBAAAA,yCAOhC;CACD,MAAM,YAAA,GAAA,mBAAA,cAAwB;AAE9B,EAAA,GAAA,MAAA,iBAAgB;EAEd,MAAM,cAAA,GAAA,iBAAA,gBAA4B;AAClC,WAAS,SAAS,GAAG,yBAAyB,GAAG,OAAO;EAGxD,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,gBAAgB,WAAW,kBAAkB;AAInD,OAAA,GAAA,iBAAA,gBAFiB,SAAS,QAAQ,+BAA+B,KAC/D,UAC0BC,wBAAAA,qBAAqB,UAAU,UAAU,EAAE;GAErE,MAAM,oBAAoB,kBACxB,UACA,YACA,eACA,QACD;AAGD,OACE,qBACA,QAAQ,SAAS,kBAAkB,IACnC,sBAAsB,QACtB;AAEA,aAAS,SAAS,GAAG,+BAA+B;AAEpD,QAAI,WAAW,cAGb,oBAAmB;QAEnB,0BAAyB;;;IAI9B;EACD;EACA;EACA;EACA;EACA;EACA;EACD,CAAC;;AAGJ,SAAS,kBACP,UACA,YACA,eACA,SACQ;CACR,MAAM,kBAAkB,cAAc,SAAS;AAC/C,KAAI,CAAC,gBACH,QAAO;AAGT,QACE,WAAW,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,IAAI;;AAI9D,SAAS,cAAc,UAAiC;AACtD,QAAO,SAAS,MAAM,qBAAqB,GAAG,MAAM"}

package/dist/utils/client-boundary.mjs

@@ -18,11 +18,15 @@ if (typeof window !== "undefined") initializeGTClient();
 /**
 * Small wrapper to embed nextjs app router behavior
 */
-function Client_GTProvider(props) {
+function Client_GTProvider({ conditions, supportsLocaleRefresh, ...props }) {
 	const router = useRouter();
 	const refreshServerComponents = useCallback(() => {
+		if (!supportsLocaleRefresh) {
+			globalThis.location.reload();
+			return;
+		}
 		router.refresh();
-	}, [router]);
+	}, [router, supportsLocaleRefresh]);
 	const reloadBrowserPage = useCallback(() => {
 		globalThis.location.reload();
 	}, []);
@@ -43,10 +47,12 @@ function Client_GTProvider(props) {
 	usePathCheck({
 		reloadBrowserPage,
 		refreshServerComponents,
-		locale: props.locale
+		locale: conditions.locale
 	});
 	return /* @__PURE__ */ jsx(GTProvider, {
 		...props,
+		...conditions,
+		_serverConditions: conditions,
 		_reload: syncServerContent
 	});
 }
@@ -59,7 +65,7 @@ function usePathCheck({ reloadBrowserPage, refreshServerComponents, locale, refe
 	const pathname = usePathname();
 	useEffect(() => {
 		const i18nConfig = getI18nConfig();
-		document.cookie = `${referrerLocaleCookieName}=${i18nConfig.resolveAliasLocale(locale)};path=/`;
+		document.cookie = `${referrerLocaleCookieName}=${locale};path=/`;
 		const locales = i18nConfig.getLocales();
 		const defaultLocale = i18nConfig.getDefaultLocale();
 		if (getCookieValue(document.cookie, localeRoutingEnabledCookieName) === "true" && pathnameMatchesRegex(pathname, pathRegex)) {
@@ -80,14 +86,12 @@ function usePathCheck({ reloadBrowserPage, refreshServerComponents, locale, refe
 	]);
 }
 function resolvePathLocale(pathname, i18nConfig, defaultLocale, locales) {
-	const extractedLocale = extractLocale(pathname, i18nConfig);
+	const extractedLocale = extractLocale(pathname);
 	if (!extractedLocale) return defaultLocale;
-	const currentPathLocale = i18nConfig.determineLocale([i18nConfig.isGTServicesEnabled() ? i18nConfig.standardizeLocale(extractedLocale) : extractedLocale], locales);
-	return currentPathLocale ? i18nConfig.resolveAliasLocale(currentPathLocale) : defaultLocale;
+	return i18nConfig.determineLocale([extractedLocale], locales) ?? defaultLocale;
 }
-function extractLocale(pathname, i18nConfig) {
-	const matches = pathname.match(/^\/([^/]+)(?:\/|$)/);
-	return matches ? i18nConfig.resolveAliasLocale(matches[1]) : null;
+function extractLocale(pathname) {
+	return pathname.match(/^\/([^/]+)(?:\/|$)/)?.[1] ?? null;
 }
 //#endregion
 export { Client_GTProvider, Client_LocaleSelector, Client_RegionSelector };

package/dist/utils/client-boundary.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"client-boundary.mjs","names":[],"sources":["../../src/utils/client-boundary.tsx"],"sourcesContent":["'use client';\n\n/**\n * This is a small boundary for RSC consumption of client components\n * Cannot be consumed through gt-react/index.rsc as deciding btwn\n * gt-react/index.server and gt-react/index.client can only happen\n * here. This matters for GTProvider, but not for LocaleSelector.\n * This pattern is just good to follow for carrying over different\n * behaviors between client and server from gt-react.\n */\n\nexport { LocaleSelector as Client_LocaleSelector } from 'gt-react';\nexport { RegionSelector as Client_RegionSelector } from 'gt-react';\n\nimport { getCookieValue, getI18nConfig, I18nConfig } from 'gt-i18n/internal';\nimport { GTProvider, type SharedGTProviderProps } from 'gt-react';\nimport { usePathname, useRouter } from 'next/navigation';\nimport { useCallback, useEffect } from 'react';\nimport { initializeGTClient } from '../setup/initGT.client';\nimport {\n  defaultLocaleRoutingEnabledCookieName,\n  defaultReferrerLocaleCookieName,\n} from './cookies';\nimport { compilePathRegex, pathnameMatchesRegex } from './pathRegex';\n\n// withGTConfig exposes this build-time value to both middleware and client code.\nconst pathRegex = compilePathRegex(process.env._GENERALTRANSLATION_PATH_REGEX);\n\n/**\n * Only need to initalize client. We know server was already\n * inialaized by index.rsc.ts. We do not know yet if client\n * has been initialized by index.client.ts.\n */\nif (typeof window !== 'undefined') {\n  initializeGTClient();\n}\n\n/**\n * Small wrapper to embed nextjs app router behavior\n */\nexport function Client_GTProvider(props: SharedGTProviderProps) {\n  const router = useRouter();\n  const refreshServerComponents = useCallback(() => {\n    router.refresh();\n  }, [router]);\n  const reloadBrowserPage = useCallback(() => {\n    globalThis.location.reload();\n  }, []);\n  const syncServerContent = useCallback<\n    NonNullable<SharedGTProviderProps['_reload']>\n  >(\n    ({ locale }) => {\n      const i18nConfig = getI18nConfig();\n      const localeRoutingEnabled =\n        getCookieValue(\n          document.cookie,\n          defaultLocaleRoutingEnabledCookieName\n        ) === 'true';\n      const defaultLocale = i18nConfig.getDefaultLocale();\n      const locales = i18nConfig.getLocales();\n      const currentPathname = globalThis.location.pathname;\n      const localeRoutingApplies =\n        localeRoutingEnabled &&\n        pathnameMatchesRegex(currentPathname, pathRegex);\n      if (localeRoutingApplies && locale === defaultLocale) {\n        const currentPathLocale = resolvePathLocale(\n          currentPathname,\n          i18nConfig,\n          defaultLocale,\n          locales\n        );\n        if (currentPathLocale !== defaultLocale) {\n          reloadBrowserPage();\n          return;\n        }\n      }\n\n      refreshServerComponents();\n    },\n    [refreshServerComponents, reloadBrowserPage]\n  );\n  usePathCheck({\n    reloadBrowserPage,\n    refreshServerComponents,\n    locale: props.locale,\n  });\n  return <GTProvider {...props} _reload={syncServerContent} />;\n}\n\n/**\n * Synchronizes server content if the URL locale does not match the selected\n * locale.\n * TODO: optimize this hook\n */\nfunction usePathCheck({\n  reloadBrowserPage,\n  refreshServerComponents,\n  locale,\n  referrerLocaleCookieName = defaultReferrerLocaleCookieName,\n  localeRoutingEnabledCookieName = defaultLocaleRoutingEnabledCookieName,\n}: {\n  reloadBrowserPage: () => void;\n  refreshServerComponents: () => void;\n  locale: string;\n  referrerLocaleCookieName?: string;\n  localeRoutingEnabledCookieName?: string;\n}) {\n  const pathname = usePathname();\n\n  useEffect(() => {\n    // Track the referrer locale for middleware\n    const i18nConfig = getI18nConfig();\n    document.cookie = `${referrerLocaleCookieName}=${i18nConfig.resolveAliasLocale(locale)};path=/`;\n\n    // Synchronize server content if the pathname changes\n    const locales = i18nConfig.getLocales();\n    const defaultLocale = i18nConfig.getDefaultLocale();\n    const localeRoutingEnabled =\n      getCookieValue(document.cookie, localeRoutingEnabledCookieName) ===\n      'true';\n    if (localeRoutingEnabled && pathnameMatchesRegex(pathname, pathRegex)) {\n      // Extract locale from pathname\n      const currentPathLocale = resolvePathLocale(\n        pathname,\n        i18nConfig,\n        defaultLocale,\n        locales\n      );\n\n      if (\n        currentPathLocale &&\n        locales.includes(currentPathLocale) &&\n        currentPathLocale !== locale\n      ) {\n        // clear cookie (avoids infinite loop when there is no middleware)\n        document.cookie = `${localeRoutingEnabledCookieName}=;path=/`;\n\n        if (locale === defaultLocale) {\n          // A browser navigation follows the middleware redirect that removes\n          // the default locale prefix. Next.js router.refresh() does not.\n          reloadBrowserPage();\n        } else {\n          refreshServerComponents();\n        }\n      }\n    }\n  }, [\n    pathname,\n    locale,\n    referrerLocaleCookieName,\n    localeRoutingEnabledCookieName,\n    reloadBrowserPage,\n    refreshServerComponents,\n  ]);\n}\n\nfunction resolvePathLocale(\n  pathname: string,\n  i18nConfig: I18nConfig,\n  defaultLocale: string,\n  locales: string[]\n): string {\n  const extractedLocale = extractLocale(pathname, i18nConfig);\n  if (!extractedLocale) {\n    return defaultLocale;\n  }\n\n  const currentPathLocale = i18nConfig.determineLocale(\n    [\n      i18nConfig.isGTServicesEnabled()\n        ? i18nConfig.standardizeLocale(extractedLocale)\n        : extractedLocale,\n    ],\n    locales\n  );\n  return currentPathLocale\n    ? i18nConfig.resolveAliasLocale(currentPathLocale)\n    : defaultLocale;\n}\n\nfunction extractLocale(\n  pathname: string,\n  i18nConfig: I18nConfig\n): string | null {\n  const matches = pathname.match(/^\\/([^/]+)(?:\\/|$)/);\n  return matches ? i18nConfig.resolveAliasLocale(matches[1]) : null;\n}\n"],"mappings":";;;;;;;;;;AA0BA,MAAM,YAAY,iBAAiB,QAAQ,IAAI,+BAA+B;;;;;;AAO9E,IAAI,OAAO,WAAW,YACpB,qBAAoB;;;;AAMtB,SAAgB,kBAAkB,OAA8B;CAC9D,MAAM,SAAS,WAAW;CAC1B,MAAM,0BAA0B,kBAAkB;AAChD,SAAO,SAAS;IACf,CAAC,OAAO,CAAC;CACZ,MAAM,oBAAoB,kBAAkB;AAC1C,aAAW,SAAS,QAAQ;IAC3B,EAAE,CAAC;CACN,MAAM,oBAAoB,aAGvB,EAAE,aAAa;EACd,MAAM,aAAa,eAAe;EAClC,MAAM,uBACJ,eACE,SAAS,QACT,sCACD,KAAK;EACR,MAAM,gBAAgB,WAAW,kBAAkB;EACnD,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,kBAAkB,WAAW,SAAS;AAI5C,MAFE,wBACA,qBAAqB,iBAAiB,UAAU,IACtB,WAAW;OACX,kBACxB,iBACA,YACA,eACA,QAEmB,KAAK,eAAe;AACvC,uBAAmB;AACnB;;;AAIJ,2BAAyB;IAE3B,CAAC,yBAAyB,kBAAkB,CAC7C;AACD,cAAa;EACX;EACA;EACA,QAAQ,MAAM;EACf,CAAC;AACF,QAAO,oBAAC,YAAD;EAAY,GAAI;EAAO,SAAS;EAAqB,CAAA;;;;;;;AAQ9D,SAAS,aAAa,EACpB,mBACA,yBACA,QACA,2BAA2B,iCAC3B,iCAAiC,yCAOhC;CACD,MAAM,WAAW,aAAa;AAE9B,iBAAgB;EAEd,MAAM,aAAa,eAAe;AAClC,WAAS,SAAS,GAAG,yBAAyB,GAAG,WAAW,mBAAmB,OAAO,CAAC;EAGvF,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,gBAAgB,WAAW,kBAAkB;AAInD,MAFE,eAAe,SAAS,QAAQ,+BAA+B,KAC/D,UAC0B,qBAAqB,UAAU,UAAU,EAAE;GAErE,MAAM,oBAAoB,kBACxB,UACA,YACA,eACA,QACD;AAED,OACE,qBACA,QAAQ,SAAS,kBAAkB,IACnC,sBAAsB,QACtB;AAEA,aAAS,SAAS,GAAG,+BAA+B;AAEpD,QAAI,WAAW,cAGb,oBAAmB;QAEnB,0BAAyB;;;IAI9B;EACD;EACA;EACA;EACA;EACA;EACA;EACD,CAAC;;AAGJ,SAAS,kBACP,UACA,YACA,eACA,SACQ;CACR,MAAM,kBAAkB,cAAc,UAAU,WAAW;AAC3D,KAAI,CAAC,gBACH,QAAO;CAGT,MAAM,oBAAoB,WAAW,gBACnC,CACE,WAAW,qBAAqB,GAC5B,WAAW,kBAAkB,gBAAgB,GAC7C,gBACL,EACD,QACD;AACD,QAAO,oBACH,WAAW,mBAAmB,kBAAkB,GAChD;;AAGN,SAAS,cACP,UACA,YACe;CACf,MAAM,UAAU,SAAS,MAAM,qBAAqB;AACpD,QAAO,UAAU,WAAW,mBAAmB,QAAQ,GAAG,GAAG"}
+{"version":3,"file":"client-boundary.mjs","names":[],"sources":["../../src/utils/client-boundary.tsx"],"sourcesContent":["'use client';\n\n/**\n * This is a small boundary for RSC consumption of client components\n * Cannot be consumed through gt-react/index.rsc as deciding btwn\n * gt-react/index.server and gt-react/index.client can only happen\n * here. This matters for GTProvider, but not for LocaleSelector.\n * This pattern is just good to follow for carrying over different\n * behaviors between client and server from gt-react.\n */\n\nexport { LocaleSelector as Client_LocaleSelector } from 'gt-react';\nexport { RegionSelector as Client_RegionSelector } from 'gt-react';\n\nimport { getCookieValue, getI18nConfig, I18nConfig } from 'gt-i18n/internal';\nimport { GTProvider, type SharedGTProviderProps } from 'gt-react';\nimport { usePathname, useRouter } from 'next/navigation';\nimport { useCallback, useEffect } from 'react';\nimport { initializeGTClient } from '../setup/initGT.client';\nimport {\n  defaultLocaleRoutingEnabledCookieName,\n  defaultReferrerLocaleCookieName,\n} from './cookies';\nimport { compilePathRegex, pathnameMatchesRegex } from './pathRegex';\n\n// withGTConfig exposes this build-time value to both middleware and client code.\nconst pathRegex = compilePathRegex(process.env._GENERALTRANSLATION_PATH_REGEX);\n\n/**\n * Only need to initalize client. We know server was already\n * inialaized by index.rsc.ts. We do not know yet if client\n * has been initialized by index.client.ts.\n */\nif (typeof window !== 'undefined') {\n  initializeGTClient();\n}\n\n/**\n * Small wrapper to embed nextjs app router behavior\n */\nexport function Client_GTProvider({\n  conditions,\n  supportsLocaleRefresh,\n  ...props\n}: Omit<\n  SharedGTProviderProps,\n  'locale' | 'region' | 'enableI18n' | '_serverConditions'\n> & {\n  conditions: NonNullable<SharedGTProviderProps['_serverConditions']>;\n  supportsLocaleRefresh: boolean;\n}) {\n  const router = useRouter();\n  const refreshServerComponents = useCallback(() => {\n    // Older Next versions can retain a stale layout/provider after a redirect.\n    if (!supportsLocaleRefresh) {\n      globalThis.location.reload();\n      return;\n    }\n    // The server supplies a fresh conditions object even when its accepted\n    // locale is unchanged. For example, switching /en/careers to excluded 'fr'\n    // returns another 'en' snapshot, which resets the browser store to 'en'\n    // without discarding client state through a document reload.\n    router.refresh();\n  }, [router, supportsLocaleRefresh]);\n  const reloadBrowserPage = useCallback(() => {\n    globalThis.location.reload();\n  }, []);\n  const syncServerContent = useCallback<\n    NonNullable<SharedGTProviderProps['_reload']>\n  >(\n    ({ locale }) => {\n      const i18nConfig = getI18nConfig();\n      const localeRoutingEnabled =\n        getCookieValue(\n          document.cookie,\n          defaultLocaleRoutingEnabledCookieName\n        ) === 'true';\n      const defaultLocale = i18nConfig.getDefaultLocale();\n      const locales = i18nConfig.getLocales();\n      const currentPathname = globalThis.location.pathname;\n      const localeRoutingApplies =\n        localeRoutingEnabled &&\n        pathnameMatchesRegex(currentPathname, pathRegex);\n      if (localeRoutingApplies && locale === defaultLocale) {\n        const currentPathLocale = resolvePathLocale(\n          currentPathname,\n          i18nConfig,\n          defaultLocale,\n          locales\n        );\n        if (currentPathLocale !== defaultLocale) {\n          reloadBrowserPage();\n          return;\n        }\n      }\n\n      refreshServerComponents();\n    },\n    [refreshServerComponents, reloadBrowserPage]\n  );\n  usePathCheck({\n    reloadBrowserPage,\n    refreshServerComponents,\n    locale: conditions.locale,\n  });\n  return (\n    <GTProvider\n      {...props}\n      {...conditions}\n      _serverConditions={conditions}\n      _reload={syncServerContent}\n    />\n  );\n}\n\n/**\n * Synchronizes server content if the URL locale does not match the selected\n * locale.\n * TODO: optimize this hook\n */\nfunction usePathCheck({\n  reloadBrowserPage,\n  refreshServerComponents,\n  locale,\n  referrerLocaleCookieName = defaultReferrerLocaleCookieName,\n  localeRoutingEnabledCookieName = defaultLocaleRoutingEnabledCookieName,\n}: {\n  reloadBrowserPage: () => void;\n  refreshServerComponents: () => void;\n  locale: string;\n  referrerLocaleCookieName?: string;\n  localeRoutingEnabledCookieName?: string;\n}) {\n  const pathname = usePathname();\n\n  useEffect(() => {\n    // Track the referrer locale for middleware\n    const i18nConfig = getI18nConfig();\n    document.cookie = `${referrerLocaleCookieName}=${locale};path=/`;\n\n    // Synchronize server content if the pathname changes\n    const locales = i18nConfig.getLocales();\n    const defaultLocale = i18nConfig.getDefaultLocale();\n    const localeRoutingEnabled =\n      getCookieValue(document.cookie, localeRoutingEnabledCookieName) ===\n      'true';\n    if (localeRoutingEnabled && pathnameMatchesRegex(pathname, pathRegex)) {\n      // Extract locale from pathname\n      const currentPathLocale = resolvePathLocale(\n        pathname,\n        i18nConfig,\n        defaultLocale,\n        locales\n      );\n\n      // Both values are resolved to configured identities before comparison.\n      if (\n        currentPathLocale &&\n        locales.includes(currentPathLocale) &&\n        currentPathLocale !== locale\n      ) {\n        // clear cookie (avoids infinite loop when there is no middleware)\n        document.cookie = `${localeRoutingEnabledCookieName}=;path=/`;\n\n        if (locale === defaultLocale) {\n          // A browser navigation follows the middleware redirect that removes\n          // the default locale prefix. Next.js router.refresh() does not.\n          reloadBrowserPage();\n        } else {\n          refreshServerComponents();\n        }\n      }\n    }\n  }, [\n    pathname,\n    locale,\n    referrerLocaleCookieName,\n    localeRoutingEnabledCookieName,\n    reloadBrowserPage,\n    refreshServerComponents,\n  ]);\n}\n\nfunction resolvePathLocale(\n  pathname: string,\n  i18nConfig: I18nConfig,\n  defaultLocale: string,\n  locales: string[]\n): string {\n  const extractedLocale = extractLocale(pathname);\n  if (!extractedLocale) {\n    return defaultLocale;\n  }\n\n  return (\n    i18nConfig.determineLocale([extractedLocale], locales) ?? defaultLocale\n  );\n}\n\nfunction extractLocale(pathname: string): string | null {\n  return pathname.match(/^\\/([^/]+)(?:\\/|$)/)?.[1] ?? null;\n}\n"],"mappings":";;;;;;;;;;AA0BA,MAAM,YAAY,iBAAiB,QAAQ,IAAI,+BAA+B;;;;;;AAO9E,IAAI,OAAO,WAAW,YACpB,qBAAoB;;;;AAMtB,SAAgB,kBAAkB,EAChC,YACA,uBACA,GAAG,SAOF;CACD,MAAM,SAAS,WAAW;CAC1B,MAAM,0BAA0B,kBAAkB;AAEhD,MAAI,CAAC,uBAAuB;AAC1B,cAAW,SAAS,QAAQ;AAC5B;;AAMF,SAAO,SAAS;IACf,CAAC,QAAQ,sBAAsB,CAAC;CACnC,MAAM,oBAAoB,kBAAkB;AAC1C,aAAW,SAAS,QAAQ;IAC3B,EAAE,CAAC;CACN,MAAM,oBAAoB,aAGvB,EAAE,aAAa;EACd,MAAM,aAAa,eAAe;EAClC,MAAM,uBACJ,eACE,SAAS,QACT,sCACD,KAAK;EACR,MAAM,gBAAgB,WAAW,kBAAkB;EACnD,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,kBAAkB,WAAW,SAAS;AAI5C,MAFE,wBACA,qBAAqB,iBAAiB,UAAU,IACtB,WAAW;OACX,kBACxB,iBACA,YACA,eACA,QAEmB,KAAK,eAAe;AACvC,uBAAmB;AACnB;;;AAIJ,2BAAyB;IAE3B,CAAC,yBAAyB,kBAAkB,CAC7C;AACD,cAAa;EACX;EACA;EACA,QAAQ,WAAW;EACpB,CAAC;AACF,QACE,oBAAC,YAAD;EACE,GAAI;EACJ,GAAI;EACJ,mBAAmB;EACnB,SAAS;EACT,CAAA;;;;;;;AASN,SAAS,aAAa,EACpB,mBACA,yBACA,QACA,2BAA2B,iCAC3B,iCAAiC,yCAOhC;CACD,MAAM,WAAW,aAAa;AAE9B,iBAAgB;EAEd,MAAM,aAAa,eAAe;AAClC,WAAS,SAAS,GAAG,yBAAyB,GAAG,OAAO;EAGxD,MAAM,UAAU,WAAW,YAAY;EACvC,MAAM,gBAAgB,WAAW,kBAAkB;AAInD,MAFE,eAAe,SAAS,QAAQ,+BAA+B,KAC/D,UAC0B,qBAAqB,UAAU,UAAU,EAAE;GAErE,MAAM,oBAAoB,kBACxB,UACA,YACA,eACA,QACD;AAGD,OACE,qBACA,QAAQ,SAAS,kBAAkB,IACnC,sBAAsB,QACtB;AAEA,aAAS,SAAS,GAAG,+BAA+B;AAEpD,QAAI,WAAW,cAGb,oBAAmB;QAEnB,0BAAyB;;;IAI9B;EACD;EACA;EACA;EACA;EACA;EACA;EACD,CAAC;;AAGJ,SAAS,kBACP,UACA,YACA,eACA,SACQ;CACR,MAAM,kBAAkB,cAAc,SAAS;AAC/C,KAAI,CAAC,gBACH,QAAO;AAGT,QACE,WAAW,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,IAAI;;AAI9D,SAAS,cAAc,UAAiC;AACtD,QAAO,SAAS,MAAM,qBAAqB,GAAG,MAAM"}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "gt-next",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "A Next.js library for automatic internationalization.",
   "main": "dist/index.server.js",
   "peerDependencies": {
-    "@generaltranslation/compiler": "^1.3.51",
+    "@generaltranslation/compiler": "^1.3.53",
     "next": ">=13.0.0 <15.2.1 || >15.2.2",
     "react": ">=16.8.0 <20.0.0",
     "react-dom": ">=16.8.0 <20.0.0"
@@ -28,11 +28,11 @@
     "./dist/utils/client-boundary.*"
   ],
   "dependencies": {
-    "@generaltranslation/format": "0.1.8",
-    "@generaltranslation/react-core": "11.2.0",
-    "generaltranslation": "9.3.1",
-    "gt-react": "11.2.0",
-    "gt-i18n": "1.0.26"
+    "@generaltranslation/format": "0.1.9",
+    "@generaltranslation/react-core": "11.3.0",
+    "generaltranslation": "9.4.1",
+    "gt-react": "11.3.0",
+    "gt-i18n": "1.0.28"
   },
   "repository": {
     "type": "git",
@@ -52,7 +52,7 @@
     "next": "15.2.3",
     "tsdown": "^0.21.10",
     "typescript": "^5.9.2",
-    "@generaltranslation/compiler": "1.3.51"
+    "@generaltranslation/compiler": "1.3.53"
   },
   "exports": {
     ".": {