next-intl 3.4.4 → 3.5.0

package/dist/development/middleware/middleware.js

@@ -136,11 +136,10 @@ function createMiddleware(config) {
     if (hasOutdatedCookie) {
       response.cookies.set(constants.COOKIE_LOCALE_NAME, locale, {
         path: request.nextUrl.basePath || undefined,
-        sameSite: 'strict',
-        maxAge: 31536000 // 1 year
+        sameSite: constants.COOKIE_SAME_SITE,
+        maxAge: constants.COOKIE_MAX_AGE
       });
     }
-
     if (configWithDefaults.localePrefix !== 'never' && configWithDefaults.alternateLinks && configWithDefaults.locales.length > 1) {
       var _configWithDefaults$p;
       response.headers.set('Link', getAlternateLinksHeaderValue.default({

package/dist/development/navigation/react-client/ClientLink.js

@@ -20,7 +20,6 @@ function ClientLink(_ref, ref) {
   const linkLocale = locale || defaultLocale;
   return /*#__PURE__*/React__default.default.createElement(BaseLink.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
-    hrefLang: linkLocale,
     locale: linkLocale
   }, rest));
 }

package/dist/development/navigation/react-client/createSharedPathnamesNavigation.js

@@ -17,7 +17,7 @@ function createSharedPathnamesNavigation(opts) {
   function Link(props, ref) {
     return /*#__PURE__*/React__default.default.createElement(ClientLink.default, _rollupPluginBabelHelpers.extends({
       ref: ref,
-      localePrefix: opts.localePrefix
+      localePrefix: opts === null || opts === void 0 ? void 0 : opts.localePrefix
     }, props));
   }
   const LinkWithRef = /*#__PURE__*/React.forwardRef(Link);

package/dist/development/navigation/react-client/useBaseRouter.js

@@ -6,6 +6,7 @@ var navigation = require('next/navigation');
 var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
 var utils = require('../../shared/utils.js');
+var syncLocaleCookie = require('../shared/syncLocaleCookie.js');
 
 /**
  * Returns a wrapped instance of `useRouter` from `next/navigation` that
@@ -29,48 +30,34 @@ var utils = require('../../shared/utils.js');
 function useBaseRouter() {
   const router = navigation.useRouter();
   const locale = useLocale.default();
+  const pathname = navigation.usePathname();
   return React.useMemo(() => {
     function localize(href, nextLocale) {
       return utils.localizeHref(href, nextLocale || locale, locale, window.location.pathname);
     }
-    return {
-      ...router,
-      push(href, options) {
-        const {
-          locale: nextLocale,
-          ...rest
-        } = options || {};
-        const args = [localize(href, nextLocale)];
-        if (Object.keys(rest).length > 0) {
-          args.push(rest);
-        }
-        return router.push(...args);
-      },
-      replace(href, options) {
-        const {
-          locale: nextLocale,
-          ...rest
-        } = options || {};
-        const args = [localize(href, nextLocale)];
-        if (Object.keys(rest).length > 0) {
-          args.push(rest);
-        }
-        return router.replace(...args);
-      },
-      prefetch(href, options) {
+    function createHandler(fn) {
+      return function handler(href, options) {
         const {
           locale: nextLocale,
           ...rest
         } = options || {};
+        syncLocaleCookie.default(pathname, locale, nextLocale);
         const args = [localize(href, nextLocale)];
         if (Object.keys(rest).length > 0) {
-          // @ts-expect-error TypeScript thinks `rest` can be an empty object
           args.push(rest);
         }
-        return router.prefetch(...args);
-      }
+
+        // @ts-expect-error -- This is ok
+        return fn(...args);
+      };
+    }
+    return {
+      ...router,
+      push: createHandler(router.push),
+      replace: createHandler(router.replace),
+      prefetch: createHandler(router.prefetch)
     };
-  }, [locale, router]);
+  }, [locale, pathname, router]);
 }
 
 exports.default = useBaseRouter;

package/dist/development/navigation/react-server/createSharedPathnamesNavigation.js

@@ -19,7 +19,7 @@ function createSharedPathnamesNavigation(opts) {
   }
   function Link(props) {
     return /*#__PURE__*/React__default.default.createElement(ServerLink.default, _rollupPluginBabelHelpers.extends({
-      localePrefix: opts.localePrefix
+      localePrefix: opts === null || opts === void 0 ? void 0 : opts.localePrefix
     }, props));
   }
   function redirect(pathname) {

package/dist/development/navigation/shared/BaseLink.js

@@ -9,6 +9,7 @@ var navigation = require('next/navigation');
 var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
 var utils = require('../../shared/utils.js');
+var syncLocaleCookie = require('./syncLocaleCookie.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -20,6 +21,7 @@ function BaseLink(_ref, ref) {
     href,
     locale,
     localePrefix,
+    onClick,
     prefetch,
     ...rest
   } = _ref;
@@ -40,6 +42,10 @@ function BaseLink(_ref, ref) {
   // render, which would potentially be wrong. The final href is
   // determined in the effect below.
   utils.prefixHref(href, locale) : href);
+  function onLinkClick(event) {
+    syncLocaleCookie.default(pathname, defaultLocale, locale);
+    if (onClick) onClick(event);
+  }
   React.useEffect(() => {
     if (!pathname || localePrefix === 'never') return;
     setLocalizedHref(utils.localizeHref(href, locale, defaultLocale, pathname !== null && pathname !== void 0 ? pathname : undefined));
@@ -53,6 +59,8 @@ function BaseLink(_ref, ref) {
   return /*#__PURE__*/React__default.default.createElement(NextLink__default.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
     href: localizedHref,
+    hrefLang: isChangingLocale ? locale : undefined,
+    onClick: onLinkClick,
     prefetch: prefetch
   }, rest));
 }

package/dist/development/navigation/shared/syncLocaleCookie.js

@@ -0,0 +1,29 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var constants = require('../../shared/constants.js');
+
+/**
+ * We have to keep the cookie value in sync as Next.js might
+ * skip a request to the server due to its router cache.
+ * See https://github.com/amannn/next-intl/issues/786.
+ */
+function syncLocaleCookie(pathname, locale, nextLocale) {
+  const isSwitchingLocale = nextLocale !== locale;
+  if (!isSwitchingLocale ||
+  // Theoretical case, we always have a pathname in a real app,
+  // only not when running e.g. in a simulated test environment
+  !pathname) {
+    return;
+  }
+  const basePath = window.location.pathname.replace(pathname, '');
+  const hasBasePath = basePath !== '';
+  const path = hasBasePath ? basePath : '/';
+
+  // Note that writing to `document.cookie` doesn't overwrite all
+  // cookies, but only the ones referenced via the name here.
+  document.cookie = "".concat(constants.COOKIE_LOCALE_NAME, "=").concat(nextLocale, "; path=").concat(path, "; max-age=").concat(constants.COOKIE_MAX_AGE, "; sameSite=").concat(constants.COOKIE_SAME_SITE);
+}
+
+exports.default = syncLocaleCookie;

package/dist/development/shared/constants.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 // Reuse the legacy cookie name
 // https://nextjs.org/docs/advanced-features/i18n-routing#leveraging-the-next_locale-cookie
 const COOKIE_LOCALE_NAME = 'NEXT_LOCALE';
+const COOKIE_MAX_AGE = 31536000; // 1 year
+const COOKIE_SAME_SITE = 'strict';
 
 // Should take precedence over the cookie
 const HEADER_LOCALE_NAME = 'X-NEXT-INTL-LOCALE';
@@ -13,5 +15,7 @@ const HEADER_LOCALE_NAME = 'X-NEXT-INTL-LOCALE';
 const LOCALE_SEGMENT_NAME = 'locale';
 
 exports.COOKIE_LOCALE_NAME = COOKIE_LOCALE_NAME;
+exports.COOKIE_MAX_AGE = COOKIE_MAX_AGE;
+exports.COOKIE_SAME_SITE = COOKIE_SAME_SITE;
 exports.HEADER_LOCALE_NAME = HEADER_LOCALE_NAME;
 exports.LOCALE_SEGMENT_NAME = LOCALE_SEGMENT_NAME;

package/dist/esm/middleware/middleware.js

@@ -1 +1 @@
-import{NextResponse as e}from"next/server";import{COOKIE_LOCALE_NAME as t,HEADER_LOCALE_NAME as a}from"../shared/constants.js";import{matchesPathname as n}from"../shared/utils.js";import l from"./getAlternateLinksHeaderValue.js";import o from"./resolveLocale.js";import{isLocaleSupportedOnDomain as r,getNormalizedPathname as s,getKnownLocaleFromPathname as i,getInternalTemplate as c,formatTemplatePathname as d,getPathWithSearch as f,getBestMatchingDomain as u,applyBasePath as m}from"./utils.js";function h(h){const p=function(e){var t,a,n;return{...e,alternateLinks:null===(t=e.alternateLinks)||void 0===t||t,localePrefix:null!==(a=e.localePrefix)&&void 0!==a?a:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(h);return function(h){var v,x;const{domain:P,locale:U}=o(p,h.headers,h.cookies,h.nextUrl.pathname),L=p.localeDetection&&(null===(v=h.cookies.get(t))||void 0===v?void 0:v.value)!==U,g=P?P.defaultLocale===U:U===p.defaultLocale,k=(null===(x=p.domains)||void 0===x?void 0:x.filter((e=>r(U,e))))||[],w=null!=p.domains&&!P;function b(t){const n=new URL(t,h.url);return h.nextUrl.basePath&&(n.pathname=m(n.pathname,h.nextUrl.basePath)),e.rewrite(n,function(){const e=new Headers(h.headers);return e.set(a,U),{request:{headers:e}}}())}function j(t,a){const n=new URL(t,h.url);if(k.length>0&&!a){const e=u(P,U,k);e&&(a=e.domain,e.defaultLocale===U&&"as-needed"===p.localePrefix&&n.pathname.startsWith("/".concat(U))&&(n.pathname=s(n.pathname,p.locales)))}var l;a&&(n.protocol=null!==(l=h.headers.get("x-forwarded-proto"))&&void 0!==l?l:h.nextUrl.protocol,n.port="",n.host=a);return h.nextUrl.basePath&&(n.pathname=m(n.pathname,h.nextUrl.basePath)),e.redirect(n.toString())}const y=s(h.nextUrl.pathname,p.locales),D=i(h.nextUrl.pathname,p.locales),q=null!=D;let A,H,R=h.nextUrl.pathname;if(p.pathnames){let e;if([e=U,H]=c(p.pathnames,y),H){const t=p.pathnames[H],a="string"==typeof t?t:t[U];if(n(a,y))R=d(y,a,H,D);else{const n=p.defaultLocale===U||(null==P?void 0:P.defaultLocale)===U;A=j(f(d(y,"string"==typeof t?t:t[e],a,D||!n?U:void 0),h.nextUrl.search))}}}if(!A)if("/"===R){const e=f("/".concat(U),h.nextUrl.search);A="never"===p.localePrefix||g&&"as-needed"===p.localePrefix?b(e):j(e)}else{const e=f(R,h.nextUrl.search);if(q){const t=f(y,h.nextUrl.search);if("never"===p.localePrefix)A=j(t);else if(D===U)if(g&&"as-needed"===p.localePrefix)A=j(t);else if(p.domains){const a=u(P,D,k);A=(null==P?void 0:P.domain)===(null==a?void 0:a.domain)||w?b(e):j(t,null==a?void 0:a.domain)}else A=b(e);else A=j("/".concat(U).concat(t))}else A="never"===p.localePrefix||g&&("as-needed"===p.localePrefix||p.domains)?b("/".concat(U).concat(e)):j("/".concat(U).concat(e))}var S;(L&&A.cookies.set(t,U,{path:h.nextUrl.basePath||void 0,sameSite:"strict",maxAge:31536e3}),"never"!==p.localePrefix&&p.alternateLinks&&p.locales.length>1)&&A.headers.set("Link",l({config:p,localizedPathnames:null!=H?null===(S=p.pathnames)||void 0===S?void 0:S[H]:void 0,request:h,resolvedLocale:U}));return A}}export{h as default};
+import{NextResponse as e}from"next/server";import{COOKIE_LOCALE_NAME as t,COOKIE_SAME_SITE as a,COOKIE_MAX_AGE as n,HEADER_LOCALE_NAME as l}from"../shared/constants.js";import{matchesPathname as o}from"../shared/utils.js";import r from"./getAlternateLinksHeaderValue.js";import s from"./resolveLocale.js";import{isLocaleSupportedOnDomain as i,getNormalizedPathname as c,getKnownLocaleFromPathname as d,getInternalTemplate as f,formatTemplatePathname as u,getPathWithSearch as m,getBestMatchingDomain as h,applyBasePath as p}from"./utils.js";function v(v){const x=function(e){var t,a,n;return{...e,alternateLinks:null===(t=e.alternateLinks)||void 0===t||t,localePrefix:null!==(a=e.localePrefix)&&void 0!==a?a:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(v);return function(v){var P,U;const{domain:L,locale:g}=s(x,v.headers,v.cookies,v.nextUrl.pathname),k=x.localeDetection&&(null===(P=v.cookies.get(t))||void 0===P?void 0:P.value)!==g,w=L?L.defaultLocale===g:g===x.defaultLocale,b=(null===(U=x.domains)||void 0===U?void 0:U.filter((e=>i(g,e))))||[],j=null!=x.domains&&!L;function y(t){const a=new URL(t,v.url);return v.nextUrl.basePath&&(a.pathname=p(a.pathname,v.nextUrl.basePath)),e.rewrite(a,function(){const e=new Headers(v.headers);return e.set(l,g),{request:{headers:e}}}())}function D(t,a){const n=new URL(t,v.url);if(b.length>0&&!a){const e=h(L,g,b);e&&(a=e.domain,e.defaultLocale===g&&"as-needed"===x.localePrefix&&n.pathname.startsWith("/".concat(g))&&(n.pathname=c(n.pathname,x.locales)))}var l;a&&(n.protocol=null!==(l=v.headers.get("x-forwarded-proto"))&&void 0!==l?l:v.nextUrl.protocol,n.port="",n.host=a);return v.nextUrl.basePath&&(n.pathname=p(n.pathname,v.nextUrl.basePath)),e.redirect(n.toString())}const q=c(v.nextUrl.pathname,x.locales),A=d(v.nextUrl.pathname,x.locales),H=null!=A;let R,S,z=v.nextUrl.pathname;if(x.pathnames){let e;if([e=g,S]=f(x.pathnames,q),S){const t=x.pathnames[S],a="string"==typeof t?t:t[g];if(o(a,q))z=u(q,a,S,A);else{const n=x.defaultLocale===g||(null==L?void 0:L.defaultLocale)===g;R=D(m(u(q,"string"==typeof t?t:t[e],a,A||!n?g:void 0),v.nextUrl.search))}}}if(!R)if("/"===z){const e=m("/".concat(g),v.nextUrl.search);R="never"===x.localePrefix||w&&"as-needed"===x.localePrefix?y(e):D(e)}else{const e=m(z,v.nextUrl.search);if(H){const t=m(q,v.nextUrl.search);if("never"===x.localePrefix)R=D(t);else if(A===g)if(w&&"as-needed"===x.localePrefix)R=D(t);else if(x.domains){const a=h(L,A,b);R=(null==L?void 0:L.domain)===(null==a?void 0:a.domain)||j?y(e):D(t,null==a?void 0:a.domain)}else R=y(e);else R=D("/".concat(g).concat(t))}else R="never"===x.localePrefix||w&&("as-needed"===x.localePrefix||x.domains)?y("/".concat(g).concat(e)):D("/".concat(g).concat(e))}var V;(k&&R.cookies.set(t,g,{path:v.nextUrl.basePath||void 0,sameSite:a,maxAge:n}),"never"!==x.localePrefix&&x.alternateLinks&&x.locales.length>1)&&R.headers.set("Link",r({config:x,localizedPathnames:null!=S?null===(V=x.pathnames)||void 0===V?void 0:V[S]:void 0,request:v,resolvedLocale:g}));return R}}export{v as default};

package/dist/esm/navigation/react-client/ClientLink.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r,{forwardRef as t}from"react";import a from"../../react-client/useLocale.js";import l from"../shared/BaseLink.js";function o(t,o){let{locale:n,...s}=t;const i=a(),c=n||i;return r.createElement(l,e({ref:o,hrefLang:c,locale:c},s))}const n=t(o);n.displayName="ClientLink";var s=n;export{s as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r,{forwardRef as t}from"react";import l from"../../react-client/useLocale.js";import a from"../shared/BaseLink.js";function o(t,o){let{locale:s,...i}=t;const n=l(),c=s||n;return r.createElement(a,e({ref:o,locale:c},i))}const s=t(o);s.displayName="ClientLink";var i=s;export{i as default};

package/dist/esm/navigation/react-client/createSharedPathnamesNavigation.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r,{forwardRef as t}from"react";import n from"./ClientLink.js";import o from"./clientRedirect.js";import i from"./useBasePathname.js";import a from"./useBaseRouter.js";function u(u){function m(t,o){return r.createElement(n,e({ref:o,localePrefix:u.localePrefix},t))}const s=t(m);return s.displayName="Link",{Link:s,redirect:function(e){for(var r=arguments.length,t=new Array(r>1?r-1:0),n=1;n<r;n++)t[n-1]=arguments[n];return o({...u,pathname:e},...t)},usePathname:function(){return i()},useRouter:a}}export{u as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r,{forwardRef as t}from"react";import n from"./ClientLink.js";import o from"./clientRedirect.js";import i from"./useBasePathname.js";import a from"./useBaseRouter.js";function u(u){function l(t,o){return r.createElement(n,e({ref:o,localePrefix:null==u?void 0:u.localePrefix},t))}const m=t(l);return m.displayName="Link",{Link:m,redirect:function(e){for(var r=arguments.length,t=new Array(r>1?r-1:0),n=1;n<r;n++)t[n-1]=arguments[n];return o({...u,pathname:e},...t)},usePathname:function(){return i()},useRouter:a}}export{u as default};

package/dist/esm/navigation/react-client/useBaseRouter.js

@@ -1 +1 @@
-import{useRouter as e}from"next/navigation";import{useMemo as t}from"react";import r from"../../react-client/useLocale.js";import{localizeHref as n}from"../../shared/utils.js";function o(){const o=e(),c=r();return t((()=>{function e(e,t){return n(e,t||c,c,window.location.pathname)}return{...o,push(t,r){const{locale:n,...c}=r||{},s=[e(t,n)];return Object.keys(c).length>0&&s.push(c),o.push(...s)},replace(t,r){const{locale:n,...c}=r||{},s=[e(t,n)];return Object.keys(c).length>0&&s.push(c),o.replace(...s)},prefetch(t,r){const{locale:n,...c}=r||{},s=[e(t,n)];return Object.keys(c).length>0&&s.push(c),o.prefetch(...s)}}}),[c,o])}export{o as default};
+import{useRouter as t,usePathname as e}from"next/navigation";import{useMemo as r}from"react";import o from"../../react-client/useLocale.js";import{localizeHref as n}from"../../shared/utils.js";import c from"../shared/syncLocaleCookie.js";function a(){const a=t(),i=o(),s=e();return r((()=>{function t(t,e){return n(t,e||i,i,window.location.pathname)}function e(e){return function(r,o){const{locale:n,...a}=o||{};c(s,i,n);const u=[t(r,n)];return Object.keys(a).length>0&&u.push(a),e(...u)}}return{...a,push:e(a.push),replace:e(a.replace),prefetch:e(a.prefetch)}}),[i,s,a])}export{a as default};

package/dist/esm/navigation/react-server/createSharedPathnamesNavigation.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import t from"./ServerLink.js";import o from"./serverRedirect.js";function n(n){function u(e){return()=>{throw new Error("`".concat(e,"` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."))}}return{Link:function(o){return r.createElement(t,e({localePrefix:n.localePrefix},o))},redirect:function(e){for(var r=arguments.length,t=new Array(r>1?r-1:0),u=1;u<r;u++)t[u-1]=arguments[u];return o({...n,pathname:e},...t)},usePathname:u("usePathname"),useRouter:u("useRouter")}}export{n as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import t from"./ServerLink.js";import o from"./serverRedirect.js";function n(n){function u(e){return()=>{throw new Error("`".concat(e,"` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."))}}return{Link:function(o){return r.createElement(t,e({localePrefix:null==n?void 0:n.localePrefix},o))},redirect:function(e){for(var r=arguments.length,t=new Array(r>1?r-1:0),u=1;u<r;u++)t[u-1]=arguments[u];return o({...n,pathname:e},...t)},usePathname:u("usePathname"),useRouter:u("useRouter")}}export{n as default};

package/dist/esm/navigation/shared/BaseLink.js

@@ -1,2 +1,2 @@
 'use client';
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"next/link";import{usePathname as t}from"next/navigation";import o,{forwardRef as l,useState as n,useEffect as i}from"react";import a from"../../react-client/useLocale.js";import{isLocalHref as p,prefixHref as c,localizeHref as s}from"../../shared/utils.js";function f(l,f){let{href:m,locale:u,localePrefix:h,prefetch:d,...v}=l;const x=t(),g=a(),j=u!==g,[k,L]=n((()=>p(m)&&("never"!==h||j)?c(m,u):m));return i((()=>{x&&"never"!==h&&L(s(m,u,g,null!=x?x:void 0))}),[g,m,u,h,x]),j&&(d&&console.error("The `prefetch` prop is currently not supported when using the `locale` prop on `Link` to switch the locale.`"),d=!1),o.createElement(r,e({ref:f,href:k,prefetch:d},v))}const m=l(f);m.displayName="ClientLink";var u=m;export{u as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"next/link";import{usePathname as o}from"next/navigation";import t,{forwardRef as n,useState as l,useEffect as i}from"react";import c from"../../react-client/useLocale.js";import{isLocalHref as a,prefixHref as p,localizeHref as s}from"../../shared/utils.js";import f from"./syncLocaleCookie.js";function m(n,m){let{href:u,locale:h,localePrefix:d,onClick:v,prefetch:k,...x}=n;const L=o(),g=c(),j=h!==g,[C,y]=l((()=>a(u)&&("never"!==d||j)?p(u,h):u));return i((()=>{L&&"never"!==d&&y(s(u,h,g,null!=L?L:void 0))}),[g,u,h,d,L]),j&&(k&&console.error("The `prefetch` prop is currently not supported when using the `locale` prop on `Link` to switch the locale.`"),k=!1),t.createElement(r,e({ref:m,href:C,hrefLang:j?h:void 0,onClick:function(e){f(L,g,h),v&&v(e)},prefetch:k},x))}const u=n(m);u.displayName="ClientLink";var h=u;export{h as default};

package/dist/esm/navigation/shared/syncLocaleCookie.js

@@ -0,0 +1 @@
+import{COOKIE_LOCALE_NAME as t,COOKIE_MAX_AGE as a,COOKIE_SAME_SITE as c}from"../../shared/constants.js";function o(o,n,e){if(!(e!==n)||!o)return;const i=window.location.pathname.replace(o,""),r=""!==i?i:"/";document.cookie="".concat(t,"=").concat(e,"; path=").concat(r,"; max-age=").concat(a,"; sameSite=").concat(c)}export{o as default};

package/dist/esm/shared/constants.js

@@ -1 +1 @@
-const L="NEXT_LOCALE",E="X-NEXT-INTL-LOCALE",o="locale";export{L as COOKIE_LOCALE_NAME,E as HEADER_LOCALE_NAME,o as LOCALE_SEGMENT_NAME};
+const L="NEXT_LOCALE",t=31536e3,E="strict",c="X-NEXT-INTL-LOCALE",e="locale";export{L as COOKIE_LOCALE_NAME,t as COOKIE_MAX_AGE,E as COOKIE_SAME_SITE,c as HEADER_LOCALE_NAME,e as LOCALE_SEGMENT_NAME};

package/dist/production/middleware/middleware.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/server"),a=require("../shared/constants.js"),t=require("../shared/utils.js"),n=require("./getAlternateLinksHeaderValue.js"),l=require("./resolveLocale.js"),o=require("./utils.js");exports.default=function(r){const s=function(e){var a,t,n;return{...e,alternateLinks:null===(a=e.alternateLinks)||void 0===a||a,localePrefix:null!==(t=e.localePrefix)&&void 0!==t?t:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(r);return function(r){var i,c;const{domain:d,locale:h}=l.default(s,r.headers,r.cookies,r.nextUrl.pathname),u=s.localeDetection&&(null===(i=r.cookies.get(a.COOKIE_LOCALE_NAME))||void 0===i?void 0:i.value)!==h,m=d?d.defaultLocale===h:h===s.defaultLocale,f=(null===(c=s.domains)||void 0===c?void 0:c.filter((e=>o.isLocaleSupportedOnDomain(h,e))))||[],p=null!=s.domains&&!d;function v(t){const n=new URL(t,r.url);return r.nextUrl.basePath&&(n.pathname=o.applyBasePath(n.pathname,r.nextUrl.basePath)),e.NextResponse.rewrite(n,function(){const e=new Headers(r.headers);return e.set(a.HEADER_LOCALE_NAME,h),{request:{headers:e}}}())}function x(a,t){const n=new URL(a,r.url);if(f.length>0&&!t){const e=o.getBestMatchingDomain(d,h,f);e&&(t=e.domain,e.defaultLocale===h&&"as-needed"===s.localePrefix&&n.pathname.startsWith("/".concat(h))&&(n.pathname=o.getNormalizedPathname(n.pathname,s.locales)))}var l;t&&(n.protocol=null!==(l=r.headers.get("x-forwarded-proto"))&&void 0!==l?l:r.nextUrl.protocol,n.port="",n.host=t);return r.nextUrl.basePath&&(n.pathname=o.applyBasePath(n.pathname,r.nextUrl.basePath)),e.NextResponse.redirect(n.toString())}const P=o.getNormalizedPathname(r.nextUrl.pathname,s.locales),g=o.getKnownLocaleFromPathname(r.nextUrl.pathname,s.locales),L=null!=g;let U,E,A=r.nextUrl.pathname;if(s.pathnames){let e;if([e=h,E]=o.getInternalTemplate(s.pathnames,P),E){const a=s.pathnames[E],n="string"==typeof a?a:a[h];if(t.matchesPathname(n,P))A=o.formatTemplatePathname(P,n,E,g);else{const t=s.defaultLocale===h||(null==d?void 0:d.defaultLocale)===h;U=x(o.getPathWithSearch(o.formatTemplatePathname(P,"string"==typeof a?a:a[e],n,g||!t?h:void 0),r.nextUrl.search))}}}if(!U)if("/"===A){const e=o.getPathWithSearch("/".concat(h),r.nextUrl.search);U="never"===s.localePrefix||m&&"as-needed"===s.localePrefix?v(e):x(e)}else{const e=o.getPathWithSearch(A,r.nextUrl.search);if(L){const a=o.getPathWithSearch(P,r.nextUrl.search);if("never"===s.localePrefix)U=x(a);else if(g===h)if(m&&"as-needed"===s.localePrefix)U=x(a);else if(s.domains){const t=o.getBestMatchingDomain(d,g,f);U=(null==d?void 0:d.domain)===(null==t?void 0:t.domain)||p?v(e):x(a,null==t?void 0:t.domain)}else U=v(e);else U=x("/".concat(h).concat(a))}else U="never"===s.localePrefix||m&&("as-needed"===s.localePrefix||s.domains)?v("/".concat(h).concat(e)):x("/".concat(h).concat(e))}var O;(u&&U.cookies.set(a.COOKIE_LOCALE_NAME,h,{path:r.nextUrl.basePath||void 0,sameSite:"strict",maxAge:31536e3}),"never"!==s.localePrefix&&s.alternateLinks&&s.locales.length>1)&&U.headers.set("Link",n.default({config:s,localizedPathnames:null!=E?null===(O=s.pathnames)||void 0===O?void 0:O[E]:void 0,request:r,resolvedLocale:h}));return U}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/server"),a=require("../shared/constants.js"),t=require("../shared/utils.js"),n=require("./getAlternateLinksHeaderValue.js"),l=require("./resolveLocale.js"),o=require("./utils.js");exports.default=function(r){const s=function(e){var a,t,n;return{...e,alternateLinks:null===(a=e.alternateLinks)||void 0===a||a,localePrefix:null!==(t=e.localePrefix)&&void 0!==t?t:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(r);return function(r){var i,c;const{domain:d,locale:h}=l.default(s,r.headers,r.cookies,r.nextUrl.pathname),u=s.localeDetection&&(null===(i=r.cookies.get(a.COOKIE_LOCALE_NAME))||void 0===i?void 0:i.value)!==h,m=d?d.defaultLocale===h:h===s.defaultLocale,f=(null===(c=s.domains)||void 0===c?void 0:c.filter((e=>o.isLocaleSupportedOnDomain(h,e))))||[],p=null!=s.domains&&!d;function v(t){const n=new URL(t,r.url);return r.nextUrl.basePath&&(n.pathname=o.applyBasePath(n.pathname,r.nextUrl.basePath)),e.NextResponse.rewrite(n,function(){const e=new Headers(r.headers);return e.set(a.HEADER_LOCALE_NAME,h),{request:{headers:e}}}())}function x(a,t){const n=new URL(a,r.url);if(f.length>0&&!t){const e=o.getBestMatchingDomain(d,h,f);e&&(t=e.domain,e.defaultLocale===h&&"as-needed"===s.localePrefix&&n.pathname.startsWith("/".concat(h))&&(n.pathname=o.getNormalizedPathname(n.pathname,s.locales)))}var l;t&&(n.protocol=null!==(l=r.headers.get("x-forwarded-proto"))&&void 0!==l?l:r.nextUrl.protocol,n.port="",n.host=t);return r.nextUrl.basePath&&(n.pathname=o.applyBasePath(n.pathname,r.nextUrl.basePath)),e.NextResponse.redirect(n.toString())}const P=o.getNormalizedPathname(r.nextUrl.pathname,s.locales),g=o.getKnownLocaleFromPathname(r.nextUrl.pathname,s.locales),L=null!=g;let U,E,O=r.nextUrl.pathname;if(s.pathnames){let e;if([e=h,E]=o.getInternalTemplate(s.pathnames,P),E){const a=s.pathnames[E],n="string"==typeof a?a:a[h];if(t.matchesPathname(n,P))O=o.formatTemplatePathname(P,n,E,g);else{const t=s.defaultLocale===h||(null==d?void 0:d.defaultLocale)===h;U=x(o.getPathWithSearch(o.formatTemplatePathname(P,"string"==typeof a?a:a[e],n,g||!t?h:void 0),r.nextUrl.search))}}}if(!U)if("/"===O){const e=o.getPathWithSearch("/".concat(h),r.nextUrl.search);U="never"===s.localePrefix||m&&"as-needed"===s.localePrefix?v(e):x(e)}else{const e=o.getPathWithSearch(O,r.nextUrl.search);if(L){const a=o.getPathWithSearch(P,r.nextUrl.search);if("never"===s.localePrefix)U=x(a);else if(g===h)if(m&&"as-needed"===s.localePrefix)U=x(a);else if(s.domains){const t=o.getBestMatchingDomain(d,g,f);U=(null==d?void 0:d.domain)===(null==t?void 0:t.domain)||p?v(e):x(a,null==t?void 0:t.domain)}else U=v(e);else U=x("/".concat(h).concat(a))}else U="never"===s.localePrefix||m&&("as-needed"===s.localePrefix||s.domains)?v("/".concat(h).concat(e)):x("/".concat(h).concat(e))}var A;(u&&U.cookies.set(a.COOKIE_LOCALE_NAME,h,{path:r.nextUrl.basePath||void 0,sameSite:a.COOKIE_SAME_SITE,maxAge:a.COOKIE_MAX_AGE}),"never"!==s.localePrefix&&s.alternateLinks&&s.locales.length>1)&&U.headers.set("Link",n.default({config:s,localizedPathnames:null!=E?null===(A=s.pathnames)||void 0===A?void 0:A[E]:void 0,request:r,resolvedLocale:h}));return U}};

package/dist/production/navigation/react-client/ClientLink.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../../react-client/useLocale.js"),l=require("../shared/BaseLink.js");function a(e){return e&&e.__esModule?e:{default:e}}var u=a(r);function n(r,a){let{locale:n,...s}=r;const i=t.default(),o=n||i;return u.default.createElement(l.default,e.extends({ref:a,hrefLang:o,locale:o},s))}const s=r.forwardRef(n);s.displayName="ClientLink";var i=s;exports.default=i;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../../react-client/useLocale.js"),l=require("../shared/BaseLink.js");function a(e){return e&&e.__esModule?e:{default:e}}var u=a(r);function s(r,a){let{locale:s,...n}=r;const i=t.default(),o=s||i;return u.default.createElement(l.default,e.extends({ref:a,locale:o},n))}const n=r.forwardRef(s);n.displayName="ClientLink";var i=n;exports.default=i;

package/dist/production/navigation/react-client/createSharedPathnamesNavigation.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("./ClientLink.js"),u=require("./clientRedirect.js"),n=require("./useBasePathname.js"),a=require("./useBaseRouter.js");function i(e){return e&&e.__esModule?e:{default:e}}var l=i(r);exports.default=function(i){function s(r,u){return l.default.createElement(t.default,e.extends({ref:u,localePrefix:i.localePrefix},r))}const f=r.forwardRef(s);return f.displayName="Link",{Link:f,redirect:function(e){for(var r=arguments.length,t=new Array(r>1?r-1:0),n=1;n<r;n++)t[n-1]=arguments[n];return u.default({...i,pathname:e},...t)},usePathname:function(){return n.default()},useRouter:a.default}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("./ClientLink.js"),u=require("./clientRedirect.js"),n=require("./useBasePathname.js"),a=require("./useBaseRouter.js");function l(e){return e&&e.__esModule?e:{default:e}}var i=l(r);exports.default=function(l){function s(r,u){return i.default.createElement(t.default,e.extends({ref:u,localePrefix:null==l?void 0:l.localePrefix},r))}const f=r.forwardRef(s);return f.displayName="Link",{Link:f,redirect:function(e){for(var r=arguments.length,t=new Array(r>1?r-1:0),n=1;n<r;n++)t[n-1]=arguments[n];return u.default({...l,pathname:e},...t)},usePathname:function(){return n.default()},useRouter:a.default}};

package/dist/production/navigation/react-client/useBaseRouter.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/navigation"),t=require("react"),r=require("../../react-client/useLocale.js"),u=require("../../shared/utils.js");exports.default=function(){const n=e.useRouter(),c=r.default();return t.useMemo((()=>{function e(e,t){return u.localizeHref(e,t||c,c,window.location.pathname)}return{...n,push(t,r){const{locale:u,...c}=r||{},s=[e(t,u)];return Object.keys(c).length>0&&s.push(c),n.push(...s)},replace(t,r){const{locale:u,...c}=r||{},s=[e(t,u)];return Object.keys(c).length>0&&s.push(c),n.replace(...s)},prefetch(t,r){const{locale:u,...c}=r||{},s=[e(t,u)];return Object.keys(c).length>0&&s.push(c),n.prefetch(...s)}}}),[c,n])};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/navigation"),r=require("react"),t=require("../../react-client/useLocale.js"),u=require("../../shared/utils.js"),n=require("../shared/syncLocaleCookie.js");exports.default=function(){const c=e.useRouter(),o=t.default(),s=e.usePathname();return r.useMemo((()=>{function e(e,r){return u.localizeHref(e,r||o,o,window.location.pathname)}function r(r){return function(t,u){const{locale:c,...a}=u||{};n.default(s,o,c);const i=[e(t,c)];return Object.keys(a).length>0&&i.push(a),r(...i)}}return{...c,push:r(c.push),replace:r(c.replace),prefetch:r(c.prefetch)}}),[o,s,c])};

package/dist/production/navigation/react-server/createSharedPathnamesNavigation.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("./ServerLink.js"),n=require("./serverRedirect.js");function u(e){return e&&e.__esModule?e:{default:e}}var o=u(r);exports.default=function(r){function u(e){return()=>{throw new Error("`".concat(e,"` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."))}}return{Link:function(n){return o.default.createElement(t.default,e.extends({localePrefix:r.localePrefix},n))},redirect:function(e){for(var t=arguments.length,u=new Array(t>1?t-1:0),o=1;o<t;o++)u[o-1]=arguments[o];return n.default({...r,pathname:e},...u)},usePathname:u("usePathname"),useRouter:u("useRouter")}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("./ServerLink.js"),n=require("./serverRedirect.js");function u(e){return e&&e.__esModule?e:{default:e}}var o=u(r);exports.default=function(r){function u(e){return()=>{throw new Error("`".concat(e,"` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."))}}return{Link:function(n){return o.default.createElement(t.default,e.extends({localePrefix:null==r?void 0:r.localePrefix},n))},redirect:function(e){for(var t=arguments.length,u=new Array(t>1?t-1:0),o=1;o<t;o++)u[o-1]=arguments[o];return n.default({...r,pathname:e},...u)},usePathname:u("usePathname"),useRouter:u("useRouter")}};

package/dist/production/navigation/shared/BaseLink.js

@@ -1,2 +1,2 @@
 'use client';
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("next/link"),t=require("next/navigation"),l=require("react"),a=require("../../react-client/useLocale.js"),u=require("../../shared/utils.js");function i(e){return e&&e.__esModule?e:{default:e}}var n=i(r),f=i(l);function s(r,i){let{href:s,locale:c,localePrefix:o,prefetch:d,...p}=r;const v=t.usePathname(),x=a.default(),h=c!==x,[q,_]=l.useState((()=>u.isLocalHref(s)&&("never"!==o||h)?u.prefixHref(s,c):s));return l.useEffect((()=>{v&&"never"!==o&&_(u.localizeHref(s,c,x,null!=v?v:void 0))}),[x,s,c,o,v]),h&&(d=!1),f.default.createElement(n.default,e.extends({ref:i,href:q,prefetch:d},p))}const c=l.forwardRef(s);c.displayName="ClientLink";var o=c;exports.default=o;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("next/link"),t=require("next/navigation"),l=require("react"),a=require("../../react-client/useLocale.js"),i=require("../../shared/utils.js"),u=require("./syncLocaleCookie.js");function n(e){return e&&e.__esModule?e:{default:e}}var f=n(r),o=n(l);function c(r,n){let{href:c,locale:s,localePrefix:d,onClick:v,prefetch:p,...h}=r;const q=t.usePathname(),x=a.default(),_=s!==x,[j,k]=l.useState((()=>i.isLocalHref(c)&&("never"!==d||_)?i.prefixHref(c,s):c));return l.useEffect((()=>{q&&"never"!==d&&k(i.localizeHref(c,s,x,null!=q?q:void 0))}),[x,c,s,d,q]),_&&(p=!1),o.default.createElement(f.default,e.extends({ref:n,href:j,hrefLang:_?s:void 0,onClick:function(e){u.default(q,x,s),v&&v(e)},prefetch:p},h))}const s=l.forwardRef(c);s.displayName="ClientLink";var d=s;exports.default=d;

package/dist/production/navigation/shared/syncLocaleCookie.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../shared/constants.js");exports.default=function(t,c,a){if(!(a!==c)||!t)return;const o=window.location.pathname.replace(t,""),n=""!==o?o:"/";document.cookie="".concat(e.COOKIE_LOCALE_NAME,"=").concat(a,"; path=").concat(n,"; max-age=").concat(e.COOKIE_MAX_AGE,"; sameSite=").concat(e.COOKIE_SAME_SITE)};

package/dist/production/shared/constants.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});exports.COOKIE_LOCALE_NAME="NEXT_LOCALE",exports.HEADER_LOCALE_NAME="X-NEXT-INTL-LOCALE",exports.LOCALE_SEGMENT_NAME="locale";
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});exports.COOKIE_LOCALE_NAME="NEXT_LOCALE",exports.COOKIE_MAX_AGE=31536e3,exports.COOKIE_SAME_SITE="strict",exports.HEADER_LOCALE_NAME="X-NEXT-INTL-LOCALE",exports.LOCALE_SEGMENT_NAME="locale";

package/dist/types/src/navigation/react-client/createSharedPathnamesNavigation.d.ts

@@ -2,8 +2,8 @@
 import React, { ReactElement } from 'react';
 import { AllLocales, LocalePrefix } from '../../shared/types';
 import useBaseRouter from './useBaseRouter';
-export default function createSharedPathnamesNavigation<Locales extends AllLocales>(opts: {
-    locales: Locales;
+export default function createSharedPathnamesNavigation<Locales extends AllLocales>(opts?: {
+    locales?: Locales;
     localePrefix?: LocalePrefix;
 }): {
     Link: (props: Omit<Omit<Omit<Omit<Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, keyof {

package/dist/types/src/navigation/react-client/useBaseRouter.d.ts

@@ -22,9 +22,9 @@ type IntlNavigateOptions<Locales extends AllLocales> = {
  * ```
  */
 export default function useBaseRouter<Locales extends AllLocales>(): {
-    push(href: string, options?: (import("next/dist/shared/lib/app-router-context.shared-runtime").NavigateOptions & IntlNavigateOptions<Locales>) | undefined): void;
-    replace(href: string, options?: (import("next/dist/shared/lib/app-router-context.shared-runtime").NavigateOptions & IntlNavigateOptions<Locales>) | undefined): void;
-    prefetch(href: string, options?: (import("next/dist/shared/lib/app-router-context.shared-runtime").PrefetchOptions & IntlNavigateOptions<Locales>) | undefined): void;
+    push: (href: string, options?: (import("next/dist/shared/lib/app-router-context.shared-runtime").NavigateOptions & IntlNavigateOptions<Locales>) | undefined) => void;
+    replace: (href: string, options?: (import("next/dist/shared/lib/app-router-context.shared-runtime").NavigateOptions & IntlNavigateOptions<Locales>) | undefined) => void;
+    prefetch: (href: string, options?: (import("next/dist/shared/lib/app-router-context.shared-runtime").PrefetchOptions & IntlNavigateOptions<Locales>) | undefined) => void;
     back(): void;
     forward(): void;
     refresh(): void;

package/dist/types/src/navigation/react-server/createSharedPathnamesNavigation.d.ts

@@ -1,8 +1,8 @@
 import React, { ComponentProps } from 'react';
 import { AllLocales, LocalePrefix } from '../../shared/types';
 import ServerLink from './ServerLink';
-export default function createSharedPathnamesNavigation<Locales extends AllLocales>(opts: {
-    locales: Locales;
+export default function createSharedPathnamesNavigation<Locales extends AllLocales>(opts?: {
+    locales?: Locales;
     localePrefix?: LocalePrefix;
 }): {
     Link: (props: ComponentProps<typeof ServerLink<Locales>>) => React.JSX.Element;

package/dist/types/src/navigation/shared/syncLocaleCookie.d.ts

@@ -0,0 +1,6 @@
+/**
+ * We have to keep the cookie value in sync as Next.js might
+ * skip a request to the server due to its router cache.
+ * See https://github.com/amannn/next-intl/issues/786.
+ */
+export default function syncLocaleCookie(pathname: string | null, locale: string, nextLocale?: string): void;

package/dist/types/src/shared/constants.d.ts

@@ -1,3 +1,6 @@
 export declare const COOKIE_LOCALE_NAME = "NEXT_LOCALE";
+export declare const COOKIE_MAX_AGE = 31536000;
+export declare const COOKIE_SAME_SITE = "strict";
+export declare const COOKIE_BASE_PATH_NAME = "NEXT_INTL_BASE_PATH";
 export declare const HEADER_LOCALE_NAME = "X-NEXT-INTL-LOCALE";
 export declare const LOCALE_SEGMENT_NAME = "locale";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.4.4",
+  "version": "3.5.0",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -82,7 +82,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.4.4"
+    "use-intl": "^3.5.0"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -100,7 +100,7 @@
     "eslint": "^8.54.0",
     "eslint-config-molindo": "^7.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
-    "next": "^14.0.4",
+    "next": "^14.1.0",
     "path-to-regexp": "^6.2.1",
     "publint": "^0.2.7",
     "react": "^18.2.0",
@@ -114,7 +114,7 @@
   "size-limit": [
     {
       "path": "dist/production/index.react-client.js",
-      "limit": "12.855 KB"
+      "limit": "12.865 KB"
     },
     {
       "path": "dist/production/index.react-server.js",
@@ -122,11 +122,11 @@
     },
     {
       "path": "dist/production/navigation.react-client.js",
-      "limit": "2.63 KB"
+      "limit": "2.83 KB"
     },
     {
       "path": "dist/production/navigation.react-server.js",
-      "limit": "2.82 KB"
+      "limit": "2.94 KB"
     },
     {
       "path": "dist/production/server.react-client.js",
@@ -141,5 +141,5 @@
       "limit": "5.8 KB"
     }
   ],
-  "gitHead": "9a57cf7bc10d61aa11094df891daea1d62e0dc36"
+  "gitHead": "716d71605c2b855c6c6004e0c233bbc20ddeaf74"
 }